diff --git a/lib/aura.extensions.js b/lib/aura.extensions.js index f848cd4..de1f763 100644 --- a/lib/aura.extensions.js +++ b/lib/aura.extensions.js @@ -172,8 +172,8 @@ define(['./base', './logger'], function(base, Logger) { ext = getVal(ext, context); if (ext && ext.require && ext.require.paths) { var deps = Object.keys(ext.require.paths) || []; - require.config(ext.require); - require(deps, function() { + requirejs.config(ext.require); + requirejs(deps, function() { dfd.resolve(ext); }, reject); } else { @@ -187,7 +187,7 @@ define(['./base', './logger'], function(base, Logger) { }; if (typeof ext === 'string') { - require([ext], resolve, reject); + requirejs([ext], resolve, reject); } else { resolve(ext); } diff --git a/lib/base.js b/lib/base.js index d629db9..6d54a17 100644 --- a/lib/base.js +++ b/lib/base.js @@ -4,7 +4,7 @@ return window.jQuery; }); } else { - require.config({ + requirejs.config({ paths: { jquery: 'bower_components/jquery/jquery' }, @@ -19,7 +19,7 @@ return window._; }); } else { - require.config({ + requirejs.config({ paths: { underscore: 'bower_components/underscore/underscore' }, @@ -32,8 +32,8 @@ define(['module', 'underscore', 'jquery', './platform'], function(module, _, $, platform) { // Auto configure aura path... if not set yet... - if (!require.s.contexts._.config.paths.aura) { - require.config({ paths: { aura: module.id.replace(/base$/, '') }}); + if (!requirejs.s.contexts._.config.paths.aura) { + requirejs.config({ paths: { aura: module.id.replace(/base$/, '') }}); } var base = {}; diff --git a/lib/ext/components.js b/lib/ext/components.js index 5d336f1..72246b4 100644 --- a/lib/ext/components.js +++ b/lib/ext/components.js @@ -200,10 +200,10 @@ define('aura/ext/components', function() { }); // Apply requirejs map / package configuration before the actual loading. - require.config(options.require); + requirejs.config(options.require); // Here, we require the component's package definition - require([ref], function(componentDefinition) { + requirejs([ref], function(componentDefinition) { if (!componentDefinition) { return dfd.reject("component " + ref + " Definition is empty !"); @@ -310,7 +310,7 @@ define('aura/ext/components', function() { var ref = name.split("@"), componentName = core.util.decamelize(ref[0]), componentSource = ref[1] || "default", - requireContext = require.s.contexts._, + requireContext = requirejs.s.contexts._, componentsPath = app.config.sources[componentSource] || "./aura_components"; // Register the component as a requirejs package... diff --git a/lib/ext/mediator.js b/lib/ext/mediator.js index 69260b3..d2f15d1 100644 --- a/lib/ext/mediator.js +++ b/lib/ext/mediator.js @@ -17,8 +17,8 @@ define('aura/ext/mediator', function () { }, initialize: function (app) { - var EventEmitter = require('eventemitter'); - var _ = require('underscore'); + var EventEmitter = requirejs('eventemitter'); + var _ = requirejs('underscore'); app.config.mediator = _.defaults(app.config.mediator || {}, { wildcard: true,