resolve rebase conflicts for updatePrefix()

src/compiler.js

@@ -229,7 +229,9 @@ CompilerProto.compile = function (node, root) {
                 compiler.childCompilers.push(child.$compiler)
             }
         } else {
-            if (partialId) { // replace innerHTML with partial
+
+            // replace innerHTML with partial
+            if (partialId) {
                 node.removeAttribute(config.partialAttr)
                 var partial = compiler.getOption('partials', partialId)
                 if (partial) {
@@ -237,12 +239,21 @@ CompilerProto.compile = function (node, root) {
                     node.appendChild(partial.cloneNode(true))
                 }
             }
+
+            // Javascript transition
             if (transId) {
+                // TODO implement this
+                node.removeAttribute(config.transAttr)
+            }
+
+            // CSS class transition
+            if (transClass) {
                 // attach the transition id to node
                 // its only text so should be fine...
-                node.sd_trans_class = transId
-                node.removeAttribute(transitionAttr)
+                node.sd_trans_class = transClass
+                node.removeAttribute(config.transClassAttr)
             }
+
             // finally, only normal directives left!
             compiler.compileNode(node)
         }

src/transition.js

@@ -18,7 +18,7 @@ module.exports = function (el, stage, changeState, init) {
     // in sd-repeat, the sd-transition directive
     // might not have been processed yet
     if (!className) {
-        className = el.getAttribute(config.prefix + '-transition-class')
+        className = el.getAttribute(config.transClassAttr)
     }
 
     // TODO: optional duration which
@@ -45,6 +45,7 @@ module.exports = function (el, stage, changeState, init) {
         // append
         changeState()
         // force a layout so transition can be triggered
+        /* jshint unused: false */
         var forceLayout = el.clientHeight
         // trigger transition
         classList.remove(className)

test/unit/specs/viewmodel.js

@@ -305,6 +305,7 @@ describe('UNIT: ViewModel', function () {
                 }
             },
             el: {
+                getAttribute: function () {},
                 parentNode: {
                     removeChild: function () {
                         elRemoved = true