ADAM / AIAHTML5

Commit 8372182415813dbe15856ee9a5ccbdd5b9972aa2

Authored by Nikita Kulshreshtha
1 parent 2977630c

Remove zoom button disable code in certain cases. 

and added generChange and viewChange to false for highlighting on zoom.
Inline Side-by-side
Showing 1 changed file with 6 additions and 6 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @8372182
... ... @@ -1400,7 +1400,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1400 1400 if (evt.ctrlKey) {
1401 1401 $rootScope.multiAnnotationIsON = true;
1402 1402  
1403   - document.getElementById("btnZoom").setAttribute('disabled', 'disabled');
  1403 + //document.getElementById("btnZoom").setAttribute('disabled', 'disabled');
1404 1404 }
1405 1405 else {
1406 1406 if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0)) {
... ... @@ -1409,7 +1409,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1409 1409  
1410 1410 $rootScope.multiAnnotationIsON = false;
1411 1411  
1412   - document.getElementById("btnZoom").disabled = false;
  1412 + // document.getElementById("btnZoom").disabled = false;
1413 1413 }
1414 1414  
1415 1415 //get mouse coordinate of mirror image click
... ... @@ -1779,7 +1779,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1779 1779 $rootScope.multiAnnotationIsON = true;
1780 1780  
1781 1781 //$("#btnZoom").addClass('disabled');
1782   - document.getElementById("btnZoom").setAttribute('disabled', 'disabled');
  1782 + // document.getElementById("btnZoom").setAttribute('disabled', 'disabled');
1783 1783 //$('#btnZoom').click(function (event) { event.preventDefault(); });
1784 1784  
1785 1785 console.log('CTRL ON')
... ... @@ -1793,7 +1793,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1793 1793 console.log('multiAnnotationIsON: ' + $rootScope.multiAnnotationIsON);
1794 1794 // document.getElementById("btnZoom").setAttribute('enabled', 'enabled');
1795 1795  
1796   - document.getElementById("btnZoom").disabled = false;
  1796 + // document.getElementById("btnZoom").disabled = false;
1797 1797 }
1798 1798  
1799 1799 var annotationText;
... ... @@ -5921,8 +5921,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5921 5921 $("#btnTranparency").removeClass("disabled");
5922 5922 $rootScope.isTransparencyBoxActivated = false;
5923 5923 $rootScope.isNormalMode = false;
5924   -
5925   -
  5924 + $rootScope.isGenderChnage = false;
  5925 + $rootScope.isViewChange = false;
5926 5926 //if listanager is visisble then close it
5927 5927  
5928 5928 $rootScope.CloseListManager();
... ...