upgraded to ember 2.1.0

ritesh83 · Nov 11, 2015 · 7521d2b · 7521d2b
1 parent 81cf783
commit 7521d2b
Show file tree

Hide file tree

Showing 17 changed files with 117 additions and 79 deletions.
diff --git a/.ember-cli b/.ember-cli
@@ -5,6 +5,5 @@
 
     Setting `disableAnalytics` to true will prevent any data from being sent.
   */
-  "disableAnalytics": false,
-  "live-reload-port": 35730
+  "disableAnalytics": false
 }
diff --git a/.npmignore b/.npmignore
@@ -0,0 +1,15 @@
+bower_components/
+tests/
+tmp/
+dist/
+
+.bowerrc
+.editorconfig
+.ember-cli
+.travis.yml
+.npmignore
+**/.gitkeep
+bower.json
+ember-cli-build.js
+Brocfile.js
+testem.json
diff --git a/.watchmanconfig b/.watchmanconfig
@@ -0,0 +1,3 @@
+{
+  "ignore_dirs": ["tmp"]
+}
diff --git a/Brocfile.js b/Brocfile.js
diff --git a/addon/components/ember-jstree.js b/addon/components/ember-jstree.js
@@ -28,6 +28,7 @@ export default Ember.Component.extend(InboundActions, EmberJstreeActions, {
     _isDestroying:        false,
 
     isReady:              false,
+
     _isReadyTestWaiter: function() {
         return this.get('isReady') === true;
     },
@@ -159,7 +160,7 @@ export default Ember.Component.extend(InboundActions, EmberJstreeActions, {
                                     		var node = self.get('currentNode');
                                     		self.send("contextmenuItemDidClick", action, node);
                                 		});
-                            		}
+                            		};
                             })(this, emberAction);
                         }
                     }
@@ -303,11 +304,15 @@ export default Ember.Component.extend(InboundActions, EmberJstreeActions, {
      * @method _redrawTree
      */
     _refreshTree: Ember.observer('data', function() {
-        var o = this.get('treeObject');
-        var t = o.jstree(true);
-        if (null !== t) {
+        var t = this.getTree();
+        if (null !== t && false !== t) {
             t.settings.core['data'] = this.get('data');
             t.refresh();
+        } else {
+            // setup again if destroyed
+            var treeObject = this._setupJsTree();
+            this._setupEventHandlers(treeObject);
+            this.set('treeObject', treeObject);
         }
     }),
 

diff --git a/addon/mixins/ember-jstree-actions.js b/addon/mixins/ember-jstree-actions.js
@@ -203,11 +203,12 @@ export default Ember.Mixin.create({
         selectNodes: function(property, values) {
             var treeObject = this.get('treeObject');
             if (null !== treeObject) {
+                var i;
                 if ('id' === property) {
                     // If property is ID, can use get_node, which is faster than search.
                     if(Ember.$.isArray(values)) {
                         var nodes = [];
-                        for(var i=0; i<values.length; i++) {
+                        for(i=0; i<values.length; i++) {
                             var node = treeObject.jstree(true).get_node(values[i]);
                             nodes.push(node);
                         }
@@ -226,7 +227,7 @@ export default Ember.Mixin.create({
                     }.bind(this));
 
                     if(Ember.$.isArray(values)) {
-                        for(var i=0; i<values.length; i++) {
+                        for(i=0; i<values.length; i++) {
                             treeObject.jstree(true).search(values[i]);
                         }
 

diff --git a/bower.json b/bower.json
@@ -1,18 +1,19 @@
 {
   "name": "ember-cli-jstree",
   "dependencies": {
-    "ember": "1.12.0",
+    "ember": "2.1.0",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
-    "ember-data": "1.0.0-beta.17",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
-    "ember-qunit": "0.3.3",
+    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
+    "ember-qunit": "0.4.9",
     "ember-qunit-notifications": "0.0.7",
-    "qunit": "~1.17.1",
-    "jstree": "git://github.com/cristinawithout/jstree.git#4cbfbe263949fa1c88e45faa1c8233348ce25352",
-    "ember-resolver": "~0.1.15",
-    "jquery": "^1.11.1",
-    "loader.js": "ember-cli/loader.js#3.2.0",
-    "qunit": "~1.17.1"
+    "ember-resolver": "~0.1.18",
+    "jquery": "^1.11.3",
+    "loader.js": "ember-cli/loader.js#3.2.1",
+    "qunit": "~1.18.0",
+    "jstree": "git://github.com/cristinawithout/jstree.git#4cbfbe263949fa1c88e45faa1c8233348ce25352"
+  },
+  "resolutions": {
+    "ember": "2.1.0"
   }
 }
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -0,0 +1,17 @@
+/* global require, module */
+var EmberApp = require('ember-cli/lib/broccoli/ember-addon');
+
+module.exports = function(defaults) {
+  var app = new EmberApp(defaults, {
+    // Add options here
+  });
+
+  /*
+    This build file specifes the options for the dummy test app of this
+    addon, located in `/tests/dummy`
+    This build file does *not* influence how the addon or the app using it
+    behave. You most likely want to be modifying `./index.js` or app's build file
+  */
+
+  return app.toTree();
+};
diff --git a/package.json b/package.json
@@ -7,8 +7,8 @@
     "test": "tests"
   },
   "scripts": {
-    "start": "ember server",
     "build": "ember build",
+    "start": "ember server",
     "test": "ember try:testall"
   },
   "repository": {
@@ -21,21 +21,23 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "broccoli-asset-rev": "^2.0.2",
-    "ember-cli": "1.13.1",
-    "ember-cli-app-version": "0.3.3",
+    "broccoli-asset-rev": "^2.1.2",
+    "ember-cli": "1.13.8",
+    "ember-cli-app-version": "0.5.0",
     "ember-cli-content-security-policy": "0.4.0",
-    "ember-cli-dependency-checker": "^1.0.0",
-    "ember-cli-htmlbars": "0.7.6",
-    "ember-cli-ic-ajax": "0.1.1",
-    "ember-cli-inject-live-reload": "^1.3.0",
-    "testem": "^0.8.0",
-    "ember-cli-qunit": "0.3.13",
-    "ember-cli-uglify": "^1.0.1",
-    "ember-data": "1.0.0-beta.17",
-    "ember-disable-proxy-controllers": "^0.7.0",
-    "ember-export-application-global": "^1.0.2",
-    "ember-try": "0.0.4"
+    "ember-cli-dependency-checker": "^1.0.1",
+    "ember-cli-htmlbars": "0.7.9",
+    "ember-cli-htmlbars-inline-precompile": "^0.2.0",
+    "ember-cli-ic-ajax": "0.2.1",
+    "ember-cli-inject-live-reload": "^1.3.1",
+    "ember-cli-qunit": "^1.0.0",
+    "ember-cli-release": "0.2.3",
+    "ember-cli-sri": "^1.0.3",
+    "ember-cli-uglify": "^1.2.0",
+    "ember-disable-proxy-controllers": "^1.0.0",
+    "ember-export-application-global": "^1.0.3",
+    "ember-disable-prototype-extensions": "^1.0.0",
+    "ember-try": "0.0.6"
   },
   "keywords": [
     "ember-addon",
@@ -51,4 +53,4 @@
   "ember-addon": {
     "configPath": "tests/dummy/config"
   }
-}
+}
diff --git a/tests/.jshintrc b/tests/.jshintrc
@@ -26,7 +26,7 @@
   "node": false,
   "browser": false,
   "boss": true,
-  "curly": false,
+  "curly": true,
   "debug": false,
   "devel": false,
   "eqeqeq": true,
@@ -47,5 +47,6 @@
   "strict": false,
   "white": false,
   "eqnull": true,
-  "esnext": true
+  "esnext": true,
+  "unused": true
 }
diff --git a/tests/dummy/app/app.js b/tests/dummy/app/app.js
@@ -9,6 +9,7 @@ Ember.MODEL_FACTORY_INJECTIONS = true;
 
 App = Ember.Application.extend({
   modulePrefix: config.modulePrefix,
+  podModulePrefix: config.podModulePrefix,
   Resolver: Resolver
 });
 

diff --git a/tests/dummy/app/dynamic/controller.js b/tests/dummy/app/dynamic/controller.js
@@ -44,12 +44,11 @@ export default Ember.Controller.extend({
             this.get('jstreeActionReceiver').send('destroy');
         },
 
-        handleTreeSelectionDidChange: function(data) {
-            var selected = this.get('jsTreeActionReceiver').send('getSelected');
+        handleTreeSelectionDidChange: function() {
+            this.get('jsTreeActionReceiver').send('getSelected');
         },
 
-        contextMenuReportClicked: function(node, tree) {
-            var self = this;
+        contextMenuReportClicked: function(node) {
             this.set('lastItemClicked', '"Report" item for node: <' + node.text + '> was clicked.');
         },
 

diff --git a/tests/dummy/app/dynamic/template.hbs b/tests/dummy/app/dynamic/template.hbs
@@ -13,15 +13,24 @@
 <div class="info">
     <div class="status">
         <h2>Tree Status</h2>
-        <p {{bind-attr class=":tree-status treeReady:tree-ready:tree-not-ready"}}>Tree Ready? <strong>{{#if treeReady}}Yes{{else}}No{{/if}}</strong></p>
+        <p class="tree-status {{if treeReady "tree-ready" "tree-not-ready"}}">
+            Tree Ready? 
+            <strong>
+                {{#if treeReady}}
+                    Yes
+                {{else}}
+                    No
+                {{/if}}
+            </strong>
+        </p>
         <p>Last Context Item Clicked: <strong>{{lastItemClicked}}</strong></p>
     </div>
 
     <div class="selected">
         <h2>Selected Items</h2>
         {{#if sortedSelectedNodes}}
             <ul>
-            {{#each node in sortedSelectedNodes}}
+            {{#each sortedSelectedNodes as |node|}}
                 <li><strong>{{node.text}}</strong></li>
             {{/each}}
             </ul>

diff --git a/tests/dummy/app/static/controller.js b/tests/dummy/app/static/controller.js
@@ -104,8 +104,7 @@ export default Ember.Controller.extend({
             }
         },
 
-        contextMenuReportClicked: function(node, tree) {
-            var self = this;
+        contextMenuReportClicked: function(node) {
             this.set('lastItemClicked', '"Report" item for node: <' + node.text + '> was clicked.');
         },
 
@@ -120,7 +119,7 @@ export default Ember.Controller.extend({
                     data[index].children.push('added child');
                 }
             });
-            this.set(data);
+            this.set('data', data);
             this.send('redraw');
         },
 

diff --git a/tests/dummy/app/static/template.hbs b/tests/dummy/app/static/template.hbs
@@ -22,15 +22,24 @@
 <div class="info">
     <div class="status">
         <h2>Tree Status</h2>
-        <p {{bind-attr class=":tree-status treeReady:tree-ready:tree-not-ready"}}>Tree Ready? <strong>{{#if treeReady}}Yes{{else}}No{{/if}}</strong></p>
+        <p class="tree-status {{if treeReady "tree-ready" "tree-not-ready"}}">
+            Tree Ready? 
+            <strong>
+                {{#if treeReady}}
+                    Yes
+                {{else}}
+                    No
+                {{/if}}
+            </strong>
+        </p>
         <p>Last Context Item Clicked: <strong>{{lastItemClicked}}</strong></p>
     </div>
 
     <div class="selected">
         <h2>Selected Items</h2>
         {{#if sortedSelectedNodes}}
             <ul>
-            {{#each node in sortedSelectedNodes}}
+            {{#each sortedSelectedNodes as |node|}}
                 <li><strong>{{node.text}}</strong></li>
             {{/each}}
             </ul>

diff --git a/tests/dummy/public/crossdomain.xml b/tests/dummy/public/crossdomain.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
 <cross-domain-policy>
-    <!-- Read this: www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html -->
+  <!-- Read this: www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html -->
 
-    <!-- Most restrictive policy: -->
-    <site-control permitted-cross-domain-policies="none"/>
+  <!-- Most restrictive policy: -->
+  <site-control permitted-cross-domain-policies="none"/>
 
-    <!-- Least restrictive policy: -->
-    <!--
-    <site-control permitted-cross-domain-policies="all"/>
-    <allow-access-from domain="*" to-ports="*" secure="false"/>
-    <allow-http-request-headers-from domain="*" headers="*" secure="false"/>
-    -->
+  <!-- Least restrictive policy: -->
+  <!--
+  <site-control permitted-cross-domain-policies="all"/>
+  <allow-access-from domain="*" to-ports="*" secure="false"/>
+  <allow-http-request-headers-from domain="*" headers="*" secure="false"/>
+  -->
 </cross-domain-policy>
diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
@@ -1,6 +1,5 @@
 import Ember from 'ember';
 import Application from '../../app';
-import Router from '../../router';
 import config from '../../config/environment';
 
 export default function startApp(attrs) {