Permalink
Browse files

Merge branch 'dev-3.x' into b2g

  • Loading branch information...
2 parents f806fca + 6f1f470 commit 0cc49779cf70bb3ae9364c82dbe7ff2b879393e0 @davglass davglass committed Mar 4, 2013
View
@@ -1,6 +1,5 @@
language: node_js
node_js:
- - 0.6
- 0.8
- 0.9
branches:

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -2723,49 +2723,51 @@ Y.log('Undefined module: ' + mname + ', matched a pattern: ' +
for (j in resCombos) {
- base = j;
- comboSep = resCombos[base].comboSep || self.comboSep;
- maxURLLength = resCombos[base].maxURLLength || self.maxURLLength;
- Y.log('Using maxURLLength of ' + maxURLLength, 'info', 'loader');
- for (type in resCombos[base]) {
- if (type === JS || type === CSS) {
- urls = resCombos[base][type];
- mods = resCombos[base][type + 'Mods'];
- len = urls.length;
- tmpBase = base + urls.join(comboSep);
- baseLen = tmpBase.length;
- if (maxURLLength <= base.length) {
- Y.log('maxURLLength (' + maxURLLength + ') is lower than the comboBase length (' + base.length + '), resetting to default (' + MAX_URL_LENGTH + ')', 'error', 'loader');
- maxURLLength = MAX_URL_LENGTH;
- }
+ if (resCombos.hasOwnProperty(j)) {
+ base = j;
+ comboSep = resCombos[base].comboSep || self.comboSep;
+ maxURLLength = resCombos[base].maxURLLength || self.maxURLLength;
+ Y.log('Using maxURLLength of ' + maxURLLength, 'info', 'loader');
+ for (type in resCombos[base]) {
+ if (type === JS || type === CSS) {
+ urls = resCombos[base][type];
+ mods = resCombos[base][type + 'Mods'];
+ len = urls.length;
+ tmpBase = base + urls.join(comboSep);
+ baseLen = tmpBase.length;
+ if (maxURLLength <= base.length) {
+ Y.log('maxURLLength (' + maxURLLength + ') is lower than the comboBase length (' + base.length + '), resetting to default (' + MAX_URL_LENGTH + ')', 'error', 'loader');
+ maxURLLength = MAX_URL_LENGTH;
+ }
- if (len) {
- if (baseLen > maxURLLength) {
- Y.log('Exceeded maxURLLength (' + maxURLLength + ') for ' + type + ', splitting', 'info', 'loader');
- u = [];
- for (s = 0; s < len; s++) {
- u.push(urls[s]);
- tmpBase = base + u.join(comboSep);
+ if (len) {
+ if (baseLen > maxURLLength) {
+ Y.log('Exceeded maxURLLength (' + maxURLLength + ') for ' + type + ', splitting', 'info', 'loader');
+ u = [];
+ for (s = 0; s < len; s++) {
+ u.push(urls[s]);
+ tmpBase = base + u.join(comboSep);
- if (tmpBase.length > maxURLLength) {
- m = u.pop();
+ if (tmpBase.length > maxURLLength) {
+ m = u.pop();
+ tmpBase = base + u.join(comboSep);
+ resolved[type].push(self._filter(tmpBase, null, resCombos[base].group));
+ u = [];
+ if (m) {
+ u.push(m);
+ }
+ }
+ }
+ if (u.length) {
tmpBase = base + u.join(comboSep);
resolved[type].push(self._filter(tmpBase, null, resCombos[base].group));
- u = [];
- if (m) {
- u.push(m);
- }
}
- }
- if (u.length) {
- tmpBase = base + u.join(comboSep);
+ } else {
resolved[type].push(self._filter(tmpBase, null, resCombos[base].group));
}
- } else {
- resolved[type].push(self._filter(tmpBase, null, resCombos[base].group));
}
+ resolved[type + 'Mods'] = resolved[type + 'Mods'].concat(mods);
}
- resolved[type + 'Mods'] = resolved[type + 'Mods'].concat(mods);
}
}
}

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -2686,46 +2686,48 @@ Y.Loader.prototype = {
for (j in resCombos) {
- base = j;
- comboSep = resCombos[base].comboSep || self.comboSep;
- maxURLLength = resCombos[base].maxURLLength || self.maxURLLength;
- for (type in resCombos[base]) {
- if (type === JS || type === CSS) {
- urls = resCombos[base][type];
- mods = resCombos[base][type + 'Mods'];
- len = urls.length;
- tmpBase = base + urls.join(comboSep);
- baseLen = tmpBase.length;
- if (maxURLLength <= base.length) {
- maxURLLength = MAX_URL_LENGTH;
- }
+ if (resCombos.hasOwnProperty(j)) {
+ base = j;
+ comboSep = resCombos[base].comboSep || self.comboSep;
+ maxURLLength = resCombos[base].maxURLLength || self.maxURLLength;
+ for (type in resCombos[base]) {
+ if (type === JS || type === CSS) {
+ urls = resCombos[base][type];
+ mods = resCombos[base][type + 'Mods'];
+ len = urls.length;
+ tmpBase = base + urls.join(comboSep);
+ baseLen = tmpBase.length;
+ if (maxURLLength <= base.length) {
+ maxURLLength = MAX_URL_LENGTH;
+ }
- if (len) {
- if (baseLen > maxURLLength) {
- u = [];
- for (s = 0; s < len; s++) {
- u.push(urls[s]);
- tmpBase = base + u.join(comboSep);
+ if (len) {
+ if (baseLen > maxURLLength) {
+ u = [];
+ for (s = 0; s < len; s++) {
+ u.push(urls[s]);
+ tmpBase = base + u.join(comboSep);
- if (tmpBase.length > maxURLLength) {
- m = u.pop();
+ if (tmpBase.length > maxURLLength) {
+ m = u.pop();
+ tmpBase = base + u.join(comboSep);
+ resolved[type].push(self._filter(tmpBase, null, resCombos[base].group));
+ u = [];
+ if (m) {
+ u.push(m);
+ }
+ }
+ }
+ if (u.length) {
tmpBase = base + u.join(comboSep);
resolved[type].push(self._filter(tmpBase, null, resCombos[base].group));
- u = [];
- if (m) {
- u.push(m);
- }
}
- }
- if (u.length) {
- tmpBase = base + u.join(comboSep);
+ } else {
resolved[type].push(self._filter(tmpBase, null, resCombos[base].group));
}
- } else {
- resolved[type].push(self._filter(tmpBase, null, resCombos[base].group));
}
+ resolved[type + 'Mods'] = resolved[type + 'Mods'].concat(mods);
}
- resolved[type + 'Mods'] = resolved[type + 'Mods'].concat(mods);
}
}
}
@@ -2723,49 +2723,51 @@ Y.log('Undefined module: ' + mname + ', matched a pattern: ' +
for (j in resCombos) {
- base = j;
- comboSep = resCombos[base].comboSep || self.comboSep;
- maxURLLength = resCombos[base].maxURLLength || self.maxURLLength;
- Y.log('Using maxURLLength of ' + maxURLLength, 'info', 'loader');
- for (type in resCombos[base]) {
- if (type === JS || type === CSS) {
- urls = resCombos[base][type];
- mods = resCombos[base][type + 'Mods'];
- len = urls.length;
- tmpBase = base + urls.join(comboSep);
- baseLen = tmpBase.length;
- if (maxURLLength <= base.length) {
- Y.log('maxURLLength (' + maxURLLength + ') is lower than the comboBase length (' + base.length + '), resetting to default (' + MAX_URL_LENGTH + ')', 'error', 'loader');
- maxURLLength = MAX_URL_LENGTH;
- }
+ if (resCombos.hasOwnProperty(j)) {
+ base = j;
+ comboSep = resCombos[base].comboSep || self.comboSep;
+ maxURLLength = resCombos[base].maxURLLength || self.maxURLLength;
+ Y.log('Using maxURLLength of ' + maxURLLength, 'info', 'loader');
+ for (type in resCombos[base]) {
+ if (type === JS || type === CSS) {
+ urls = resCombos[base][type];
+ mods = resCombos[base][type + 'Mods'];
+ len = urls.length;
+ tmpBase = base + urls.join(comboSep);
+ baseLen = tmpBase.length;
+ if (maxURLLength <= base.length) {
+ Y.log('maxURLLength (' + maxURLLength + ') is lower than the comboBase length (' + base.length + '), resetting to default (' + MAX_URL_LENGTH + ')', 'error', 'loader');
+ maxURLLength = MAX_URL_LENGTH;
+ }
- if (len) {
- if (baseLen > maxURLLength) {
- Y.log('Exceeded maxURLLength (' + maxURLLength + ') for ' + type + ', splitting', 'info', 'loader');
- u = [];
- for (s = 0; s < len; s++) {
- u.push(urls[s]);
- tmpBase = base + u.join(comboSep);
+ if (len) {
+ if (baseLen > maxURLLength) {
+ Y.log('Exceeded maxURLLength (' + maxURLLength + ') for ' + type + ', splitting', 'info', 'loader');
+ u = [];
+ for (s = 0; s < len; s++) {
+ u.push(urls[s]);
+ tmpBase = base + u.join(comboSep);
- if (tmpBase.length > maxURLLength) {
- m = u.pop();
+ if (tmpBase.length > maxURLLength) {
+ m = u.pop();
+ tmpBase = base + u.join(comboSep);
+ resolved[type].push(self._filter(tmpBase, null, resCombos[base].group));
+ u = [];
+ if (m) {
+ u.push(m);
+ }
+ }
+ }
+ if (u.length) {
tmpBase = base + u.join(comboSep);
resolved[type].push(self._filter(tmpBase, null, resCombos[base].group));
- u = [];
- if (m) {
- u.push(m);
- }
}
- }
- if (u.length) {
- tmpBase = base + u.join(comboSep);
+ } else {
resolved[type].push(self._filter(tmpBase, null, resCombos[base].group));
}
- } else {
- resolved[type].push(self._filter(tmpBase, null, resCombos[base].group));
}
+ resolved[type + 'Mods'] = resolved[type + 'Mods'].concat(mods);
}
- resolved[type + 'Mods'] = resolved[type + 'Mods'].concat(mods);
}
}
}
Oops, something went wrong.

0 comments on commit 0cc4977

Please sign in to comment.