Commit eadd7bbbee8e1a2e57d0d1325463eaa9a2b46455
Merge branch 'DrawBDSysetmPrintPrivAA' into Develop
Showing
1 changed file
with
10 additions
and
1 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
... | ... | @@ -4312,6 +4312,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
4312 | 4312 | } |
4313 | 4313 | if ($location.url() == "/module-item-view") { |
4314 | 4314 | $("#aaDetailViewCanvas").css("display", "none"); |
4315 | + $("#canvasPaint").css("display", "none"); | |
4316 | + $("#canvas").css("display", "none"); | |
4317 | + | |
4315 | 4318 | } |
4316 | 4319 | }, 520); |
4317 | 4320 | } |
... | ... | @@ -4329,6 +4332,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
4329 | 4332 | } |
4330 | 4333 | if ($location.url() == "/module-item-view") { |
4331 | 4334 | $("#aaDetailViewCanvas").css("display", "none"); |
4335 | + $("#canvasPaint").css("display", "none"); | |
4336 | + $("#canvas").css("display", "none"); | |
4332 | 4337 | } |
4333 | 4338 | }, 320); |
4334 | 4339 | } |
... | ... | @@ -4486,7 +4491,11 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
4486 | 4491 | $("#annotationToolBarOptions").removeClass("disableMenuoption"); |
4487 | 4492 | $("#optionsListManagerTab").removeClass("disableMenuoption"); |
4488 | 4493 | $('#fileMenuAnchor').parent().removeClass('disableFileMenu'); |
4489 | - $("#aaDetailViewCanvas").css("display", "block"); | |
4494 | + if ($location.url() == "/module-item-view") { | |
4495 | + $("#aaDetailViewCanvas").css("display", "block"); | |
4496 | + $("#canvasPaint").css("display", "block"); | |
4497 | + $("#canvas").css("display", "block"); | |
4498 | + } | |
4490 | 4499 | if ($('#jsPanel-1').length > 0) |
4491 | 4500 | $('#jsPanel-1').remove(); |
4492 | 4501 | console.log('close'); | ... | ... |