ADAM / AIAHTML5

Commit 4b30386f361e025fc5fa740dcb4ceba38aa5721b

Authored by Nikita Kulshreshtha
2 parents 3555617d 55ce5bd2

Merge branch 'brokenBodyOnSwitch' into Develop

Inline Side-by-side
Showing 1 changed file with 15 additions and 7 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @4b30386
... ... @@ -1384,6 +1384,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1384 1384  
1385 1385 if (evt.ctrlKey) {
1386 1386 $rootScope.multiAnnotationIsON = true;
  1387 +
  1388 + document.getElementById("btnZoom").setAttribute('disabled', 'disabled');
1387 1389 }
1388 1390 else {
1389 1391 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
1391 1393 }
1392 1394  
1393 1395 $rootScope.multiAnnotationIsON = false;
  1396 +
  1397 + document.getElementById("btnZoom").disabled = false;
1394 1398 }
1395 1399  
1396 1400 //get mouse coordinate of mirror image click
... ... @@ -1758,12 +1762,23 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1758 1762  
1759 1763 if (evt.ctrlKey) {
1760 1764 $rootScope.multiAnnotationIsON = true;
  1765 +
  1766 + //$("#btnZoom").addClass('disabled');
  1767 + document.getElementById("btnZoom").setAttribute('disabled', 'disabled');
  1768 + //$('#btnZoom').click(function (event) { event.preventDefault(); });
  1769 +
  1770 + console.log('CTRL ON')
1761 1771 }
1762 1772 else {
1763 1773 if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0)) {
1764 1774 $rootScope.previousHighlightList = [];
1765 1775 }
1766 1776 $rootScope.multiAnnotationIsON = false;
  1777 +
  1778 + console.log('multiAnnotationIsON: ' + $rootScope.multiAnnotationIsON);
  1779 + // document.getElementById("btnZoom").setAttribute('enabled', 'enabled');
  1780 +
  1781 + document.getElementById("btnZoom").disabled = false;
1767 1782 }
1768 1783  
1769 1784 var annotationText;
... ... @@ -1917,9 +1932,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1917 1932  
1918 1933 }
1919 1934 else {
1920   -
1921   -
1922   -
1923 1935 $scope.MultiLanguageAnnationArray = [];
1924 1936 $scope.MultiLanguageAnnationArray.push(annotationText);
1925 1937  
... ... @@ -6910,12 +6922,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6910 6922 $rootScope.CloseAnnotationTool();
6911 6923 }
6912 6924  
6913   -
6914 6925 //clsoe worker process
6915 6926 $scope.$on('jsPanelCloseEvent', function (event, data) {
6916   -
6917   -
6918   -
6919 6927 console.log('terminate worker process')
6920 6928 //terminate previous running workers to create space for new workers
6921 6929 $scope.terminateCurrentlyRunningWPs();
... ...