From 7fab149380cdbcec6f4d01f548af9269d22e6b46 Mon Sep 17 00:00:00 2001 From: Lubomir Balogh Date: Fri, 12 Aug 2016 13:52:54 +0200 Subject: [PATCH] Yangman - cleaned code - removed commented code blocks, debug outputs - fixed linter errors Change-Id: I48a1b7fbd67ca07900375bce0deaec882e0c0af7 Signed-off-by: Lubomir Balogh --- .../yangman/controllers/modules-list.controller.js | 6 +----- .../controllers/request-header.controller.js | 14 +------------- .../controllers/requests-list.controller.js | 3 --- .../yangman/controllers/yang-form.controller.js | 2 +- .../yangman/controllers/yangman.controller.js | 1 - .../yangman/services/parameters.services.js | 2 +- .../yangman/services/requests.services.js | 2 -- .../yangman/services/yangman-design.services.js | 2 +- .../yangman/views/rightpanel/request-data.tpl.html | 2 +- .../views/rightpanel/request-header.tpl.html | 3 ++- .../src/main/resources/yangman/yangman.less | 13 ------------- 11 files changed, 8 insertions(+), 42 deletions(-) diff --git a/modules/yangman-resources/src/main/resources/yangman/controllers/modules-list.controller.js b/modules/yangman-resources/src/main/resources/yangman/controllers/modules-list.controller.js index 686d19e8..b801edf1 100644 --- a/modules/yangman-resources/src/main/resources/yangman/controllers/modules-list.controller.js +++ b/modules/yangman-resources/src/main/resources/yangman/controllers/modules-list.controller.js @@ -69,7 +69,7 @@ define([ if ( $scope.selectedDatastore && (module === $scope.selectedModule)) { haveSelectedDS = $scope.selectedModule.children.filter(function(item){ - return item === $scope.selectedDatastore; + return item === $scope.selectedDatastore; }); } @@ -104,12 +104,10 @@ define([ $scope.setGlobalParams(apis, augGroups); modulesList.allNodes = allNodes; modulesList.treeApis = YangUtilsService.generateApiTreeData(apis); - // $scope.processingModulesSuccessCallback(); modulesList.showLoadingBox = false; showToastInfoBox('YANGMAN_LOADED_MODULES'); PluginsHandlerService.plugAll(apis, modulesList); - // $scope.$broadcast('LOAD_REQ_DATA'); }, function () { showToastInfoBox('YANGMAN_LOADED_MODULES_ERROR'); modulesList.showLoadingBox = false; @@ -122,7 +120,6 @@ define([ function setModule(module, e){ if ( $(e.target).hasClass('top-element') ) { module.expanded = !module.expanded; - //$scope.setModule(module); } } @@ -152,5 +149,4 @@ define([ }, 500); } } - }); diff --git a/modules/yangman-resources/src/main/resources/yangman/controllers/request-header.controller.js b/modules/yangman-resources/src/main/resources/yangman/controllers/request-header.controller.js index 10b3f8f1..ce0e1702 100644 --- a/modules/yangman-resources/src/main/resources/yangman/controllers/request-header.controller.js +++ b/modules/yangman-resources/src/main/resources/yangman/controllers/request-header.controller.js @@ -121,8 +121,6 @@ define([ } else { $scope.setJsonView(true, false); } - - // sendRequestData({}, 'RECEIVED'); } /** @@ -335,18 +333,10 @@ define([ } - function finishRequestProgress (message){ + function finishRequestProgress(message){ $scope.rootBroadcast('YANGMAN_EXECUTING_REQUEST_PROGRESS_STOP'); - // $mdToast.show( - // $mdToast.simple() - // .textContent(message) - // .position('bottom right') - // .parent(angular.element('.yangmanModule__right-panel__header')) - // .hideDelay(1500) - // ); } - /** * Execute request operation */ @@ -470,8 +460,6 @@ define([ $scope.rootBroadcast('YANGMAN_SELECT_THE_NEWEST_REQUEST'); }); - //setNodeDataFromRequestData(requestHeader.requestUrl); - if (response.data) { // try to fill code mirror editor sendRequestData(response.data, constants.REQUEST_DATA_TYPE_RECEIVED); diff --git a/modules/yangman-resources/src/main/resources/yangman/controllers/requests-list.controller.js b/modules/yangman-resources/src/main/resources/yangman/controllers/requests-list.controller.js index ad717ef4..62a35f89 100644 --- a/modules/yangman-resources/src/main/resources/yangman/controllers/requests-list.controller.js +++ b/modules/yangman-resources/src/main/resources/yangman/controllers/requests-list.controller.js @@ -72,9 +72,6 @@ define([ vm.deselectAllRequests = deselectAllRequests; vm.filterCollReq = filterCollReq; - - - /** * Save request obje to collection from other controller * @param reqObj diff --git a/modules/yangman-resources/src/main/resources/yangman/controllers/yang-form.controller.js b/modules/yangman-resources/src/main/resources/yangman/controllers/yang-form.controller.js index 1101976b..22f3c249 100644 --- a/modules/yangman-resources/src/main/resources/yangman/controllers/yang-form.controller.js +++ b/modules/yangman-resources/src/main/resources/yangman/controllers/yang-form.controller.js @@ -23,7 +23,7 @@ define([ YangFormCtrl.$inject = ['$scope', '$rootScope', '$filter', 'constants', 'YangUtilsService']; - function YangFormCtrl($scope, $rootScope, $filter, constants, YangUtilsService) { + function YangFormCtrl($scope, $rootScope, $filter, constants) { var yangForm = this; yangForm.viewPath = $scope.globalViewPath + 'rightpanel/form'; diff --git a/modules/yangman-resources/src/main/resources/yangman/controllers/yangman.controller.js b/modules/yangman-resources/src/main/resources/yangman/controllers/yangman.controller.js index 107fe1fd..7c4a3727 100644 --- a/modules/yangman-resources/src/main/resources/yangman/controllers/yangman.controller.js +++ b/modules/yangman-resources/src/main/resources/yangman/controllers/yangman.controller.js @@ -268,7 +268,6 @@ define([ if ( expand ) { $scope.node = null; - // toggleLeftPanel(leftPanel); setLeftPanel(leftPanel); $scope.$broadcast('YANGMAN_MODULE_D_INIT'); } else { diff --git a/modules/yangman-resources/src/main/resources/yangman/services/parameters.services.js b/modules/yangman-resources/src/main/resources/yangman/services/parameters.services.js index a5ce415b..7c7d3fd0 100644 --- a/modules/yangman-resources/src/main/resources/yangman/services/parameters.services.js +++ b/modules/yangman-resources/src/main/resources/yangman/services/parameters.services.js @@ -15,7 +15,7 @@ define([ service.createEmptyParametersList = createEmptyParametersList; service.createParameter = createParameter; - // service.validateFile = validateFile; + service.validateFile = validateFile; /** * Validating collection import file diff --git a/modules/yangman-resources/src/main/resources/yangman/services/requests.services.js b/modules/yangman-resources/src/main/resources/yangman/services/requests.services.js index e02c862a..cde859f8 100644 --- a/modules/yangman-resources/src/main/resources/yangman/services/requests.services.js +++ b/modules/yangman-resources/src/main/resources/yangman/services/requests.services.js @@ -285,8 +285,6 @@ define([ */ function createHistoryRequest(sentData, receivedData, path, operation, status, name, collection, timestamp, responseStatus, responseStatusText, responseTime) { - // TODO: investigate, if this line is needed - // var receivedDataProcessed = status === 'success' ? receivedData : null, var result = new HistoryRequestModel(PathUtilsService, YangUtilsService, ParsingJsonService); timestamp = timestamp || Date.now(); diff --git a/modules/yangman-resources/src/main/resources/yangman/services/yangman-design.services.js b/modules/yangman-resources/src/main/resources/yangman/services/yangman-design.services.js index 6b86af46..1eb37f4c 100644 --- a/modules/yangman-resources/src/main/resources/yangman/services/yangman-design.services.js +++ b/modules/yangman-resources/src/main/resources/yangman/services/yangman-design.services.js @@ -90,7 +90,7 @@ define([], function () { handles: 'e', minWidth: 300, stop: function(event, ui) { - if (typeof(Storage) !== "undefined") { + if (typeof(Storage) !== 'undefined') { localStorage.setItem('yangman__left-panel-width', ui.size.width); } }, diff --git a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/request-data.tpl.html b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/request-data.tpl.html index d2e8c94d..48075019 100644 --- a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/request-data.tpl.html +++ b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/request-data.tpl.html @@ -6,6 +6,6 @@
- <<{{param.name}}>> : {{param.value !== undefined ? param.value : 'YANGUI_PARAM_DONT_REPLACE' | translate}} + <<{{param.name}}>> : {{param.value !== undefined ? param.value : 'YANGUI_PARAM_DONT_REPLACE' | translate}}
diff --git a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/request-header.tpl.html b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/request-header.tpl.html index 23e01d32..2493e277 100644 --- a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/request-header.tpl.html +++ b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/request-header.tpl.html @@ -17,7 +17,8 @@ + placeholder="{{'YANGMAN_REQ_URL' | translate}}" + spellcheck="false">