diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 1b7cf7a..e592ebb 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -559,7 +559,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $('#daBodyview').css("width", $(window).outerWidth()); - }, 250); + }, 350); } } @@ -8609,6 +8609,8 @@ function OnIdentityClick() { function OnZoom() { + if ($(".btn-annotation").hasClass("activebtncolor")) //Bug #14928 + $(".btn-annotation").removeClass("activebtncolor"); //Dissectible Anatomy > Extract and Annotations displays apart on the page after click on Zoom-in. $(".com").remove(); $("#bord").remove(); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index d1f98a9..6d182b1 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -69,6 +69,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $rootScope.shapestyleborderWidth = 2; $rootScope.shapestyleborderStyles = "solid"; $rootScope.errorMassage = ''; + $rootScope.disableFileMenu = "disableFileMenu"; $rootScope.userInfo = { username: null, @@ -411,8 +412,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic if (($location.url() == "/da-body-view")) { $rootScope.disableMenuannotation = " "; $rootScope.disableMenuoption = " "; - $("#annotationToolBarOptions").removeClass("disableSubMenu"); - + $rootScope.disableSubMenu = "disableSubMenu"; + $rootScope.disableFileMenu = " "; } else if ($location.url() == "/clinical-illustrations-detail") { @@ -420,6 +421,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $rootScope.disableMenuoption = " "; $rootScope.disableSubMenu = "disableSubMenu"; $("#annotationToolBarOptions").removeClass("disableSubMenu"); + $rootScope.disableFileMenu = " "; } else if($location.url() == "/clinical-animations-detail") { @@ -427,6 +429,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $rootScope.disableMenuoption = " "; $rootScope.disableSubMenu = "disableSubMenu"; $("#annotationToolBarOptions").addClass("disableSubMenu"); + $rootScope.disableFileMenu = " "; } else { $("#annotationToolBarOptions").removeClass("disableSubMenu"); @@ -443,7 +446,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic if ($rootScope.menuLabExer == 1) { $rootScope.disableMenuoption = " "; } - + $rootScope.disableFileMenu = "disableFileMenu"; } }); @@ -2812,8 +2815,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic //$("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" }); //$('#termList option[value="' + $rootScope.SelectedTermList + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" }); - $("#optionsListManagerTab").addClass("active"); + } + $("#optionsListManagerTab").addClass("active"); } $rootScope.CloseListManager = function () { @@ -3108,9 +3112,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $('#snipImage').attr('src', dataURL); $('#spnModule').text($rootScope.currentActiveModuleTitle); - $('#spnPosture').text(localStorage.getItem('currentViewTitle')); + $('#spnBodyViewTitle').text(localStorage.getItem('currentViewTitle')); - PrintDIVContent('printBox'); // Open Print Window + PrintDivContentByID('printBox'); // Open Print Window } }); }; @@ -3143,7 +3147,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic document.getElementById('spnBodyViewTitlePor').innerHTML = curPosture; document.getElementById('spnModuleLan').innerHTML = curModule; document.getElementById('spnBodyViewTitleLan').innerHTML = curPosture; - }, 100); + }, 320); } $('#fileMenuAnchor').addClass('disableMenuannotation'); @@ -3259,7 +3263,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic window.frames["frame1"].focus(); window.frames["frame1"].print(); frame1.remove(); - }, 250); + }, 320); console.log('close') } @@ -3271,21 +3275,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic console.log('close') }); - $rootScope.ShowPrintWindow = function () { // Print Active Viewer - html2canvas($("#canvasDiv"), { - onrendered: function (canvas) { - var dataURL = canvas.toDataURL("image/jpeg"); - var imageToPrint = new Image(); - imageToPrint.src = dataURL; - $('#snipImage').attr('src', dataURL); - - $('#spnModule').text($rootScope.currentActiveModuleTitle); - $('#spnBodyViewTitle').text(localStorage.getItem('currentViewTitle')); - - PrintDivContentByID('printBox'); // Open Print Window - } - }); - }; $rootScope.restrictBodySystemList = function () { var RestrictListDiv = document.getElementById("restrictListDiv"); if (RestrictListDiv.style.display == 'block') { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html index 0a45dc3..9699079 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html @@ -1,24 +1,24 @@  + \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html index 7bbba52..15262dd 100644 --- a/400-SOURCECODE/AIAHTML5.Web/index.html +++ b/400-SOURCECODE/AIAHTML5.Web/index.html @@ -557,7 +557,7 @@
-
Modesty Setting
+
Modesty Settings