Skip to content

Commit 377b995

Browse files
tripptripp
committed
Merge branch 'master' of git@yuisource.corp.yahoo.com:yui3
2 parents a5213fe + 20ce15f commit 377b995

21 files changed

+259
-104
lines changed

‎build/loader/loader-base-debug.js

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if (!YUI.Env[Y.version]) {
1313
BUILD = '/build/',
1414
ROOT = VERSION + BUILD,
1515
CDN_BASE = Y.Env.base,
16-
GALLERY_VERSION = 'gallery-2010.12.01-21-32',
16+
GALLERY_VERSION = 'gallery-2010.12.10-17-31',
1717
TNT = '2in3',
1818
TNT_VERSION = '4',
1919
YUI2_VERSION = '2.8.2',
@@ -899,7 +899,7 @@ Y.Loader.prototype = {
899899
oeach(mods, function(v, k) {
900900
v.group = name;
901901
self.addModule(v, k);
902-
}, self);
902+
});
903903
}
904904
},
905905

@@ -1638,25 +1638,31 @@ Y.log('Undefined module: ' + mname + ', matched a pattern: ' +
16381638
},
16391639

16401640
_onSuccess: function() {
1641-
var self = this, skipped = Y.merge(this.skipped), fn;
1641+
var self = this, skipped = Y.merge(self.skipped), fn,
1642+
failed = [], rreg = self.requireRegistration;
16421643

16431644
oeach(skipped, function(k) {
16441645
delete self.inserted[k];
16451646
});
16461647

16471648
self.skipped = {};
16481649

1649-
// Y.mix(self.loaded, self.inserted);
16501650
oeach(self.inserted, function(v, k) {
1651-
Y.mix(self.loaded, self.getProvides(k));
1651+
mod = self.getModule(k);
1652+
if (rreg && k.type == JS && !(k in YUI.Env.mods)) {
1653+
failed.push(k);
1654+
} else {
1655+
Y.mix(self.loaded, self.getProvides(k));
1656+
}
16521657
});
16531658

16541659
fn = self.onSuccess;
16551660
if (fn) {
16561661
fn.call(self.context, {
1657-
msg: 'success',
1662+
msg: (failed.length) ? 'success' : 'notregistered',
16581663
data: self.data,
1659-
success: true,
1664+
success: !!(failed.length),
1665+
failed: failed,
16601666
skipped: skipped
16611667
});
16621668
}
@@ -2166,4 +2172,5 @@ Y.log('attempting to load ' + s[i] + ', ' + self.base, 'info', 'loader');
21662172
};
21672173

21682174

2175+
21692176
}, '@VERSION@' ,{requires:['get']});

‎build/loader/loader-base-min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/loader/loader-base.js

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if (!YUI.Env[Y.version]) {
1313
BUILD = '/build/',
1414
ROOT = VERSION + BUILD,
1515
CDN_BASE = Y.Env.base,
16-
GALLERY_VERSION = 'gallery-2010.12.01-21-32',
16+
GALLERY_VERSION = 'gallery-2010.12.10-17-31',
1717
TNT = '2in3',
1818
TNT_VERSION = '4',
1919
YUI2_VERSION = '2.8.2',
@@ -896,7 +896,7 @@ Y.Loader.prototype = {
896896
oeach(mods, function(v, k) {
897897
v.group = name;
898898
self.addModule(v, k);
899-
}, self);
899+
});
900900
}
901901
},
902902

@@ -1616,25 +1616,31 @@ Y.Loader.prototype = {
16161616
},
16171617

16181618
_onSuccess: function() {
1619-
var self = this, skipped = Y.merge(this.skipped), fn;
1619+
var self = this, skipped = Y.merge(self.skipped), fn,
1620+
failed = [], rreg = self.requireRegistration;
16201621

16211622
oeach(skipped, function(k) {
16221623
delete self.inserted[k];
16231624
});
16241625

16251626
self.skipped = {};
16261627

1627-
// Y.mix(self.loaded, self.inserted);
16281628
oeach(self.inserted, function(v, k) {
1629-
Y.mix(self.loaded, self.getProvides(k));
1629+
mod = self.getModule(k);
1630+
if (rreg && k.type == JS && !(k in YUI.Env.mods)) {
1631+
failed.push(k);
1632+
} else {
1633+
Y.mix(self.loaded, self.getProvides(k));
1634+
}
16301635
});
16311636

16321637
fn = self.onSuccess;
16331638
if (fn) {
16341639
fn.call(self.context, {
1635-
msg: 'success',
1640+
msg: (failed.length) ? 'success' : 'notregistered',
16361641
data: self.data,
1637-
success: true,
1642+
success: !!(failed.length),
1643+
failed: failed,
16381644
skipped: skipped
16391645
});
16401646
}
@@ -2130,4 +2136,5 @@ Y.Loader.prototype = {
21302136
};
21312137

21322138

2139+
21332140
}, '@VERSION@' ,{requires:['get']});

‎build/loader/loader-debug.js

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if (!YUI.Env[Y.version]) {
1313
BUILD = '/build/',
1414
ROOT = VERSION + BUILD,
1515
CDN_BASE = Y.Env.base,
16-
GALLERY_VERSION = 'gallery-2010.12.01-21-32',
16+
GALLERY_VERSION = 'gallery-2010.12.10-17-31',
1717
TNT = '2in3',
1818
TNT_VERSION = '4',
1919
YUI2_VERSION = '2.8.2',
@@ -899,7 +899,7 @@ Y.Loader.prototype = {
899899
oeach(mods, function(v, k) {
900900
v.group = name;
901901
self.addModule(v, k);
902-
}, self);
902+
});
903903
}
904904
},
905905

@@ -1638,25 +1638,31 @@ Y.log('Undefined module: ' + mname + ', matched a pattern: ' +
16381638
},
16391639

16401640
_onSuccess: function() {
1641-
var self = this, skipped = Y.merge(this.skipped), fn;
1641+
var self = this, skipped = Y.merge(self.skipped), fn,
1642+
failed = [], rreg = self.requireRegistration;
16421643

16431644
oeach(skipped, function(k) {
16441645
delete self.inserted[k];
16451646
});
16461647

16471648
self.skipped = {};
16481649

1649-
// Y.mix(self.loaded, self.inserted);
16501650
oeach(self.inserted, function(v, k) {
1651-
Y.mix(self.loaded, self.getProvides(k));
1651+
mod = self.getModule(k);
1652+
if (rreg && k.type == JS && !(k in YUI.Env.mods)) {
1653+
failed.push(k);
1654+
} else {
1655+
Y.mix(self.loaded, self.getProvides(k));
1656+
}
16521657
});
16531658

16541659
fn = self.onSuccess;
16551660
if (fn) {
16561661
fn.call(self.context, {
1657-
msg: 'success',
1662+
msg: (failed.length) ? 'success' : 'notregistered',
16581663
data: self.data,
1659-
success: true,
1664+
success: !!(failed.length),
1665+
failed: failed,
16601666
skipped: skipped
16611667
});
16621668
}
@@ -2166,6 +2172,7 @@ Y.log('attempting to load ' + s[i] + ', ' + self.base, 'info', 'loader');
21662172
};
21672173

21682174

2175+
21692176
}, '@VERSION@' ,{requires:['get']});
21702177
YUI.add('loader-rollup', function(Y) {
21712178

‎build/loader/loader-min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/loader/loader.js

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if (!YUI.Env[Y.version]) {
1313
BUILD = '/build/',
1414
ROOT = VERSION + BUILD,
1515
CDN_BASE = Y.Env.base,
16-
GALLERY_VERSION = 'gallery-2010.12.01-21-32',
16+
GALLERY_VERSION = 'gallery-2010.12.10-17-31',
1717
TNT = '2in3',
1818
TNT_VERSION = '4',
1919
YUI2_VERSION = '2.8.2',
@@ -896,7 +896,7 @@ Y.Loader.prototype = {
896896
oeach(mods, function(v, k) {
897897
v.group = name;
898898
self.addModule(v, k);
899-
}, self);
899+
});
900900
}
901901
},
902902

@@ -1616,25 +1616,31 @@ Y.Loader.prototype = {
16161616
},
16171617

16181618
_onSuccess: function() {
1619-
var self = this, skipped = Y.merge(this.skipped), fn;
1619+
var self = this, skipped = Y.merge(self.skipped), fn,
1620+
failed = [], rreg = self.requireRegistration;
16201621

16211622
oeach(skipped, function(k) {
16221623
delete self.inserted[k];
16231624
});
16241625

16251626
self.skipped = {};
16261627

1627-
// Y.mix(self.loaded, self.inserted);
16281628
oeach(self.inserted, function(v, k) {
1629-
Y.mix(self.loaded, self.getProvides(k));
1629+
mod = self.getModule(k);
1630+
if (rreg && k.type == JS && !(k in YUI.Env.mods)) {
1631+
failed.push(k);
1632+
} else {
1633+
Y.mix(self.loaded, self.getProvides(k));
1634+
}
16301635
});
16311636

16321637
fn = self.onSuccess;
16331638
if (fn) {
16341639
fn.call(self.context, {
1635-
msg: 'success',
1640+
msg: (failed.length) ? 'success' : 'notregistered',
16361641
data: self.data,
1637-
success: true,
1642+
success: !!(failed.length),
1643+
failed: failed,
16381644
skipped: skipped
16391645
});
16401646
}
@@ -2130,6 +2136,7 @@ Y.Loader.prototype = {
21302136
};
21312137

21322138

2139+
21332140
}, '@VERSION@' ,{requires:['get']});
21342141
YUI.add('loader-rollup', function(Y) {
21352142

‎build/simpleyui/simpleyui-debug.js

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,6 @@ proto = {
532532
}
533533
}
534534

535-
536535
if (use) {
537536
for (j = 0; j < use.length; j++) {
538537
if (!done[use[j]]) {
@@ -1589,7 +1588,11 @@ SUBREGEX = /\{\s*([^\|\}]+?)\s*(?:\|([^\}]*))?\s*\}/g;
15891588
* @param o The object to test.
15901589
* @return {boolean} true if o is an array.
15911590
*/
1592-
L.isArray = Array.isArray || function(o) {
1591+
// L.isArray = Array.isArray || function(o) {
1592+
// return L.type(o) === ARRAY;
1593+
// };
1594+
1595+
L.isArray = function(o) {
15931596
return L.type(o) === ARRAY;
15941597
};
15951598

@@ -2305,12 +2308,16 @@ Y.cached = function(source, cache, refetch) {
23052308
*/
23062309
var F = function() {},
23072310

2308-
O = Object.create || function(o) {
2311+
// O = Object.create || function(o) {
2312+
// F.prototype = o;
2313+
// return new F();
2314+
// },
2315+
2316+
O = function(o) {
23092317
F.prototype = o;
23102318
return new F();
23112319
},
23122320

2313-
23142321
owns = function(o, k) {
23152322
return o && o.hasOwnProperty && o.hasOwnProperty(k);
23162323
// return Object.prototype.hasOwnProperty.call(o, k);
@@ -2353,7 +2360,11 @@ Y.Object = O;
23532360
* @param o an object.
23542361
* @return {string[]} the keys.
23552362
*/
2356-
O.keys = Object.keys || function(o) {
2363+
// O.keys = Object.keys || function(o) {
2364+
// return _extract(o);
2365+
// };
2366+
2367+
O.keys = function(o) {
23572368
return _extract(o);
23582369
};
23592370

@@ -2364,7 +2375,11 @@ O.keys = Object.keys || function(o) {
23642375
* @param o an object.
23652376
* @return {Array} the values.
23662377
*/
2367-
O.values = Object.values || function(o) {
2378+
// O.values = Object.values || function(o) {
2379+
// return _extract(o, 1);
2380+
// };
2381+
2382+
O.values = function(o) {
23682383
return _extract(o, 1);
23692384
};
23702385

@@ -13359,7 +13374,7 @@ Y.Node.prototype.delegate = function(type) {
1335913374
}, '@VERSION@' ,{requires:['node-base', 'event-delegate']});
1336013375

1336113376

13362-
YUI.add('node', function(Y){}, '@VERSION@' ,{requires:['dom', 'event-base', 'event-delegate', 'pluginhost'], use:['node-base', 'node-style', 'node-screen', 'node-pluginhost', 'node-event-delegate'], skinnable:false});
13377+
YUI.add('node', function(Y){}, '@VERSION@' ,{skinnable:false, requires:['dom', 'event-base', 'event-delegate', 'pluginhost'], use:['node-base', 'node-style', 'node-screen', 'node-pluginhost', 'node-event-delegate']});
1336313378

1336413379
YUI.add('event-delegate', function(Y) {
1336513380

0 commit comments

Comments
 (0)