google
/
material-design-lite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #27 from jasonmayes/master 

Updating correct componentHandler
master
Addy Osmani 2015-03-18 10:00:29 +00:00
parent 2d9dc21039 04b00eeaa1
commit ce88c8db40
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/wskComponentHandler.js
View File

@ -41,16 +41,23 @@ var componentHandler = (function() {
* will have. * will have.
*/ */
function upgradeDomInternal(jsClass, cssClass) { function upgradeDomInternal(jsClass, cssClass) {
if (cssClass === undefined) { if (jsClass === undefined && cssClass === undefined) {
var registeredClass = findRegisteredClass_(jsClass); for (var i = 0; i < registeredComponents_.length; i++) {
if (registeredClass) { upgradeDomInternal(registeredComponents_[i].className,
cssClass = registeredClass.cssClass; registeredComponents_[i].cssClass);
}
} else {
if (cssClass === undefined) {
var registeredClass = findRegisteredClass_(jsClass);
if (registeredClass) {
cssClass = registeredClass.cssClass;
}
} }
}
var elements = document.querySelectorAll('.' + cssClass); var elements = document.querySelectorAll('.' + cssClass);
for (var n = 0; n < elements.length; n++) { for (var n = 0; n < elements.length; n++) {
upgradeElementInternal(elements[n], jsClass); upgradeElementInternal(elements[n], jsClass);
}
} }
} }
@ -160,7 +167,8 @@ window.addEventListener('load', function() {
* tested, adds a wsk-js class to the <html> element. It then upgrades all WSK * tested, adds a wsk-js class to the <html> element. It then upgrades all WSK
* components requiring JavaScript. * components requiring JavaScript.
*/ */
if ('classList' in document.createElement('div') && 'querySelector' in document && 'addEventListener' in window && Array.prototype.forEach) { if ('classList' in document.createElement('div') && 'querySelector' in document &&
'addEventListener' in window && Array.prototype.forEach) {
document.documentElement.classList.add('wsk-js'); document.documentElement.classList.add('wsk-js');
componentHandler.upgradeAllRegistered(); componentHandler.upgradeAllRegistered();
} else { } else {