diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index f2828e2..6f51706 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -2327,8 +2327,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //layer change function $scope.LayerChange = function () { - //remove annotation - + + //if listanager is visisble then close it + $rootScope.isListManagerSelected = false; + + $rootScope.CloseListManager(); @@ -3295,6 +3298,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.createTransparencyBox = function () { + //if listanager is visisble then close it + + $rootScope.isListManagerSelected = false; + $rootScope.CloseListManager(); + + $scope.isTransparencyActivated = true; // alert('transparencyClicked' + $scope.isTransparencyActivated) $('#btnTranparency').addClass('tButtonActive'); @@ -4492,6 +4501,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.OnIdentityClick = function () { + + //if listanager is visisble then close it + + $rootScope.isListManagerSelected = false; + $rootScope.CloseListManager(); // $('#btnIdentity').addClass('btn-primary'); if ($scope.isTransparencyActivated == true) { @@ -4512,7 +4526,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.enableZoom = function () { - //remove speech bubble + + //if listanager is visisble then close it + + $rootScope.isListManagerSelected = false; + $rootScope.CloseListManager(); + $('#sppeachBubble').css('display', 'none'); $("#dot").css("display", "none"); @@ -4527,6 +4546,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $rootScope.isZoomed = true; //1. + $scope.flushCanvas(); if ($scope.zoomInOut == 25) { @@ -4674,6 +4694,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo + + //if listanager is visisble then close it + + // $rootScope.isListManagerSelected = false; + $rootScope.CloseListManager(); + if ($rootScope.isHighLight == true) { } @@ -4729,6 +4755,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.enableNormalMode = function () { + + //if listanager is visisble then close it + + // $rootScope.isListManagerSelected = false; + $rootScope.CloseListManager(); + if ($rootScope.isNormalMode == true) { } @@ -4780,6 +4812,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.enableExtract = function () { + + + //if listanager is visisble then close it + + // $rootScope.isListManagerSelected = false; + $rootScope.CloseListManager(); //1. $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); @@ -4839,6 +4877,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.enableShowHideStructureBox = function () { + + //if listanager is visisble then close it + + $rootScope.isListManagerSelected = false; + $rootScope.CloseListManager(); + $(".com").toggle(); $('#dot').toggle(); $('#sppeachBubble').toggle() @@ -5284,6 +5328,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.OnGenderChange = function (event) { + //if listanager is visisble then close it + + $rootScope.isListManagerSelected = false; + $rootScope.CloseListManager(); + $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); @@ -5441,6 +5490,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.OnViewChange = function (event) { + //if listanager is visisble then close it + + $rootScope.isListManagerSelected = false; + $rootScope.CloseListManager(); + + $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); @@ -5603,13 +5658,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //if ($rootScope.isSettingEventAlredayDispachted == true) { - $scope.loadSelectedBodyView(data.reloadDABodyViewId); + $scope.loadSelectedBodyView(data.reloadDABodyViewId); - $scope.loadSelectedBodyViewNavigator(data.reloadDABodyViewId); + $scope.loadSelectedBodyViewNavigator(data.reloadDABodyViewId); - $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle"); + $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle"); - //$rootScope.isSettingEventAlredayDispachted = false; + //$rootScope.isSettingEventAlredayDispachted = false; //} }) @@ -6286,7 +6341,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $rootScope.textArea = $("#text_area").val(); $("#canvas").removeLayer('TextArea_' + $rootScope.resetText).drawLayers(); $("#canvas").removeLayer("TextRect_" + $rootScope.resetTextRect).drawLayers(); - + $('#canvas').drawText({ layer: true, draggable: true, @@ -6539,6 +6594,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.HighlightBodyByBodySystem = function (event) { + //if listanager is visisble then close it + + $rootScope.isListManagerSelected = false; + $rootScope.CloseListManager(); + + //NIKITA $scope.isHighlightBodyByBodySystem = true; $scope.systemMatchedTermList = new jinqJs() @@ -6865,7 +6926,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo var systemList = $rootScope.CommonData.DACommonData.BodySystems.Item; $('#bodySystems').empty(); - + var $all = $('').appendTo('#bodySystems'); $compile($all)($scope); @@ -6892,7 +6953,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //confirm that this is DA module which is last open if (currentOpenModuleId == 1) { - + $('#termList').empty(); $scope.loadListManger(); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index 5c29cd7..ad5c07a 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -72,7 +72,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", if (alreadyOpenThisView != null) { for (var i = 0; i < $rootScope.openViews.length; i++) { k++; - if ($rootScope.openViews[i].body - views == title) { + if ($rootScope.openViews[i].body-views == title) { $rootScope.openViews.splice((k - 1), 1); $rootScope.openViews.push( @@ -395,7 +395,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", $rootScope.CloseListManager = function () { console.log('close') - $rootScope.isListManagerSelected = false; + //$rootScope.isListManagerSelected = false; $('#listManager').css('display', 'none'); $("#listManager").css("visibility", "hidden"); // $rootScope.isAnnotationWindowClose = true; diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html index d02ccc4..9ef6575 100644 --- a/400-SOURCECODE/AIAHTML5.Web/index.html +++ b/400-SOURCECODE/AIAHTML5.Web/index.html @@ -1,7 +1,7 @@  - +