diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index 312857a..4f77091 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -141,7 +141,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $rootScope.disableSubMenu = ""; $rootScope.CloseAnnotationTool(); $rootScope.CloseListManager(); - angular.element('#modal-settings').modal('hide'); + angular.element('#modal-settings').css('display','none'); if ($location.url() == "/lab-exercises") { $rootScope.menuLabExer = 0; @@ -345,9 +345,13 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $rootScope.ShowSettingWindow = function () { if ($(".annotationTollbar").css("display") == "block") { // alert("already open"); + $('#modal-settings').css("display", "none"); + $("#modelsettingsbackground").css("display", "none"); } else { - $('#modal-settings').modal('toggle'); + + $('#modal-settings').css("display", "block"); + $("#modelsettingsbackground").css("display", "block"); } } @@ -2382,16 +2386,27 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $rootScope.setEthncitySettings($rootScope.globalSetting.ethnicity); $rootScope.setModestySettings($rootScope.globalSetting.modesty); - $('#modal-settings').modal('hide'); + + $('#modal-settings').css("display", "none"); + $("#modelsettingsbackground").css("display", "none"); } $rootScope.UpdateAndCloseSetting = function (setting) { $rootScope.UpdateSetting(setting); - $('#modal-settings').modal('hide'); + + $('#modal-settings').css("display", "none"); + $("#modelsettingsbackground").css("display", "none"); }; + + $rootScope.CloseSettingPopup = function () { + $('#modal-settings').css("display", "none"); + $("#modelsettingsbackground").css("display", "none"); + } + + $rootScope.UpdateSetting = function (setting) { var isReloadingViewRequired = false; //1. @@ -2448,7 +2463,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic } } else { - $('#modal-settings').modal('hide'); + + $('#modal-settings').css("display", "none"); + $("#modelsettingsbackground").css("display", "none"); } }; diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html index 0a9973b..d078cbd 100644 --- a/400-SOURCECODE/AIAHTML5.Web/index.html +++ b/400-SOURCECODE/AIAHTML5.Web/index.html @@ -398,1392 +398,1395 @@ -