ember-cli-assets 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8a198b91fac7f1e5ff821d9368172835da89b58
-  data.tar.gz: 3f33116c234ea2eb8e12db95e213e82efdbc3e8d
+  metadata.gz: 87a3d6547a75004b8310bf9a2299e89632e4719f
+  data.tar.gz: 2d428f9e18dea1ae01c63a3102807ca67f9d271c
 SHA512:
-  metadata.gz: d75c390633e479a1d30c3a78418ffaec1be4bf73418d817201a5ebf3c2bc14df68f2786cbc3e27fa56bc42f24f6959ba40d11840bc00b222b290f3a0b3668616
-  data.tar.gz: bcafb3591176fb79fdcc00acd678c9460db40697efa8df7b796c19b3e488696c67aab27db414ac2592b9cce5c03182d2bc7432a031d92fb30b954cadfdcabb12
+  metadata.gz: 99a656a78816ee0fc74e0c89d68cf62687e35944841fba30eb014638e49417523e5d10469b61d9099901785b72dd1058ccf93d3e61ea5a56407881dda17ff309
+  data.tar.gz: 9138437d8e161fc545c71a44d9cd515d84267f12a64c6305aab0456f5904d2fc42320f726b1be1bec658151fc5a4c2919535b8edb82c536846e962f482d8d225

data/lib/ember/cli/assets/version.rb

@@ -1,7 +1,7 @@
 module Ember
   module CLI
     module Assets
-      VERSION = '0.0.13'
+      VERSION = '0.0.14'
     end
   end
 end

data/lib/ember/cli/resolver.rb

@@ -1,7 +1,7 @@
 module Ember
   module CLI
     module Resolver
-      VERSION = '0.1.18'
+      VERSION = '0.1.19'
     end
   end
 end

data/vendor/assets/ember/resolver.js

@@ -65,21 +65,34 @@ define("ember/resolver",
 
     if (fullName.parsedName === true) { return fullName; }
 
-    var prefixParts = fullName.split('@');
-    var prefix;
+    var prefix, type, name;
+    var fullNameParts = fullName.split('@');
+
+    // Htmlbars uses helper:@content-helper which collides
+    // with ember-cli namespace detection.
+    // This will be removed in a future release of Htmlbars.
+    if (fullName !== 'helper:@content-helper' &&
+        fullNameParts.length === 2) {
+      var prefixParts = fullNameParts[0].split(':');
+
+      if (prefixParts.length === 2) {
+        prefix = prefixParts[1];
+        type = prefixParts[0];
+        name = fullNameParts[1];
+      } else {
+        var nameParts = fullNameParts[1].split(':');
 
-    if (prefixParts.length === 2) {
-      if (prefixParts[0].split(':')[0] === 'view') {
-        prefixParts[0] = prefixParts[0].split(':')[1];
-        prefixParts[1] = 'view:' + prefixParts[1];
+        prefix = fullNameParts[0];
+        type = nameParts[0];
+        name = nameParts[1];
       }
-
-      prefix = prefixParts[0];
+    } else {
+      fullNameParts = fullName.split(':');
+      type = fullNameParts[0];
+      name = fullNameParts[1];
     }
 
-    var nameParts = prefixParts[prefixParts.length - 1].split(":");
-    var type = nameParts[0], fullNameWithoutType = nameParts[1];
-    var name = fullNameWithoutType;
+    var fullNameWithoutType = name;
     var namespace = get(this, 'namespace');
     var root = namespace;
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ember-cli-assets
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Ryunosuke SATO
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: The assets for Ember CLI.