ember-cli-assets 0.0.17 → 0.0.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/ember/cli/assets/version.rb +1 -1
- data/lib/ember/cli/loader.rb +1 -1
- data/vendor/assets/ember/loader.js +29 -2
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: d8d01ca4031d0f81609bd9c180eae9f6617a0adb
|
|
4
|
+
data.tar.gz: a250a200c0d334a013f4ce205575188ed77e3185
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 30f28cd8f189b81c1629a6f2af0d2ebe18169402965b5c055fbd95e535f9d8420933e1819ae4390a08af11dc4424ef8ed10467d50d86d9943feaddac310421a1
|
|
7
|
+
data.tar.gz: 7dfd1b671f50f87caf0fac9e29d30a77919a368be8a17818001d859afe41b60f0e965b61ea58383bbd6d5122326c6dc2ce86d832cb1a2b8f8cccbc12f43c6a47
|
data/lib/ember/cli/loader.rb
CHANGED
|
@@ -1,8 +1,35 @@
|
|
|
1
|
-
var define, requireModule, require, requirejs;
|
|
1
|
+
var loader, define, requireModule, require, requirejs;
|
|
2
|
+
var global = this;
|
|
2
3
|
|
|
3
4
|
(function() {
|
|
4
5
|
'use strict';
|
|
5
6
|
|
|
7
|
+
// Save off the original values of these globals, so we can restore them if someone asks us to
|
|
8
|
+
var oldGlobals = {
|
|
9
|
+
loader: loader,
|
|
10
|
+
define: define,
|
|
11
|
+
requireModule: requireModule,
|
|
12
|
+
require: require,
|
|
13
|
+
requirejs: requirejs
|
|
14
|
+
};
|
|
15
|
+
|
|
16
|
+
loader = {
|
|
17
|
+
noConflict: function(aliases) {
|
|
18
|
+
var oldName, newName;
|
|
19
|
+
|
|
20
|
+
for (oldName in aliases) {
|
|
21
|
+
if (aliases.hasOwnProperty(oldName)) {
|
|
22
|
+
if (oldGlobals.hasOwnProperty(oldName)) {
|
|
23
|
+
newName = aliases[oldName];
|
|
24
|
+
|
|
25
|
+
global[newName] = global[oldName];
|
|
26
|
+
global[oldName] = oldGlobals[oldName];
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
};
|
|
32
|
+
|
|
6
33
|
var _isArray;
|
|
7
34
|
if (!Array.isArray) {
|
|
8
35
|
_isArray = function (x) {
|
|
@@ -140,7 +167,7 @@ var define, requireModule, require, requirejs;
|
|
|
140
167
|
};
|
|
141
168
|
|
|
142
169
|
function findModule(name, referrer) {
|
|
143
|
-
var mod = registry[name];
|
|
170
|
+
var mod = registry[name] || registry[name + '/index'];
|
|
144
171
|
|
|
145
172
|
while (mod && mod.callback instanceof Alias) {
|
|
146
173
|
name = mod.callback.name;
|