Skip to content

Commit

Permalink
update loader
Browse files Browse the repository at this point in the history
  • Loading branch information
@yiminghe
yiminghe committed Sep 4, 2014
1 parent 21b29da commit b97f6d9
Show file tree
Hide file tree
Showing 7 changed files with 233 additions and 235 deletions.
134 changes: 67 additions & 67 deletions build/kissy-nodejs-min.js
View file

Large diffs are not rendered by default.

19 changes: 9 additions & 10 deletions build/kissy-nodejs.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
Copyright 2014, KISSY v1.49
MIT Licensed
build time: Sep 4 10:31
build time: Sep 4 19:12
*/
/**
* @ignore
Expand Down Expand Up @@ -87,11 +87,11 @@ var KISSY = (function (undefined) {
S = {
/**
* The build time of the library.
* NOTICE: '20140904103117' will replace with current timestamp when compressing.
* NOTICE: '20140904191134' will replace with current timestamp when compressing.
* @private
* @type {String}
*/
__BUILD_TIME: '20140904103117',
__BUILD_TIME: '20140904191134',

/**
* KISSY Environment.
Expand All @@ -118,10 +118,10 @@ var KISSY = (function (undefined) {

/**
* The version of the library.
* NOTICE: '1.48' will replace with current version when compressing.
* NOTICE: '1.49' will replace with current version when compressing.
* @type {String}
*/
version:'1.49',
version: '1.49',

/**
* set KISSY configuration
Expand Down Expand Up @@ -1992,7 +1992,6 @@ var KISSY = (function (undefined) {
var requestFlush;
if (typeof setImmediate === 'function') {
requestFlush = function () {

setImmediate(flush);
};
} else if (typeof process !== 'undefined' && typeof process.nextTick === 'function') {
Expand Down Expand Up @@ -5318,7 +5317,7 @@ var KISSY = (function (undefined) {
* @author yiminghe@gmail.com
*/
(function (S, undefined) {
var logger = S.getLogger('s/loader');
var logger = S.getLogger('s/loader');
var Loader = S.Loader,
Env = S.Env,

Expand Down Expand Up @@ -5388,6 +5387,7 @@ var KISSY = (function (undefined) {
* @param {String|String[]} modNames moduleNames. 1-n modules to bind(use comma to separate)
* @param {Function} success callback function executed
* when KISSY has the required functionality.
* @param {Function} error callback
* @param {KISSY} success.S KISSY instance
* @param success.x... modules exports
* @member KISSY
Expand All @@ -5396,10 +5396,9 @@ var KISSY = (function (undefined) {
* // loads and attached overlay,dd and its dependencies
* KISSY.use('overlay,dd', function(S, Overlay){});
*/
use: function (modNames, success) {
use: function (modNames, success, error) {
var normalizedModNames,
loader,
error,
sync,
tryCount = 0,
finalSuccess,
Expand Down Expand Up @@ -5503,7 +5502,7 @@ var KISSY = (function (undefined) {
var doc = S.Env.host && S.Env.host.document;
// var logger = S.getLogger('s/loader');
var Utils = S.Loader.Utils;
var TIMESTAMP = '20140904103117';
var TIMESTAMP = '20140904191134';
var defaultComboPrefix = '??';
var defaultComboSep = ',';

Expand Down
186 changes: 93 additions & 93 deletions build/seed-min.js
View file

Large diffs are not rendered by default.

19 changes: 9 additions & 10 deletions build/seed.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
Copyright 2014, KISSY v1.49
MIT Licensed
build time: Sep 4 10:31
build time: Sep 4 19:12
*/
/**
* @ignore
Expand Down Expand Up @@ -87,11 +87,11 @@ var KISSY = (function (undefined) {
S = {
/**
* The build time of the library.
* NOTICE: '20140904103117' will replace with current timestamp when compressing.
* NOTICE: '20140904191134' will replace with current timestamp when compressing.
* @private
* @type {String}
*/
__BUILD_TIME: '20140904103117',
__BUILD_TIME: '20140904191134',

/**
* KISSY Environment.
Expand All @@ -118,10 +118,10 @@ var KISSY = (function (undefined) {

/**
* The version of the library.
* NOTICE: '1.48' will replace with current version when compressing.
* NOTICE: '1.49' will replace with current version when compressing.
* @type {String}
*/
version:'1.49',
version: '1.49',

/**
* set KISSY configuration
Expand Down Expand Up @@ -1992,7 +1992,6 @@ var KISSY = (function (undefined) {
var requestFlush;
if (typeof setImmediate === 'function') {
requestFlush = function () {

setImmediate(flush);
};
} else if (typeof process !== 'undefined' && typeof process.nextTick === 'function') {
Expand Down Expand Up @@ -5450,7 +5449,7 @@ var KISSY = (function (undefined) {
* @author yiminghe@gmail.com
*/
(function (S, undefined) {
var logger = S.getLogger('s/loader');
var logger = S.getLogger('s/loader');
var Loader = S.Loader,
Env = S.Env,

Expand Down Expand Up @@ -5520,6 +5519,7 @@ var KISSY = (function (undefined) {
* @param {String|String[]} modNames moduleNames. 1-n modules to bind(use comma to separate)
* @param {Function} success callback function executed
* when KISSY has the required functionality.
* @param {Function} error callback
* @param {KISSY} success.S KISSY instance
* @param success.x... modules exports
* @member KISSY
Expand All @@ -5528,10 +5528,9 @@ var KISSY = (function (undefined) {
* // loads and attached overlay,dd and its dependencies
* KISSY.use('overlay,dd', function(S, Overlay){});
*/
use: function (modNames, success) {
use: function (modNames, success, error) {
var normalizedModNames,
loader,
error,
sync,
tryCount = 0,
finalSuccess,
Expand Down Expand Up @@ -5635,7 +5634,7 @@ var KISSY = (function (undefined) {
var doc = S.Env.host && S.Env.host.document;
// var logger = S.getLogger('s/loader');
var Utils = S.Loader.Utils;
var TIMESTAMP = '20140904103117';
var TIMESTAMP = '20140904191134';
var defaultComboPrefix = '??';
var defaultComboSep = ',';

Expand Down
92 changes: 46 additions & 46 deletions src/seed/coverage/src/lang/set-immediate.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,23 +253,23 @@ if (! _$jscoverage['/lang/set-immediate.js']) {
_$jscoverage['/lang/set-immediate.js'].lineData[50] = 0;
_$jscoverage['/lang/set-immediate.js'].lineData[51] = 0;
_$jscoverage['/lang/set-immediate.js'].lineData[52] = 0;
_$jscoverage['/lang/set-immediate.js'].lineData[54] = 0;
_$jscoverage['/lang/set-immediate.js'].lineData[53] = 0;
_$jscoverage['/lang/set-immediate.js'].lineData[55] = 0;
_$jscoverage['/lang/set-immediate.js'].lineData[56] = 0;
_$jscoverage['/lang/set-immediate.js'].lineData[57] = 0;
_$jscoverage['/lang/set-immediate.js'].lineData[58] = 0;
_$jscoverage['/lang/set-immediate.js'].lineData[60] = 0;
_$jscoverage['/lang/set-immediate.js'].lineData[63] = 0;
_$jscoverage['/lang/set-immediate.js'].lineData[59] = 0;
_$jscoverage['/lang/set-immediate.js'].lineData[62] = 0;
_$jscoverage['/lang/set-immediate.js'].lineData[65] = 0;
_$jscoverage['/lang/set-immediate.js'].lineData[66] = 0;
_$jscoverage['/lang/set-immediate.js'].lineData[67] = 0;
_$jscoverage['/lang/set-immediate.js'].lineData[68] = 0;
_$jscoverage['/lang/set-immediate.js'].lineData[69] = 0;
_$jscoverage['/lang/set-immediate.js'].lineData[71] = 0;
_$jscoverage['/lang/set-immediate.js'].lineData[74] = 0;
_$jscoverage['/lang/set-immediate.js'].lineData[70] = 0;
_$jscoverage['/lang/set-immediate.js'].lineData[73] = 0;
_$jscoverage['/lang/set-immediate.js'].lineData[75] = 0;
_$jscoverage['/lang/set-immediate.js'].lineData[76] = 0;
_$jscoverage['/lang/set-immediate.js'].lineData[77] = 0;
_$jscoverage['/lang/set-immediate.js'].lineData[78] = 0;
_$jscoverage['/lang/set-immediate.js'].lineData[82] = 0;
_$jscoverage['/lang/set-immediate.js'].lineData[83] = 0;
_$jscoverage['/lang/set-immediate.js'].lineData[84] = 0;
}
if (! _$jscoverage['/lang/set-immediate.js'].functionData) {
_$jscoverage['/lang/set-immediate.js'].functionData = [];
Expand All @@ -296,28 +296,28 @@ if (! _$jscoverage['/lang/set-immediate.js'].branchData) {
_$jscoverage['/lang/set-immediate.js'].branchData['44'][1] = new BranchData();
_$jscoverage['/lang/set-immediate.js'].branchData['51'] = [];
_$jscoverage['/lang/set-immediate.js'].branchData['51'][1] = new BranchData();
_$jscoverage['/lang/set-immediate.js'].branchData['56'] = [];
_$jscoverage['/lang/set-immediate.js'].branchData['56'][1] = new BranchData();
_$jscoverage['/lang/set-immediate.js'].branchData['56'][2] = new BranchData();
_$jscoverage['/lang/set-immediate.js'].branchData['56'][3] = new BranchData();
_$jscoverage['/lang/set-immediate.js'].branchData['60'] = [];
_$jscoverage['/lang/set-immediate.js'].branchData['60'][1] = new BranchData();
_$jscoverage['/lang/set-immediate.js'].branchData['55'] = [];
_$jscoverage['/lang/set-immediate.js'].branchData['55'][1] = new BranchData();
_$jscoverage['/lang/set-immediate.js'].branchData['55'][2] = new BranchData();
_$jscoverage['/lang/set-immediate.js'].branchData['55'][3] = new BranchData();
_$jscoverage['/lang/set-immediate.js'].branchData['59'] = [];
_$jscoverage['/lang/set-immediate.js'].branchData['59'][1] = new BranchData();
}
_$jscoverage['/lang/set-immediate.js'].branchData['60'][1].init(1316, 37, 'typeof MessageChannel !== \'undefined\'');
function visit286_60_1(result) {
_$jscoverage['/lang/set-immediate.js'].branchData['60'][1].ranCondition(result);
_$jscoverage['/lang/set-immediate.js'].branchData['59'][1].init(1315, 37, 'typeof MessageChannel !== \'undefined\'');
function visit286_59_1(result) {
_$jscoverage['/lang/set-immediate.js'].branchData['59'][1].ranCondition(result);
return result;
}_$jscoverage['/lang/set-immediate.js'].branchData['56'][3].init(1172, 39, 'typeof process.nextTick === \'function\'');
function visit285_56_3(result) {
_$jscoverage['/lang/set-immediate.js'].branchData['56'][3].ranCondition(result);
}_$jscoverage['/lang/set-immediate.js'].branchData['55'][3].init(1171, 39, 'typeof process.nextTick === \'function\'');
function visit285_55_3(result) {
_$jscoverage['/lang/set-immediate.js'].branchData['55'][3].ranCondition(result);
return result;
}_$jscoverage['/lang/set-immediate.js'].branchData['56'][2].init(1138, 30, 'typeof process !== \'undefined\'');
function visit284_56_2(result) {
_$jscoverage['/lang/set-immediate.js'].branchData['56'][2].ranCondition(result);
}_$jscoverage['/lang/set-immediate.js'].branchData['55'][2].init(1137, 30, 'typeof process !== \'undefined\'');
function visit284_55_2(result) {
_$jscoverage['/lang/set-immediate.js'].branchData['55'][2].ranCondition(result);
return result;
}_$jscoverage['/lang/set-immediate.js'].branchData['56'][1].init(1138, 73, 'typeof process !== \'undefined\' && typeof process.nextTick === \'function\'');
function visit283_56_1(result) {
_$jscoverage['/lang/set-immediate.js'].branchData['56'][1].ranCondition(result);
}_$jscoverage['/lang/set-immediate.js'].branchData['55'][1].init(1137, 73, 'typeof process !== \'undefined\' && typeof process.nextTick === \'function\'');
function visit283_55_1(result) {
_$jscoverage['/lang/set-immediate.js'].branchData['55'][1].ranCondition(result);
return result;
}_$jscoverage['/lang/set-immediate.js'].branchData['51'][1].init(1002, 34, 'typeof setImmediate === \'function\'');
function visit282_51_1(result) {
Expand Down Expand Up @@ -402,52 +402,52 @@ function visit278_17_1(result) {
_$jscoverage['/lang/set-immediate.js'].lineData[52]++;
requestFlush = function() {
_$jscoverage['/lang/set-immediate.js'].functionData[4]++;
_$jscoverage['/lang/set-immediate.js'].lineData[54]++;
_$jscoverage['/lang/set-immediate.js'].lineData[53]++;
setImmediate(flush);
};
} else {
_$jscoverage['/lang/set-immediate.js'].lineData[56]++;
if (visit283_56_1(visit284_56_2(typeof process !== 'undefined') && visit285_56_3(typeof process.nextTick === 'function'))) {
_$jscoverage['/lang/set-immediate.js'].lineData[57]++;
_$jscoverage['/lang/set-immediate.js'].lineData[55]++;
if (visit283_55_1(visit284_55_2(typeof process !== 'undefined') && visit285_55_3(typeof process.nextTick === 'function'))) {
_$jscoverage['/lang/set-immediate.js'].lineData[56]++;
requestFlush = function() {
_$jscoverage['/lang/set-immediate.js'].functionData[5]++;
_$jscoverage['/lang/set-immediate.js'].lineData[58]++;
_$jscoverage['/lang/set-immediate.js'].lineData[57]++;
process.nextTick(flush);
};
} else {
_$jscoverage['/lang/set-immediate.js'].lineData[60]++;
if (visit286_60_1(typeof MessageChannel !== 'undefined')) {
_$jscoverage['/lang/set-immediate.js'].lineData[63]++;
_$jscoverage['/lang/set-immediate.js'].lineData[59]++;
if (visit286_59_1(typeof MessageChannel !== 'undefined')) {
_$jscoverage['/lang/set-immediate.js'].lineData[62]++;
var channel = new MessageChannel();
_$jscoverage['/lang/set-immediate.js'].lineData[66]++;
_$jscoverage['/lang/set-immediate.js'].lineData[65]++;
channel.port1.onmessage = function() {
_$jscoverage['/lang/set-immediate.js'].functionData[6]++;
_$jscoverage['/lang/set-immediate.js'].lineData[67]++;
_$jscoverage['/lang/set-immediate.js'].lineData[66]++;
requestFlush = realRequestFlush;
_$jscoverage['/lang/set-immediate.js'].lineData[68]++;
_$jscoverage['/lang/set-immediate.js'].lineData[67]++;
channel.port1.onmessage = flush;
_$jscoverage['/lang/set-immediate.js'].lineData[69]++;
_$jscoverage['/lang/set-immediate.js'].lineData[68]++;
flush();
};
_$jscoverage['/lang/set-immediate.js'].lineData[71]++;
_$jscoverage['/lang/set-immediate.js'].lineData[70]++;
var realRequestFlush = function() {
_$jscoverage['/lang/set-immediate.js'].functionData[7]++;
_$jscoverage['/lang/set-immediate.js'].lineData[74]++;
_$jscoverage['/lang/set-immediate.js'].lineData[73]++;
channel.port2.postMessage(0);
};
_$jscoverage['/lang/set-immediate.js'].lineData[76]++;
_$jscoverage['/lang/set-immediate.js'].lineData[75]++;
requestFlush = function() {
_$jscoverage['/lang/set-immediate.js'].functionData[8]++;
_$jscoverage['/lang/set-immediate.js'].lineData[77]++;
_$jscoverage['/lang/set-immediate.js'].lineData[76]++;
setTimeout(flush, 0);
_$jscoverage['/lang/set-immediate.js'].lineData[78]++;
_$jscoverage['/lang/set-immediate.js'].lineData[77]++;
realRequestFlush();
};
} else {
_$jscoverage['/lang/set-immediate.js'].lineData[83]++;
_$jscoverage['/lang/set-immediate.js'].lineData[82]++;
requestFlush = function() {
_$jscoverage['/lang/set-immediate.js'].functionData[9]++;
_$jscoverage['/lang/set-immediate.js'].lineData[84]++;
_$jscoverage['/lang/set-immediate.js'].lineData[83]++;
setTimeout(flush, 0);
};
}
Expand Down
12 changes: 6 additions & 6 deletions src/seed/coverage/src/loader/loader.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ if (! _$jscoverage['/loader/loader.js']) {
_$jscoverage['/loader/loader.js'].lineData[47] = 0;
_$jscoverage['/loader/loader.js'].lineData[49] = 0;
_$jscoverage['/loader/loader.js'].lineData[70] = 0;
_$jscoverage['/loader/loader.js'].lineData[86] = 0;
_$jscoverage['/loader/loader.js'].lineData[87] = 0;
_$jscoverage['/loader/loader.js'].lineData[94] = 0;
_$jscoverage['/loader/loader.js'].lineData[96] = 0;
_$jscoverage['/loader/loader.js'].lineData[98] = 0;
Expand Down Expand Up @@ -330,7 +330,7 @@ _$jscoverage['/loader/loader.js'].branchData['169'][1].init(17, 10, 'moduleName'
function visit478_169_1(result) {
_$jscoverage['/loader/loader.js'].branchData['169'][1].ranCondition(result);
return result;
}_$jscoverage['/loader/loader.js'].branchData['151'][1].init(2462, 4, 'sync');
}_$jscoverage['/loader/loader.js'].branchData['151'][1].init(2439, 4, 'sync');
function visit477_151_1(result) {
_$jscoverage['/loader/loader.js'].branchData['151'][1].ranCondition(result);
return result;
Expand Down Expand Up @@ -358,7 +358,7 @@ function visit472_121_1(result) {
function visit471_119_1(result) {
_$jscoverage['/loader/loader.js'].branchData['119'][1].ranCondition(result);
return result;
}_$jscoverage['/loader/loader.js'].branchData['94'][1].init(247, 24, 'S.isPlainObject(success)');
}_$jscoverage['/loader/loader.js'].branchData['94'][1].init(224, 24, 'S.isPlainObject(success)');
function visit470_94_1(result) {
_$jscoverage['/loader/loader.js'].branchData['94'][1].ranCondition(result);
return result;
Expand Down Expand Up @@ -420,10 +420,10 @@ function visit469_28_1(result) {
_$jscoverage['/loader/loader.js'].lineData[70]++;
ComboLoader.add(name, factory, cfg, S, arguments.length);
},
use: function(modNames, success) {
use: function(modNames, success, error) {
_$jscoverage['/loader/loader.js'].functionData[7]++;
_$jscoverage['/loader/loader.js'].lineData[86]++;
var normalizedModNames, loader, error, sync, tryCount = 0, finalSuccess, waitingModules = new WaitingModules(loadReady);
_$jscoverage['/loader/loader.js'].lineData[87]++;
var normalizedModNames, loader, sync, tryCount = 0, finalSuccess, waitingModules = new WaitingModules(loadReady);
_$jscoverage['/loader/loader.js'].lineData[94]++;
if (visit470_94_1(S.isPlainObject(success))) {
_$jscoverage['/loader/loader.js'].lineData[96]++;
Expand Down
6 changes: 3 additions & 3 deletions src/seed/src/loader/loader.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @author yiminghe@gmail.com
*/
(function (S, undefined) {
var logger = S.getLogger('s/loader');
var logger = S.getLogger('s/loader');
var Loader = S.Loader,
Env = S.Env,

Expand Down Expand Up @@ -74,6 +74,7 @@
* @param {String|String[]} modNames moduleNames. 1-n modules to bind(use comma to separate)
* @param {Function} success callback function executed
* when KISSY has the required functionality.
* @param {Function} error callback
* @param {KISSY} success.S KISSY instance
* @param success.x... modules exports
* @member KISSY
Expand All @@ -82,10 +83,9 @@
* // loads and attached overlay,dd and its dependencies
* KISSY.use('overlay,dd', function(S, Overlay){});
*/
use: function (modNames, success) {
use: function (modNames, success, error) {
var normalizedModNames,
loader,
error,
sync,
tryCount = 0,
finalSuccess,
Expand Down

0 comments on commit b97f6d9

Please sign in to comment.