Commit 34dc20b6637f19b524cfca2407e34c551131fbb3
Merge branch 'annotationToolBarDisableissue' into Develop
Showing
1 changed file
with
1 additions
and
1 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
| @@ -781,7 +781,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | @@ -781,7 +781,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
| 781 | $rootScope.isAnnotatiomToolBarPopupActive = true; | 781 | $rootScope.isAnnotatiomToolBarPopupActive = true; |
| 782 | $rootScope.isAnnotatiomToolBarPopupClosed = false; | 782 | $rootScope.isAnnotatiomToolBarPopupClosed = false; |
| 783 | $rootScope.isAnnotaionToolBarDrawingModeActive = false; | 783 | $rootScope.isAnnotaionToolBarDrawingModeActive = false; |
| 784 | - if ($rootScope.MenuModuleName == "DA" || $rootScope.MenuModuleName == "CI") { | 784 | + if ($rootScope.MenuModuleName == "DA" || $rootScope.MenuModuleName == "CI" || $rootScope.MenuModuleName == "AA") { |
| 785 | if ($rootScope.disableAnnotationtoolOnListManager == true) { | 785 | if ($rootScope.disableAnnotationtoolOnListManager == true) { |
| 786 | $('#AnnotaionPopupDiv').find('a,input, textarea, button, select,img,div').attr('disabled', 'disabled'); | 786 | $('#AnnotaionPopupDiv').find('a,input, textarea, button, select,img,div').attr('disabled', 'disabled'); |
| 787 | $('#slider-range-min-2').slider('disable'); | 787 | $('#slider-range-min-2').slider('disable'); |