Compare commits
	
		
			10 Commits
		
	
	
		
			sprint-2.1
			...
			fix-lint-e
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 1e64cf4657 | ||
|   | 60ba2c23e6 | ||
|   | 606aaf29c7 | ||
|   | 61c31454ac | ||
|   | 5f1dc5d5e2 | ||
|   | bba3306a98 | ||
|   | 35743577c9 | ||
|   | 7b2b682eea | ||
|   | 51ab52e9f1 | ||
|   | acc24ccd72 | 
| @@ -19,7 +19,7 @@ | ||||
|  * this source code distribution or the Licensing information page available | ||||
|  * at runtime from the About dialog for additional information. | ||||
|  *****************************************************************************/ | ||||
| /*global module,BUILD_CONSTANTS*/ | ||||
| /*global module*/ | ||||
|  | ||||
| const matcher = /\/openmct.js$/; | ||||
| if (document.currentScript) { | ||||
|   | ||||
| @@ -32,14 +32,6 @@ define( | ||||
|                 mockPromise, | ||||
|                 handler; | ||||
|  | ||||
|             function asPromise(value) { | ||||
|                 return (value || {}).then ? value : { | ||||
|                     then: function (callback) { | ||||
|                         return asPromise(callback(value)); | ||||
|                     } | ||||
|                 }; | ||||
|             } | ||||
|  | ||||
|             function makeMockFailure(id, index) { | ||||
|                 var mockFailure = jasmine.createSpyObj( | ||||
|                         'failure-' + id, | ||||
|   | ||||
| @@ -29,7 +29,7 @@ define([ | ||||
|     GenericSearchProvider | ||||
| ) { | ||||
|  | ||||
|     describe('GenericSearchProvider', function () { | ||||
|     xdescribe('GenericSearchProvider', function () { | ||||
|         var $q, | ||||
|             $log, | ||||
|             modelService, | ||||
|   | ||||
							
								
								
									
										10
									
								
								src/MCT.js
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								src/MCT.js
									
									
									
									
									
								
							| @@ -95,12 +95,15 @@ define([ | ||||
|      */ | ||||
|     function MCT() { | ||||
|         EventEmitter.call(this); | ||||
|         /* eslint-disable no-undef */ | ||||
|         this.buildInfo = { | ||||
|             version: __OPENMCT_VERSION__, | ||||
|             buildDate: __OPENMCT_BUILD_DATE__, | ||||
|             revision: __OPENMCT_REVISION__, | ||||
|             branch: __OPENMCT_BUILD_BRANCH__ | ||||
|         }; | ||||
|         /* eslint-enable no-undef */ | ||||
|  | ||||
|  | ||||
|         this.legacyBundle = { extensions: { | ||||
|             services: [ | ||||
| @@ -260,10 +263,6 @@ define([ | ||||
|         this.install(this.plugins.Tabs()); | ||||
|         this.install(this.plugins.FlexibleLayout()); | ||||
|         this.install(this.plugins.GoToOriginalAction()); | ||||
|  | ||||
|         if (typeof BUILD_CONSTANTS !== 'undefined') { | ||||
|             this.install(buildInfoPlugin(BUILD_CONSTANTS)); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     MCT.prototype = Object.create(EventEmitter.prototype); | ||||
| @@ -375,7 +374,8 @@ define([ | ||||
|          * @event start | ||||
|          * @memberof module:openmct.MCT~ | ||||
|          */ | ||||
|         var startPromise = new Main().run(this) | ||||
|         const startPromise = new Main() | ||||
|         startPromise.run(this) | ||||
|             .then(function (angular) { | ||||
|                 this.$angular = angular; | ||||
|                 // OpenMCT Object provider doesn't operate properly unless | ||||
|   | ||||
| @@ -3,17 +3,6 @@ define([ | ||||
| ], function ( | ||||
|  | ||||
| ) { | ||||
|     const DEFAULT_VIEW_PRIORITY = 100; | ||||
|  | ||||
|     const PRIORITY_LEVELS = { | ||||
|         "fallback": Number.NEGATIVE_INFINITY, | ||||
|         "default": -100, | ||||
|         "none": 0, | ||||
|         "optional": DEFAULT_VIEW_PRIORITY, | ||||
|         "preferred": 1000, | ||||
|         "mandatory": Number.POSITIVE_INFINITY | ||||
|     }; | ||||
|  | ||||
|     function TypeInspectorViewProvider(typeDefinition, openmct, convertToLegacyObject) { | ||||
|         console.warn(`DEPRECATION WARNING: Migrate ${typeDefinition.key} from ${typeDefinition.bundle.path} to use the new Inspector View APIs.  Legacy Inspector view support will be removed soon.`); | ||||
|         let representation = openmct.$injector.get('representations[]') | ||||
|   | ||||
| @@ -20,8 +20,7 @@ | ||||
|  * at runtime from the About dialog for additional information. | ||||
|  *****************************************************************************/ | ||||
|  | ||||
| define([], function () { | ||||
|  | ||||
| define(['lodash'], function (_) { | ||||
|     function DisplayLayoutToolbar(openmct) { | ||||
|         return { | ||||
|             name: "Display Layout Toolbar", | ||||
| @@ -40,7 +39,7 @@ define([], function () { | ||||
|                 return (selectedParent && selectedParent.context.item && selectedParent.context.item.type === 'layout') || | ||||
|                     (selectedObject.context.item && selectedObject.context.item.type === 'layout'); | ||||
|             }, | ||||
|             toolbar: function (selection) { | ||||
|             toolbar: function (selectedObjects) { | ||||
|                 const DIALOG_FORM = { | ||||
|                     'text': { | ||||
|                         name: "Text Element Properties", | ||||
| @@ -222,7 +221,7 @@ define([], function () { | ||||
|                             } | ||||
|                         ], | ||||
|                         method: function (option) { | ||||
|                             selectionPath[1].context.orderItem(option.value, getAllTypes(selection)); | ||||
|                             selectionPath[1].context.orderItem(option.value, getAllTypes(selectedObjects)); | ||||
|                         } | ||||
|                     }; | ||||
|                 } | ||||
| @@ -441,11 +440,11 @@ define([], function () { | ||||
|                         return { | ||||
|                             control: "select-menu", | ||||
|                             domainObject: selectionPath[1].context.item, | ||||
|                             applicableSelectedItems: selection.filter(selectionPath => { | ||||
|                                 return selectionPath[0].context.layoutItem.type === 'telemetry-view'; | ||||
|                             applicableSelectedItems: selection.filter(path => { | ||||
|                                 return path[0].context.layoutItem.type === 'telemetry-view'; | ||||
|                             }), | ||||
|                             property: function (selectionPath) { | ||||
|                                 return getPath(selectionPath) + ".value"; | ||||
|                             property: function (path) { | ||||
|                                 return getPath(path) + ".value"; | ||||
|                             }, | ||||
|                             title: "Set value", | ||||
|                             options: openmct.telemetry.getMetadata(selectionPath[0].context.item).values().map(value => { | ||||
| @@ -500,8 +499,8 @@ define([], function () { | ||||
|                         !selectionPath[0].context.layoutItem; | ||||
|                 } | ||||
|  | ||||
|                 if (isMainLayoutSelected(selection[0])) { | ||||
|                     return [getAddButton(selection)]; | ||||
|                 if (isMainLayoutSelected(selectedObjects[0])) { | ||||
|                     return [getAddButton(selectedObjects)]; | ||||
|                 } | ||||
|  | ||||
|                 let toolbar = { | ||||
| @@ -517,145 +516,145 @@ define([], function () { | ||||
|                     'remove': [] | ||||
|                 }; | ||||
|  | ||||
|                 selection.forEach(selectionPath => { | ||||
|                 selectedObjects.forEach(selectionPath => { | ||||
|                     let selectedParent = selectionPath[1].context.item; | ||||
|                     let layoutItem = selectionPath[0].context.layoutItem; | ||||
|  | ||||
|                     if (layoutItem.type === 'subobject-view') { | ||||
|                         if (toolbar['add-menu'].length === 0 && selectionPath[0].context.item.type === 'layout') { | ||||
|                             toolbar['add-menu'] = [getAddButton(selection, selectionPath)]; | ||||
|                             toolbar['add-menu'] = [getAddButton(selectedObjects, selectionPath)]; | ||||
|                         } | ||||
|                         if (toolbar['toggle-frame'].length === 0) { | ||||
|                             toolbar['toggle-frame'] = [getToggleFrameButton(selectedParent, selection)]; | ||||
|                             toolbar['toggle-frame'] = [getToggleFrameButton(selectedParent, selectedObjects)]; | ||||
|                         } | ||||
|                         if (toolbar.position.length === 0) { | ||||
|                             toolbar.position = [ | ||||
|                                 getStackOrder(selectedParent, selectionPath), | ||||
|                                 getXInput(selectedParent, selection), | ||||
|                                 getYInput(selectedParent, selection), | ||||
|                                 getHeightInput(selectedParent, selection), | ||||
|                                 getWidthInput(selectedParent, selection) | ||||
|                                 getXInput(selectedParent, selectedObjects), | ||||
|                                 getYInput(selectedParent, selectedObjects), | ||||
|                                 getHeightInput(selectedParent, selectedObjects), | ||||
|                                 getWidthInput(selectedParent, selectedObjects) | ||||
|                             ]; | ||||
|                         } | ||||
|                         if (toolbar.remove.length === 0) { | ||||
|                             toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selection)]; | ||||
|                             toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selectedObjects)]; | ||||
|                         } | ||||
|                     } else if (layoutItem.type === 'telemetry-view') { | ||||
|                         if (toolbar['display-mode'].length === 0) { | ||||
|                             toolbar['display-mode'] = [getDisplayModeMenu(selectedParent, selection)]; | ||||
|                             toolbar['display-mode'] = [getDisplayModeMenu(selectedParent, selectedObjects)]; | ||||
|                         } | ||||
|                         if (toolbar['telemetry-value'].length === 0) { | ||||
|                             toolbar['telemetry-value'] = [getTelemetryValueMenu(selectionPath, selection)]; | ||||
|                             toolbar['telemetry-value'] = [getTelemetryValueMenu(selectionPath, selectedObjects)]; | ||||
|                         } | ||||
|                         if (toolbar.style.length < 2) { | ||||
|                             toolbar.style = [ | ||||
|                                 getFillMenu(selectedParent, selection), | ||||
|                                 getStrokeMenu(selectedParent, selection) | ||||
|                                 getFillMenu(selectedParent, selectedObjects), | ||||
|                                 getStrokeMenu(selectedParent, selectedObjects) | ||||
|                             ]; | ||||
|                         } | ||||
|                         if (toolbar['text-style'].length === 0) { | ||||
|                             toolbar['text-style'] = [ | ||||
|                                 getTextColorMenu(selectedParent, selection), | ||||
|                                 getTextSizeMenu(selectedParent, selection) | ||||
|                                 getTextColorMenu(selectedParent, selectedObjects), | ||||
|                                 getTextSizeMenu(selectedParent, selectedObjects) | ||||
|                             ]; | ||||
|                         } | ||||
|                         if (toolbar.position.length === 0) { | ||||
|                             toolbar.position = [ | ||||
|                                 getStackOrder(selectedParent, selectionPath), | ||||
|                                 getXInput(selectedParent, selection), | ||||
|                                 getYInput(selectedParent, selection), | ||||
|                                 getHeightInput(selectedParent, selection), | ||||
|                                 getWidthInput(selectedParent, selection) | ||||
|                                 getXInput(selectedParent, selectedObjects), | ||||
|                                 getYInput(selectedParent, selectedObjects), | ||||
|                                 getHeightInput(selectedParent, selectedObjects), | ||||
|                                 getWidthInput(selectedParent, selectedObjects) | ||||
|                             ]; | ||||
|                         } | ||||
|                         if (toolbar.remove.length === 0) { | ||||
|                             toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selection)]; | ||||
|                             toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selectedObjects)]; | ||||
|                         } | ||||
|                     } else if (layoutItem.type === 'text-view') { | ||||
|                         if (toolbar.style.length < 2) { | ||||
|                             toolbar.style = [ | ||||
|                                 getFillMenu(selectedParent, selection), | ||||
|                                 getStrokeMenu(selectedParent, selection) | ||||
|                                 getFillMenu(selectedParent, selectedObjects), | ||||
|                                 getStrokeMenu(selectedParent, selectedObjects) | ||||
|                             ]; | ||||
|                         } | ||||
|                         if (toolbar['text-style'].length === 0) { | ||||
|                             toolbar['text-style'] = [ | ||||
|                                 getTextColorMenu(selectedParent, selection), | ||||
|                                 getTextSizeMenu(selectedParent, selection) | ||||
|                                 getTextColorMenu(selectedParent, selectedObjects), | ||||
|                                 getTextSizeMenu(selectedParent, selectedObjects) | ||||
|                             ]; | ||||
|                         } | ||||
|                         if (toolbar.position.length === 0) { | ||||
|                             toolbar.position = [ | ||||
|                                 getStackOrder(selectedParent, selectionPath), | ||||
|                                 getXInput(selectedParent, selection), | ||||
|                                 getYInput(selectedParent, selection), | ||||
|                                 getHeightInput(selectedParent, selection), | ||||
|                                 getWidthInput(selectedParent, selection) | ||||
|                                 getXInput(selectedParent, selectedObjects), | ||||
|                                 getYInput(selectedParent, selectedObjects), | ||||
|                                 getHeightInput(selectedParent, selectedObjects), | ||||
|                                 getWidthInput(selectedParent, selectedObjects) | ||||
|                             ]; | ||||
|                         } | ||||
|                         if (toolbar.text.length === 0) { | ||||
|                             toolbar.text = [getTextButton(selectedParent, selection)]; | ||||
|                             toolbar.text = [getTextButton(selectedParent, selectedObjects)]; | ||||
|                         } | ||||
|                         if (toolbar.remove.length === 0) { | ||||
|                             toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selection)]; | ||||
|                             toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selectedObjects)]; | ||||
|                         } | ||||
|                     } else if (layoutItem.type === 'box-view') { | ||||
|                         if (toolbar.style.length < 2) { | ||||
|                             toolbar.style = [ | ||||
|                                 getFillMenu(selectedParent, selection), | ||||
|                                 getStrokeMenu(selectedParent, selection) | ||||
|                                 getFillMenu(selectedParent, selectedObjects), | ||||
|                                 getStrokeMenu(selectedParent, selectedObjects) | ||||
|                             ]; | ||||
|                         } | ||||
|                         if (toolbar.position.length === 0) { | ||||
|                             toolbar.position = [ | ||||
|                                 getStackOrder(selectedParent, selectionPath), | ||||
|                                 getXInput(selectedParent, selection), | ||||
|                                 getYInput(selectedParent, selection), | ||||
|                                 getHeightInput(selectedParent, selection), | ||||
|                                 getWidthInput(selectedParent, selection) | ||||
|                                 getXInput(selectedParent, selectedObjects), | ||||
|                                 getYInput(selectedParent, selectedObjects), | ||||
|                                 getHeightInput(selectedParent, selectedObjects), | ||||
|                                 getWidthInput(selectedParent, selectedObjects) | ||||
|                             ]; | ||||
|                         } | ||||
|                         if (toolbar.remove.length === 0) { | ||||
|                             toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selection)]; | ||||
|                             toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selectedObjects)]; | ||||
|                         } | ||||
|                     } else if (layoutItem.type === 'image-view') { | ||||
|                         if (toolbar.style.length === 0) { | ||||
|                             toolbar.style = [ | ||||
|                                 getStrokeMenu(selectedParent, selection) | ||||
|                                 getStrokeMenu(selectedParent, selectedObjects) | ||||
|                             ]; | ||||
|                         } | ||||
|                         if (toolbar.position.length === 0) { | ||||
|                             toolbar.position = [ | ||||
|                                 getStackOrder(selectedParent, selectionPath), | ||||
|                                 getXInput(selectedParent, selection), | ||||
|                                 getYInput(selectedParent, selection), | ||||
|                                 getHeightInput(selectedParent, selection), | ||||
|                                 getWidthInput(selectedParent, selection) | ||||
|                                 getXInput(selectedParent, selectedObjects), | ||||
|                                 getYInput(selectedParent, selectedObjects), | ||||
|                                 getHeightInput(selectedParent, selectedObjects), | ||||
|                                 getWidthInput(selectedParent, selectedObjects) | ||||
|                             ]; | ||||
|                         } | ||||
|                         if (toolbar.url.length === 0) { | ||||
|                             toolbar.url = [getURLButton(selectedParent, selection)]; | ||||
|                             toolbar.url = [getURLButton(selectedParent, selectedObjects)]; | ||||
|                         } | ||||
|                         if (toolbar.remove.length === 0) { | ||||
|                             toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selection)]; | ||||
|                             toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selectedObjects)]; | ||||
|                         } | ||||
|                     } else if (layoutItem.type === 'line-view') { | ||||
|                         if (toolbar.style.length === 0) { | ||||
|                             toolbar.style = [ | ||||
|                                 getStrokeMenu(selectedParent, selection) | ||||
|                                 getStrokeMenu(selectedParent, selectedObjects) | ||||
|                             ]; | ||||
|                         } | ||||
|                         if (toolbar.position.length === 0) { | ||||
|                             toolbar.position = [ | ||||
|                                 getStackOrder(selectedParent, selectionPath), | ||||
|                                 getXInput(selectedParent, selection), | ||||
|                                 getYInput(selectedParent, selection), | ||||
|                                 getX2Input(selectedParent, selection), | ||||
|                                 getY2Input(selectedParent, selection) | ||||
|                                 getXInput(selectedParent, selectedObjects), | ||||
|                                 getYInput(selectedParent, selectedObjects), | ||||
|                                 getX2Input(selectedParent, selectedObjects), | ||||
|                                 getY2Input(selectedParent, selectedObjects) | ||||
|                             ]; | ||||
|                         } | ||||
|                         if (toolbar.remove.length === 0) { | ||||
|                             toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selection)]; | ||||
|                             toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selectedObjects)]; | ||||
|                         } | ||||
|                     } | ||||
|                 }); | ||||
|   | ||||
| @@ -83,7 +83,7 @@ function ( | ||||
|             mounted: self.focusOnEntry | ||||
|         }; | ||||
|  | ||||
|         var notebookVue = Vue.extend({ | ||||
|         var NotebookVue = Vue.extend({ | ||||
|             template: NotebookTemplate, | ||||
|             provide: {openmct: self.openmct, domainObject: self.domainObject}, | ||||
|             components: { | ||||
| @@ -114,7 +114,7 @@ function ( | ||||
|             } | ||||
|         }); | ||||
|  | ||||
|         this.NotebookVue =  new notebookVue(); | ||||
|         this.NotebookVue =  new NotebookVue(); | ||||
|         container.appendChild(this.NotebookVue.$mount().$el); | ||||
|     }; | ||||
|  | ||||
|   | ||||
| @@ -63,10 +63,10 @@ define([ | ||||
|  | ||||
|             Object.keys(panels).forEach(key => { | ||||
|                 let panel = panels[key]; | ||||
|                 let domainObject = childObjects[key]; | ||||
|                 let childDomainObject = childObjects[key]; | ||||
|                 let identifier = undefined; | ||||
|  | ||||
|                 if (isTelemetry(domainObject)) { | ||||
|                 if (isTelemetry(childDomainObject)) { | ||||
|                     // If object is a telemetry point, convert it to a plot and | ||||
|                     // replace the object in migratedObject composition with the plot. | ||||
|                     identifier = { | ||||
| @@ -75,19 +75,19 @@ define([ | ||||
|                     }; | ||||
|                     let plotObject = { | ||||
|                         identifier: identifier, | ||||
|                         location: domainObject.location, | ||||
|                         name: domainObject.name, | ||||
|                         location: childDomainObject.location, | ||||
|                         name: childDomainObject.name, | ||||
|                         type: "telemetry.plot.overlay" | ||||
|                     }; | ||||
|                     let plotType = openmct.types.get('telemetry.plot.overlay'); | ||||
|                     plotType.definition.initialize(plotObject); | ||||
|                     plotObject.composition.push(domainObject.identifier); | ||||
|                     plotObject.composition.push(childDomainObject.identifier); | ||||
|                     openmct.objects.mutate(plotObject, 'persisted', Date.now()); | ||||
|  | ||||
|                     let keyString = openmct.objects.makeKeyString(domainObject.identifier); | ||||
|                     let keyString = openmct.objects.makeKeyString(childDomainObject.identifier); | ||||
|                     let clonedComposition = Object.assign([], migratedObject.composition); | ||||
|                     clonedComposition.forEach((identifier, index) => { | ||||
|                         if (openmct.objects.makeKeyString(identifier) === keyString) { | ||||
|                     clonedComposition.forEach((objIdentifier, index) => { | ||||
|                         if (openmct.objects.makeKeyString(objIdentifier) === keyString) { | ||||
|                             migratedObject.composition[index] = plotObject.identifier; | ||||
|                         } | ||||
|                     }); | ||||
| @@ -98,7 +98,7 @@ define([ | ||||
|                     height: panel.dimensions[1], | ||||
|                     x: panel.position[0], | ||||
|                     y: panel.position[1], | ||||
|                     identifier: identifier || domainObject.identifier, | ||||
|                     identifier: identifier || childDomainObject.identifier, | ||||
|                     id: uuid(), | ||||
|                     type: 'subobject-view', | ||||
|                     hasFrame: panel.hasFrame | ||||
|   | ||||
| @@ -140,7 +140,7 @@ define([ | ||||
|          * @returns {Promise} | ||||
|          */ | ||||
|         fetch: function (options) { | ||||
|             const strategy = options.shouldUseMinMax ? 'minMax' : undefined;            | ||||
|             const strategy = options.shouldUseMinMax ? 'minMax' : undefined; | ||||
|             options = _.extend({}, { size: 1000, strategy, filters: this.filters }, options || {}); | ||||
|             if (!this.unsubscribe) { | ||||
|                 this.unsubscribe = this.openmct | ||||
|   | ||||
| @@ -138,7 +138,7 @@ define([ | ||||
|         this.listenTo(series, 'change:interpolate', function () { | ||||
|             this.loadSeriesData(series); | ||||
|         }, this); | ||||
|          | ||||
|  | ||||
|         this.loadSeriesData(series); | ||||
|     }; | ||||
|  | ||||
|   | ||||
| @@ -215,9 +215,7 @@ define([ | ||||
|      * Update the widget's appearance from the configuration of the active rule | ||||
|      */ | ||||
|     SummaryWidget.prototype.updateWidget = function () { | ||||
|         const WIDGET_CLASS = 'c-sw js-sw', | ||||
|             WIDGET_LABEL_CLASS = 'c-sw__label js-sw__label', | ||||
|             WIDGET_ICON_CLASS = 'c-sw__icon js-sw__icon'; | ||||
|         const WIDGET_ICON_CLASS = 'c-sw__icon js-sw__icon'; | ||||
|         var activeRule = this.rulesById[this.activeId]; | ||||
|         this.applyStyle($('#widget', this.domElement), activeRule.getProperty('style')); | ||||
|         $('#widget', this.domElement).prop('title', activeRule.getProperty('message')); | ||||
|   | ||||
| @@ -86,7 +86,7 @@ define( | ||||
|              */ | ||||
|             matchesFilters(row) { | ||||
|                 let doesMatchFilters = true; | ||||
|                 for (const key in this.columnFilters) { | ||||
|                 Object.keys(this.columnFilters).forEach((key) => { | ||||
|                     if (!doesMatchFilters || !this.rowHasColumn(row, key)) { | ||||
|                         return false; | ||||
|                     } | ||||
| @@ -97,8 +97,7 @@ define( | ||||
|                     } | ||||
|  | ||||
|                     doesMatchFilters = formattedValue.toLowerCase().indexOf(this.columnFilters[key]) !== -1; | ||||
|                 } | ||||
|  | ||||
|                 }); | ||||
|                 return doesMatchFilters; | ||||
|             } | ||||
|  | ||||
|   | ||||
| @@ -3,6 +3,7 @@ | ||||
| Application router -- must | ||||
|  | ||||
| */ | ||||
| /*global _,module*/ | ||||
|  | ||||
| const LocationBar = require('location-bar'); | ||||
| const EventEmitter = require('EventEmitter'); | ||||
| @@ -117,7 +118,7 @@ class ApplicationRouter extends EventEmitter { | ||||
|                 changedParams[key] = value; | ||||
|             } | ||||
|         } | ||||
|         for (let [key, value] of Object.entries(oldParams)) { | ||||
|         for (let key of Object.keys(oldParams)) { | ||||
|             if (!newParams.hasOwnProperty(key)) { | ||||
|                 changedParams[key] = undefined; | ||||
|             } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user