'
+ '
![]()
'//alt="{{value._Title}}" >'
@@ -198,7 +201,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
//});
- $timeout(function () { $('#ciSpinner').css('visibility', 'hidden'); }, 300);
+ // $timeout(function () { $('#ciSpinner').css('visibility', 'hidden'); }, 300);
+ $('#CISpinner').remove();
},
function (error) {
// handle errors here
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 315892c..e3264b0 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -175,12 +175,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
//get the DA body view list based on selected gender
$scope.getDAViewList = function ($event) {
-
+
if ($('#MainImage') != null) {
$('#MainImage').remove();
}
// $rootScope.currentActiveModuleTitle = Modules[0].Name;
$("#bodyViewList").empty();
+ $("

").appendTo('#bodyViewList');
//for default load
if ($event == null || $event == undefined) {
//if ((localStorage.getItem("genderId") != "")||(localStorage.getItem("genderId")!="null")) {
@@ -262,6 +263,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$compile($el)($scope);
+
+ $("#DASpinner").remove();
+
$(".sidebar").mCustomScrollbar({
autoHideScrollbar: true,
//theme:"rounded"
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
index 035f97e..e569f5a 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
@@ -13,7 +13,9 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
$scope.dragableId = "";
$scope.blReviewAttempt = false;
$scope.$on('$viewContentLoaded', function (event) {
- // code that will be executed ...
+
+ $("#LabExSpinner").fadeOut('slow');
+ //code that will be executed ...
// every time this view is loaded
//get current path
@@ -25,7 +27,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
selectedModuleName = value.name;
}
$rootScope.currentActiveModuleTitle = selectedModuleName;
- })
+ });
$scope.showTabButton = false;
$rootScope.currentActiveModuleTitle = pages[8].name;
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js
index 6d6772d..36a588d 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js
@@ -19,8 +19,7 @@ function ($scope, $rootScope, log, pages, $routeParams) {
$scope.$on('$viewContentLoaded', function (event) {
// code that will be executed ...
// every time this view is loaded
-
-
+
for (var i = 0; i < $scope.links.length; i++) {
if ($scope.links[i].modname == $routeParams.modname) {
$rootScope.currentActiveModuleTitle = $scope.links[i].title;
@@ -31,8 +30,17 @@ function ($scope, $rootScope, log, pages, $routeParams) {
}
$scope.objdata = $scope.links[i].objurl;
$scope.myObj = $scope.links[i].objstyle;
- }
- }
+ }
+
+
+ }
+
+
+ $("#siteloaderSpinner").fadeOut(5000);
+
+
+
+
});
$scope.showTabButton = false;
@@ -46,6 +54,7 @@ function ($scope, $rootScope, log, pages, $routeParams) {
$("html,body").scrollTop(0);
//alert("scroll");
}
+
}]
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/ADAMImg/ADAMImg-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/ADAMImg/ADAMImg-view.html
index b65e3c7..10b6fa8 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/ADAMImg/ADAMImg-view.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/ADAMImg/ADAMImg-view.html
@@ -52,6 +52,7 @@