Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

WIP: perf(jqLite): use classList for add/removeClass #7829

Closed
wants to merge 2 commits into from
Closed

WIP: perf(jqLite): use classList for add/removeClass #7829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5da78ff
perf(jqLite): use classList for adding classes if available
IgorMinar Jun 4, 2014
bd52525
perf(jqLite): use classList for removing classes if available
rodyhaddad Jun 13, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 46 additions & 18 deletions src/jqLite.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,30 +337,58 @@ function jqLiteHasClass(element, selector) {
}

function jqLiteRemoveClass(element, cssClasses) {
if (cssClasses && element.setAttribute) {
forEach(cssClasses.split(' '), function(cssClass) {
element.setAttribute('class', trim(
(" " + (element.getAttribute('class') || '') + " ")
.replace(/[\n\t]/g, " ")
.replace(" " + trim(cssClass) + " ", " "))
);
});
if (cssClasses) {

// if browser and element support classList api use it
if (element.classList) {
cssClasses = trim(cssClasses);
if (cssClasses) {
cssClasses = cssClasses.split(/\s+/);
if (cssClasses.length === 1) {
element.classList.remove(cssClasses[0]);
} else {
element.classList.remove.apply(element.classList, cssClasses);
}
}
} else if (element.setAttribute) {
forEach(cssClasses.split(' '), function(cssClass) {
element.setAttribute('class', trim(
(" " + (element.getAttribute('class') || '') + " ")
.replace(/[\n\t]/g, " ")
.replace(" " + trim(cssClass) + " ", " "))
);
});
}
}
}

function jqLiteAddClass(element, cssClasses) {
if (cssClasses && element.setAttribute) {
var existingClasses = (' ' + (element.getAttribute('class') || '') + ' ')
.replace(/[\n\t]/g, " ");

forEach(cssClasses.split(' '), function(cssClass) {
cssClass = trim(cssClass);
if (existingClasses.indexOf(' ' + cssClass + ' ') === -1) {
existingClasses += cssClass + ' ';
if (cssClasses) {

// if browser and element support classList api use it
if (element.classList) {
cssClasses = trim(cssClasses);
if (cssClasses) {
cssClasses = cssClasses.split(/\s+/);
if (cssClasses.length === 1) {
element.classList.add(cssClasses[0]);
} else {
element.classList.add.apply(element.classList, cssClasses);
}
}
});
} else if (element.setAttribute) {
var existingClasses = (' ' + (element.getAttribute('class') || '') + ' ')
.replace(/[\n\t]/g, " ");

forEach(cssClasses.split(' '), function (cssClass) {
cssClass = trim(cssClass);
if (existingClasses.indexOf(' ' + cssClass + ' ') === -1) {
existingClasses += cssClass + ' ';
}
});

element.setAttribute('class', trim(existingClasses));
element.setAttribute('class', trim(existingClasses));
}
}
}

Expand Down
9 changes: 9 additions & 0 deletions test/ngAnimate/animateSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3532,6 +3532,15 @@ describe("ngAnimate", function() {
}
node._setAttribute(prop, val);
};
node._classListAdd = node.classList.add;
node.classList.add = function(cssClass) {
if (cssClass === 'trigger-class') {
var propertyKey = ($sniffer.vendorPrefix == 'Webkit' ? '-webkit-' : '') + 'transition-property';
capturedProperty = element.css(propertyKey);
}

return node._classListAdd.apply(node.classList, arguments);
};

expect(capturedProperty).toBe('none');
$animate.addClass(element, 'trigger-class');
Expand Down