diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index fae0173..a75ff44 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -1384,6 +1384,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo if (evt.ctrlKey) { $rootScope.multiAnnotationIsON = true; + + document.getElementById("btnZoom").setAttribute('disabled', 'disabled'); } else { if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0)) { @@ -1391,6 +1393,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } $rootScope.multiAnnotationIsON = false; + + document.getElementById("btnZoom").disabled = false; } //get mouse coordinate of mirror image click @@ -1758,12 +1762,23 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo if (evt.ctrlKey) { $rootScope.multiAnnotationIsON = true; + + //$("#btnZoom").addClass('disabled'); + document.getElementById("btnZoom").setAttribute('disabled', 'disabled'); + //$('#btnZoom').click(function (event) { event.preventDefault(); }); + + console.log('CTRL ON') } else { if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0)) { $rootScope.previousHighlightList = []; } $rootScope.multiAnnotationIsON = false; + + console.log('multiAnnotationIsON: ' + $rootScope.multiAnnotationIsON); + // document.getElementById("btnZoom").setAttribute('enabled', 'enabled'); + + document.getElementById("btnZoom").disabled = false; } var annotationText; @@ -1917,9 +1932,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } else { - - - $scope.MultiLanguageAnnationArray = []; $scope.MultiLanguageAnnationArray.push(annotationText); @@ -6910,12 +6922,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $rootScope.CloseAnnotationTool(); } - //clsoe worker process $scope.$on('jsPanelCloseEvent', function (event, data) { - - - console.log('terminate worker process') //terminate previous running workers to create space for new workers $scope.terminateCurrentlyRunningWPs();