Skip to content

Commit

Permalink
panel_name is removed or renamed to panelName
Browse files Browse the repository at this point in the history
Because it is used in a seperate directive now
refs #230
  • Loading branch information
raitisbe committed Jul 20, 2019
1 parent b238d6a commit 5075f63
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 12 deletions.
8 changes: 0 additions & 8 deletions components/compositions/compositions.component.js
Expand Up @@ -16,14 +16,6 @@ export default {
$scope.compNext = $scope.pageSize; $scope.compNext = $scope.pageSize;
/** /**
* @ngdoc property * @ngdoc property
* @name hs.compositions.controller#panel_name
* @deprecated
* @type {string} composition_browser
* @description
*/
$scope.panel_name = 'composition_browser';
/**
* @ngdoc property
* @name hs.compositions.controller#keywords * @name hs.compositions.controller#keywords
* @public * @public
* @type {Object} * @type {Object}
Expand Down
2 changes: 1 addition & 1 deletion components/core/core.js
Expand Up @@ -232,7 +232,7 @@ angular.module('hs.core', ['hs.map', 'gettext', 'hs.drag', 'hs.layout', 'hs.api'
*/ */
panelVisible: function (which, scope) { panelVisible: function (which, scope) {
if (angular.isDefined(scope)) if (angular.isDefined(scope))
if (angular.isUndefined(scope.panel_name)) scope.panel_name = which; if (angular.isUndefined(scope.panelName)) scope.panelName = which;
if (angular.isDefined(me.panel_statuses[which])) { if (angular.isDefined(me.panel_statuses[which])) {
return me.panel_statuses[which] && me.panelEnabled(which); return me.panel_statuses[which] && me.panelEnabled(which);
} }
Expand Down
2 changes: 1 addition & 1 deletion components/query/query.controller.js
Expand Up @@ -97,7 +97,7 @@ export default ['$scope', '$rootScope', '$timeout', 'hs.map.service', 'hs.query.


//add current panel queriable - activate/deactivate //add current panel queriable - activate/deactivate
$scope.$on('core.mainpanel_changed', function (event, closed) { $scope.$on('core.mainpanel_changed', function (event, closed) {
if (angular.isDefined(closed) && closed.panel_name == "info") { if (angular.isDefined(closed) && closed.panelName == "info") {
popup.hide(); popup.hide();
Base.deactivateQueries(); Base.deactivateQueries();
} }
Expand Down
1 change: 0 additions & 1 deletion components/save-map/save-map.component.js
Expand Up @@ -5,7 +5,6 @@ export default {
$scope.compoData = StatusManager.compoData; $scope.compoData = StatusManager.compoData;
$scope.statusData = StatusManager.statusData; $scope.statusData = StatusManager.statusData;
$scope.userData = StatusManager.userData; $scope.userData = StatusManager.userData;
$scope.panel_name = 'saveMap';
$scope.config = config; $scope.config = config;


/** /**
Expand Down
2 changes: 1 addition & 1 deletion materialComponents/panelContents/queryResult.js
Expand Up @@ -61,7 +61,7 @@ define(['angular', 'ol', 'angular-material'],
} }


$scope.$on('core.mainpanel_changed', function (event, closed) { $scope.$on('core.mainpanel_changed', function (event, closed) {
if (angular.isDefined(closed) && closed.panel_name == "info") { if (angular.isDefined(closed) && closed.panelName == "info") {
Base.deactivateQueries(); Base.deactivateQueries();
} }
else if (Core.current_panel_queryable) { else if (Core.current_panel_queryable) {
Expand Down

0 comments on commit 5075f63

Please sign in to comment.