diff --git a/app/adapters/basic.js b/app/adapters/basic.js index 5fa56023eb..902680591c 100644 --- a/app/adapters/basic.js +++ b/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', /** diff --git a/app/adapters/bookmarklet.js b/app/adapters/bookmarklet.js index 49e5fd36fe..df75b663b8 100644 --- a/app/adapters/bookmarklet.js +++ b/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; } diff --git a/app/adapters/chrome.js b/app/adapters/chrome.js index 5bb0e72bbd..946ecb806b 100644 --- a/app/adapters/chrome.js +++ b/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); diff --git a/app/adapters/firefox.js b/app/adapters/firefox.js index 463e2e0ef7..d8c7044501 100644 --- a/app/adapters/firefox.js +++ b/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 }); }); diff --git a/app/adapters/websocket.js b/app/adapters/websocket.js index 87d62f1aa2..0615403f07 100644 --- a/app/adapters/websocket.js +++ b/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; diff --git a/app/app.js b/app/app.js index c07b68f84b..68ee186b78 100644 --- a/app/app.js +++ b/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 { diff --git a/app/components/action-checkbox.js b/app/components/action-checkbox.js index 8f9d4c4f24..1ccb05d78a 100644 --- a/app/components/action-checkbox.js +++ b/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', diff --git a/app/components/date-property-field.js b/app/components/date-property-field.js index 1b9574ce3a..bf1c8c3ca8 100644 --- a/app/components/date-property-field.js +++ b/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 }; diff --git a/app/components/drag-handle.js b/app/components/drag-handle.js index 1a48398cca..79fcb348f6 100644 --- a/app/components/drag-handle.js +++ b/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; diff --git a/app/components/draggable-column.js b/app/components/draggable-column.js index f23fdf1c3b..873ea85f61 100644 --- a/app/components/draggable-column.js +++ b/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 diff --git a/app/components/icon-button.js b/app/components/icon-button.js index cd0eb9feeb..ef088a0ffb 100644 --- a/app/components/icon-button.js +++ b/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'], diff --git a/app/computed/custom-filter.js b/app/computed/custom-filter.js index bb60c72de3..b02db49dc0 100644 --- a/app/computed/custom-filter.js +++ b/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 */ diff --git a/app/computed/debounce.js b/app/computed/debounce.js index 7ca8815c35..f6153acb5e 100644 --- a/app/computed/debounce.js +++ b/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); diff --git a/app/controllers/application.js b/app/controllers/application.js index ad8eb1dc66..4de968f5eb 100644 --- a/app/controllers/application.js +++ b/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) { diff --git a/app/controllers/container-type.js b/app/controllers/container-type.js index ed5afb717b..2bc2673266 100644 --- a/app/controllers/container-type.js +++ b/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'], diff --git a/app/controllers/deprecation-item.js b/app/controllers/deprecation-item.js index 42ea05802b..854c9dc450 100644 --- a/app/controllers/deprecation-item.js +++ b/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, diff --git a/app/controllers/deprecation-source.js b/app/controllers/deprecation-source.js index 6f92909b2b..28cbbcf103 100644 --- a/app/controllers/deprecation-source.js +++ b/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 { diff --git a/app/controllers/deprecations.js b/app/controllers/deprecations.js index b053705b2a..584b5b3773 100644 --- a/app/controllers/deprecations.js +++ b/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'], diff --git a/app/controllers/iframes.js b/app/controllers/iframes.js index 2bcbd212fe..9cc5214c29 100644 --- a/app/controllers/iframes.js +++ b/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); diff --git a/app/controllers/mixin-detail.js b/app/controllers/mixin-detail.js index 062cc18a64..aa6b423d70 100644 --- a/app/controllers/mixin-detail.js +++ b/app/controllers/mixin-detail.js @@ -1,5 +1,5 @@ import Ember from "ember"; -var oneWay = Ember.computed.oneWay; +const { computed: { oneWay } } = Ember; export default Ember.ObjectController.extend({ needs: ['mixin-details'], @@ -13,8 +13,8 @@ export default Ember.ObjectController.extend({ actions: { calculate: function(property) { - var objectId = this.get('objectId'); - var mixinIndex = this.get('mixinDetails.model.mixins').indexOf(this.get('model')); + let objectId = this.get('objectId'); + let mixinIndex = this.get('mixinDetails.model.mixins').indexOf(this.get('model')); this.get('port').send('objectInspector:calculate', { objectId: objectId, @@ -24,7 +24,7 @@ export default Ember.ObjectController.extend({ }, sendToConsole: function(property) { - var objectId = this.get('objectId'); + let objectId = this.get('objectId'); this.get('port').send('objectInspector:sendToConsole', { objectId: objectId, @@ -37,7 +37,7 @@ export default Ember.ObjectController.extend({ }, digDeeper: function(property) { - var objectId = this.get('objectId'); + let objectId = this.get('objectId'); this.get('port').send('objectInspector:digDeeper', { objectId: objectId, @@ -46,7 +46,7 @@ export default Ember.ObjectController.extend({ }, saveProperty: function(prop, val, type) { - var mixinIndex = this.get('mixinDetails.model.mixins').indexOf(this.get('model')); + let mixinIndex = this.get('mixinDetails.model.mixins').indexOf(this.get('model')); this.get('port').send('objectInspector:saveProperty', { objectId: this.get('objectId'), diff --git a/app/controllers/mixin-property.js b/app/controllers/mixin-property.js index 3fc683f3c8..a27049794d 100644 --- a/app/controllers/mixin-property.js +++ b/app/controllers/mixin-property.js @@ -1,6 +1,5 @@ import Ember from "ember"; -var equal = Ember.computed.equal; -var alias = Ember.computed.alias; +const { computed: { equal, alias} } = Ember; export default Ember.ObjectController.extend({ isEdit: false, @@ -24,12 +23,12 @@ export default Ember.ObjectController.extend({ isDate: equal('value.type', 'type-date'), _parseTextValue: function(value) { - var parsedValue; + let parsedValue; try { parsedValue = JSON.parse(value); } catch(e) { // if surrounded by quotes, remove quotes - var match = value.match(/^"(.*)"$/); + let match = value.match(/^"(.*)"$/); if (match && match.length > 1) { parsedValue = match[1]; } else { @@ -55,8 +54,8 @@ export default Ember.ObjectController.extend({ return; } - var value = this.get('value.inspect'); - var type = this.get('value.type'); + let value = this.get('value.inspect'); + let type = this.get('value.type'); if (type === 'type-string') { value = '"' + value + '"'; } @@ -70,7 +69,7 @@ export default Ember.ObjectController.extend({ }, saveProperty: function() { - var realValue, dataType; + let realValue, dataType; if (!this.get('isDate')) { realValue = this._parseTextValue(this.get('txtValue')); } else { diff --git a/app/controllers/mixin-stack.js b/app/controllers/mixin-stack.js index ab4e6c93c5..43634584d9 100644 --- a/app/controllers/mixin-stack.js +++ b/app/controllers/mixin-stack.js @@ -3,7 +3,7 @@ export default Ember.ArrayController.extend({ needs: ['application'], trail: function() { - var nested = this.slice(1); + let nested = this.slice(1); if (nested.length === 0) { return ""; } return "." + nested.mapProperty('property').join("."); }.property('[]'), @@ -21,7 +21,7 @@ export default Ember.ArrayController.extend({ }, sendObjectToConsole: function(obj) { - var objectId = Ember.get(obj, 'objectId'); + let objectId = Ember.get(obj, 'objectId'); this.get('port').send('objectInspector:sendToConsole', { objectId: objectId }); diff --git a/app/controllers/model-type-item.js b/app/controllers/model-type-item.js index 37ee8794a6..d106f2988f 100644 --- a/app/controllers/model-type-item.js +++ b/app/controllers/model-type-item.js @@ -1,5 +1,5 @@ import Ember from "ember"; -var oneWay = Ember.computed.oneWay; +const { computed: { oneWay } } = Ember; export default Ember.ObjectController.extend({ needs: ['model-types'], diff --git a/app/controllers/promise-item.js b/app/controllers/promise-item.js index b4b87148f5..60df5bc5e7 100644 --- a/app/controllers/promise-item.js +++ b/app/controllers/promise-item.js @@ -1,16 +1,13 @@ import Ember from "ember"; -var COLOR_MAP = { +const { computed } = Ember; +const { alias, notEmpty, empty, gt, equal } = computed; + +const COLOR_MAP = { red: '#ff2717', blue: '#174fff', green: '#006400' }; -var alias = Ember.computed.alias; -var notEmpty = Ember.computed.notEmpty; -var gt = Ember.computed.gt; -var empty = Ember.computed.empty; -var computedEqual = Ember.computed.equal; - export default Ember.ObjectProxy.extend({ promiseTreeController: function() { return this.container.lookup('controller:promiseTree'); @@ -21,10 +18,10 @@ export default Ember.ObjectProxy.extend({ model: alias('content'), - isError: computedEqual('reason.type', 'type-error'), + isError: equal('reason.type', 'type-error'), style: function() { - var color = ''; + let color = ''; if (this.get('isFulfilled')) { color = 'green'; } else if (this.get('isRejected')) { @@ -37,7 +34,7 @@ export default Ember.ObjectProxy.extend({ nodeStyle: function() { - var relevant; + let relevant; switch (this.get('filter')) { case 'pending': relevant = this.get('isPending'); @@ -115,8 +112,8 @@ export default Ember.ObjectProxy.extend({ if (!this.get('createdAt') || !this.get('settledAt')) { return ' -- '; } - var startedAt = this.get('parent.settledAt') || this.get('createdAt'); - var remaining = this.get('settledAt').getTime() - startedAt.getTime(); + let startedAt = this.get('parent.settledAt') || this.get('createdAt'); + let remaining = this.get('settledAt').getTime() - startedAt.getTime(); return remaining; }.property('createdAt', 'settledAt', 'parent.settledAt') }); diff --git a/app/controllers/promise-tree.js b/app/controllers/promise-tree.js index 934b39c8a3..a3e732b919 100644 --- a/app/controllers/promise-tree.js +++ b/app/controllers/promise-tree.js @@ -1,16 +1,18 @@ import Ember from "ember"; import filterComputed from "ember-inspector/computed/custom-filter"; +const { computed } = Ember; +const { equal, bool, and, not } = computed; // Manual implementation of item controllers function itemProxyComputed(dependentKey, itemProxy) { - var options = { + let options = { addedItem: function(array, item, changeMeta) { - var proxy = itemProxy.create({ content: item }); + let proxy = itemProxy.create({ content: item }); array.insertAt(changeMeta.index, proxy); return array; }, removedItem: function(array, item, changeMeta) { - var proxy = array.objectAt(changeMeta.index); + let proxy = array.objectAt(changeMeta.index); array.removeAt(changeMeta.index, 1); proxy.destroy(); return array; @@ -20,11 +22,6 @@ function itemProxyComputed(dependentKey, itemProxy) { return Ember.arrayComputed(dependentKey, options); } -var equal = Ember.computed.equal; -var bool = Ember.computed.bool; -var and = Ember.computed.and; -var not = Ember.computed.not; - export default Ember.ArrayController.extend({ needs: ['application'], @@ -75,7 +72,7 @@ export default Ember.ArrayController.extend({ // Exclude non-filter complying promises // If at least one of their children passes the filter, // then they pass - var include = true; + let include = true; if (this.get('filter') === 'pending') { include = item.get('pendingBranch'); } else if (this.get('filter') === 'rejected') { @@ -90,7 +87,7 @@ export default Ember.ArrayController.extend({ // Search filter // If they or at least one of their children // match the search, then include them - var search = this.get('effectiveSearch'); + let search = this.get('effectiveSearch'); if (!Ember.isEmpty(search)) { return item.matches(search); } @@ -115,7 +112,7 @@ export default Ember.ArrayController.extend({ }.observes('search'), notifyChange: function() { - var self = this; + let self = this; this.set('effectiveSearch', this.get('search')); Ember.run.next(function() { self.notifyPropertyChange('model'); @@ -124,7 +121,7 @@ export default Ember.ArrayController.extend({ actions: { setFilter: function(filter) { - var self = this; + let self = this; this.set('filter', filter); Ember.run.next(function() { self.notifyPropertyChange('filtered'); diff --git a/app/controllers/records.js b/app/controllers/records.js index 02712b6dbb..1a17dcd61c 100644 --- a/app/controllers/records.js +++ b/app/controllers/records.js @@ -28,8 +28,8 @@ export default Controller.extend({ }.observes('model'), recordToString: function(record) { - var search = ''; - var searchKeywords = Ember.get(record, 'searchKeywords'); + let search = ''; + let searchKeywords = Ember.get(record, 'searchKeywords'); if (searchKeywords) { search = Ember.get(record, 'searchKeywords').join(' '); } diff --git a/app/controllers/render-item.js b/app/controllers/render-item.js index 90126b6105..18c773ad7d 100644 --- a/app/controllers/render-item.js +++ b/app/controllers/render-item.js @@ -1,10 +1,8 @@ import Ember from "ember"; import escapeRegExp from "ember-inspector/utils/escape-reg-exp"; -var ObjectController = Ember.ObjectController; -var gt = Ember.computed.gt; -var oneWay = Ember.computed.oneWay; -var isEmpty = Ember.isEmpty; -var runOnce = Ember.run.once; +const { ObjectController, computed, isEmpty, run} = Ember; +const { gt, oneWay } = computed; +const { once } = run; export default ObjectController.extend({ needs: ['render-tree'], @@ -18,19 +16,19 @@ export default ObjectController.extend({ }, searchChanged: function() { - var search = this.get('search'); + let search = this.get('search'); if (!isEmpty(search)) { - runOnce(this, 'expand'); + once(this, 'expand'); } }.observes('search').on('init'), searchMatch: function() { - var search = this.get('search'); + let search = this.get('search'); if (isEmpty(search)) { return true; } - var name = this.get('name'); - var regExp = new RegExp(escapeRegExp(search.toLowerCase())); + let name = this.get('name'); + let regExp = new RegExp(escapeRegExp(search.toLowerCase())); return !!name.toLowerCase().match(regExp); }.property('search', 'name'), @@ -41,7 +39,7 @@ export default ObjectController.extend({ }.property('searchMatch'), level: function() { - var parentLevel = this.get('target.level'); + let parentLevel = this.get('target.level'); if (parentLevel === undefined) { parentLevel = -1; } @@ -65,7 +63,7 @@ export default ObjectController.extend({ }.property('hasChildren', 'isExpanded'), readableTime: function() { - var d = new Date(this.get('timestamp')), + let d = new Date(this.get('timestamp')), ms = d.getMilliseconds(), seconds = d.getSeconds(), minutes = d.getMinutes().toString().length === 1 ? '0' + d.getMinutes() : d.getMinutes(), diff --git a/app/controllers/render-tree.js b/app/controllers/render-tree.js index 2db1a1d22f..32fc343559 100644 --- a/app/controllers/render-tree.js +++ b/app/controllers/render-tree.js @@ -25,23 +25,23 @@ export default Controller.extend({ }.property('search'), filtered: filter('model', function(item) { - var search = this.get('escapedSearch'); + let search = this.get('escapedSearch'); if (isEmpty(search)) { return true; } - var regExp = new RegExp(search); + let regExp = new RegExp(search); return !!recursiveMatch(item, regExp); }).property('model.@each.name', 'search') }); function recursiveMatch(item, regExp) { - var children, child; - var name = get(item, 'name'); + let children, child; + let name = get(item, 'name'); if (name.toLowerCase().match(regExp)) { return true; } children = get(item, 'children'); - for (var i = 0; i < children.length; i++) { + for (let i = 0; i < children.length; i++) { child = children[i]; if (recursiveMatch(child, regExp)) { return true; diff --git a/app/helpers/ms-to-time.js b/app/helpers/ms-to-time.js index b3742611a3..20be48fe7b 100644 --- a/app/helpers/ms-to-time.js +++ b/app/helpers/ms-to-time.js @@ -1,6 +1,6 @@ export default function(time) { if (time && !isNaN(+time)) { - var formatted = time.toFixed(2).replace(/\d(?=(\d{3})+\.)/g, '$&,'); + let formatted = time.toFixed(2).replace(/\d(?=(\d{3})+\.)/g, '$&,'); return formatted + 'ms'; } diff --git a/app/libs/promise-assembler.js b/app/libs/promise-assembler.js index ba0093ff86..7bcf6bd0ae 100644 --- a/app/libs/promise-assembler.js +++ b/app/libs/promise-assembler.js @@ -1,13 +1,13 @@ import Ember from "ember"; import Promise from "ember-inspector/models/promise"; -var EventedMixin = Ember.Evented; +let EventedMixin = Ember.Evented; -var arrayComputed = Ember.computed(function() { +let arrayComputed = Ember.computed(function() { return []; }); -var objectComputed = Ember.computed(function() { +let objectComputed = Ember.computed(function() { return {}; }); @@ -39,7 +39,7 @@ export default Ember.Object.extend(EventedMixin, { this.get('topSort').clear(); this.set('firstMessageReceived', false); - var all = this.get('all'); + let all = this.get('all'); // Lazily destroy promises // Allows for a smooth transition on deactivate, // and thus providing the illusion of better perf @@ -67,21 +67,21 @@ export default Ember.Object.extend(EventedMixin, { rebuildPromises: function(promises) { promises.forEach(function(props) { props = Ember.copy(props); - var childrenIds = props.children; - var parentId = props.parent; + let childrenIds = props.children; + let parentId = props.parent; delete props.children; delete props.parent; if (parentId && parentId !== props.guid) { props.parent = this.updateOrCreate({ guid: parentId }); } - var promise = this.updateOrCreate(props); + let promise = this.updateOrCreate(props); if (childrenIds) { childrenIds.forEach(function(childId) { // avoid infinite recursion if (childId === props.guid) { return; } - var child = this.updateOrCreate({ guid: childId, parent: promise }); + let child = this.updateOrCreate({ guid: childId, parent: promise }); promise.get('children').pushObject(child); }.bind(this)); } @@ -89,7 +89,7 @@ export default Ember.Object.extend(EventedMixin, { }, updateTopSort: function(promise) { - var topSortMeta = this.get('topSortMeta'), + let topSortMeta = this.get('topSortMeta'), guid = promise.get('guid'), meta = topSortMeta[guid], isNew = !meta, @@ -115,9 +115,9 @@ export default Ember.Object.extend(EventedMixin, { }, insertInTopSort: function(promise) { - var topSort = this.get('topSort'); + let topSort = this.get('topSort'); if (promise.get('parent')) { - var parentIndex = topSort.indexOf(promise.get('parent')); + let parentIndex = topSort.indexOf(promise.get('parent')); topSort.insertAt(parentIndex + 1, promise); } else { topSort.pushObject(promise); @@ -129,8 +129,8 @@ export default Ember.Object.extend(EventedMixin, { }, updateOrCreate: function(props) { - var guid = props.guid; - var promise = this.findOrCreate(guid); + let guid = props.guid; + let promise = this.findOrCreate(guid); promise.setProperties(props); @@ -140,7 +140,7 @@ export default Ember.Object.extend(EventedMixin, { }, createPromise: function(props) { - var promise = Promise.create(props), + let promise = Promise.create(props), index = this.get('all.length'); this.get('all').pushObject(promise); @@ -150,7 +150,7 @@ export default Ember.Object.extend(EventedMixin, { find: function(guid) { if (guid) { - var index = this.get('promiseIndex')[guid]; + let index = this.get('promiseIndex')[guid]; if (index !== undefined) { return this.get('all').objectAt(index); } diff --git a/app/mixins/fake-table.js b/app/mixins/fake-table.js index d79481ce1a..c376309633 100644 --- a/app/mixins/fake-table.js +++ b/app/mixins/fake-table.js @@ -7,8 +7,8 @@ import Ember from "ember"; function accountForScrollbar() { /*jshint validthis:true */ - var outside = this.$('.list-tree').innerWidth(); - var inside = this.$('.ember-list-container').innerWidth(); + let outside = this.$('.list-tree').innerWidth(); + let inside = this.$('.ember-list-container').innerWidth(); this.$('.spacer').width(outside - inside); } diff --git a/app/models/promise.js b/app/models/promise.js index cf1eb724bc..0eae9ad991 100644 --- a/app/models/promise.js +++ b/app/models/promise.js @@ -1,12 +1,9 @@ import Ember from "ember"; import escapeRegExp from "ember-inspector/utils/escape-reg-exp"; import computed from 'ember-new-computed'; -var typeOf = Ember.typeOf; -var or = Ember.computed.or; -var equal = Ember.computed.equal; -var not = Ember.computed.not; +const { typeOf, computed: { or, equal, not } } = Ember; -var dateComputed = function() { +const dateComputed = function() { return computed({ get: function() { return null; @@ -29,7 +26,7 @@ export default Ember.Object.extend({ parent: null, level: function() { - var parent = this.get('parent'); + let parent = this.get('parent'); if (!parent) { return 0; } @@ -64,7 +61,7 @@ export default Ember.Object.extend({ if (this.get(prop)) { return true; } - for (var i = 0; i < this.get('children.length'); i++) { + for (let i = 0; i < this.get('children.length'); i++) { if (this.get('children').objectAt(i).get(cp)) { return true; } @@ -108,7 +105,7 @@ export default Ember.Object.extend({ this.set('branchLabel', this.get('branchLabel') + ' ' + label); } - var parent = this.get('parent'); + let parent = this.get('parent'); if (parent) { parent.addBranchLabel(label); } @@ -133,14 +130,14 @@ export default Ember.Object.extend({ isManuallyExpanded: undefined, stateOrParentChanged: function() { - var parent = this.get('parent'); + let parent = this.get('parent'); if (parent) { Ember.run.once(parent, 'recalculateExpanded'); } }.observes('isPending', 'isFulfilled', 'isRejected', 'parent'), _findTopParent: function() { - var parent = this.get('parent'); + let parent = this.get('parent'); if (!parent) { return this; } else { @@ -149,13 +146,13 @@ export default Ember.Object.extend({ }, recalculateExpanded: function() { - var isExpanded = false; + let isExpanded = false; if (this.get('isManuallyExpanded') !== undefined) { isExpanded = this.get('isManuallyExpanded'); } else { - var children = this._allChildren(); - for (var i = 0, l = children.length; i < l; i++) { - var child = children[i]; + let children = this._allChildren(); + for (let i = 0, l = children.length; i < l; i++) { + let child = children[i]; if (child.get('isRejected')) { isExpanded = true; } @@ -166,7 +163,7 @@ export default Ember.Object.extend({ break; } } - var parents = this._allParents(); + let parents = this._allParents(); if (isExpanded) { parents.forEach(function(parent) { parent.set('isExpanded', true); @@ -187,7 +184,7 @@ export default Ember.Object.extend({ }.property('parent.isExpanded', 'parent', 'parent.isVisible'), _allChildren: function() { - var children = Ember.$.extend([], this.get('children')); + let children = Ember.$.extend([], this.get('children')); children.forEach(function(item) { children = Ember.$.merge(children, item._allChildren()); }); @@ -195,7 +192,7 @@ export default Ember.Object.extend({ }, _allParents: function() { - var parent = this.get('parent'); + let parent = this.get('parent'); if (parent) { return Ember.$.merge([parent], parent._allParents()); } else { diff --git a/app/port.js b/app/port.js index 71eed01505..85fcd47432 100644 --- a/app/port.js +++ b/app/port.js @@ -8,7 +8,7 @@ export default Ember.Object.extend(Ember.Evented, { }.property(), init: function() { - var detectedApplications = this.get('detectedApplications'); + const detectedApplications = this.get('detectedApplications'); this.get('adapter').onMessageReceived(function(message) { if (!message.applicationId) { return; @@ -21,7 +21,7 @@ export default Ember.Object.extend(Ember.Evented, { detectedApplications.pushObject(message.applicationId); } - var applicationId = this.get('applicationId'); + const applicationId = this.get('applicationId'); if (applicationId === message.applicationId) { this.trigger(message.type, message, applicationId); } diff --git a/app/router.js b/app/router.js index 3029e25d07..96ed3f3c9f 100644 --- a/app/router.js +++ b/app/router.js @@ -1,7 +1,7 @@ import Ember from 'ember'; import config from './config/environment'; -var Router = Ember.Router.extend({ +const Router = Ember.Router.extend({ location: config.locationType }); diff --git a/app/routes/app-detected.js b/app/routes/app-detected.js index af4888d3a3..189359318c 100644 --- a/app/routes/app-detected.js +++ b/app/routes/app-detected.js @@ -1,10 +1,9 @@ import Ember from 'ember'; -var Route = Ember.Route; -var Promise = Ember.RSVP.Promise; +const { Route, RSVP: { Promise } } = Ember; export default Route.extend({ model: function() { - var port = this.get('port'); + let port = this.get('port'); return new Promise(function(resolve) { port.on('general:applicationBooted', this, function(message) { if (message.booted) { diff --git a/app/routes/application.js b/app/routes/application.js index 3eddca2ea8..31b9812556 100644 --- a/app/routes/application.js +++ b/app/routes/application.js @@ -6,7 +6,7 @@ export default Route.extend({ setupController() { this.controllerFor('mixinStack').set('model', []); - var port = this.get('port'); + let port = this.get('port'); port.on('objectInspector:updateObject', this, this.updateObject); port.on('objectInspector:updateProperty', this, this.updateProperty); port.on('objectInspector:updateErrors', this, this.updateErrors); @@ -16,7 +16,7 @@ export default Route.extend({ }, deactivate() { - var port = this.get('port'); + let port = this.get('port'); port.off('objectInspector:updateObject', this, this.updateObject); port.off('objectInspector:updateProperty', this, this.updateProperty); port.off('objectInspector:updateErrors', this, this.updateErrors); @@ -25,7 +25,7 @@ export default Route.extend({ }, updateObject: function(options) { - var details = options.details, + const details = options.details, name = options.name, property = options.property, objectId = options.objectId, @@ -34,7 +34,7 @@ export default Route.extend({ Ember.NativeArray.apply(details); details.forEach(arrayize); - var controller = this.get('controller'); + let controller = this.get('controller'); if (options.parentObject) { controller.pushMixinDetails(name, property, objectId, details); @@ -63,7 +63,7 @@ export default Route.extend({ }, droppedObject: function(message) { - var controller = this.get('controller'); + let controller = this.get('controller'); controller.droppedObject(message.objectId); }, diff --git a/app/routes/container-type.js b/app/routes/container-type.js index a028ddd2d6..561bd38ae4 100644 --- a/app/routes/container-type.js +++ b/app/routes/container-type.js @@ -1,7 +1,7 @@ import Ember from "ember"; import TabRoute from "ember-inspector/routes/tab"; -var get = Ember.get; -var Promise = Ember.RSVP.Promise; +const get = Ember.get; +const { RSVP: { Promise } } = Ember; export default TabRoute.extend({ setupController: function(controller) { @@ -12,8 +12,8 @@ export default TabRoute.extend({ this._super.apply(this, arguments); }, model: function(params) { - var type = params.type_id; - var port = this.get('port'); + const type = params.type_id; + const port = this.get('port'); return new Promise((resolve, reject) => { port.one('container:instances', message => { if (message.status === 200) { diff --git a/app/routes/container-types.js b/app/routes/container-types.js index bb8ce3c9ce..4abcac5b75 100644 --- a/app/routes/container-types.js +++ b/app/routes/container-types.js @@ -1,10 +1,9 @@ import Ember from "ember"; -var Route = Ember.Route; -var Promise = Ember.RSVP.Promise; +const { Route, RSVP: { Promise } } = Ember; export default Route.extend({ model: function() { - var port = this.get('port'); + const port = this.get('port'); return new Promise(function(resolve) { port.one('container:types', function(message) { resolve(message.types); diff --git a/app/routes/data/index.js b/app/routes/data/index.js index 25fa79e9b4..8af27ebfc5 100644 --- a/app/routes/data/index.js +++ b/app/routes/data/index.js @@ -1,9 +1,9 @@ import Ember from "ember"; -var Promise = Ember.RSVP.Promise; +const { RSVP: { Promise} } = Ember; export default Ember.Route.extend({ model: function() { - var route = this; + let route = this; return new Promise(function(resolve) { route.get('port').one('data:hasAdapter', function(message) { resolve(message.hasAdapter); diff --git a/app/routes/deprecations.js b/app/routes/deprecations.js index 7653446a28..f1cd949c31 100644 --- a/app/routes/deprecations.js +++ b/app/routes/deprecations.js @@ -1,10 +1,10 @@ import Ember from "ember"; import TabRoute from "ember-inspector/routes/tab"; -var set = Ember.set; +const set = Ember.set; export default TabRoute.extend({ setupController: function() { - var port = this.get('port'); + let port = this.get('port'); port.on('deprecation:deprecationsAdded', this, this.deprecationsAdded); port.send('deprecation:watch'); this._super.apply(this, arguments); @@ -19,9 +19,9 @@ export default TabRoute.extend({ }, deprecationsAdded: function(message) { - var model = this.get('currentModel'); + const model = this.get('currentModel'); message.deprecations.forEach(function(item) { - var record = model.findBy('id', item.id); + let record = model.findBy('id', item.id); if (record) { set(record, 'count', item.count); set(record, 'sources', item.sources); diff --git a/app/routes/info.js b/app/routes/info.js index 5eb0e61814..91961dda44 100644 --- a/app/routes/info.js +++ b/app/routes/info.js @@ -1,15 +1,15 @@ import Ember from "ember"; import TabRoute from "ember-inspector/routes/tab"; -var Promise = Ember.RSVP.Promise; -var oneWay = Ember.computed.oneWay; +const { RSVP: { Promise }, computed } = Ember; +const { oneWay } = computed; export default TabRoute.extend({ version: oneWay('config.VERSION').readOnly(), model: function() { - var version = this.get('version'); - var port = this.get('port'); + const version = this.get('version'); + const port = this.get('port'); return new Promise(function(resolve) { port.one('general:libraries', function(message) { message.libraries.insertAt(0, { diff --git a/app/routes/model-type.js b/app/routes/model-type.js index 408612a05e..77891c4eb1 100644 --- a/app/routes/model-type.js +++ b/app/routes/model-type.js @@ -1,5 +1,5 @@ import Ember from "ember"; -var Promise = Ember.RSVP.Promise; +const { RSVP: { Promise } } = Ember; /*eslint camelcase: 0 */ export default Ember.Route.extend({ setupController: function(controller, model) { @@ -9,7 +9,7 @@ export default Ember.Route.extend({ model: function(params) { return new Promise(function(resolve) { - var type = this.modelFor('model-types').findBy('name', params.type_id); + const type = this.modelFor('model-types').findBy('name', params.type_id); if (type) { resolve(type); } else { diff --git a/app/routes/model-types.js b/app/routes/model-types.js index 23783a9c3f..96bbadeb18 100644 --- a/app/routes/model-types.js +++ b/app/routes/model-types.js @@ -1,5 +1,5 @@ import Ember from "ember"; -var Promise = Ember.RSVP.Promise; +const { RSVP: { Promise } } = Ember; export default Ember.Route.extend({ setupController: function(controller, model) { @@ -9,7 +9,7 @@ export default Ember.Route.extend({ }, model: function() { - var port = this.get('port'); + const port = this.get('port'); return new Promise(function(resolve) { port.one('data:modelTypesAdded', this, function(message) { resolve(message.modelTypes); @@ -29,9 +29,9 @@ export default Ember.Route.extend({ }, updateModelTypes: function(message) { - var route = this; + let route = this; message.modelTypes.forEach(function(modelType) { - var currentType = route.get('currentModel').findProperty('objectId', modelType.objectId); + const currentType = route.get('currentModel').findProperty('objectId', modelType.objectId); Ember.set(currentType, 'count', modelType.count); }); } diff --git a/app/routes/promise-tree.js b/app/routes/promise-tree.js index 0eaabde213..1bf8789e6c 100644 --- a/app/routes/promise-tree.js +++ b/app/routes/promise-tree.js @@ -1,13 +1,13 @@ import Ember from "ember"; import TabRoute from "ember-inspector/routes/tab"; -var Promise = Ember.RSVP.Promise; +const { RSVP: { Promise } } = Ember; export default TabRoute.extend({ model: function() { // block rendering until first batch arrives // Helps prevent flashing of "please refresh the page" - var route = this; + let route = this; return new Promise(function(resolve) { route.get('assembler').one('firstMessageReceived', function() { resolve(route.get('assembler.topSort')); @@ -37,13 +37,13 @@ export default TabRoute.extend({ }, toggleExpand: function(promise) { - var isExpanded = !promise.get('isExpanded'); + const isExpanded = !promise.get('isExpanded'); promise.set('isManuallyExpanded', isExpanded); promise.recalculateExpanded(); - var children = promise._allChildren(); + let children = promise._allChildren(); if (isExpanded) { children.forEach(function(child) { - var isManuallyExpanded = child.get('isManuallyExpanded'); + let isManuallyExpanded = child.get('isManuallyExpanded'); if (isManuallyExpanded === undefined) { child.set('isManuallyExpanded', isExpanded); child.recalculateExpanded(); diff --git a/app/routes/promises/index.js b/app/routes/promises/index.js index f94de182d6..11a074cdf7 100644 --- a/app/routes/promises/index.js +++ b/app/routes/promises/index.js @@ -1,9 +1,9 @@ import Ember from "ember"; -var Promise = Ember.RSVP.Promise; +const { RSVP: { Promise } } = Ember; export default Ember.Route.extend({ beforeModel: function() { - var route = this; + let route = this; return new Promise(function(resolve) { route.get('port').one('promise:supported', this, function(message) { if (message.supported) { diff --git a/app/routes/records.js b/app/routes/records.js index 84c457b473..78a16defd9 100644 --- a/app/routes/records.js +++ b/app/routes/records.js @@ -1,13 +1,13 @@ import Ember from "ember"; import TabRoute from "ember-inspector/routes/tab"; -var set = Ember.set; +const set = Ember.set; export default TabRoute.extend({ setupController: function(controller, model) { this._super(controller, model); - var type = this.modelFor('model_type'); + const type = this.modelFor('model_type'); controller.set('modelType', type); @@ -33,9 +33,9 @@ export default TabRoute.extend({ }, updateRecords: function(message) { - var route = this; + let route = this; message.records.forEach(function(record) { - var currentRecord = route.get('currentModel').findProperty('objectId', record.objectId); + const currentRecord = route.get('currentModel').findProperty('objectId', record.objectId); if (currentRecord) { set(currentRecord, 'columnValues', record.columnValues); set(currentRecord, 'filterValues', record.filterValues); diff --git a/app/routes/render-tree.js b/app/routes/render-tree.js index a860f62cdb..3e0faa413e 100644 --- a/app/routes/render-tree.js +++ b/app/routes/render-tree.js @@ -1,11 +1,11 @@ import Ember from "ember"; import TabRoute from "ember-inspector/routes/tab"; -var Promise = Ember.RSVP.Promise; +const { RSVP: { Promise } } = Ember; export default TabRoute.extend({ model: function() { - var port = this.get('port'); + const port = this.get('port'); return new Promise(function(resolve) { port.one('render:profilesAdded', function(message) { resolve(message.profiles); @@ -19,13 +19,13 @@ export default TabRoute.extend({ if (model.length === 0) { controller.set('initialEmpty', true); } - var port = this.get('port'); + const port = this.get('port'); port.on('render:profilesUpdated', this, this.profilesUpdated); port.on('render:profilesAdded', this, this.profilesAdded); }, deactivate: function() { - var port = this.get('port'); + const port = this.get('port'); port.off('render:profilesUpdated', this, this.profilesUpdated); port.off('render:profilesAdded', this, this.profilesAdded); port.send('render:releaseProfiles'); @@ -36,8 +36,8 @@ export default TabRoute.extend({ }, profilesAdded: function(message) { - var model = this.get('controller.model'); - var profiles = message.profiles; + const model = this.get('controller.model'); + const profiles = message.profiles; model.pushObjects(profiles); }, diff --git a/app/routes/route-tree.js b/app/routes/route-tree.js index 438018dfa0..2550508bc2 100644 --- a/app/routes/route-tree.js +++ b/app/routes/route-tree.js @@ -1,6 +1,6 @@ import Ember from "ember"; import TabRoute from "ember-inspector/routes/tab"; -var $ = Ember.$; +const $ = Ember.$; export default TabRoute.extend({ setupController: function() { @@ -20,7 +20,7 @@ export default TabRoute.extend({ }, setTree: function(options) { - var routeArray = topSort(options.tree); + const routeArray = topSort(options.tree); this.set('controller.model', routeArray); }, @@ -49,7 +49,7 @@ export default TabRoute.extend({ function topSort(tree, list) { list = list || []; - var view = $.extend({}, tree); + let view = $.extend({}, tree); view.parentCount = view.parentCount || 0; delete view.children; list.push(view); diff --git a/app/routes/view-tree.js b/app/routes/view-tree.js index d170534f42..5e44650209 100644 --- a/app/routes/view-tree.js +++ b/app/routes/view-tree.js @@ -1,6 +1,6 @@ import Ember from "ember"; import TabRoute from "ember-inspector/routes/tab"; -var $ = Ember.$; +const $ = Ember.$; export default TabRoute.extend({ model() { @@ -26,7 +26,7 @@ export default TabRoute.extend({ }, setViewTree: function(options) { - var viewArray = topSort(options.tree); + let viewArray = topSort(options.tree); this.set('controller.model', viewArray); }, @@ -61,7 +61,7 @@ export default TabRoute.extend({ function topSort(tree, list) { list = list || []; - var view = $.extend({}, tree); + let view = $.extend({}, tree); view.parentCount = view.parentCount || 0; delete view.children; list.push(view); diff --git a/app/utils/check-current-route.js b/app/utils/check-current-route.js index 308622d03e..9aa5d0bf43 100644 --- a/app/utils/check-current-route.js +++ b/app/utils/check-current-route.js @@ -1,5 +1,5 @@ export default function(currentRouteName, routeName) { - var regName, match; + let regName, match; if (routeName === 'application') { return true; diff --git a/app/utils/search-match.js b/app/utils/search-match.js index 2b02a5d4a8..2db8921fad 100644 --- a/app/utils/search-match.js +++ b/app/utils/search-match.js @@ -1,11 +1,11 @@ import Ember from "ember"; import escapeRegExp from "ember-inspector/utils/escape-reg-exp"; -var isEmpty = Ember.isEmpty; +const { isEmpty } = Ember; export default function(text, searchQuery) { if (isEmpty(searchQuery)) { return true; } - var regExp = new RegExp(escapeRegExp(searchQuery.toLowerCase())); + let regExp = new RegExp(escapeRegExp(searchQuery.toLowerCase())); return !!text.toLowerCase().match(regExp); } diff --git a/app/views/list.js b/app/views/list.js index fd967613da..3228b0ca76 100644 --- a/app/views/list.js +++ b/app/views/list.js @@ -8,7 +8,7 @@ export default ListView.extend({ contentHeight: Ember.computed.alias('controller.controllers.application.contentHeight'), height: function() { - var headerHeight = 31, + let headerHeight = 31, contentHeight = this.get('contentHeight'); // In testing list-view is created before `contentHeight` is set diff --git a/app/views/render-list.js b/app/views/render-list.js index a045a41ccd..a140459f6e 100644 --- a/app/views/render-list.js +++ b/app/views/render-list.js @@ -1,5 +1,5 @@ import Ember from "ember"; -var View = Ember.View; +const { View } = Ember; export default View.extend({ attributeBindings: ['style'], @@ -14,7 +14,7 @@ export default View.extend({ filterHeight: 22, height: function() { - var filterHeight = this.get('filterHeight'), + const filterHeight = this.get('filterHeight'), headerHeight = 30, contentHeight = this.get('contentHeight'); diff --git a/package.json b/package.json index ad88e4ab4a..068bcab354 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "broccoli-wrap": "0.0.2", "ember-cli": "0.2.0", "ember-cli-app-version": "0.3.2", - "ember-cli-babel": "5.0.0", + "ember-cli-babel": "^5.0.0", "ember-cli-content-security-policy": "0.3.0", "ember-cli-dependency-checker": "0.0.8", "ember-cli-eslint": "0.1.3", diff --git a/tests/ember_debug/container_debug_test.js b/tests/ember_debug/container_debug_test.js index a153bb966d..a18519d38c 100644 --- a/tests/ember_debug/container_debug_test.js +++ b/tests/ember_debug/container_debug_test.js @@ -1,15 +1,13 @@ /* jshint ignore:start */ import { module, test } from 'qunit'; import Ember from "ember"; -var emberA = Ember.A; - -var EmberDebug; -var port, name, message; -var run = Ember.run; -var App; +const { run, A: emberA, Application } = Ember; +let EmberDebug; +let port, name, message; +let App; function setupApp() { - App = Ember.Application.create(); + App = Application.create(); App.setupForTesting(); App.injectTestHelpers(); diff --git a/tests/ember_debug/deprecation_debug_test.js b/tests/ember_debug/deprecation_debug_test.js index b266c4d052..790dafad6f 100644 --- a/tests/ember_debug/deprecation_debug_test.js +++ b/tests/ember_debug/deprecation_debug_test.js @@ -2,12 +2,11 @@ import Ember from "ember"; import { module, test } from 'qunit'; const { RSVP, run } = Ember; /*globals require */ -var EmberDebug = require("ember-debug/main")["default"]; +const EmberDebug = require("ember-debug/main")["default"]; -var port; +let port; /* jshint ignore:start */ -var EmberDebug; -var App; +let App; function setupApp() { App = Ember.Application.create(); @@ -39,7 +38,7 @@ module("Deprecation Debug", { }); test("deprecations are caught and sent", async function t(assert) { - var messages = []; + let messages = []; port.reopen({ send: function(name, message) { messages.push({ @@ -59,9 +58,9 @@ test("deprecations are caught and sent", async function t(assert) { run(port, 'trigger', 'deprecation:watch'); await visit('/'); - var deprecations = messages.filterBy('name', 'deprecation:deprecationsAdded').get('lastObject').message.deprecations; + let deprecations = messages.filterBy('name', 'deprecation:deprecationsAdded').get('lastObject').message.deprecations; assert.equal(deprecations.length, 2); - var deprecation = deprecations[0]; + let deprecation = deprecations[0]; assert.equal(deprecation.count, 2, 'Correctly combined'); assert.equal(deprecation.message, 'Deprecation 1'); assert.equal(deprecation.sources.length, 2, 'Correctly separated by source'); @@ -71,7 +70,7 @@ test("deprecations are caught and sent", async function t(assert) { assert.equal(deprecation.sources.length, 1); assert.equal(deprecation.url, 'http://www.emberjs.com'); - var count = messages.filterBy('name', 'deprecation:count').get('lastObject').message.count; + let count = messages.filterBy('name', 'deprecation:count').get('lastObject').message.count; assert.equal(count, 3, 'count correctly sent'); }); diff --git a/tests/ember_debug/ember_debug_test.js b/tests/ember_debug/ember_debug_test.js index 1dbc35a558..ca17a84ea2 100644 --- a/tests/ember_debug/ember_debug_test.js +++ b/tests/ember_debug/ember_debug_test.js @@ -1,18 +1,18 @@ -var name; +let name; /* jshint ignore:start */ /* eslint no-empty:0 */ import Ember from "ember"; import { module, test } from 'qunit'; -var EmberDebug; -var name, port, adapter; +let EmberDebug; +let port, adapter; /* jshint ignore:start */ -var run = Ember.run; -var App; -var EmberInspector; +const { run, Application, Object: EmberObject } = Ember; +let App; +let EmberInspector; function setupApp() { - App = Ember.Application.create(); + App = Application.create(); App.setupForTesting(); App.injectTestHelpers(); @@ -54,7 +54,7 @@ function cantSend(obj, assert) { } test("EmberInspector#inspect sends inspectable objects", function(assert) { - var obj = Ember.Object.create(); + let obj = EmberObject.create(); EmberInspector.inspect(obj); assert.equal(name, "objectInspector:updateObject"); name = null; diff --git a/tests/ember_debug/object_inspector_test.js b/tests/ember_debug/object_inspector_test.js index 9078004187..3cb7fbe19b 100644 --- a/tests/ember_debug/object_inspector_test.js +++ b/tests/ember_debug/object_inspector_test.js @@ -2,10 +2,10 @@ import Ember from "ember"; import { module, test } from 'qunit'; -var EmberDebug; -var port, name, message; -var App; -var objectInspector; +let EmberDebug; +let port, name, message; +let App; +let objectInspector; const { run, guidFor, Object: EmberObject, computed } = Ember; const { Handlebars: { compile } } = Ember; @@ -57,9 +57,9 @@ module("Ember Debug - Object Inspector", { }); test("An Ember Object is correctly transformed into an inspection hash", function(assert) { - var date = new Date(); + let date = new Date(); - var Parent = Ember.Object.extend({ + let Parent = Ember.Object.extend({ id: null, name: 'My Object' }); @@ -70,7 +70,7 @@ test("An Ember Object is correctly transformed into an inspection hash", functio } }); - var inspected = Parent.create({ + let inspected = Parent.create({ id: 1, toString: function() { return 'Object:' + this.get('name'); @@ -85,41 +85,41 @@ test("An Ember Object is correctly transformed into an inspection hash", functio assert.equal(message.name, 'Object:My Object'); - var firstDetail = message.details[0]; + let firstDetail = message.details[0]; assert.equal(firstDetail.name, 'Own Properties'); assert.equal(firstDetail.properties.length, 3, 'methods are not included'); - var idProperty = firstDetail.properties[0]; + let idProperty = firstDetail.properties[0]; assert.equal(idProperty.name, 'id'); assert.equal(idProperty.value.type, 'type-number'); assert.equal(idProperty.value.inspect, '1'); - var nullProperty = firstDetail.properties[1]; + let nullProperty = firstDetail.properties[1]; assert.equal(nullProperty.name, 'nullVal'); assert.equal(nullProperty.value.type, 'type-null'); assert.equal(nullProperty.value.inspect, 'null'); - var prop = firstDetail.properties[2]; + let prop = firstDetail.properties[2]; assert.equal(prop.name, 'dateVal'); assert.equal(prop.value.type, 'type-date'); assert.equal(prop.value.inspect, date.toString()); - var secondDetail = message.details[1]; + let secondDetail = message.details[1]; assert.equal(secondDetail.name, 'Parent Object'); idProperty = secondDetail.properties[0]; assert.equal(idProperty.name, 'id'); assert.equal(idProperty.overridden, 'Own Properties'); - var nameProperty = secondDetail.properties[1]; + let nameProperty = secondDetail.properties[1]; assert.equal(nameProperty.name, 'name'); assert.equal(nameProperty.value.inspect, 'My Object'); }); test("Computed properties are correctly calculated", function(assert) { - var inspected = Ember.Object.extend({ + let inspected = Ember.Object.extend({ hi: computed(function() { return 'Hello'; }).property(), @@ -134,14 +134,14 @@ test("Computed properties are correctly calculated", function(assert) { objectInspector.sendObject(inspected); - var computedProperty = message.details[1].properties[0]; + let computedProperty = message.details[1].properties[0]; assert.equal(computedProperty.name, 'hi'); assert.ok(computedProperty.value.computed); assert.equal(computedProperty.value.type, 'type-descriptor'); assert.equal(computedProperty.value.inspect, ''); - var id = message.objectId; + let id = message.objectId; port.trigger('objectInspector:calculate', { objectId: id, @@ -160,7 +160,7 @@ test("Computed properties are correctly calculated", function(assert) { }); test("Cached Computed properties are pre-calculated", function(assert) { - var inspected = Ember.Object.extend({ + let inspected = Ember.Object.extend({ hi: computed(function() { return 'Hello'; }).property() @@ -171,7 +171,7 @@ test("Cached Computed properties are pre-calculated", function(assert) { objectInspector.sendObject(inspected); - var computedProperty = message.details[1].properties[0]; + let computedProperty = message.details[1].properties[0]; assert.equal(computedProperty.name, 'hi'); assert.ok(computedProperty.value.computed); @@ -181,7 +181,7 @@ test("Cached Computed properties are pre-calculated", function(assert) { }); test("Properties are correctly bound", function(assert) { - var inspected = Ember.Object.extend({ + let inspected = Ember.Object.extend({ name: 'Teddy', hi: computed(function(key, val) { @@ -203,7 +203,7 @@ test("Properties are correctly bound", function(assert) { objectInspector.sendObject(inspected); - var id = message.objectId; + let id = message.objectId; inspected.set('name', 'Alex'); @@ -243,13 +243,13 @@ test("Properties are correctly bound", function(assert) { }); test("Properties can be updated through a port message", function(assert) { - var inspected = Ember.Object.extend({ + let inspected = Ember.Object.extend({ name: 'Teddy' }).create(); objectInspector.sendObject(inspected); - var id = message.objectId; + let id = message.objectId; port.trigger('objectInspector:saveProperty', { objectId: id, @@ -268,15 +268,15 @@ test("Properties can be updated through a port message", function(assert) { }); test("Date properties are converted to dates before being updated", function(assert) { - var newDate = new Date('2015-01-01'); + let newDate = new Date('2015-01-01'); - var inspected = Ember.Object.extend({ + let inspected = Ember.Object.extend({ date: null }).create(); objectInspector.sendObject(inspected); - var id = message.objectId; + let id = message.objectId; port.trigger('objectInspector:saveProperty', { objectId: id, @@ -292,10 +292,10 @@ test("Date properties are converted to dates before being updated", function(ass }); test("Property grouping can be customized using _debugInfo", function(assert) { - var mixinToSkip = Ember.Mixin.create({}); + let mixinToSkip = Ember.Mixin.create({}); mixinToSkip[Ember.NAME_KEY] = 'MixinToSkip'; - var Inspected = Ember.Object.extend(mixinToSkip, { + let Inspected = Ember.Object.extend(mixinToSkip, { name: 'Teddy', gender: 'Male', hasChildren: false, @@ -327,7 +327,7 @@ test("Property grouping can be customized using _debugInfo", function(assert) { return 'TestObject'; }; - var inspected = Inspected.create({ + let inspected = Inspected.create({ maritalStatus: 'Single', propertyToSkip: null }); @@ -355,14 +355,14 @@ test("Property grouping can be customized using _debugInfo", function(assert) { }); test("Read Only Computed properties mush have a readOnly property", function(assert) { - var inspected = Ember.Object.extend({ + let inspected = Ember.Object.extend({ readCP: computed(function() {}).property().readOnly(), writeCP: computed(function() {}).property() }).create(); objectInspector.sendObject(inspected); - var properties = message.details[1].properties; + let properties = message.details[1].properties; assert.ok(properties[0].readOnly); assert.ok(!properties[1].readOnly); diff --git a/tests/ember_debug/profile_manager_test.js b/tests/ember_debug/profile_manager_test.js index 437241c381..c1c5c9a3e9 100644 --- a/tests/ember_debug/profile_manager_test.js +++ b/tests/ember_debug/profile_manager_test.js @@ -1,10 +1,10 @@ /* jshint ignore:start */ /* globals require */ import { module, test } from 'qunit'; -var ProfileManager = require('ember-debug/models/profile-manager')["default"]; +const ProfileManager = require('ember-debug/models/profile-manager')["default"]; test("Construction", function(assert) { - var manager = new ProfileManager(); + let manager = new ProfileManager(); assert.ok(!!manager, "it was created"); assert.equal(manager.profiles.length, 0, "it has no profiles"); }); diff --git a/tests/ember_debug/profile_node_test.js b/tests/ember_debug/profile_node_test.js index 29f316b234..3cb030144a 100644 --- a/tests/ember_debug/profile_node_test.js +++ b/tests/ember_debug/profile_node_test.js @@ -1,11 +1,11 @@ /*globals require */ import { module, test } from 'qunit'; -var ProfileNode = require('ember-debug/models/profile-node')["default"]; +const ProfileNode = require('ember-debug/models/profile-node')["default"]; module("ProfileNode"); test("It can create a ProfileNode", function(assert) { - var p = new ProfileNode(1001, { template: 'application' }); + const p = new ProfileNode(1001, { template: 'application' }); assert.ok(!!p, "it creates a ProfileNode"); assert.equal(p.start, 1001, "it stores the start time"); @@ -15,12 +15,12 @@ test("It can create a ProfileNode", function(assert) { }); /* jshint ignore:start */ test("with no payload it has an unknown name", function(assert) { - var p = new ProfileNode(1234); + const p = new ProfileNode(1234); assert.equal(p.name, "Unknown view"); }); test("It can extract the name from an object payload", function(assert) { - var p = new ProfileNode(1000, { + let p = new ProfileNode(1000, { object: { toString: function() { return "custom toString()"; } } @@ -30,8 +30,8 @@ test("It can extract the name from an object payload", function(assert) { }); test("It can create a child ProfileNode", function(assert) { - var p1 = new ProfileNode(new Date().getTime(), { template: 'items' }), - p2 = new ProfileNode(new Date().getTime(), { template: 'item' }, p1); + const p1 = new ProfileNode(new Date().getTime(), { template: 'items' }), + p2 = new ProfileNode(new Date().getTime(), { template: 'item' }, p1); assert.ok(!p1.parent, "Without a parent parameter, the attribute is not set"); assert.equal(p2.parent, p1, "If passed, p2's parent is assigned to p1"); @@ -40,14 +40,14 @@ test("It can create a child ProfileNode", function(assert) { }); test("It can finish the timer", function(assert) { - var p = new ProfileNode(1000, { template: 'users' }); + const p = new ProfileNode(1000, { template: 'users' }); p.finish(1004); assert.equal(p.time, 4, "it took 4 ms"); }); test("When a node has children, they are inserted when finished", function(assert) { - var p1 = new ProfileNode(1000, { template: 'candies' }), - p2 = new ProfileNode(1001, { template: 'candy' }, p1); + const p1 = new ProfileNode(1000, { template: 'candies' }), + p2 = new ProfileNode(1001, { template: 'candy' }, p1); assert.equal(p1.children.length, 0, "has no children at first"); p2.finish(2022); @@ -55,8 +55,8 @@ test("When a node has children, they are inserted when finished", function(asser }); test("Can be serialized as JSON", function(assert) { - var p1 = new ProfileNode(1000, { template: 'donuts' }), - p2 = new ProfileNode(1001, { template: 'donut' }, p1); + const p1 = new ProfileNode(1000, { template: 'donuts' }), + p2 = new ProfileNode(1001, { template: 'donut' }, p1); p2.finish(1003); p1.finish(1004); @@ -65,7 +65,7 @@ test("Can be serialized as JSON", function(assert) { }); test("Name takes the following priority: display, containerKey, object", function(assert) { - var p; + let p; p = new ProfileNode(1000, { view: { instrumentDisplay: 'donuts', _debugContainerKey: 'candy' }, object: 'coffee' }); assert.equal(p.name, 'donuts'); p = new ProfileNode(1000, { view: { _debugContainerKey: 'candy' }, object: 'coffee' }); diff --git a/tests/ember_debug/promise_assembler_test.js b/tests/ember_debug/promise_assembler_test.js index 625eca17e8..00ce435f3a 100644 --- a/tests/ember_debug/promise_assembler_test.js +++ b/tests/ember_debug/promise_assembler_test.js @@ -2,11 +2,11 @@ import Ember from "ember"; import { module, test } from 'qunit'; /*globals require*/ -var PromiseAssembler = require('ember-debug/libs/promise-assembler')["default"]; +const PromiseAssembler = require('ember-debug/libs/promise-assembler')["default"]; -var assembler; +let assembler; -var fakeRSVP; +let fakeRSVP; function stubRSVP() { fakeRSVP = Ember.Object.createWithMixins(Ember.Evented, { @@ -38,8 +38,8 @@ module("PromiseAssembler", { test("Creates promises correctly", function(assert) { startAssembler(); - var date = new Date(); - var event; + let date = new Date(); + let event; assembler.on('created', function(e) { event = e; @@ -53,7 +53,7 @@ test("Creates promises correctly", function(assert) { }); assert.ok(event); - var promise = event.promise; + let promise = event.promise; assert.equal(event.promise, assembler.find(promise.get('guid'))); assert.equal(assembler.find().get('length'), 1); @@ -67,8 +67,8 @@ test("Creates promises correctly", function(assert) { test("Chains a promise correctly (parent and child not-existing)", function(assert) { startAssembler(); - var date = new Date(); - var event; + let date = new Date(); + let event; assembler.on('chained', function(e) { event = e; @@ -81,8 +81,8 @@ test("Chains a promise correctly (parent and child not-existing)", function(asse childGuid: 2 }); - var parent = event.promise; - var child = event.child; + let parent = event.promise; + let child = event.child; assert.equal(assembler.find(parent.get('guid')), parent); assert.equal(assembler.find(child.get('guid')), child); @@ -101,10 +101,10 @@ test("Chains a promise correctly (parent and child not-existing)", function(asse test("Chains a promise correctly (parent and child existing)", function(assert) { startAssembler(); - var date = new Date(); - var event; - var parent; - var child; + let date = new Date(); + let event; + let parent; + let child; assembler.on('created', function(e) { parent = e.promise; @@ -155,9 +155,9 @@ test("Chains a promise correctly (parent and child existing)", function(assert) test("Fulfills a promise correctly", function(assert) { startAssembler(); - var date = new Date(); - var event; - var promise; + let date = new Date(); + let event; + let promise; assembler.on('created', function(e) { promise = e.promise; @@ -190,9 +190,9 @@ test("Fulfills a promise correctly", function(assert) { test("Rejects a promise correctly", function(assert) { startAssembler(); - var date = new Date(); - var event; - var promise; + let date = new Date(); + let event; + let promise; assembler.on('created', function(e) { promise = e.promise; diff --git a/tests/ember_debug/promise_debug_test.js b/tests/ember_debug/promise_debug_test.js index a0c631d09f..3fcc96e368 100644 --- a/tests/ember_debug/promise_debug_test.js +++ b/tests/ember_debug/promise_debug_test.js @@ -2,11 +2,10 @@ import Ember from "ember"; import { module, test, stop, start } from 'qunit'; /*globals require */ -var EmberDebug = require("ember-debug/main")["default"]; +const EmberDebug = require("ember-debug/main")["default"]; -var port, name, message, RSVP = Ember.RSVP; -var EmberDebug; -var App; +let port, name, message, RSVP = Ember.RSVP; +let App; let { run, K, A: emberA } = Ember; function setupApp() { @@ -95,7 +94,7 @@ test("Existing promises sent when requested", async function t(assert) { test("Updates are published when they happen", function(assert) { port.trigger('promise:getAndObservePromises'); - var p; + let p; run(function() { p = new RSVP.Promise(function() {}, "Promise1"); @@ -104,17 +103,17 @@ test("Updates are published when they happen", function(assert) { let done = assert.async(); Ember.run.later(function() { assert.equal(name, 'promise:promisesUpdated'); - var promises = emberA(message.promises); - var promise = promises.findBy('label', 'Promise1'); + let promises = emberA(message.promises); + let promise = promises.findBy('label', 'Promise1'); assert.equal(promise.label, 'Promise1'); p.then(function() {}, null, "Child1"); Ember.run.later(function() { assert.equal(name, 'promise:promisesUpdated'); assert.equal(message.promises.length, 2); - var child = message.promises[0]; + let child = message.promises[0]; assert.equal(child.parent, promise.guid); assert.equal(child.label, 'Child1'); - var parent = message.promises[1]; + let parent = message.promises[1]; assert.equal(parent.guid, promise.guid); done(); }, 200); @@ -123,7 +122,7 @@ test("Updates are published when they happen", function(assert) { test("Instrumentation with stack is persisted to session storage", function(assert) { - var withStack = false; + let withStack = false; EmberDebug.get('promiseDebug').reopen({ session: { getItem: function(/*key*/) { diff --git a/tests/ember_debug/render_debug_test.js b/tests/ember_debug/render_debug_test.js index 1b6b0f330a..8bbce48354 100644 --- a/tests/ember_debug/render_debug_test.js +++ b/tests/ember_debug/render_debug_test.js @@ -3,13 +3,13 @@ import Ember from "ember"; import { module, test } from 'qunit'; /* globals require */ -var EmberDebug = require('ember-debug/main')["default"]; -var port; -var App, run = Ember.run; -var compile = Ember.Handlebars.compile; +const EmberDebug = require('ember-debug/main')["default"]; +const { run, Application, Handlebars: { compile } } = Ember; +let port, App; + function setupApp() { - App = Ember.Application.create(); + App = Application.create(); App.setupForTesting(); App.injectTestHelpers(); diff --git a/tests/ember_debug/route_debug_test.js b/tests/ember_debug/route_debug_test.js index b97418cbcb..867d049c2e 100644 --- a/tests/ember_debug/route_debug_test.js +++ b/tests/ember_debug/route_debug_test.js @@ -1,7 +1,7 @@ /* jshint ignore:start */ import Ember from "ember"; import { module, test } from 'qunit'; -const { run } = Ember; +const { run, Application } = Ember; /* globals require */ const EmberDebug = require('ember-debug/main')["default"]; @@ -9,7 +9,7 @@ let port; let App; function setupApp() { - App = Ember.Application.create(); + App = Application.create(); App.toString = function() { return 'App'; }; App.setupForTesting(); App.injectTestHelpers(); @@ -51,7 +51,7 @@ module("Route Tree Debug", { }); test("Route tree", async function t(assert) { - var name = null, message = null, route; + let name = null, message = null, route; port.reopen({ send(n, m) { name = n; @@ -78,7 +78,7 @@ test("Route tree", async function t(assert) { assert.deepEqual(getChildrenProperty(route, 'name'), ['loading', 'error', 'simple', 'posts', 'comments', 'index'] ); - var commentsRoute = route.children.filter(function(child) { + let commentsRoute = route.children.filter(function(child) { return child.value.name === 'comments'; })[0]; diff --git a/tests/ember_debug/view_debug_test.js b/tests/ember_debug/view_debug_test.js index 80c89dc04a..b0cffe96f5 100644 --- a/tests/ember_debug/view_debug_test.js +++ b/tests/ember_debug/view_debug_test.js @@ -4,15 +4,12 @@ import { module, test } from 'qunit'; const { $ } = Ember; /* globals require, findByLabel, clickByLabel */ -var EmberDebug = require('ember-debug/main').default; -var port; -var App, run = Ember.run; -var compile = Ember.Handlebars.compile; -var ObjectController = Ember.ObjectController; -var View = Ember.View; -var Route = Ember.Route; -var EmberObject = Ember.Object; -var OLD_TEMPLATES = {}; +const EmberDebug = require('ember-debug/main').default; +const { View, Route, Object: EmberObject, Handlebars, ObjectController } = Ember; +const { compile } = Handlebars; +let port; +let App, run = Ember.run; +let OLD_TEMPLATES = {}; function setTemplate(name, template) { OLD_TEMPLATES = Ember.TEMPLATES[name]; @@ -20,7 +17,7 @@ function setTemplate(name, template) { } function destroyTemplates() { - for (var name in OLD_TEMPLATES) { + for (let name in OLD_TEMPLATES) { Ember.TEMPLATES[name] = OLD_TEMPLATES[name]; } OLD_TEMPLATES = {}; diff --git a/tests/helpers/resolver.js b/tests/helpers/resolver.js index 28f4ece46a..ebfb4e4d45 100644 --- a/tests/helpers/resolver.js +++ b/tests/helpers/resolver.js @@ -1,7 +1,7 @@ import Resolver from 'ember/resolver'; import config from '../../config/environment'; -var resolver = Resolver.create(); +const resolver = Resolver.create(); resolver.namespace = { modulePrefix: config.modulePrefix, diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js index a60c40e244..8e8d5d84fa 100644 --- a/tests/helpers/start-app.js +++ b/tests/helpers/start-app.js @@ -6,9 +6,9 @@ import triggerPort from './trigger-port'; let { generateGuid } = Ember; export default function startApp(attrs) { - var application; + let application; - var attributes = Ember.merge({}, config.APP); + let attributes = Ember.merge({}, config.APP); attributes = Ember.merge(attributes, attrs); // use defaults, but you can override; Application.initializer({ @@ -34,8 +34,8 @@ export default function startApp(attrs) { // TODO: separate each helper in its own file Ember.Test.registerHelper('findByLabel', function(app, label, context) { - var selector = '[data-label="' + label + '"]'; - var result = app.testHelpers.find(selector, context); + let selector = '[data-label="' + label + '"]'; + let result = app.testHelpers.find(selector, context); return result; }); diff --git a/tests/integration/container_test.js b/tests/integration/container_test.js index acc9b311e2..9627753ea5 100644 --- a/tests/integration/container_test.js +++ b/tests/integration/container_test.js @@ -3,9 +3,9 @@ import Ember from "ember"; import { module } from 'qunit'; import { test } from 'ember-qunit'; import startApp from '../helpers/start-app'; -var App; +let App; -var port, message, name; +let port, message, name; module('Container Tab', { beforeEach() { diff --git a/tests/integration/data_test.js b/tests/integration/data_test.js index fbace3d043..5d7bb8c147 100644 --- a/tests/integration/data_test.js +++ b/tests/integration/data_test.js @@ -66,11 +66,11 @@ function modelTypes() { function recordFactory(attr, filterValues) { filterValues = filterValues || { isNew: false }; - var searchKeywords = []; - for (var i in attr) { + let searchKeywords = []; + for (let i in attr) { searchKeywords.push(attr[i]); } - var object = Ember.Object.create(); + let object = Ember.Object.create(); return { columnValues: attr, objectId: attr.objectId || Ember.guidFor(object), diff --git a/tests/integration/deprecation_test.js b/tests/integration/deprecation_test.js index 52eb779c73..62ce2438d7 100644 --- a/tests/integration/deprecation_test.js +++ b/tests/integration/deprecation_test.js @@ -3,9 +3,9 @@ import Ember from "ember"; import { test } from 'ember-qunit'; import { module } from 'qunit'; import startApp from '../helpers/start-app'; -var App; +let App; -var port, message, name; +let port, message, name; function deprecationsWithSource() { return [{ @@ -74,9 +74,9 @@ test('No source map', async function t(assert) { await visit('/deprecations'); - var rows = findByLabel('deprecation-item'); + let rows = findByLabel('deprecation-item'); assert.equal(rows.length, 1); - var row = rows[0]; + let row = rows[0]; assert.equal(findByLabel('deprecation-source', row).length, 0, 'no sources'); assert.equal(findByLabel('deprecation-message', row).text().trim(), 'Deprecation 1', 'message shown'); assert.equal(findByLabel('deprecation-count', row).text().trim(), 2, 'Count correct'); diff --git a/tests/integration/object_inspector_test.js b/tests/integration/object_inspector_test.js index ccfe773366..6867260dcb 100644 --- a/tests/integration/object_inspector_test.js +++ b/tests/integration/object_inspector_test.js @@ -506,7 +506,7 @@ test("Errors are correctly displayed", async function t(assert) { function triggerEvent(elem, name) { /*global Event */ - var event; + let event; try { event = new Event(name); } catch (e) { diff --git a/tests/integration/promise_test.js b/tests/integration/promise_test.js index f41cbfcf3f..d3733fd604 100644 --- a/tests/integration/promise_test.js +++ b/tests/integration/promise_test.js @@ -162,7 +162,7 @@ test("Fulfilled promise", async function t(assert) { test("Rejected promise", async function t(assert) { await visit('/promises'); - var now = Date.now(); + let now = Date.now(); await triggerPort('promise:promisesUpdated', { promises: [ diff --git a/tests/integration/route_tree_test.js b/tests/integration/route_tree_test.js index d8248a2754..90afc4e0c9 100644 --- a/tests/integration/route_tree_test.js +++ b/tests/integration/route_tree_test.js @@ -3,10 +3,10 @@ import Ember from "ember"; import { test } from 'ember-qunit'; import { module } from 'qunit'; import startApp from '../helpers/start-app'; -var App; +let App; const { run } = Ember; -var port; +let port; module('Route Tree Tab', { beforeEach() { @@ -21,7 +21,7 @@ module('Route Tree Tab', { }); function routeValue(name, props) { - var value = { + let value = { name: name, controller: { name: name, @@ -40,7 +40,7 @@ function routeValue(name, props) { return Ember.$.extend(true, {}, value, props); } -var routeTree = { +let routeTree = { value: routeValue('application'), children: [{ value: routeValue('post', { controller: { exists: false } }), @@ -67,32 +67,32 @@ test("Route tree is successfully displayed", function(assert) { andThen(function() { - var routeNodes = findByLabel('route-node'); + let routeNodes = findByLabel('route-node'); assert.equal(routeNodes.length, 4); - var routeNames = findByLabel('route-name').get().map(function(item) { + let routeNames = findByLabel('route-name').get().map(function(item) { return Ember.$(item).text().trim(); }); assert.deepEqual(routeNames, ['application', 'post', 'post.new', 'post.edit']); - var routeHandlers = findByLabel('route-handler').get().map(function(item) { + let routeHandlers = findByLabel('route-handler').get().map(function(item) { return Ember.$(item).text().trim(); }); assert.deepEqual(routeHandlers, ['ApplicationRoute', 'PostRoute', 'PostNewRoute', 'PostEditRoute']); - var controllers = findByLabel('route-controller').get().map(function(item) { + let controllers = findByLabel('route-controller').get().map(function(item) { return Ember.$(item).text().trim(); }); assert.deepEqual(controllers, ['ApplicationController', 'PostController', 'PostNewController', 'PostEditController']); - var templates = findByLabel('route-template').get().map(function(item) { + let templates = findByLabel('route-template').get().map(function(item) { return Ember.$(item).text().trim(); }); assert.deepEqual(templates, ['application', 'post', 'post/new', 'post/edit']); - var titleTips = find('span[title]', routeNodes).map(function (i, node) { + let titleTips = find('span[title]', routeNodes).map(function (i, node) { return node.getAttribute('title'); }).toArray().sort(); @@ -123,7 +123,7 @@ test("Route tree is successfully displayed", function(assert) { }); test("Clicking on route handlers and controller sends an inspection message", function(assert) { - var name, message, applicationRow; + let name, message, applicationRow; port.reopen({ send: function(n, m) { @@ -157,7 +157,7 @@ test("Clicking on route handlers and controller sends an inspection message", fu name = null; message = null; - var postRow = findByLabel('route-node').eq(1); + let postRow = findByLabel('route-node').eq(1); return clickByLabel('route-controller', postRow); }).then(function() { assert.equal(name, null, "If controller does not exist, clicking should have no effect."); @@ -177,12 +177,12 @@ test("Current Route is highlighted", function(assert) { }); - var routeNodes; + let routeNodes; visit('route-tree') .then(function() { routeNodes = findByLabel('route-node'); - var isCurrent = routeNodes.get().map(function(item) { + let isCurrent = routeNodes.get().map(function(item) { return Ember.$(item).hasClass('row_highlight'); }); assert.deepEqual(isCurrent, [true, true, false, true]); @@ -192,7 +192,7 @@ test("Current Route is highlighted", function(assert) { }) .then(function() { routeNodes = findByLabel('route-node'); - var isCurrent = routeNodes.get().map(function(item) { + let isCurrent = routeNodes.get().map(function(item) { return Ember.$(item).hasClass('row_highlight'); }); assert.deepEqual(isCurrent, [true, true, true, false], 'Current route is bound'); @@ -212,17 +212,17 @@ test("Hiding non current route", function(assert) { visit('route-tree'); andThen( function() { - var routeNodes = findByLabel('route-node'); + let routeNodes = findByLabel('route-node'); assert.equal(routeNodes.length, 4); }); andThen( function() { - var checkbox = findByLabel('filter-hide-routes').find('input'); + let checkbox = findByLabel('filter-hide-routes').find('input'); checkbox.prop('checked', true); checkbox.trigger('change'); return wait(); }); andThen( function() { - var routeNodes = findByLabel('route-node'); + let routeNodes = findByLabel('route-node'); assert.equal(routeNodes.length, 3); }); }); diff --git a/tests/integration/view_tree_test.js b/tests/integration/view_tree_test.js index ebf7cbe77e..a9ee7f013a 100644 --- a/tests/integration/view_tree_test.js +++ b/tests/integration/view_tree_test.js @@ -3,10 +3,10 @@ import Ember from "ember"; import { test } from 'ember-qunit'; import { module } from 'qunit'; import startApp from '../helpers/start-app'; -var App; -var run = Ember.run; +let App; +const { run } = Ember; -var port; +let port; module('View Tree Tab', { beforeEach() { @@ -20,12 +20,12 @@ module('View Tree Tab', { } }); -var treeId = 0; +let treeId = 0; function viewNodeFactory(props) { if (!props.template) { props.template = props.name; } - var obj = { + let obj = { value: props, children: [], treeId: ++treeId @@ -34,11 +34,11 @@ function viewNodeFactory(props) { } function viewTreeFactory(tree) { - var children = tree.children; + let children = tree.children; delete tree.children; - var viewNode = viewNodeFactory(tree); + let viewNode = viewNodeFactory(tree); if (children) { - for (var i = 0; i < children.length; i++) { + for (let i = 0; i < children.length; i++) { viewNode.children.push(viewTreeFactory(children[i])); } } @@ -107,7 +107,7 @@ function defaultViewTree() { } test("It should correctly display the view tree", function(assert) { - var viewTree = defaultViewTree(); + const viewTree = defaultViewTree(); visit('/'); @@ -120,9 +120,9 @@ test("It should correctly display the view tree", function(assert) { andThen(() => { - var $treeNodes = findByLabel('tree-node'); + let $treeNodes = findByLabel('tree-node'); assert.equal($treeNodes.length, 3, 'expected some tree nodes'); - var controllerNames = [], + let controllerNames = [], templateNames = [], modelNames = [], viewClassNames = [], @@ -140,7 +140,7 @@ test("It should correctly display the view tree", function(assert) { durations.push(label('view-duration', this)); }); - var titleTips = find('span[title]:not([data-label])').map(function (i, node) { + let titleTips = find('span[title]:not([data-label])').map(function (i, node) { return node.getAttribute('title'); }).toArray().sort(); @@ -193,7 +193,7 @@ test("It should correctly display the view tree", function(assert) { test("It should update the view tree when the port triggers a change", function(assert) { assert.expect(4); - var $treeNodes, viewTree = defaultViewTree(); + let $treeNodes, viewTree = defaultViewTree(); visit('/') .then(function() { @@ -225,7 +225,7 @@ test("It should update the view tree when the port triggers a change", function( }); test("Previewing / showing a view on the client", function(assert) { - var messageSent = null; + let messageSent = null; port.reopen({ send: function(name, message) { messageSent = { name: name, message: message }; @@ -234,7 +234,7 @@ test("Previewing / showing a view on the client", function(assert) { visit('/') .then(function() { - var viewTree = defaultViewTree(); + let viewTree = defaultViewTree(); viewTree.children = []; port.trigger('view:viewTree', { tree: viewTree }); return wait(); @@ -251,7 +251,7 @@ test("Previewing / showing a view on the client", function(assert) { }); test("Inspecting views on hover", function(assert) { - var messageSent = null; + let messageSent = null; port.reopen({ send: function(name, message) { messageSent = { name: name, message: message }; @@ -274,7 +274,7 @@ test("Inspecting views on hover", function(assert) { }); test("Configuring which views to show", function(assert) { - var messageSent = null; + let messageSent = null; port.reopen({ send: function(name, message) { messageSent = { name: name, message: message }; @@ -283,7 +283,7 @@ test("Configuring which views to show", function(assert) { visit('/') .then(function() { - var checkbox = findByLabel('filter-components').find('input'); + const checkbox = findByLabel('filter-components').find('input'); checkbox.prop('checked', true); checkbox.trigger('change'); return wait(); @@ -294,7 +294,7 @@ test("Configuring which views to show", function(assert) { return wait(); }) .then(function() { - var checkbox = findByLabel('filter-all-views').find('input'); + const checkbox = findByLabel('filter-all-views').find('input'); checkbox.prop('checked', true); checkbox.trigger('change'); return wait(); diff --git a/tests/test-helper.js b/tests/test-helper.js index a78494102e..83ba0e4d4c 100644 --- a/tests/test-helper.js +++ b/tests/test-helper.js @@ -16,7 +16,7 @@ if (!Function.prototype.bind) { throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable"); } - var aArgs = Array.prototype.slice.call(arguments, 1), + let aArgs = Array.prototype.slice.call(arguments, 1), fToBind = this, FNOP = function () {}, fBound = function () {