Skip to content

Commit

Permalink
[Loader]: Build.
Browse files Browse the repository at this point in the history
  • Loading branch information
Ezequiel Rodriguez committed Apr 1, 2014
1 parent 761af78 commit 2db62dd
Show file tree
Hide file tree
Showing 13 changed files with 161 additions and 97 deletions.
4 changes: 2 additions & 2 deletions build/loader-base/loader-base-coverage.js
View file

Large diffs are not rendered by default.

26 changes: 17 additions & 9 deletions build/loader-base/loader-base-debug.js
View file
Expand Up @@ -2253,15 +2253,15 @@ Y.log('Undefined module: ' + mname + ', matched a pattern: ' +
* @private
*/
_sort: function() {
var name,
var name,

// Object containing module names.
required = this.required,
required = this.required,

// Keep track of whether we've visited a module.
visited = {};

// Will contain modules names, in the correct order,
// Will contain modules names, in the correct order,
// according to dependencies.
this.sorted = [];

Expand All @@ -2279,24 +2279,32 @@ Y.log('Undefined module: ' + mname + ', matched a pattern: ' +
* @param {Object} visited Keeps track of whether a module was visited.
* @method _visit
* @private
*/
*/
_visit: function (name, visited) {
var required, moduleInfo, dependency, dependencies, i, l;
var required, condition, moduleInfo, dependency, dependencies,
trigger, isAfter, i, l;

visited[name] = true;
required = this.required;
moduleInfo = this.moduleInfo[name];
condition = this.conditions[name] || {};

if (moduleInfo) {
// Recurse on each dependency of this module,
// Recurse on each dependency of this module,
// figuring out its dependencies, and so on.
dependencies = moduleInfo.requires;
dependencies = moduleInfo.expanded || moduleInfo.requires;

for (i = 0, l = dependencies.length; i < l; ++i) {
dependency = dependencies[i];

trigger = condition[dependency];

// We cannot process this dependency yet if it must
// appear after our current module.
isAfter = trigger && (!trigger.when || trigger.when === "after");

// Is this module name in the required list of modules,
// and have we not already visited it?
if (required[dependency] && !visited[dependency]) {
if (required[dependency] && !visited[dependency] && !isAfter) {
this._visit(dependency, visited);
}
}
Expand Down
4 changes: 2 additions & 2 deletions build/loader-base/loader-base-min.js
View file

Large diffs are not rendered by default.

26 changes: 17 additions & 9 deletions build/loader-base/loader-base.js
View file
Expand Up @@ -2228,15 +2228,15 @@ Y.Loader.prototype = {
* @private
*/
_sort: function() {
var name,
var name,

// Object containing module names.
required = this.required,
required = this.required,

// Keep track of whether we've visited a module.
visited = {};

// Will contain modules names, in the correct order,
// Will contain modules names, in the correct order,
// according to dependencies.
this.sorted = [];

Expand All @@ -2254,24 +2254,32 @@ Y.Loader.prototype = {
* @param {Object} visited Keeps track of whether a module was visited.
* @method _visit
* @private
*/
*/
_visit: function (name, visited) {
var required, moduleInfo, dependency, dependencies, i, l;
var required, condition, moduleInfo, dependency, dependencies,
trigger, isAfter, i, l;

visited[name] = true;
required = this.required;
moduleInfo = this.moduleInfo[name];
condition = this.conditions[name] || {};

if (moduleInfo) {
// Recurse on each dependency of this module,
// Recurse on each dependency of this module,
// figuring out its dependencies, and so on.
dependencies = moduleInfo.requires;
dependencies = moduleInfo.expanded || moduleInfo.requires;

for (i = 0, l = dependencies.length; i < l; ++i) {
dependency = dependencies[i];

trigger = condition[dependency];

// We cannot process this dependency yet if it must
// appear after our current module.
isAfter = trigger && (!trigger.when || trigger.when === "after");

// Is this module name in the required list of modules,
// and have we not already visited it?
if (required[dependency] && !visited[dependency]) {
if (required[dependency] && !visited[dependency] && !isAfter) {
this._visit(dependency, visited);
}
}
Expand Down
26 changes: 17 additions & 9 deletions build/loader/loader-debug.js
View file
Expand Up @@ -2253,15 +2253,15 @@ Y.log('Undefined module: ' + mname + ', matched a pattern: ' +
* @private
*/
_sort: function() {
var name,
var name,

// Object containing module names.
required = this.required,
required = this.required,

// Keep track of whether we've visited a module.
visited = {};

// Will contain modules names, in the correct order,
// Will contain modules names, in the correct order,
// according to dependencies.
this.sorted = [];

Expand All @@ -2279,24 +2279,32 @@ Y.log('Undefined module: ' + mname + ', matched a pattern: ' +
* @param {Object} visited Keeps track of whether a module was visited.
* @method _visit
* @private
*/
*/
_visit: function (name, visited) {
var required, moduleInfo, dependency, dependencies, i, l;
var required, condition, moduleInfo, dependency, dependencies,
trigger, isAfter, i, l;

visited[name] = true;
required = this.required;
moduleInfo = this.moduleInfo[name];
condition = this.conditions[name] || {};

if (moduleInfo) {
// Recurse on each dependency of this module,
// Recurse on each dependency of this module,
// figuring out its dependencies, and so on.
dependencies = moduleInfo.requires;
dependencies = moduleInfo.expanded || moduleInfo.requires;

for (i = 0, l = dependencies.length; i < l; ++i) {
dependency = dependencies[i];

trigger = condition[dependency];

// We cannot process this dependency yet if it must
// appear after our current module.
isAfter = trigger && (!trigger.when || trigger.when === "after");

// Is this module name in the required list of modules,
// and have we not already visited it?
if (required[dependency] && !visited[dependency]) {
if (required[dependency] && !visited[dependency] && !isAfter) {
this._visit(dependency, visited);
}
}
Expand Down
14 changes: 7 additions & 7 deletions build/loader/loader-min.js
View file

Large diffs are not rendered by default.

26 changes: 17 additions & 9 deletions build/loader/loader.js
View file
Expand Up @@ -2228,15 +2228,15 @@ Y.Loader.prototype = {
* @private
*/
_sort: function() {
var name,
var name,

// Object containing module names.
required = this.required,
required = this.required,

// Keep track of whether we've visited a module.
visited = {};

// Will contain modules names, in the correct order,
// Will contain modules names, in the correct order,
// according to dependencies.
this.sorted = [];

Expand All @@ -2254,24 +2254,32 @@ Y.Loader.prototype = {
* @param {Object} visited Keeps track of whether a module was visited.
* @method _visit
* @private
*/
*/
_visit: function (name, visited) {
var required, moduleInfo, dependency, dependencies, i, l;
var required, condition, moduleInfo, dependency, dependencies,
trigger, isAfter, i, l;

visited[name] = true;
required = this.required;
moduleInfo = this.moduleInfo[name];
condition = this.conditions[name] || {};

if (moduleInfo) {
// Recurse on each dependency of this module,
// Recurse on each dependency of this module,
// figuring out its dependencies, and so on.
dependencies = moduleInfo.requires;
dependencies = moduleInfo.expanded || moduleInfo.requires;

for (i = 0, l = dependencies.length; i < l; ++i) {
dependency = dependencies[i];

trigger = condition[dependency];

// We cannot process this dependency yet if it must
// appear after our current module.
isAfter = trigger && (!trigger.when || trigger.when === "after");

// Is this module name in the required list of modules,
// and have we not already visited it?
if (required[dependency] && !visited[dependency]) {
if (required[dependency] && !visited[dependency] && !isAfter) {
this._visit(dependency, visited);
}
}
Expand Down
26 changes: 17 additions & 9 deletions build/yui-nodejs/yui-nodejs-debug.js
View file
Expand Up @@ -7411,15 +7411,15 @@ Y.log('Undefined module: ' + mname + ', matched a pattern: ' +
* @private
*/
_sort: function() {
var name,
var name,

// Object containing module names.
required = this.required,
required = this.required,

// Keep track of whether we've visited a module.
visited = {};

// Will contain modules names, in the correct order,
// Will contain modules names, in the correct order,
// according to dependencies.
this.sorted = [];

Expand All @@ -7437,24 +7437,32 @@ Y.log('Undefined module: ' + mname + ', matched a pattern: ' +
* @param {Object} visited Keeps track of whether a module was visited.
* @method _visit
* @private
*/
*/
_visit: function (name, visited) {
var required, moduleInfo, dependency, dependencies, i, l;
var required, condition, moduleInfo, dependency, dependencies,
trigger, isAfter, i, l;

visited[name] = true;
required = this.required;
moduleInfo = this.moduleInfo[name];
condition = this.conditions[name] || {};

if (moduleInfo) {
// Recurse on each dependency of this module,
// Recurse on each dependency of this module,
// figuring out its dependencies, and so on.
dependencies = moduleInfo.requires;
dependencies = moduleInfo.expanded || moduleInfo.requires;

for (i = 0, l = dependencies.length; i < l; ++i) {
dependency = dependencies[i];

trigger = condition[dependency];

// We cannot process this dependency yet if it must
// appear after our current module.
isAfter = trigger && (!trigger.when || trigger.when === "after");

// Is this module name in the required list of modules,
// and have we not already visited it?
if (required[dependency] && !visited[dependency]) {
if (required[dependency] && !visited[dependency] && !isAfter) {
this._visit(dependency, visited);
}
}
Expand Down

0 comments on commit 2db62dd

Please sign in to comment.