diff options
| author | Brian Ford | 2013-09-23 17:29:51 -0700 |
|---|---|---|
| committer | Igor Minar | 2013-09-27 12:38:27 -0700 |
| commit | c785267eb8780d8b7658ef93ebb5ebddd566294d (patch) | |
| tree | 46fa85051d7aa768719b8c4572aec63ed30d52e2 /src/jqLite.js | |
| parent | 6aaae062171bfc8e5046c3eae99bc9d63037120a (diff) | |
| download | angular.js-c785267eb8780d8b7658ef93ebb5ebddd566294d.tar.bz2 | |
fix(jqLite): use get/setAttribute so that jqLite works on SVG nodes
jqLite previously used `elt.className` to add and remove classes from a DOM Node, but
because the className property is not writable on SVG elements, it doesn't work with
them. This patch replaces accesses to `className` with `get/setAttribute`.
`classList` was also considered as a solution, but because only IE10+ supports it, we
have to wait. :'(
The JqLiteAddClass/JQLiteRemoveClass methods are now also used directly by $animate
to work around the jQuery not being able to handle class modifications on SVG elements.
Closes #3858
Diffstat (limited to 'src/jqLite.js')
| -rw-r--r-- | src/jqLite.js | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/jqLite.js b/src/jqLite.js index 1e1d025c..d3110788 100644 --- a/src/jqLite.js +++ b/src/jqLite.js @@ -279,17 +279,17 @@ function JQLiteData(element, key, value) { } function JQLiteHasClass(element, selector) { - return ((" " + element.className + " ").replace(/[\n\t]/g, " "). + return ((" " + (element.getAttribute('class') || '') + " ").replace(/[\n\t]/g, " "). indexOf( " " + selector + " " ) > -1); } function JQLiteRemoveClass(element, cssClasses) { if (cssClasses) { forEach(cssClasses.split(' '), function(cssClass) { - element.className = trim( - (" " + element.className + " ") + element.setAttribute('class', trim( + (" " + (element.getAttribute('class') || '') + " ") .replace(/[\n\t]/g, " ") - .replace(" " + trim(cssClass) + " ", " ") + .replace(" " + trim(cssClass) + " ", " ")) ); }); } @@ -297,11 +297,17 @@ function JQLiteRemoveClass(element, cssClasses) { function JQLiteAddClass(element, cssClasses) { if (cssClasses) { + var existingClasses = (' ' + (element.getAttribute('class') || '') + ' ') + .replace(/[\n\t]/g, " "); + forEach(cssClasses.split(' '), function(cssClass) { - if (!JQLiteHasClass(element, cssClass)) { - element.className = trim(element.className + ' ' + trim(cssClass)); + cssClass = trim(cssClass); + if (existingClasses.indexOf(' ' + cssClass + ' ') === -1) { + existingClasses += cssClass + ' '; } }); + + element.setAttribute('class', trim(existingClasses)); } } |
