ADAM / AIAHTML5

Commit 6ed41bbb594528bd1f3d4c5dbec12ccf5a3f8c4d

Authored by Amrita Vishnoi
2 parents dc1cfa04 b334d6e9

Merge branch 'AAToolBarDisable' of http://52.6.196.163/ADAM/AIAHTML5 into Develop

Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @6ed41bb
... ... @@ -3283,7 +3283,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3283 3283 $("#optionsListManagerTab").removeClass("active");
3284 3284 console.log('close');
3285 3285 $rootScope.disableAnnotationtoolOnListManager = false;
3286   - if ($rootScope.MenuModuleName == "DA") {
  3286 + if ($rootScope.MenuModuleName == "DA" || $rootScope.MenuModuleName == "AA") {
3287 3287 $("#annotationpaintbrushsize").attr("href", "#canvasPaint");
3288 3288 $("#annotationpainteraser").attr("href", "#canvasPaint");
3289 3289 if ($rootScope.disableAnnotationtoolOnListManager == false) {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @6ed41bb
... ... @@ -127,7 +127,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
127 127 //});
128 128 $scope.isOpenBtnClicked = false;
129 129 $scope.openModuleItemView = function (event) {
130   -
  130 + $rootScope.MenuModuleName = "AA";
131 131 localStorage.setItem("activeTab", $scope.activeTab);
132 132 //0. Get selected Image Id
133 133 if ($scope.isListViewButtonClicked == true) {
... ...