diff --git a/400-SOURCECODE/AIAHTML5.API/Web.config b/400-SOURCECODE/AIAHTML5.API/Web.config index f7d8a30..51437da 100644 --- a/400-SOURCECODE/AIAHTML5.API/Web.config +++ b/400-SOURCECODE/AIAHTML5.API/Web.config @@ -39,7 +39,7 @@ - + diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index d8cc549..9ef1d61 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -554,30 +554,34 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic } $rootScope.openParent = function (slug) { + if ($('#jsPanel-1').length > 0) { - var openViews = $rootScope.openViews; - if (openViews.length > 0) { - $rootScope.openViews.splice(openViews.length - 1); } - if (openViews.length > 0) { - var lastOpenMoudle = $rootScope.openViews[openViews.length - 1]; - } - $('#daImagePanel').remove(); - if ($('#jsPanel-1').length > 0) - $('#jsPanel-1').remove(); + else { + var openViews = $rootScope.openViews; + if (openViews.length > 0) { + $rootScope.openViews.splice(openViews.length - 1); + } + if (openViews.length > 0) { + var lastOpenMoudle = $rootScope.openViews[openViews.length - 1]; + } + // $('#daImagePanel').remove(); + if ($('#jsPanel-1').length > 0) + $('#jsPanel-1').remove(); - if ($('#3DImagePanel').length > 0) - $('#3DImagePanel').remove(); + if ($('#3DImagePanel').length > 0) + $('#3DImagePanel').remove(); - if ($('#ciImagePanel').length > 0) - $('#ciImagePanel').remove(); + if ($('#ciImagePanel').length > 0) + $('#ciImagePanel').remove(); - if ($('#caVideoPanel').length > 0) - $('#caVideoPanel').remove(); + if ($('#caVideoPanel').length > 0) + $('#caVideoPanel').remove(); - $location.url('/' + slug); + $location.url('/' + slug); - $rootScope.$broadcast('jsPanelCloseEvent', true); + $rootScope.$broadcast('jsPanelCloseEvent', true); + } } //called on jsanel minimize @@ -3444,19 +3448,21 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic if ($('#daImagePanel').length > 0) { console.log('close') //$('#daImagePanel').css('display', 'none'); - $('#daImagePanel').remove(); + // $('#daImagePanel').remove(); } } }); }; function OpenJSPanel() { + $("#daImagePanel").css({ "pointer-events": "none", "opacity": ".5" }); + $("#ciImagePanel").css({ "pointer-events": "none", "opacity": ".5" }); $.jsPanel({ id: 'jsPanel-1', selector: '#dvPrintPreview', theme: 'success', currentController: 'HomeController', - parentSlug: 'da-view-list', //After closing panel, control moves to here + //parentSlug: 'da-view-list', //After closing panel, control moves to here ajax: { url: 'app/views/home/printPreview.html' }, @@ -3559,11 +3565,16 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic console.log('close') } - $(document).on('click', '.jsglyph-remove', function () { + $(document).on('click', '#jsPanel-1 .jsglyph-remove', function () { + $("#daImagePanel").css({ "pointer-events": "auto", "opacity": "1" }); + $("#ciImagePanel").css({ "pointer-events": "auto", "opacity": "1" }); + $("#annotationButton").parent().removeClass("disableMenuannotation"); + $("#annotationToolBarOptions").removeClass("disableMenuoption"); $('#fileMenuAnchor').removeClass('disableMenuannotation'); if ($('#jsPanel-1').length > 0) $('#jsPanel-1').remove(); - console.log('close') + console.log('close'); + }); $rootScope.restrictBodySystemList = function () { diff --git a/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css b/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css index cdb4183..d2fad17 100644 --- a/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css +++ b/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css @@ -990,4 +990,8 @@ background-size:cover; border-top: none; padding: 20px 10px; text-align:center; + } + #jsPanel-1 + { + z-index:11111; } \ No newline at end of file