Commit 3261a410e930d08d6f19fed87930c01537342e6a
Merge branch 'printpriviewdisablelistmanager' into Develop
Showing
1 changed file
with
6 additions
and
1 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
... | ... | @@ -515,6 +515,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
515 | 515 | return moduleUrl === currentRoute ? 'active' : ''; |
516 | 516 | } |
517 | 517 | $("#annotationToolBarOptions").removeClass("disableMenuoption"); |
518 | + $("#optionsListManagerTab").removeClass("disableMenuoption"); | |
519 | + | |
520 | + | |
518 | 521 | if (($location.url() == "/da-body-view")) { |
519 | 522 | $rootScope.disableMenuannotation = " "; |
520 | 523 | $rootScope.disableMenuoption = " "; |
... | ... | @@ -3427,10 +3430,11 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
3427 | 3430 | }; |
3428 | 3431 | |
3429 | 3432 | $rootScope.ShowPrintPreviewWindow = function (event) { // Print Preview |
3430 | - | |
3433 | + $rootScope.CloseListManager(); | |
3431 | 3434 | $rootScope.CloseAnnotationTool(); |
3432 | 3435 | $("#annotationButton").parent().addClass("disableMenuannotation"); |
3433 | 3436 | $("#annotationToolBarOptions").addClass("disableMenuoption"); |
3437 | + $("#optionsListManagerTab").addClass("disableMenuoption"); | |
3434 | 3438 | $('#dvPrintPreview').css('display', 'block'); |
3435 | 3439 | html2canvas($("#canvasDiv"), { |
3436 | 3440 | onrendered: function (canvas) { |
... | ... | @@ -3611,6 +3615,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
3611 | 3615 | $("#ciImagePanel").css({ "pointer-events": "auto", "opacity": "1" }); |
3612 | 3616 | $("#annotationButton").parent().removeClass("disableMenuannotation"); |
3613 | 3617 | $("#annotationToolBarOptions").removeClass("disableMenuoption"); |
3618 | + $("#optionsListManagerTab").removeClass("disableMenuoption"); | |
3614 | 3619 | $('#fileMenuAnchor').removeClass('disableMenuannotation'); |
3615 | 3620 | if ($('#jsPanel-1').length > 0) |
3616 | 3621 | $('#jsPanel-1').remove(); | ... | ... |