ember-cli-assets 0.0.13 → 0.0.14
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/resolver.rb +1 -1
- data/vendor/assets/ember/resolver.js +24 -11
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 87a3d6547a75004b8310bf9a2299e89632e4719f
|
|
4
|
+
data.tar.gz: 2d428f9e18dea1ae01c63a3102807ca67f9d271c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 99a656a78816ee0fc74e0c89d68cf62687e35944841fba30eb014638e49417523e5d10469b61d9099901785b72dd1058ccf93d3e61ea5a56407881dda17ff309
|
|
7
|
+
data.tar.gz: 9138437d8e161fc545c71a44d9cd515d84267f12a64c6305aab0456f5904d2fc42320f726b1be1bec658151fc5a4c2919535b8edb82c536846e962f482d8d225
|
data/lib/ember/cli/resolver.rb
CHANGED
|
@@ -65,21 +65,34 @@ define("ember/resolver",
|
|
|
65
65
|
|
|
66
66
|
if (fullName.parsedName === true) { return fullName; }
|
|
67
67
|
|
|
68
|
-
var
|
|
69
|
-
var
|
|
68
|
+
var prefix, type, name;
|
|
69
|
+
var fullNameParts = fullName.split('@');
|
|
70
|
+
|
|
71
|
+
// Htmlbars uses helper:@content-helper which collides
|
|
72
|
+
// with ember-cli namespace detection.
|
|
73
|
+
// This will be removed in a future release of Htmlbars.
|
|
74
|
+
if (fullName !== 'helper:@content-helper' &&
|
|
75
|
+
fullNameParts.length === 2) {
|
|
76
|
+
var prefixParts = fullNameParts[0].split(':');
|
|
77
|
+
|
|
78
|
+
if (prefixParts.length === 2) {
|
|
79
|
+
prefix = prefixParts[1];
|
|
80
|
+
type = prefixParts[0];
|
|
81
|
+
name = fullNameParts[1];
|
|
82
|
+
} else {
|
|
83
|
+
var nameParts = fullNameParts[1].split(':');
|
|
70
84
|
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
prefixParts[1] = 'view:' + prefixParts[1];
|
|
85
|
+
prefix = fullNameParts[0];
|
|
86
|
+
type = nameParts[0];
|
|
87
|
+
name = nameParts[1];
|
|
75
88
|
}
|
|
76
|
-
|
|
77
|
-
|
|
89
|
+
} else {
|
|
90
|
+
fullNameParts = fullName.split(':');
|
|
91
|
+
type = fullNameParts[0];
|
|
92
|
+
name = fullNameParts[1];
|
|
78
93
|
}
|
|
79
94
|
|
|
80
|
-
var
|
|
81
|
-
var type = nameParts[0], fullNameWithoutType = nameParts[1];
|
|
82
|
-
var name = fullNameWithoutType;
|
|
95
|
+
var fullNameWithoutType = name;
|
|
83
96
|
var namespace = get(this, 'namespace');
|
|
84
97
|
var root = namespace;
|
|
85
98
|
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: ember-cli-assets
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0.
|
|
4
|
+
version: 0.0.14
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ryunosuke SATO
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-08-
|
|
11
|
+
date: 2015-08-28 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|
|
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
97
97
|
version: '0'
|
|
98
98
|
requirements: []
|
|
99
99
|
rubyforge_project:
|
|
100
|
-
rubygems_version: 2.4.
|
|
100
|
+
rubygems_version: 2.4.5.1
|
|
101
101
|
signing_key:
|
|
102
102
|
specification_version: 4
|
|
103
103
|
summary: The assets for Ember CLI.
|