- Refactor tests/ & app/ folders to use let & const and destructuring…

… to import Ember classes.

- Add bable.

- WIP, using let & const and destructuring to import Ember classes.

- Complete refactoring app/ to use let & cost and destructuring.

- Minor edits.

app/adapters/basic.js

@@ -12,7 +12,7 @@
  * ```
  */
 import Ember from "ember";
-var K = Ember.K;
+const K = Ember.K;
 export default Ember.Object.extend({
   name: 'basic',
   /**

app/adapters/bookmarklet.js

@@ -17,10 +17,10 @@ export default BasicAdapter.extend({
   },
 
   _connect: function() {
-    var self = this;
+    let self = this;
 
     window.addEventListener('message', function(e) {
-      var message = e.data;
+      let message = e.data;
       if (e.origin !== self.get('inspectedWindowURL')) {
         return;
       }

app/adapters/chrome.js

@@ -1,7 +1,7 @@
 /* globals chrome */
 import BasicAdapter from "./basic";
 
-var emberDebug = null;
+let emberDebug = null;
 
 export default BasicAdapter.extend({
   name: 'chrome',
@@ -16,8 +16,8 @@ export default BasicAdapter.extend({
   }.property(),
 
   _connect: function() {
-    var self = this;
-    var chromePort = this.get('_chromePort');
+    let self = this;
+    let chromePort = this.get('_chromePort');
     chromePort.postMessage({ appId: chrome.devtools.inspectedWindow.tabId });
 
     chromePort.onMessage.addListener(function(message) {
@@ -29,7 +29,7 @@ export default BasicAdapter.extend({
   }.on('init'),
 
   _handleReload: function() {
-    var self = this;
+    let self = this;
     chrome.devtools.network.onNavigated.addListener(function() {
       self._injectDebugger();
       location.reload(true);
@@ -76,7 +76,7 @@ function sendIframes(urls) {
 }
 
 function loadEmberDebug() {
-  var xhr;
+  let xhr;
   if (!emberDebug) {
     xhr = new XMLHttpRequest();
     xhr.open("GET", chrome.extension.getURL('/panes/ember_debug.js'), false);

app/adapters/firefox.js

@@ -23,7 +23,7 @@ export default BasicAdapter.extend({
       return;
     }
 
-    var message = evt.data;
+    const message = evt.data;
     // check if the event is originated by our privileged ember inspector code
     if (evt.isTrusted) {
       if (typeof message.type === 'string' && message.type === 'iframes') {
@@ -39,7 +39,7 @@ export default BasicAdapter.extend({
   },
 
   _sendIframes: function (urls) {
-    var self = this;
+    let self = this;
     urls.forEach(function(url) {
       self.sendMessage({ type: "injectEmberDebug", frameURL: url });
     });

app/adapters/websocket.js

@@ -1,9 +1,8 @@
 import Ember from "ember";
 import BasicAdapter from "./basic";
+const { computed } = Ember;
 
-var computed = Ember.computed;
-
-var WebsocketAdapter = BasicAdapter.extend({
+export default BasicAdapter.extend({
   init: function() {
     this._super();
     this._connect();
@@ -19,7 +18,7 @@ var WebsocketAdapter = BasicAdapter.extend({
   }).property(),
 
   _connect: function() {
-    var self = this;
+    let self = this;
     this.get('socket').on('emberInspectorMessage', function(message) {
       Ember.run(function() {
         self._messageReceived(message);
@@ -36,4 +35,3 @@ var WebsocketAdapter = BasicAdapter.extend({
   }
 });
 
-export default WebsocketAdapter;

app/app.js

@@ -10,9 +10,9 @@ import msToTime from "ember-inspector/helpers/ms-to-time";
 
 Ember.MODEL_FACTORY_INJECTIONS = true;
 
-var version = '1.8.0';
+const version = '1.8.0';
 
-var App = Ember.Application.extend({
+const App = Ember.Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
   Resolver: Resolver
@@ -30,7 +30,7 @@ App.initializer({
 
   initialize: function(container, app) {
     // register and inject adapter
-    var Adapter;
+    let Adapter;
     if (Ember.typeOf(app.adapter) === 'string') {
       Adapter = container.resolve('adapter:' + app.adapter);
     } else {

app/components/action-checkbox.js

@@ -1,5 +1,5 @@
 import Ember from 'ember';
-var Component = Ember.Component;
+const { Component } = Ember;
 
 export default Component.extend({
   tagName: 'input',

app/components/date-property-field.js

@@ -1,8 +1,7 @@
 import Ember from "ember";
 import DatePicker from "ember-inspector/components/pikaday-input";
-
-var once = Ember.run.once;
-var KEY_EVENTS = {
+const { run: { once } } = Ember;
+const KEY_EVENTS = {
   enter: 13,
   escape: 27
 };

app/components/drag-handle.js

@@ -11,7 +11,7 @@ export default Ember.Component.extend({
   minWidth: 60,
 
   startDragging: function() {
-    var self = this,
+    let self = this,
         $container = this.$().parent(),
         $containerOffsetLeft = $container.offset().left,
         $containerOffsetRight = $containerOffsetLeft + $container.width(),
@@ -20,7 +20,7 @@ export default Ember.Component.extend({
     this.sendAction('action', true);
 
     Ember.$('body').on('mousemove.' + namespace, function(e) {
-      var position = self.get('isLeft') ?
+      let position = self.get('isLeft') ?
                        e.pageX - $containerOffsetLeft :
                        $containerOffsetRight - e.pageX;
 

app/components/draggable-column.js

@@ -3,7 +3,7 @@
 // A wrapper for a resizable-column and a drag-handle component
 
 import Ember from "ember";
-var Component = Ember.Component;
+const { Component } = Ember;
 
 export default Component.extend({
   tagName: '', // Prevent wrapping in a div

app/components/icon-button.js

@@ -1,5 +1,5 @@
 import Ember from "ember";
-var Component = Ember.Component;
+const { Component } = Ember;
 export default Component.extend({
   attributeBindings: ['dataLabel:data-label', 'title'],
 

app/computed/custom-filter.js

@@ -1,19 +1,19 @@
 import Ember from "ember";
 export default function filterComputed() {
-  var dependentKeys, callback;
+  let dependentKeys, callback;
 
   if (arguments.length > 1) {
-    var slice = [].slice;
+    const slice = [].slice;
     dependentKeys = slice.call(arguments, 0, -1);
     callback = slice.call(arguments, -1)[0];
   }
-  var options = {
+  let options = {
     initialize: function (array, changeMeta, instanceMeta) {
       instanceMeta.filteredArrayIndexes = new Ember.SubArray();
     },
 
     addedItem: function(array, item, changeMeta, instanceMeta) {
-      var match = !!callback.call(this, item),
+      let match = !!callback.call(this, item),
           filterIndex = instanceMeta.filteredArrayIndexes.addItem(changeMeta.index, match);
 
       if (match) {
@@ -24,7 +24,7 @@ export default function filterComputed() {
     },
 
     removedItem: function(array, item, changeMeta, instanceMeta) {
-      var filterIndex = instanceMeta.filteredArrayIndexes.removeItem(changeMeta.index);
+      let filterIndex = instanceMeta.filteredArrayIndexes.removeItem(changeMeta.index);
 
       if (filterIndex > -1) {
         array.removeAt(filterIndex);
@@ -33,7 +33,7 @@ export default function filterComputed() {
       return array;
     }
   };
-  var args = dependentKeys;
+  let args = dependentKeys;
   args.push(options);
 
   /*jshint validthis:true */

app/computed/debounce.js

@@ -1,14 +1,15 @@
 import Ember from "ember";
-var debounce = Ember.run.debounce;
+const { run } = Ember;
+const { debounce } = run;
 
 // Use this if you want a property to debounce
 // another property with a certain delay.
 // This means that every time this prop changes,
 // the other prop will change to the same val after [delay]
 export default function(prop, delay, callback) {
-  var value;
+  let value;
 
-  var updateVal = function() {
+  let updateVal = function() {
     this.set(prop, value);
     if (callback) {
       callback.call(this);

app/controllers/application.js

@@ -1,7 +1,5 @@
 import Ember from "ember";
-
-var oneWay = Ember.computed.oneWay,
-    equal = Ember.computed.equal;
+const { computed: { oneWay, equal} } = Ember;
 
 export default Ember.Controller.extend({
   needs: ['mixin-stack', 'mixin-details'],
@@ -34,14 +32,14 @@ export default Ember.Controller.extend({
   },
 
   popMixinDetails() {
-    var mixinStack = this.get('controllers.mixin-stack');
-    var item = mixinStack.popObject();
+    let mixinStack = this.get('controllers.mixin-stack');
+    let item = mixinStack.popObject();
     this.set('mixinDetails.model', mixinStack.get('lastObject'));
     this.get('port').send('objectInspector:releaseObject', { objectId: item.objectId });
   },
 
   activateMixinDetails(name, objectId, details, errors) {
-    var self = this;
+    let self = this;
     this.get('mixinStack').forEach(function(item) {
       self.get('port').send('objectInspector:releaseObject', { objectId: item.objectId });
     });
@@ -51,12 +49,12 @@ export default Ember.Controller.extend({
   },
 
   droppedObject(objectId) {
-    var mixinStack = this.get('mixinStack.model');
-    var obj = mixinStack.findProperty('objectId', objectId);
+    let mixinStack = this.get('mixinStack.model');
+    let obj = mixinStack.findProperty('objectId', objectId);
     if (obj) {
-      var index = mixinStack.indexOf(obj);
-      var objectsToRemove = [];
-      for (var i = index; i >= 0; i--) {
+      let index = mixinStack.indexOf(obj);
+      let objectsToRemove = [];
+      for (let i = index; i >= 0; i--) {
         objectsToRemove.pushObject(mixinStack.objectAt(i));
       }
       objectsToRemove.forEach(function(item) {

app/controllers/container-type.js

@@ -1,10 +1,8 @@
 import Ember from "ember";
 import debounceComputed from "ember-inspector/computed/debounce";
 import searchMatch from "ember-inspector/utils/search-match";
-var ArrayController = Ember.ArrayController;
-var computed = Ember.computed;
-var filter = computed.filter;
-var get = Ember.get;
+const { ArrayController, computed, get } = Ember;
+const { filter } = computed;
 
 export default ArrayController.extend({
   needs: ['application'],

app/controllers/deprecation-item.js

@@ -1,6 +1,7 @@
 import Ember from "ember";
-var Controller = Ember.Controller;
-var notEmpty = Ember.computed.notEmpty;
+const { Controller, computed } = Ember;
+const { notEmpty } = computed;
+
 export default Controller.extend({
   isExpanded: true,
 

app/controllers/deprecation-source.js

@@ -1,15 +1,12 @@
 import Ember from "ember";
-var Controller = Ember.Controller;
-var computed = Ember.computed;
-var bool = computed.bool;
-var readOnly = computed.readOnly;
-var and = computed.and;
+const { Controller, computed } = Ember;
+const { bool, readOnly, and } = computed;
 
 export default Controller.extend({
   known: bool('model.map.source'),
 
   url: function() {
-    var source = this.get('model.map.source');
+    let source = this.get('model.map.source');
     if (this.get('known')) {
       return source + ':' + this.get('model.map.line');
     } else {

app/controllers/deprecations.js

@@ -1,10 +1,8 @@
 import Ember from "ember";
 import debounceComputed from "ember-inspector/computed/debounce";
 import searchMatch from "ember-inspector/utils/search-match";
-var Controller = Ember.Controller;
-var computed = Ember.computed;
-var filter = computed.filter;
-var get = Ember.get;
+const { Controller, computed, get } = Ember;
+const { filter } = computed;
 
 export default Controller.extend({
   needs: ['application'],

app/controllers/iframes.js

@@ -1,12 +1,10 @@
 import Ember from "ember";
-var ArrayController = Ember.ArrayController;
-var alias = Ember.computed.alias;
-var mapComputed = Ember.computed.map;
-var run = Ember.run;
+const { ArrayController, computed, run } = Ember;
+const { alias, map } = computed;
 
 export default ArrayController.extend({
-  model: mapComputed('port.detectedApplications', function(item) {
-    var name = item.split('__');
+  model: map('port.detectedApplications', function(item) {
+    let name = item.split('__');
     return {
       name: name[1],
       val: item
@@ -17,14 +15,14 @@ export default ArrayController.extend({
 
   selectedDidChange: function() {
     // Change iframe being debugged
-    var url = '/';
-    var applicationId = this.get('selectedApp');
-    var app = this.container.lookup('application:main');
-    var list = this.get('port').get('detectedApplications');
+    let url = '/';
+    let applicationId = this.get('selectedApp');
+    let app = this.container.lookup('application:main');
+    let list = this.get('port').get('detectedApplications');
 
     run(app, app.reset);
-    var router = app.__container__.lookup('router:main');
-    var port = app.__container__.lookup('port:main');
+    let router = app.__container__.lookup('router:main');
+    let port = app.__container__.lookup('port:main');
     port.set('applicationId', applicationId);
     port.set('detectedApplications', list);