Change type of binding to allow changes to mergetabs during runtime #3508
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -90,7 +90,7 @@ gmf.displayquerygridComponent = { | |||
| 'removeEmptyColumnsFn': '&?gmfDisplayquerygridRemoveemptycolumns', | |||
| 'maxResultsFn': '&?gmfDisplayquerygridMaxresults', | |||
| 'maxRecenterZoomFn': '&?gmfDisplayquerygridMaxrecenterzoom', | |||
| 'mergeTabsFn': '&?gmfDisplayquerygridMergetabs' | |||
| 'mergeTabs': '=?gmfDisplayquerygridMergetabs' | |||
There was a problem hiding this comment.
< is better than = in this case. Because the change can only be from the main controller to this controller, never in the other way. So that's useless to watch the change in this controller.
| @@ -274,7 +274,7 @@ gmf.DisplayquerygridController = function($injector, $scope, ngeoQueryResult, ng | |||
| gmf.DisplayquerygridController.prototype.$onInit = function() { | |||
| this.removeEmptyColumns_ = this['removeEmptyColumnsFn'] ? this['removeEmptyColumnsFn']() === true : false; | |||
| this.maxRecenterZoom = this['maxRecenterZoomFn'] ? this['maxRecenterZoomFn']() : undefined; | |||
| this.mergeTabs_ = this['mergeTabsFn'] ? this['mergeTabsFn']() : {}; | |||
| this.mergeTabs_ = this['mergeTabs'] ? this['mergeTabs'] : {}; | |||
There was a problem hiding this comment.
You can remove this line and change the line 217 from:
/**
* @type {!gmfx.GridMergeTabs}
* @private
*/
this.mergeTabs_ = {};
to
/**
* @type {!gmfx.GridMergeTabs}
*/
this.mergeTabs = {};
Then, adapt all this.mergeTabs_ to this.mergeTabs;
| @@ -274,7 +273,7 @@ gmf.DisplayquerygridController = function($injector, $scope, ngeoQueryResult, ng | |||
| gmf.DisplayquerygridController.prototype.$onInit = function() { | |||
| this.removeEmptyColumns_ = this['removeEmptyColumnsFn'] ? this['removeEmptyColumnsFn']() === true : false; | |||
| this.maxRecenterZoom = this['maxRecenterZoomFn'] ? this['maxRecenterZoomFn']() : undefined; | |||
| this.mergeTabs_ = this['mergeTabs'] ? this['mergeTabs'] : {}; | |||
| this.mergeTabs = this['mergeTabs'] ? this['mergeTabs'] : {}; | |||
There was a problem hiding this comment.
Now you can completely remove this line. If nothing set the property, it will be the property declared in the constructor (so {}).
pfirpfel
force-pushed
the
allow-changes-to-mergetabs-2.2
branch
from
0a921c7
to
5e32ae1
Compare
ger-benjamin
approved these changes
Feb 12, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
see: GEO-977
Tested with desktop_alt. Changes to the bound object during runtime will be reflected in a new search.
This should not break existing code as long the feature is used like in the desktop_alt.