ADAM / AIAHTML5

Commit 44cef165e0b0f2dc1b9b63d9424354168a4e5d58

Authored by Amrita Vishnoi
1 parent 8566ff1d

We have switched off zoom button for now if user will choose multi annotation th… 

…en he will be unable to click on zoom button but when will leave the CTRL key , will get back the zoom button enabled. This is a fix for disorder body view.
Inline Side-by-side
Showing 1 changed file with 11 additions and 7 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @44cef16
... ... @@ -1709,12 +1709,23 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1709 1709  
1710 1710 if (evt.ctrlKey) {
1711 1711 $rootScope.multiAnnotationIsON = true;
  1712 +
  1713 + //$("#btnZoom").addClass('disabled');
  1714 + document.getElementById("btnZoom").setAttribute('disabled', 'disabled');
  1715 + //$('#btnZoom').click(function (event) { event.preventDefault(); });
  1716 +
  1717 + console.log('CTRL ON')
1712 1718 }
1713 1719 else {
1714 1720 if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0)) {
1715 1721 $rootScope.previousHighlightList = [];
1716 1722 }
1717 1723 $rootScope.multiAnnotationIsON = false;
  1724 +
  1725 + console.log('multiAnnotationIsON: ' + $rootScope.multiAnnotationIsON);
  1726 + // document.getElementById("btnZoom").setAttribute('enabled', 'enabled');
  1727 +
  1728 + document.getElementById("btnZoom").disabled = false;
1718 1729 }
1719 1730  
1720 1731 var annotationText;
... ... @@ -1868,9 +1879,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1868 1879  
1869 1880 }
1870 1881 else {
1871   -
1872   -
1873   -
1874 1882 $scope.MultiLanguageAnnationArray = [];
1875 1883 $scope.MultiLanguageAnnationArray.push(annotationText);
1876 1884  
... ... @@ -6688,12 +6696,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6688 6696  
6689 6697 }
6690 6698  
6691   -
6692 6699 //clsoe worker process
6693 6700 $scope.$on('jsPanelCloseEvent', function (event, data) {
6694   -
6695   -
6696   -
6697 6701 console.log('terminate worker process')
6698 6702 //terminate previous running workers to create space for new workers
6699 6703 $scope.terminateCurrentlyRunningWPs();
... ...