Merge pull request #483 from teddyzeenny/1.9.3

1.9.3

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Ember Inspector Changelog
 
+## Ember Inspector 1.9.3
+
+* [BUGFIX] Make sure we only reopen the app once [#482](https://github.com/emberjs/ember-inspector/pull/482)
+* [BUGFIX] Save `_super` before reopening [#481](https://github.com/emberjs/ember-inspector/pull/481)
+* [BUGFIX] Prevent errors when document.documentElement.dataset is not present [#475](https://github.com/emberjs/ember-inspector/pull/475)
+* [BUGFIX] (Ember 2.1) Prevent deprecation for initializer arguments [#476](https://github.com/emberjs/ember-inspector/pull/476)
+* [BUGFIX] (Ember 2.1) Update getState and getLocals for compatibility with canary [#467](https://github.com/emberjs/ember-inspector/pull/467)
+
 ## Ember Inspector 1.9.2
 
 * [BUGFIX] Don't assume Ember.View exists (for Ember 2.0+) [#469](https://github.com/emberjs/ember-inspector/pull/469)

app/app.js

@@ -10,7 +10,7 @@ import msToTime from "ember-inspector/helpers/ms-to-time";
 
 Ember.MODEL_FACTORY_INJECTIONS = true;
 
-const version = '1.9.2';
+const version = '1.9.3';
 
 const App = Ember.Application.extend({
   modulePrefix: config.modulePrefix,

ember_debug/vendor/startup-wrapper.js

@@ -39,21 +39,24 @@ if (typeof env !== 'undefined') {
       Ember.EmberInspectorDebugger.Adapter = requireModule('ember-debug/adapters/' + adapter)['default'];
 
       onApplicationStart(function appStarted(app) {
+        var isFirstBoot = !('__inspector__booted' in app);
         app.__inspector__booted = true;
         Ember.EmberInspectorDebugger.set('application', app);
         Ember.EmberInspectorDebugger.start(true);
-        // Watch for app reset
-        app.reopen({
-          reset: function() {
-            this.__inspector__booted = false;
-            this._super.apply(this, arguments);
-          },
-          willDestroy: function() {
-            Ember.EmberInspectorDebugger.destroyContainer();
-            Ember.EmberInspectorDebugger.set('application', null);
-            this._super.apply(this, arguments);
-          }
-        });
+        if (isFirstBoot) {
+          // Watch for app reset/destroy
+          app.reopen({
+            reset: function() {
+              this.__inspector__booted = false;
+              this._super.apply(this, arguments);
+            },
+            willDestroy: function() {
+              Ember.EmberInspectorDebugger.destroyContainer();
+              Ember.EmberInspectorDebugger.set('application', null);
+              this._super.apply(this, arguments);
+            }
+          });
+        }
       });
     }
   });
@@ -112,13 +115,22 @@ if (typeof env !== 'undefined') {
     }
     Ember.Application.initializer({
       name: 'ember-inspector-booted',
-      initialize: function(container, app) {
-        app.reopen({
-          didBecomeReady: function() {
-            callback(app);
-            return this._super.apply(this, arguments);
-          }
-        });
+      initialize: function() {
+        // If 2 arguments are passed, we are on Ember < 2.1 (app is second arg)
+        // If 1 argument is passed, we are on Ember 2.1+ (app is only arg)
+        var app = arguments[1] || arguments[0];
+        if (!app.__inspector__setup) {
+          app.__inspector__setup = true;
+          app.reopen({
+            didBecomeReady: function() {
+              // _super will get reset when we reopen the app
+              // so we store it in this variable to call it later.
+              var _super = this._super;
+              callback(app);
+              return _super.apply(this, arguments);
+            }
+          });
+        }
       }
     });
   }

ember_debug/view-debug.js

@@ -696,7 +696,11 @@ export default EmberObject.extend(PortMixin, {
    * @return {Boolean}
    */
   _nodeIsView(renderNode) {
-    return !!renderNode.state.manager;
+    if (renderNode.getState) {
+      return !!renderNode.getState().manager;
+    } else {
+      return !!renderNode.state.manager;
+    }
   },
 
   /**
@@ -731,7 +735,14 @@ export default EmberObject.extend(PortMixin, {
    * @return {Ember.Controller}
    */
   _controllerForNode(renderNode) {
-    return renderNode.lastResult && renderNode.lastResult.scope.locals.controller.value();
+    if (renderNode.lastResult) {
+      let scope = renderNode.lastResult.scope;
+      if (scope.getLocal) {
+        return scope.getLocal('controller');
+      } else {
+        return scope.locals.controller.value();
+      }
+    }
   },
 
   /**

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-inspector",
-  "version": "1.9.2",
+  "version": "1.9.3",
   "description": "Extends developer tools to allow you to better inspect your Ember.js apps.",
   "directories": {
     "test": "tests"

skeleton_chrome/content-script.js

@@ -25,8 +25,12 @@
     port.start();
   }
 
-  // let ember-debug know that content script has executed
-  document.documentElement.dataset.emberExtension = 1;
+  // document.documentElement.dataset is not present for SVG elements
+  // this guard prevents that condition from triggering an error
+  if (document.documentElement && document.documentElement.dataset) {
+    // let ember-debug know that content script has executed
+    document.documentElement.dataset.emberExtension = 1;
+  }
 
 
 

skeleton_chrome/manifest.json

@@ -3,7 +3,7 @@
 
   "name": "Ember Inspector",
   "description": "Tool for debugging Ember applications.",
-  "version": "1.9.2",
+  "version": "1.9.3",
 
   "icons": {
     "16":  "panes/assets/images/icon16.png",

skeleton_firefox/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-inspector",
-  "version": "1.9.2",
+  "version": "1.9.3",
   "fullName": "Ember Inspector",
   "id": "ember-inspector@emberjs.com",
   "description": "Tool for debugging Ember applications.",