Update

OrKoN · Apr 27, 2015 · fac5437 · fac5437
1 parent cae8092
commit fac5437
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 40 deletions.
diff --git a/app/components/my-component.js b/app/components/my-component.js
@@ -9,9 +9,10 @@ var MyComponent = Ember.Component.extend({
   key: 'my-key',
 
   @computed('key')
-  testComputed(key) {
-    return key + '-computed';
+  test(key) {
+    return `${key} + computed`;
   }
+
 });
 
 Ember.Handlebars.helper('my-component', MyComponent);
diff --git a/app/components/templates/my-component.hbs b/app/components/templates/my-component.hbs
@@ -2,4 +2,4 @@ This is component's content
 
 {{input value=key}}
 
-{{testComputed}}
+{{test}}
diff --git a/app/config.js b/app/config.js
@@ -15,14 +15,15 @@ System.config({
 
 System.config({
   "map": {
-    "babel": "npm:babel-core@5.1.11",
-    "babel-runtime": "npm:babel-runtime@5.1.11",
-    "core-js": "npm:core-js@0.8.4",
+    "babel": "npm:babel-core@5.1.13",
+    "babel-runtime": "npm:babel-runtime@5.1.13",
+    "core-js": "npm:core-js@0.9.4",
     "ember": "github:components/ember@1.12.0-beta.1",
     "ember-computed-decorators": "github:rwjblue/ember-computed-decorators@master",
     "hbs": "github:n-fuse/plugin-ember-hbs@1.12.0-beta.1",
     "ihbs": "github:n-fuse/plugin-ember-ihbs@1.12.0-beta.1",
     "jquery": "github:components/jquery@2.1.3",
+    "n-fuse/pajax": "github:n-fuse/pajax@0.1.7",
     "pajax": "github:n-fuse/pajax@0.1.7",
     "github:components/ember@1.12.0-beta.1": {
       "jquery": "github:components/jquery@2.1.3"
@@ -43,7 +44,7 @@ System.config({
     "github:rwjblue/ember-new-computed@master": {
       "ember": "github:components/ember@1.12.0-beta.1"
     },
-    "npm:core-js@0.8.4": {
+    "npm:core-js@0.9.4": {
       "process": "github:jspm/nodelibs-process@0.1.1"
     }
   }

diff --git a/dist/app.js b/dist/app.js
diff --git a/package.json b/package.json
@@ -30,9 +30,9 @@
       "pajax": "github:n-fuse/pajax@^0.1.0"
     },
     "devDependencies": {
-      "babel": "npm:babel-core@^5.1.11",
-      "babel-runtime": "npm:babel-runtime@^5.1.11",
-      "core-js": "npm:core-js@^0.8.1"
+      "babel": "npm:babel-core@^5.1.13",
+      "babel-runtime": "npm:babel-runtime@^5.1.13",
+      "core-js": "npm:core-js@^0.9.4"
     },
     "overrides": {
       "github:components/ember@1.12.0-beta.1": {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@ This is component's content

		{{input value=key}}

		{{testComputed}}
		{{test}}