Permalink
Browse files

Merge branch 'master' of git@yuisource.corp.yahoo.com:yui3

  • Loading branch information...
2 parents a5213fe + 20ce15f commit 377b995902a1669279cb1573a50142e5b1ad30b3 @tripp tripp committed Dec 14, 2010
@@ -13,7 +13,7 @@ if (!YUI.Env[Y.version]) {
BUILD = '/build/',
ROOT = VERSION + BUILD,
CDN_BASE = Y.Env.base,
- GALLERY_VERSION = 'gallery-2010.12.01-21-32',
+ GALLERY_VERSION = 'gallery-2010.12.10-17-31',
TNT = '2in3',
TNT_VERSION = '4',
YUI2_VERSION = '2.8.2',
@@ -899,7 +899,7 @@ Y.Loader.prototype = {
oeach(mods, function(v, k) {
v.group = name;
self.addModule(v, k);
- }, self);
+ });
}
},
@@ -1638,25 +1638,31 @@ Y.log('Undefined module: ' + mname + ', matched a pattern: ' +
},
_onSuccess: function() {
- var self = this, skipped = Y.merge(this.skipped), fn;
+ var self = this, skipped = Y.merge(self.skipped), fn,
+ failed = [], rreg = self.requireRegistration;
oeach(skipped, function(k) {
delete self.inserted[k];
});
self.skipped = {};
- // Y.mix(self.loaded, self.inserted);
oeach(self.inserted, function(v, k) {
- Y.mix(self.loaded, self.getProvides(k));
+ mod = self.getModule(k);
+ if (rreg && k.type == JS && !(k in YUI.Env.mods)) {
+ failed.push(k);
+ } else {
+ Y.mix(self.loaded, self.getProvides(k));
+ }
});
fn = self.onSuccess;
if (fn) {
fn.call(self.context, {
- msg: 'success',
+ msg: (failed.length) ? 'success' : 'notregistered',
data: self.data,
- success: true,
+ success: !!(failed.length),
+ failed: failed,
skipped: skipped
});
}
@@ -2166,4 +2172,5 @@ Y.log('attempting to load ' + s[i] + ', ' + self.base, 'info', 'loader');
};
+
}, '@VERSION@' ,{requires:['get']});

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -13,7 +13,7 @@ if (!YUI.Env[Y.version]) {
BUILD = '/build/',
ROOT = VERSION + BUILD,
CDN_BASE = Y.Env.base,
- GALLERY_VERSION = 'gallery-2010.12.01-21-32',
+ GALLERY_VERSION = 'gallery-2010.12.10-17-31',
TNT = '2in3',
TNT_VERSION = '4',
YUI2_VERSION = '2.8.2',
@@ -896,7 +896,7 @@ Y.Loader.prototype = {
oeach(mods, function(v, k) {
v.group = name;
self.addModule(v, k);
- }, self);
+ });
}
},
@@ -1616,25 +1616,31 @@ Y.Loader.prototype = {
},
_onSuccess: function() {
- var self = this, skipped = Y.merge(this.skipped), fn;
+ var self = this, skipped = Y.merge(self.skipped), fn,
+ failed = [], rreg = self.requireRegistration;
oeach(skipped, function(k) {
delete self.inserted[k];
});
self.skipped = {};
- // Y.mix(self.loaded, self.inserted);
oeach(self.inserted, function(v, k) {
- Y.mix(self.loaded, self.getProvides(k));
+ mod = self.getModule(k);
+ if (rreg && k.type == JS && !(k in YUI.Env.mods)) {
+ failed.push(k);
+ } else {
+ Y.mix(self.loaded, self.getProvides(k));
+ }
});
fn = self.onSuccess;
if (fn) {
fn.call(self.context, {
- msg: 'success',
+ msg: (failed.length) ? 'success' : 'notregistered',
data: self.data,
- success: true,
+ success: !!(failed.length),
+ failed: failed,
skipped: skipped
});
}
@@ -2130,4 +2136,5 @@ Y.Loader.prototype = {
};
+
}, '@VERSION@' ,{requires:['get']});
@@ -13,7 +13,7 @@ if (!YUI.Env[Y.version]) {
BUILD = '/build/',
ROOT = VERSION + BUILD,
CDN_BASE = Y.Env.base,
- GALLERY_VERSION = 'gallery-2010.12.01-21-32',
+ GALLERY_VERSION = 'gallery-2010.12.10-17-31',
TNT = '2in3',
TNT_VERSION = '4',
YUI2_VERSION = '2.8.2',
@@ -899,7 +899,7 @@ Y.Loader.prototype = {
oeach(mods, function(v, k) {
v.group = name;
self.addModule(v, k);
- }, self);
+ });
}
},
@@ -1638,25 +1638,31 @@ Y.log('Undefined module: ' + mname + ', matched a pattern: ' +
},
_onSuccess: function() {
- var self = this, skipped = Y.merge(this.skipped), fn;
+ var self = this, skipped = Y.merge(self.skipped), fn,
+ failed = [], rreg = self.requireRegistration;
oeach(skipped, function(k) {
delete self.inserted[k];
});
self.skipped = {};
- // Y.mix(self.loaded, self.inserted);
oeach(self.inserted, function(v, k) {
- Y.mix(self.loaded, self.getProvides(k));
+ mod = self.getModule(k);
+ if (rreg && k.type == JS && !(k in YUI.Env.mods)) {
+ failed.push(k);
+ } else {
+ Y.mix(self.loaded, self.getProvides(k));
+ }
});
fn = self.onSuccess;
if (fn) {
fn.call(self.context, {
- msg: 'success',
+ msg: (failed.length) ? 'success' : 'notregistered',
data: self.data,
- success: true,
+ success: !!(failed.length),
+ failed: failed,
skipped: skipped
});
}
@@ -2166,6 +2172,7 @@ Y.log('attempting to load ' + s[i] + ', ' + self.base, 'info', 'loader');
};
+
}, '@VERSION@' ,{requires:['get']});
YUI.add('loader-rollup', function(Y) {

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -13,7 +13,7 @@ if (!YUI.Env[Y.version]) {
BUILD = '/build/',
ROOT = VERSION + BUILD,
CDN_BASE = Y.Env.base,
- GALLERY_VERSION = 'gallery-2010.12.01-21-32',
+ GALLERY_VERSION = 'gallery-2010.12.10-17-31',
TNT = '2in3',
TNT_VERSION = '4',
YUI2_VERSION = '2.8.2',
@@ -896,7 +896,7 @@ Y.Loader.prototype = {
oeach(mods, function(v, k) {
v.group = name;
self.addModule(v, k);
- }, self);
+ });
}
},
@@ -1616,25 +1616,31 @@ Y.Loader.prototype = {
},
_onSuccess: function() {
- var self = this, skipped = Y.merge(this.skipped), fn;
+ var self = this, skipped = Y.merge(self.skipped), fn,
+ failed = [], rreg = self.requireRegistration;
oeach(skipped, function(k) {
delete self.inserted[k];
});
self.skipped = {};
- // Y.mix(self.loaded, self.inserted);
oeach(self.inserted, function(v, k) {
- Y.mix(self.loaded, self.getProvides(k));
+ mod = self.getModule(k);
+ if (rreg && k.type == JS && !(k in YUI.Env.mods)) {
+ failed.push(k);
+ } else {
+ Y.mix(self.loaded, self.getProvides(k));
+ }
});
fn = self.onSuccess;
if (fn) {
fn.call(self.context, {
- msg: 'success',
+ msg: (failed.length) ? 'success' : 'notregistered',
data: self.data,
- success: true,
+ success: !!(failed.length),
+ failed: failed,
skipped: skipped
});
}
@@ -2130,6 +2136,7 @@ Y.Loader.prototype = {
};
+
}, '@VERSION@' ,{requires:['get']});
YUI.add('loader-rollup', function(Y) {
@@ -532,7 +532,6 @@ proto = {
}
}
-
if (use) {
for (j = 0; j < use.length; j++) {
if (!done[use[j]]) {
@@ -1589,7 +1588,11 @@ SUBREGEX = /\{\s*([^\|\}]+?)\s*(?:\|([^\}]*))?\s*\}/g;
* @param o The object to test.
* @return {boolean} true if o is an array.
*/
-L.isArray = Array.isArray || function(o) {
+// L.isArray = Array.isArray || function(o) {
+// return L.type(o) === ARRAY;
+// };
+
+L.isArray = function(o) {
return L.type(o) === ARRAY;
};
@@ -2305,12 +2308,16 @@ Y.cached = function(source, cache, refetch) {
*/
var F = function() {},
-O = Object.create || function(o) {
+// O = Object.create || function(o) {
+// F.prototype = o;
+// return new F();
+// },
+
+O = function(o) {
F.prototype = o;
return new F();
},
-
owns = function(o, k) {
return o && o.hasOwnProperty && o.hasOwnProperty(k);
// return Object.prototype.hasOwnProperty.call(o, k);
@@ -2353,7 +2360,11 @@ Y.Object = O;
* @param o an object.
* @return {string[]} the keys.
*/
-O.keys = Object.keys || function(o) {
+// O.keys = Object.keys || function(o) {
+// return _extract(o);
+// };
+
+O.keys = function(o) {
return _extract(o);
};
@@ -2364,7 +2375,11 @@ O.keys = Object.keys || function(o) {
* @param o an object.
* @return {Array} the values.
*/
-O.values = Object.values || function(o) {
+// O.values = Object.values || function(o) {
+// return _extract(o, 1);
+// };
+
+O.values = function(o) {
return _extract(o, 1);
};
@@ -13359,7 +13374,7 @@ Y.Node.prototype.delegate = function(type) {
}, '@VERSION@' ,{requires:['node-base', 'event-delegate']});
-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});
+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']});
YUI.add('event-delegate', function(Y) {
Oops, something went wrong.

0 comments on commit 377b995

Please sign in to comment.