From 8372182415813dbe15856ee9a5ccbdd5b9972aa2 Mon Sep 17 00:00:00 2001 From: nikita Date: Thu, 16 Mar 2017 18:31:57 +0530 Subject: [PATCH] Remove zoom button disable code in certain cases. and added generChange and viewChange to false for highlighting on zoom. --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index b0f1aa3..1da35ea 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -1400,7 +1400,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo if (evt.ctrlKey) { $rootScope.multiAnnotationIsON = true; - document.getElementById("btnZoom").setAttribute('disabled', 'disabled'); + //document.getElementById("btnZoom").setAttribute('disabled', 'disabled'); } else { 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 $rootScope.multiAnnotationIsON = false; - document.getElementById("btnZoom").disabled = false; + // document.getElementById("btnZoom").disabled = false; } //get mouse coordinate of mirror image click @@ -1779,7 +1779,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $rootScope.multiAnnotationIsON = true; //$("#btnZoom").addClass('disabled'); - document.getElementById("btnZoom").setAttribute('disabled', 'disabled'); + // document.getElementById("btnZoom").setAttribute('disabled', 'disabled'); //$('#btnZoom').click(function (event) { event.preventDefault(); }); console.log('CTRL ON') @@ -1793,7 +1793,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo console.log('multiAnnotationIsON: ' + $rootScope.multiAnnotationIsON); // document.getElementById("btnZoom").setAttribute('enabled', 'enabled'); - document.getElementById("btnZoom").disabled = false; + // document.getElementById("btnZoom").disabled = false; } var annotationText; @@ -5921,8 +5921,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $("#btnTranparency").removeClass("disabled"); $rootScope.isTransparencyBoxActivated = false; $rootScope.isNormalMode = false; - - + $rootScope.isGenderChnage = false; + $rootScope.isViewChange = false; //if listanager is visisble then close it $rootScope.CloseListManager(); -- libgit2 0.21.4