Commit a5504e681733d238a0ed6a24e5f9a6e2cc7519ef
Merge branch 'AAprintpreviewissue' into Develop
Showing
1 changed file
with
7 additions
and
0 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -4303,6 +4303,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | @@ -4303,6 +4303,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
4303 | $("#printcontainer").css('width', $(window).outerWidth()); | 4303 | $("#printcontainer").css('width', $(window).outerWidth()); |
4304 | $("#printcontainer").css('height', $(window).outerHeight()); | 4304 | $("#printcontainer").css('height', $(window).outerHeight()); |
4305 | } | 4305 | } |
4306 | + if ($location.url() == "/module-item-view") { | ||
4307 | + $("#aaDetailViewCanvas").css("display", "none"); | ||
4308 | + } | ||
4306 | }, 520); | 4309 | }, 520); |
4307 | } | 4310 | } |
4308 | else { | 4311 | else { |
@@ -4317,6 +4320,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | @@ -4317,6 +4320,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
4317 | $("#printcontainer").css('width', $(window).outerWidth()); | 4320 | $("#printcontainer").css('width', $(window).outerWidth()); |
4318 | $("#printcontainer").css('height', $(window).outerHeight()); | 4321 | $("#printcontainer").css('height', $(window).outerHeight()); |
4319 | } | 4322 | } |
4323 | + if ($location.url() == "/module-item-view") { | ||
4324 | + $("#aaDetailViewCanvas").css("display", "none"); | ||
4325 | + } | ||
4320 | }, 320); | 4326 | }, 320); |
4321 | } | 4327 | } |
4322 | 4328 | ||
@@ -4473,6 +4479,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | @@ -4473,6 +4479,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
4473 | $("#annotationToolBarOptions").removeClass("disableMenuoption"); | 4479 | $("#annotationToolBarOptions").removeClass("disableMenuoption"); |
4474 | $("#optionsListManagerTab").removeClass("disableMenuoption"); | 4480 | $("#optionsListManagerTab").removeClass("disableMenuoption"); |
4475 | $('#fileMenuAnchor').parent().removeClass('disableFileMenu'); | 4481 | $('#fileMenuAnchor').parent().removeClass('disableFileMenu'); |
4482 | + $("#aaDetailViewCanvas").css("display", "block"); | ||
4476 | if ($('#jsPanel-1').length > 0) | 4483 | if ($('#jsPanel-1').length > 0) |
4477 | $('#jsPanel-1').remove(); | 4484 | $('#jsPanel-1').remove(); |
4478 | console.log('close'); | 4485 | console.log('close'); |