Merge pull request vuejs#537 from tyage/svg-class

yyx990803 · yyx990803 · commit 5f27148eea85 · 2014-11-04T12:34:09.000-05:00
Support v-class attr of svg in IE
diff --git a/src/transition.js b/src/transition.js
@@ -1,5 +1,6 @@
 var endEvents  = sniffEndEvents(),
     config     = require('./config'),
+    utils      = require('./utils'),
     // batch enter animations so we only force the layout once
     Batcher    = require('./batcher'),
     batcher    = new Batcher(),
@@ -79,10 +80,7 @@ function applyTransitionClass (el, stage, changeState, hasAnimation) {
         return codes.CSS_SKIP
     }
 
-    // if the browser supports transition,
-    // it must have classList...
     var onEnd,
-        classList        = el.classList,
         existingCallback = el.vue_trans_cb,
         enterClass       = config.enterClass,
         leaveClass       = config.leaveClass,
@@ -91,30 +89,30 @@ function applyTransitionClass (el, stage, changeState, hasAnimation) {
     // cancel unfinished callbacks and jobs
     if (existingCallback) {
         el.removeEventListener(endEvent, existingCallback)
-        classList.remove(enterClass)
-        classList.remove(leaveClass)
+        utils.removeClass(el, enterClass)
+        utils.removeClass(el, leaveClass)
         el.vue_trans_cb = null
     }
 
     if (stage > 0) { // enter
 
         // set to enter state before appending
-        classList.add(enterClass)
+        utils.addClass(el, enterClass)
         // append
         changeState()
         // trigger transition
         if (!hasAnimation) {
             batcher.push({
                 execute: function () {
-                    classList.remove(enterClass)
+                    utils.removeClass(el, enterClass)
                 }
             })
         } else {
             onEnd = function (e) {
                 if (e.target === el) {
                     el.removeEventListener(endEvent, onEnd)
                     el.vue_trans_cb = null
-                    classList.remove(enterClass)
+                    utils.removeClass(el, enterClass)
                 }
             }
             el.addEventListener(endEvent, onEnd)
@@ -128,7 +126,7 @@ function applyTransitionClass (el, stage, changeState, hasAnimation) {
             // trigger hide transition
             batcher.push({
                 execute: function () {
-                    classList.add(leaveClass)
+                    utils.addClass(el, leaveClass)
                 }
             })
             onEnd = function (e) {
@@ -137,7 +135,7 @@ function applyTransitionClass (el, stage, changeState, hasAnimation) {
                     el.vue_trans_cb = null
                     // actually remove node here
                     changeState()
-                    classList.remove(leaveClass)
+                    utils.removeClass(el, leaveClass)
                 }
             }
             // attach transition end listener
@@ -148,7 +146,7 @@ function applyTransitionClass (el, stage, changeState, hasAnimation) {
             changeState()
         }
         return codes.CSS_L
-        
+
     }
 
 }
diff --git a/src/utils.js b/src/utils.js
@@ -7,7 +7,6 @@ var config       = require('./config'),
     THIS_RE      = /[^\w]this[^\w]/,
     BRACKET_RE_S = /\['([^']+)'\]/g,
     BRACKET_RE_D = /\["([^"]+)"\]/g,
-    hasClassList = 'classList' in document.documentElement,
     ViewModel // late def
 
 var defer =
@@ -257,36 +256,43 @@ var utils = module.exports = {
     },
 
     /**
-     *  add class for IE9
+     *  add class for IE
      *  uses classList if available
      */
     addClass: function (el, cls) {
-        if (hasClassList) {
+        if (el.classList) {
             el.classList.add(cls)
         } else {
-            var cur = ' ' + el.className + ' '
+            var cur = ' ' + utils.getClassName(el) + ' '
             if (cur.indexOf(' ' + cls + ' ') < 0) {
-                el.className = (cur + cls).trim()
+                el.setAttribute('class', (cur + cls).trim())
             }
         }
     },
 
     /**
-     *  remove class for IE9
+     *  remove class for IE
      */
     removeClass: function (el, cls) {
-        if (hasClassList) {
+        if (el.classList) {
             el.classList.remove(cls)
         } else {
-            var cur = ' ' + el.className + ' ',
+            var cur = ' ' + utils.getClassName(el) + ' ',
                 tar = ' ' + cls + ' '
             while (cur.indexOf(tar) >= 0) {
                 cur = cur.replace(tar, ' ')
             }
-            el.className = cur.trim()
+            el.setAttribute('class', cur.trim())
         }
     },
 
+    /**
+     *  get class name for IE
+     */
+    getClassName: function(el) {
+        return (el.className instanceof SVGAnimatedString ? el.className.baseVal : el.className)
+    },
+
     /**
      *  Convert an object to Array
      *  used in v-repeat and array filters
@@ -328,4 +334,4 @@ function enableDebug () {
             }
         }
     }
-}
+}
