ADAM / AIAHTML5

Commit c72081e83f40c769a42c6c7f1e86fba488c7eb57

Authored by Birendra
2 parents 4d9219d1 227608de

Merge branch 'AIAOptionFix' into AIA_Develop

Inline Side-by-side
Showing 5 changed files with 152 additions and 150 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
  View file @c72081e
... ... @@ -506,10 +506,10 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
506 506 $("#ThreeDImagePanel_" + windowviewid).unbind('mouseenter');// remove prev event
507 507  
508 508 $("#ThreeDImagePanel_" + windowviewid).on('mouseenter', function (event) {
509   - // var pnlName = event.currentTarget.id;
  509 + var pnlName = event.currentTarget.id;
510 510 //console.log('Mouse enter fired: ' + event.currentTarget.id);
511 511 $scope.$emit("cBEnableDisableMenuOption", "");
512   - $rootScope.resetMenuOptionOnClick("");
  512 + $rootScope.resetMenuOptionOnClick(pnlName);
513 513  
514 514 });
515 515  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
  View file @c72081e
... ... @@ -785,13 +785,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
785 785 $location.path('/');
786 786 }
787 787  
788   - if ($rootScope.disableAnnotationTB == true)
789   - {
790   - $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled');
791   - $('#slider-range-min-2').slider('disable');
792   - $("#annotationpaintbrushsize").attr('disabled', 'disabled');
793   - //$("#annotationpaintbrushsize").attr("href", "#");
794   - }
795 788 $rootScope.isLoading = true;
796 789 $('#spinner').css('visibility', 'visible');
797 790  
... ... @@ -965,8 +958,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
965 958 $rootScope.resetMenuOption();
966 959 // call from while open module in CB
967 960 $("#caImagePanel_" + windowviewid).on('click', function (event) {
968   - $rootScope.resetMenuOptionOnClick("");
969   - // var pnlName = event.currentTarget.id;
  961 + var pnlName = event.currentTarget.id;
  962 + $rootScope.resetMenuOptionOnClick(pnlName);
970 963 $scope.$emit("cBEnableDisableMenuOption", "");
971 964  
972 965 });
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @c72081e
... ... @@ -53,8 +53,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
53 53 $rootScope.isModestyOn;
54 54 $rootScope.isModestyOff;
55 55 $rootScope.SetSettingActiveTab;
56   - $rootScope.disableMenuannotation = "disableMenuannotation";
57   - $rootScope.disableMenuoption = "disableMenuoption";
  56 + $("#annotationButton").addClass("disableMenuoption");
  57 + $("#Menuoptionid").addClass("disableMenuoption");
58 58 $rootScope.menuLabExer;
59 59 $rootScope.menuLabExer = 0;
60 60  
... ... @@ -1649,18 +1649,19 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1649 1649 var currentRoute = $location.path().substring(1);
1650 1650 return moduleUrl === currentRoute ? 'active' : '';
1651 1651 }
1652   - $("#annotationToolBarOptions").removeClass("disableMenuoption");
  1652 + $("#annotationToolBarOptions").removeClass("disableSubMenu");
1653 1653 $("#optionsListManagerTab").removeClass("disableSubMenu");
1654 1654 $("#optiontSetting").removeClass("disableSubMenu");
1655 1655  
1656 1656 var userInformation = $rootScope.userData;
1657 1657 if (($location.url() == "/da-body-view")) {
1658   - $rootScope.disableMenuannotation = " ";
1659   - $rootScope.disableMenuoption = " ";
1660   - $rootScope.disableSubMenu = "disableSubMenu";
  1658 + $("#annotationButton").removeClass("disableMenuoption");
  1659 + $("#Menuoptionid").removeClass("disableMenuoption");
  1660 + $("#labExPdfOption").addClass("disableSubMenu");
1661 1661 $rootScope.disableFileMenu = " ";
1662 1662 $rootScope.openResources = "";
1663 1663 $rootScope.OpenPitures = "OpenPitures";
  1664 + $rootScope.disableMenuoption = "disableMenuoption";
1664 1665 $rootScope.newCurriculum = "newCurriculum";
1665 1666 $rootScope.openCurriculum = "openCurriculum";
1666 1667 $rootScope.saveCurriculam = "saveCurriculam";
... ... @@ -1671,15 +1672,16 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1671 1672  
1672 1673 }
1673 1674 else if ($location.url() == "/clinical-illustrations-detail") {
1674   - $rootScope.disableMenuannotation = " ";
1675   - $rootScope.disableMenuoption = " ";
1676   - $rootScope.disableSubMenu = "disableSubMenu";
  1675 + $("#annotationButton").removeClass("disableMenuoption");
  1676 + $("#Menuoptionid").removeClass("disableMenuoption");
  1677 + $("#labExPdfOption").addClass("disableSubMenu");
1677 1678 $("#annotationToolBarOptions").removeClass("disableSubMenu");
1678 1679 $("#optionsListManagerTab").addClass("disableSubMenu");
1679 1680 $("#optiontSetting").addClass("disableSubMenu");
1680 1681 $rootScope.disableFileMenu = " ";
1681 1682 $rootScope.openResources = "";
1682 1683 $rootScope.OpenPitures = "OpenPitures";
  1684 + $rootScope.disableMenuoption = "disableMenuoption";
1683 1685 $rootScope.newCurriculum = "newCurriculum";
1684 1686 $rootScope.openCurriculum = "openCurriculum";
1685 1687 $rootScope.saveCurriculam = "saveCurriculam";
... ... @@ -1689,14 +1691,15 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1689 1691 $scope.EnableDisableExportImage();
1690 1692 }
1691 1693 else if ($location.url() == "/module-item-view") {
1692   - $rootScope.disableMenuannotation = " ";
1693   - $rootScope.disableMenuoption = " ";
  1694 + $("#annotationButton").removeClass("disableMenuoption");
  1695 + $("#Menuoptionid").removeClass("disableMenuoption");
1694 1696 $("#optiontSetting").addClass("disableSubMenu");
1695   - $rootScope.disableSubMenu = "disableSubMenu";
  1697 + $("#labExPdfOption").addClass("disableSubMenu");
1696 1698 $("#annotationToolBarOptions").removeClass("disableSubMenu");
1697 1699 $rootScope.disableFileMenu = " ";
1698 1700 $rootScope.openResources = "";
1699 1701 $rootScope.OpenPitures = "OpenPitures";
  1702 + $rootScope.disableMenuoption = "disableMenuoption";
1700 1703 $rootScope.newCurriculum = "newCurriculum";
1701 1704 $rootScope.openCurriculum = "openCurriculum";
1702 1705 $rootScope.saveCurriculam = "saveCurriculam";
... ... @@ -1707,14 +1710,15 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1707 1710 }
1708 1711  
1709 1712 else if ($location.url() == "/clinical-animations-detail") {
1710   - $rootScope.disableMenuannotation = "disableMenuannotation";
1711   - $rootScope.disableMenuoption = "disableMenuoption";
1712   - $rootScope.disableSubMenu = "disableSubMenu";
  1713 + $("#annotationButton").addClass("disableMenuoption");
  1714 + $("#Menuoptionid").addClass("disableMenuoption");
  1715 + $("#labExPdfOption").addClass("disableSubMenu");
1713 1716 $("#annotationToolBarOptions").addClass("disableSubMenu");
1714 1717 $("#optionsListManagerTab").addClass("disableSubMenu");
1715 1718 $rootScope.disableFileMenu = " ";
1716 1719 $rootScope.openResources = "";
1717 1720 $rootScope.OpenPitures = "OpenPitures";
  1721 + $rootScope.disableMenuoption = "disableMenuoption";
1718 1722 $rootScope.newCurriculum = "newCurriculum";
1719 1723 $rootScope.openCurriculum = "openCurriculum";
1720 1724 $rootScope.saveCurriculam = "saveCurriculam";
... ... @@ -1726,8 +1730,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1726 1730  
1727 1731 $rootScope.openResources = "openResources";
1728 1732  
1729   - $rootScope.disableMenuannotation = "disableMenuannotation";
1730   - $rootScope.disableMenuoption = "disableMenuoption";
  1733 + $("#annotationButton").addClass("disableMenuoption");
  1734 + $("#Menuoptionid").addClass("disableMenuoption");
1731 1735 $rootScope.PrintPreview = "PrintPreview";
1732 1736 $rootScope.PrintViewer = "PrintViewer";
1733 1737  
... ... @@ -1735,32 +1739,36 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1735 1739 $rootScope.openCurriculum = "";
1736 1740 $rootScope.saveCurriculam = "saveCurriculam";
1737 1741  
1738   - $rootScope.disableSubMenu = "disableSubMenu";
  1742 + $("#labExPdfOption").addClass("disableSubMenu");
1739 1743 $rootScope.OpenPitures = "OpenPitures";
  1744 + $rootScope.disableMenuoption = "disableMenuoption";
1740 1745 $rootScope.disableFileMenu = "";
1741 1746 $rootScope.exportImage = "exportImage";
1742 1747 }
1743 1748 else if ($location.url() == "/curriculum-builder-detail") {
1744 1749 $rootScope.disableFileMenu = "";
1745   - $rootScope.disableMenuoption = "disableMenuoption";
  1750 + $("#Menuoptionid").addClass("disableMenuoption");
1746 1751 $rootScope.PrintPreview = "PrintPreview";
1747 1752 $rootScope.PrintViewer = "PrintViewer";
1748 1753 $rootScope.newCurriculum = "";
1749 1754 $rootScope.openCurriculum = "";
1750 1755 $rootScope.saveCurriculam = "";
1751 1756 $rootScope.openResources = "";
  1757 + $rootScope.OpenPitures = "OpenPitures";
  1758 + $rootScope.disableMenuoption = "disableMenuoption";
1752 1759 $rootScope.exportImage = "exportImage";
1753 1760 }
1754 1761 else if ($location.url() == "/adam-images-detail") {
1755   - $rootScope.disableMenuannotation = " ";
1756   - $rootScope.disableMenuoption = " ";
1757   - $rootScope.disableSubMenu = "disableSubMenu";
  1762 + $("#annotationButton").removeClass("disableMenuoption");
  1763 + $("#Menuoptionid").removeClass("disableMenuoption");
  1764 + $("#labExPdfOption").addClass("disableSubMenu");
1758 1765 $("#annotationToolBarOptions").removeClass("disableSubMenu");
1759 1766 $("#optionsListManagerTab").addClass("disableSubMenu");
1760 1767 $("#optiontSetting").addClass("disableSubMenu");
1761 1768 $rootScope.disableFileMenu = " ";
1762 1769 $rootScope.openResources = "";
1763 1770 $rootScope.OpenPitures = "OpenPitures";
  1771 + $rootScope.disableMenuoption = "disableMenuoption";
1764 1772 $rootScope.newCurriculum = "newCurriculum";
1765 1773 $rootScope.openCurriculum = "openCurriculum";
1766 1774 $rootScope.saveCurriculam = "saveCurriculam";
... ... @@ -1770,14 +1778,15 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1770 1778 $scope.EnableDisableExportImage();
1771 1779 }
1772 1780 else if ($location.url() == "/3d-anatomy-details") {
1773   - $rootScope.disableMenuannotation = "disableMenuannotation";
1774   - $rootScope.disableMenuoption = "disableMenuoption";
1775   - $rootScope.disableSubMenu = "disableSubMenu";
  1781 + $("#annotationButton").addClass("disableMenuoption");
  1782 + $("#Menuoptionid").addClass("disableMenuoption");
  1783 + $("#labExPdfOption").addClass("disableSubMenu");
1776 1784 $("#annotationToolBarOptions").addClass("disableSubMenu");
1777 1785 $("#optionsListManagerTab").addClass("disableSubMenu");
1778 1786 $rootScope.disableFileMenu = " ";
1779 1787 $rootScope.openResources = "";
1780 1788 $rootScope.OpenPitures = "OpenPitures";
  1789 + $rootScope.disableMenuoption = "disableMenuoption";
1781 1790 $rootScope.newCurriculum = "newCurriculum";
1782 1791 $rootScope.openCurriculum = "openCurriculum";
1783 1792 $rootScope.saveCurriculam = "saveCurriculam";
... ... @@ -1786,14 +1795,15 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1786 1795 $rootScope.exportImage = "exportImage";
1787 1796 }
1788 1797 else if ($location.url() == "/lab-exercise-view") {
1789   - $rootScope.disableMenuannotation = "disableMenuannotation";
1790   - $rootScope.disableMenuoption = "disableMenuoption";
1791   - $rootScope.disableSubMenu = "disableSubMenu";
  1798 + $("#annotationButton").addClass("disableMenuoption");
  1799 + $("#Menuoptionid").removeClass("disableMenuoption");
  1800 + $("#labExPdfOption").removeClass("disableSubMenu");
1792 1801 $("#annotationToolBarOptions").addClass("disableSubMenu");
1793 1802 $("#optionsListManagerTab").addClass("disableSubMenu");
1794 1803 $rootScope.disableFileMenu = " ";
1795 1804 $rootScope.openResources = "";
1796 1805 $rootScope.OpenPitures = "OpenPitures";
  1806 + $rootScope.disableMenuoption = "disableMenuoption";
1797 1807 $rootScope.newCurriculum = "newCurriculum";
1798 1808 $rootScope.openCurriculum = "openCurriculum";
1799 1809 $rootScope.saveCurriculam = "saveCurriculam";
... ... @@ -1804,9 +1814,9 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1804 1814 else {
1805 1815 $("#annotationToolBarOptions").removeClass("disableSubMenu");
1806 1816 $("#optionsListManagerTab").removeClass("disableSubMenu");
1807   - $rootScope.disableMenuannotation = "disableMenuannotation";
1808   - $rootScope.disableMenuoption = "disableMenuoption";
1809   - $rootScope.disableSubMenu = "";
  1817 + $("#annotationButton").addClass("disableMenuoption");
  1818 + $("#Menuoptionid").addClass("disableMenuoption");
  1819 + $("#labExPdfOption").removeClass("disableSubMenu");
1810 1820 $rootScope.CloseAnnotationTool();
1811 1821 $rootScope.CloseListManager();
1812 1822 angular.element('#modal-settings').css('display', 'none');
... ... @@ -1815,7 +1825,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1815 1825 $rootScope.menuLabExer = 0;
1816 1826 }
1817 1827 if ($rootScope.menuLabExer == 1) {
1818   - $rootScope.disableMenuoption = " ";
  1828 + $("#Menuoptionid").removeClass("disableMenuoption");
1819 1829 $("#annotationToolBarOptions").addClass("disableSubMenu");
1820 1830 $("#optionsListManagerTab").addClass("disableSubMenu");
1821 1831 $("#optionsCurriculum").addClass("disableSubMenu");
... ... @@ -1869,56 +1879,94 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1869 1879  
1870 1880 return paneltopPosition;
1871 1881 }
1872   -//reset option list manager and annotation when load
1873   -//call also when close module
  1882 + $scope.disableTopMenuOption=function()
  1883 + {
  1884 + $("#annotationButton").addClass("disableMenuoption");
  1885 + $("#Menuoptionid").addClass("disableMenuoption");
  1886 + $("#optionsListManagerTab").addClass("disableSubMenu");
  1887 + $("#annotationToolBarOptions").addClass("disableSubMenu");
  1888 + $("#optionsCurriculum").addClass("disableSubMenu");
  1889 + $("#optiontSetting").addClass("disableSubMenu");
  1890 + $("#labExPdfOption").addClass("disableSubMenu");
  1891 +
  1892 + //disble option popup
  1893 +
  1894 + $("#listManagerBody *").prop('disabled',true);
  1895 +
  1896 + }
  1897 + $scope.enableTopMenuOption=function(paneld)
  1898 + {
  1899 + if(paneld.match('daImagePanel'))
  1900 + {
  1901 + $("#optionsListManagerTab").removeClass("disableSubMenu");
  1902 + $("#annotationButton").removeClass("disableMenuoption");
  1903 + $("#Menuoptionid").removeClass("disableMenuoption");
  1904 + $("#annotationToolBarOptions").removeClass("disableSubMenu");
  1905 + $("#optiontSetting").removeClass("disableSubMenu");
  1906 +
  1907 + $("#listManagerBody *").prop('disabled',false);
  1908 + }
  1909 + else if(paneld.match('AAImagePanel'))
  1910 + {
  1911 + $("#optionsListManagerTab").removeClass("disableSubMenu");
  1912 + $("#annotationButton").removeClass("disableMenuoption");
  1913 + $("#Menuoptionid").removeClass("disableMenuoption");
  1914 + $("#annotationToolBarOptions").removeClass("disableSubMenu");
  1915 +
  1916 + $("#listManagerBody *").prop('disabled',false);
  1917 + }
  1918 + else if(paneld.match('aiImagePanel'))
  1919 + {
  1920 + $("#annotationButton").removeClass("disableMenuoption");
  1921 + $("#Menuoptionid").removeClass("disableMenuoption");
  1922 + $("#annotationToolBarOptions").removeClass("disableSubMenu");
  1923 + }
  1924 + else if(paneld.match('ciImagePanel'))
  1925 + {
  1926 + $("#annotationButton").removeClass("disableMenuoption");
  1927 + $("#Menuoptionid").removeClass("disableMenuoption");
  1928 + $("#annotationToolBarOptions").removeClass("disableSubMenu");
  1929 + }
  1930 + else if(paneld.match('caImagePanel'))
  1931 + {
  1932 + //disable all option
  1933 + }
  1934 +
  1935 + else if(paneld.match('labImagePanel'))
  1936 + {
  1937 + $("#Menuoptionid").removeClass("disableMenuoption");
  1938 + $("#labExPdfOption").removeClass("disableSubMenu");
  1939 + }
  1940 + else if(paneld.match('ThreeDImagePanel'))
  1941 + {
  1942 + //disable all option
  1943 + }
  1944 + }
  1945 +
  1946 +//reset option when load
1874 1947 $rootScope.resetMenuOption = function () {
1875 1948 $timeout(function () {
1876   - var islistManagerActive=false;
  1949 + $scope.disableTopMenuOption();
1877 1950 if ($location.url() != "/curriculum-builder-detail") {
1878 1951 var modulePanel = $("#HomeContainerDiv").find("div[id*='ImagePanel']");
1879 1952 if (modulePanel != undefined && modulePanel.length>0) {
1880 1953 for (var i = 0 ; i < modulePanel.length; i++) {
1881 1954 var paneld = modulePanel[i].id;
1882   - if(paneld.match('daImagePanel')||paneld.match('AAImagePanel'))
1883   - {
1884   - islistManagerActive=true;
1885   - }
  1955 + $scope.enableTopMenuOption(paneld);
1886 1956 }
1887   - }
1888   - if(islistManagerActive==true)
1889   - {
1890   - $("#optionsListManagerTab").removeClass("disableSubMenu");
1891   - }
1892   - else
1893   - {
1894   - $("#optionsListManagerTab").addClass("disableSubMenu");
1895   - }
  1957 + }
1896 1958 }
1897 1959 }, 500);
1898 1960 }
1899 1961  
1900   - // enable/disable list manager option and annotation Panel click
1901   -$rootScope.resetMenuOptionOnClick = function (moduleName) {
1902   - if ($location.url() != "/curriculum-builder-detail") {
1903   - if (moduleName != "") {
1904   - if(moduleName.match('daImagePanel')||moduleName.match('AAImagePanel'))
1905   - {
1906   - $("#optionsListManagerTab").removeClass("disableSubMenu");
1907   - }
1908   - else
1909   - {
1910   - $("#optionsListManagerTab").addClass("disableSubMenu");
1911   - }
1912   - }
1913   - else
1914   - {
1915   - $("#optionsListManagerTab").addClass("disableSubMenu");
1916   - }
  1962 + // enable/disable option Panel click
  1963 + $rootScope.resetMenuOptionOnClick = function (moduleName) {
  1964 + if ($location.url() != "/curriculum-builder-detail") {
  1965 + $scope.disableTopMenuOption();
  1966 + $scope.enableTopMenuOption(moduleName);
  1967 + }
1917 1968  
1918   - $scope.ListManagerViewDisableEnable(moduleName);
1919   - }
1920   -
1921   -}
  1969 + }
1922 1970  
1923 1971 // CB: reset panel top position when if any module closed
1924 1972 $rootScope.resetjsPanelTop = function () {
... ... @@ -1929,7 +1977,10 @@ $rootScope.resetMenuOptionOnClick = function (moduleName) {
1929 1977  
1930 1978 firsttopPosition = 680;
1931 1979 }
1932   - var islistManagerActive=false;
  1980 + if ($location.url() != "/curriculum-builder-detail") {
  1981 + $scope.disableTopMenuOption();
  1982 + }
  1983 +
1933 1984 var moduleImagePanel = $("div[id*='ImagePanel']");
1934 1985  
1935 1986 if (moduleImagePanel.length > 0) {
... ... @@ -1952,35 +2003,22 @@ $rootScope.resetMenuOptionOnClick = function (moduleName) {
1952 2003 //Reset menu option like list manager,annotation when close module
1953 2004  
1954 2005 if ($location.url() != "/curriculum-builder-detail") {
1955   - var paneld = moduleImagePanel[index].id;
1956   - if(paneld.match('daImagePanel')||paneld.match('AAImagePanel'))
1957   - {
1958   - islistManagerActive=true;
1959   - }
  2006 + var moduleName = moduleImagePanel[index].id;
  2007 + $scope.enableTopMenuOption(moduleName);
1960 2008 }
1961 2009  
1962 2010 }
1963 2011 }
1964 2012  
1965   - if ($location.url() != "/curriculum-builder-detail") {
1966   - if(islistManagerActive==true)
1967   - {
1968   - $("#optionsListManagerTab").removeClass("disableSubMenu");
1969   -
1970   - }
1971   - else
1972   - {
1973   - $("#optionsListManagerTab").addClass("disableSubMenu");
1974   -
1975   - }
  2013 + if ($location.url() != "/curriculum-builder-detail") {
1976 2014 // list manger already open then refresh it or close
1977 2015 $scope.updateListManagerView();
1978   - }
  2016 + }
1979 2017  
1980 2018 }, 500);
1981 2019  
1982 2020 }
1983   -
  2021 + //file menu option
1984 2022 $scope.$on("cBEnableDisableMenuOption", function (evt, name) {
1985 2023  
1986 2024  
... ... @@ -2116,7 +2154,7 @@ $rootScope.resetMenuOptionOnClick = function (moduleName) {
2116 2154 $rootScope.isAnnotatiomToolBarPopupActive = true;
2117 2155 $rootScope.isAnnotatiomToolBarPopupClosed = false;
2118 2156 $rootScope.isAnnotaionToolBarDrawingModeActive = false;
2119   - if ($rootScope.MenuModuleName == "DA" || $rootScope.MenuModuleName == "CI" || $rootScope.MenuModuleName == "AA") {
  2157 + if ($rootScope.MenuModuleName == "DA" || $rootScope.MenuModuleName == "CI" || $rootScope.MenuModuleName == "AA" || $rootScope.MenuModuleName == "AI") {
2120 2158 if ($rootScope.disableAnnotationtoolOnListManager == true) {
2121 2159 $('#AnnotaionPopupDiv').find('a,input, textarea, button, select,img,div').attr('disabled', 'disabled');
2122 2160 $('#slider-range-min-2').slider('disable');
... ... @@ -2145,9 +2183,7 @@ $rootScope.resetMenuOptionOnClick = function (moduleName) {
2145 2183 // $("#annotationpainteraser").css('pointer-events', 'auto');
2146 2184 }
2147 2185 $("#OnIdentify").addClass("annotationtoolbartab");
2148   - $("#annotationToolBarOptions").addClass("active");
2149   - $("#annotationButton").addClass("active");
2150   -
  2186 +
2151 2187 $rootScope.isAnnotationWindowOpen = true;
2152 2188 $(".annotationTollbar").css("display", "block");
2153 2189 $rootScope.$broadcast('annotationToolEvent', true);
... ... @@ -2215,11 +2251,7 @@ $rootScope.resetMenuOptionOnClick = function (moduleName) {
2215 2251 $("#OnIdentify").removeClass("annotationtoolbartab");
2216 2252 $("#DrawMode").removeClass("annotationtoolbartab");
2217 2253 $('.btnCursor').removeClass('activebtncolor');
2218   - $("#annotationButton").removeClass("active");
2219   - $("#annotationButton").blur();
2220   - $("#annotationToolBarOptions").removeClass("active");
2221   -
2222   -
  2254 +
2223 2255 $(".annotationTollbar").css("display", "none");
2224 2256 $rootScope.isAnnotationWindowClose = true;
2225 2257 $('.btnCursor').removeClass('activebtncolor');
... ... @@ -5783,19 +5815,6 @@ $rootScope.resetMenuOptionOnClick = function (moduleName) {
5783 5815 $rootScope.disableAnnotationTB = true;
5784 5816 }
5785 5817  
5786   - //list manager function
5787   - $scope.ListManagerViewDisableEnable = function (moduleName) {
5788   - if(moduleName.match('daImagePanel')||moduleName.match('AAImagePanel'))
5789   - {
5790   - $("#listManagerBody *").prop('disabled',false);
5791   - }
5792   - else
5793   - {
5794   - $("#listManagerBody *").prop('disabled',true);
5795   - }
5796   -
5797   - }
5798   -
5799 5818 $scope.updateListManagerView = function () {
5800 5819  
5801 5820 $("#listManagerBody *").prop('disabled',false);
... ... @@ -5954,8 +5973,6 @@ $rootScope.resetMenuOptionOnClick = function (moduleName) {
5954 5973 if (canvasPaintElement == null) return;
5955 5974 var canvasPaintId = canvasPaintElement.id;
5956 5975  
5957   -
5958   - // $("#optionsListManagerTab").removeClass("active");
5959 5976 $rootScope.isListManagerMenuSelected = false;
5960 5977 console.log('listManager closed');
5961 5978 $rootScope.disableAnnotationtoolOnListManager = false;
... ... @@ -6586,9 +6603,8 @@ $rootScope.resetMenuOptionOnClick = function (moduleName) {
6586 6603 $(".tools").css("z-index", "1029");
6587 6604 $rootScope.CloseListManager();
6588 6605 $rootScope.CloseAnnotationTool();
6589   - $("#annotationButton").parent().addClass("disableMenuannotation");
6590   - $("#annotationToolBarOptions").addClass("disableMenuoption");
6591   - // $("#optionsListManagerTab").addClass("disableSubMenu");
  6606 + $("#annotationButton").addClass("disableMenuoption");
  6607 + $("#annotationToolBarOptions").addClass("disableSubMenu");
6592 6608 $('#dvPrintPreview').css('display', 'block');
6593 6609 html2canvas($("#" + canvasDivId), {
6594 6610 onrendered: function (canvas) {
... ... @@ -6957,11 +6973,10 @@ $rootScope.resetMenuOptionOnClick = function (moduleName) {
6957 6973 }
6958 6974  
6959 6975 if ($location.url() != "/curriculum-builder-detail") {
6960   - $("#annotationButton").parent().removeClass("disableMenuannotation");
  6976 + $("#annotationButton").removeClass("disableMenuoption");
6961 6977 }
6962 6978  
6963   - $("#annotationToolBarOptions").removeClass("disableMenuoption");
6964   - // $("#optionsListManagerTab").removeClass("disableSubMenu");
  6979 + $("#annotationToolBarOptions").removeClass("disableSubMenu");
6965 6980 $('#fileMenuAnchor').parent().removeClass('disableFileMenu');
6966 6981  
6967 6982  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
  View file @c72081e
... ... @@ -459,9 +459,9 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
459 459 //call when module loaded
460 460 $rootScope.resetMenuOption();
461 461 // call from while open module in CB
462   - $("#labImagePanel_" + windowviewid).on('click', function (event) {
463   - $rootScope.resetMenuOptionOnClick("");
464   - // var pnlName = event.currentTarget.id;
  462 + $("#labImagePanel_" + windowviewid).on('click', function (event) {
  463 + var pnlName = event.currentTarget.id;
  464 + $rootScope.resetMenuOptionOnClick(pnlName);
465 465 $scope.$emit("cBEnableDisableMenuOption", "");
466 466  
467 467 });
... ...
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
  View file @c72081e
... ... @@ -5,11 +5,11 @@
5 5 <ul class="dropdown-menu">
6 6 <li ng-class="openResources"><a href="#" ng-click="openResource()">Open Resources</a></li>
7 7 <li ng-class="OpenPitures"><a href="#">Open My Pictures</a></li>
8   - <li ng-class="disableSubMenu"><a href="#">Open My Animations</a></li>
  8 + <li ng-class="disableMenuoption"><a href="#">Open My Animations</a></li>
9 9 <li role="separator" class="divider"></li>
10   - <li ng-class="disableSubMenu"><a href="#">Test Creator</a></li>
11   - <li ng-class="disableSubMenu"><a href="#">Open Test</a></li>
12   - <li ng-class="disableSubMenu"><a href="#">Save Test As</a></li>
  10 + <li ng-class="disableMenuoption"><a href="#">Test Creator</a></li>
  11 + <li ng-class="disableMenuoption"><a href="#">Open Test</a></li>
  12 + <li ng-class="disableMenuoption"><a href="#">Save Test As</a></li>
13 13 <li role="separator" class="divider"></li>
14 14 <li ng-class="newCurriculum"><a href="curriculum-builder-detail" ng-click="NewCurricullumData('NewCurriculam')">New Curriculum</a></li>
15 15 <li ng-class="openCurriculum" ng-click="OpenExistingCurriculum($event)"> <a href="curriculum-builder">Open Existing Curriculum</a></li>
... ... @@ -23,31 +23,25 @@
23 23 </ul>
24 24 </li>
25 25 <!--#7904-->
26   - <li class="navbarItem" ng-class="disableMenuannotation"><a href="#" data-toggle="modal" id="annotationButton" data-target=".bs-example-modal-sm" ng-click="ShowAnnotationWindow()">Annotation</a></li>
  26 + <li id="annotationButton" class="navbarItem"><a href="#" data-toggle="modal" data-target=".bs-example-modal-sm" ng-click="ShowAnnotationWindow()">Annotation</a></li>
27 27  
28   - <li class="dropdown navbarDropdownItem" ng-class="disableMenuoption">
  28 + <li id="Menuoptionid" class="dropdown navbarDropdownItem">
29 29 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Options<span class="caret"></span></a>
30   - <ul class="dropdown-menu">
31   - <!--<li><a href="#" ng-click="ShowListManager()">List Manager</a></li>-->
32   -
33   - <li ng-class="" id="optionsListManagerTab"><a href="#" ng-click="ShowListManager()">List Manager</a></li>
  30 + <ul class="dropdown-menu">
  31 + <li id="optionsListManagerTab"><a href="#" ng-click="ShowListManager()">List Manager</a></li>
34 32 <!--#7904-->
35   - <li><a href="#" id="annotationToolBarOptions" ng-click="ShowAnnotationWindow()">Annotation Toolbar</a></li>
  33 + <li id="annotationToolBarOptions" ><a href="#" ng-click="ShowAnnotationWindow()">Annotation Toolbar</a></li>
36 34  
37   - <li ng-class="disableSubMenu" id="optionsCurriculum"><a href="#">Add to Existing Curriculum</a></li>
  35 + <li id="optionsCurriculum"><a href="#">Add to Existing Curriculum</a></li>
38 36 <li id="optiontSetting"><a ng-click="ShowSettingWindow()" class="cursor-pointer">Settings</a></li>
39 37 <li role="separator" class="divider"></li>
40   - <li ng-class="disableSubMenu"><a href="../../content/quiz/pdf/Instructor.html" target="_blank">Lab Exercises PDF</a></li>
  38 + <li id="labExPdfOption"><a href="../../content/quiz/pdf/Instructor.html" target="_blank">Lab Exercises PDF</a></li>
41 39  
42 40 </ul>
43 41 </li>
44 42 <li class="dropdown navbarDropdownItem">
45 43 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Help<span class="caret"></span></a>
46   - <ul class="dropdown-menu" id="helplinkId">
47   - <!--<li><a href="http://interactiveanatomy.com/content/help/index.html" target="_blank">Help Topics</a></li>
48   - <li><a href="http://adameducation.com/Contact" target="_blank">Customer Support</a></li>
49   - <li role="separator" class="divider"></li>
50   - <li><a href="http://interactiveanatomy.com/content/help/about/Adam_Credits_AIA5.html" target="_blank">About A.D.A.M.</a></li>-->
  44 + <ul class="dropdown-menu" id="helplinkId">
51 45 </ul>
52 46 </li>
53 47 <!--redirecting to Admin-->
... ...