Skip to content

resolve name conflict on node-webkit #311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yapcheahshen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

resolve name conflict on node-webkit #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/aura.extensions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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);
}
Expand Down
8 changes: 4 additions & 4 deletions lib/base.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
return window.jQuery;
});
} else {
require.config({
requirejs.config({
paths: {
jquery: 'bower_components/jquery/jquery'
},
Expand All @@ -19,7 +19,7 @@
return window._;
});
} else {
require.config({
requirejs.config({
paths: {
underscore: 'bower_components/underscore/underscore'
},
Expand All @@ -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 = {};
Expand Down
6 changes: 3 additions & 3 deletions lib/ext/components.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 !");
Expand Down Expand Up @@ -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...
Expand Down
4 changes: 2 additions & 2 deletions lib/ext/mediator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down