Commit 585ecfacc16b08f7f265bc2cf0a406a2128fc940
1 parent
e082e3cd
revert changes of paste anther browser code for refresh issue
Showing
12 changed files
with
21 additions
and
53 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
... | ... | @@ -6,9 +6,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location |
6 | 6 | $scope.threeDAnatomyData; |
7 | 7 | $scope.Id; |
8 | 8 | $scope.$on('$viewContentLoaded', function (event) { |
9 | - if ($rootScope.refreshcheck == null) { | |
10 | - $location.path('/'); | |
11 | - } | |
9 | + | |
12 | 10 | $scope.scroll(); |
13 | 11 | var promise = DataService.getJson('~/../content/data/json/3da/3da_dat_contentlist.json') |
14 | 12 | promise.then( |
... | ... | @@ -89,9 +87,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location |
89 | 87 | } |
90 | 88 | |
91 | 89 | $scope.Open3DModelBody = function () { |
92 | - if ($rootScope.refreshcheck == null) { | |
93 | - $location.path('/'); | |
94 | - } | |
90 | + | |
95 | 91 | $rootScope.isLoading = true; |
96 | 92 | $('#spinner').css('visibility', 'visible'); |
97 | 93 | //alert(localStorage.getItem("currentBodyViewId")); | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js
... | ... | @@ -12,9 +12,7 @@ function ($scope, $rootScope, pages, log, $location) { |
12 | 12 | //alert("scroll"); |
13 | 13 | } |
14 | 14 | $scope.$on('$viewContentLoaded', function (event) { |
15 | - if ($rootScope.refreshcheck == null) { | |
16 | - $location.path('/'); | |
17 | - } | |
15 | + | |
18 | 16 | // code that will be executed ... |
19 | 17 | // every time this view is loaded |
20 | 18 | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js
... | ... | @@ -19,9 +19,7 @@ function ($scope, $rootScope, pages, log, $location) { |
19 | 19 | //$rootScope.currentActiveModuleTitle = pages[10].name; |
20 | 20 | |
21 | 21 | $scope.$on('$viewContentLoaded', function (event) { |
22 | - if ($rootScope.refreshcheck == null) { | |
23 | - $location.path('/'); | |
24 | - } | |
22 | + | |
25 | 23 | // code that will be executed ... |
26 | 24 | // every time this view is loaded |
27 | 25 | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js
... | ... | @@ -13,9 +13,7 @@ function ($scope, $rootScope, pages, log, $location) { |
13 | 13 | } |
14 | 14 | |
15 | 15 | $scope.$on('$viewContentLoaded', function (event) { |
16 | - if ($rootScope.refreshcheck == null) { | |
17 | - $location.path('/'); | |
18 | - } | |
16 | + | |
19 | 17 | // code that will be executed ... |
20 | 18 | // every time this view is loaded |
21 | 19 | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
... | ... | @@ -27,9 +27,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
27 | 27 | }; |
28 | 28 | |
29 | 29 | $scope.$on('$viewContentLoaded', function (event) { |
30 | - if ($rootScope.refreshcheck == null) { | |
31 | - $location.path('/'); | |
32 | - } | |
30 | + | |
33 | 31 | |
34 | 32 | // code that will be executed ... |
35 | 33 | // every time this view is loaded |
... | ... | @@ -464,9 +462,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
464 | 462 | } |
465 | 463 | |
466 | 464 | $scope.openBodyView = function () { |
467 | - if ($rootScope.refreshcheck == null) { | |
468 | - $location.path('/'); | |
469 | - } | |
465 | + | |
470 | 466 | if ($rootScope.disableAnnotationTB == true) |
471 | 467 | { |
472 | 468 | $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled'); | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
... | ... | @@ -32,9 +32,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
32 | 32 | }; |
33 | 33 | |
34 | 34 | $scope.$on('$viewContentLoaded', function (event) { |
35 | - if ($rootScope.refreshcheck == null) { | |
36 | - $location.path('/'); | |
37 | - } | |
35 | + | |
38 | 36 | // code that will be executed ... |
39 | 37 | // every time this view is loaded |
40 | 38 | |
... | ... | @@ -533,9 +531,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
533 | 531 | } |
534 | 532 | |
535 | 533 | $scope.openBodyView = function () { |
536 | - if ($rootScope.refreshcheck == null) { | |
537 | - $location.path('/'); | |
538 | - } | |
534 | + | |
539 | 535 | $rootScope.isLoading = true; |
540 | 536 | $('#spinner').css('visibility', 'visible'); |
541 | 537 | $scope.voId = localStorage.getItem("currentBodyViewId"); | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
... | ... | @@ -19,9 +19,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location) { |
19 | 19 | } |
20 | 20 | //load json data |
21 | 21 | $scope.loadCurriculumBuiderData = function () { |
22 | - if ($rootScope.refreshcheck == null) { | |
23 | - $location.path('/'); | |
24 | - } | |
22 | + | |
25 | 23 | //get current path |
26 | 24 | var currentURL = $location.path(); |
27 | 25 | var selectedModuleName = ''; | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
... | ... | @@ -376,9 +376,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l |
376 | 376 | |
377 | 377 | //load json data for body view |
378 | 378 | $scope.loadDissectibleAnatomyData = function () { |
379 | - if ($rootScope.refreshcheck == null) { | |
380 | - $location.path('/'); | |
381 | - } | |
379 | + | |
382 | 380 | //get current path |
383 | 381 | var currentURL = $location.path(); |
384 | 382 | var selectedModuleName = ''; | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
... | ... | @@ -132,7 +132,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
132 | 132 | |
133 | 133 | $rootScope.userModules = UserModules; |
134 | 134 | $rootScope.isVisibleLogin = false; |
135 | - $location.path('/'); | |
135 | + | |
136 | 136 | } |
137 | 137 | else { |
138 | 138 | if (result == LoginConstants.USER_NOT_FOUND) { |
... | ... | @@ -167,7 +167,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
167 | 167 | $rootScope.haveRoleAdmin = false; |
168 | 168 | localStorage.setItem('loggedInUserDetails', JSON.stringify(result)); |
169 | 169 | $('#dvUserModulesInfo').modal('show'); |
170 | - $location.path('/'); | |
170 | + | |
171 | 171 | } |
172 | 172 | //else if ((!result.IsSubscriptionExpired) && (result.UserType== UserTypeConstants.CLIENT_ADMIN || result.UserType== UserTypeConstants.DISTRICT_ADMIN || result.UserType== UserTypeConstants.SINGLE_USER ||result.UserType== UserTypeConstants.RESELLER) && result.License.IsTermAccepted) {} |
173 | 173 | |
... | ... | @@ -177,11 +177,11 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
177 | 177 | $rootScope.userData = result; |
178 | 178 | $rootScope.userModules = result.Modules; |
179 | 179 | $rootScope.isVisibleLogin = false; |
180 | - $rootScope.haveRoleAdmin = true; | |
180 | + $rootScope.haveRoleAdmin = true; | |
181 | 181 | $rootScope.licenseeAccountNumber = result.License.AccountNumber; |
182 | 182 | localStorage.setItem('loggedInUserDetails', JSON.stringify(result)); |
183 | 183 | $('#dvUserModulesInfo').modal('show'); |
184 | - $location.path('/'); | |
184 | + | |
185 | 185 | } |
186 | 186 | else { |
187 | 187 | if ($('#dvTerms').length > 0) { | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
... | ... | @@ -13,9 +13,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location |
13 | 13 | $scope.dragableId = ""; |
14 | 14 | $scope.blReviewAttempt = false; |
15 | 15 | $scope.$on('$viewContentLoaded', function (event) { |
16 | - if ($rootScope.refreshcheck == null) { | |
17 | - $location.path('/'); | |
18 | - } | |
16 | + | |
19 | 17 | // code that will be executed ... |
20 | 18 | // every time this view is loaded |
21 | 19 | |
... | ... | @@ -91,9 +89,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location |
91 | 89 | |
92 | 90 | |
93 | 91 | $scope.GetQuizByTopic = function () { |
94 | - if ($rootScope.refreshcheck == null) { | |
95 | - $location.path('/'); | |
96 | - } | |
92 | + | |
97 | 93 | var keywords = $location.search(); |
98 | 94 | $scope.LabExerciseName = keywords.labexercise; |
99 | 95 | $scope.LabExerciseModules = null; | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js
1 | 1 | 'use strict'; |
2 | 2 | |
3 | -AIA.controller("LinkController", ["$scope", "$rootScope", "$log", "$location", "pages", "$routeParams", | |
3 | +AIA.controller("LinkController", ["$scope", "$rootScope", "$log", "pages", "$routeParams", | |
4 | 4 | function ($scope, $rootScope, log, $location, pages, $routeParams) { |
5 | 5 | |
6 | 6 | //$rootScope.currentActiveModuleTitle = Modules[10].Name; |
... | ... | @@ -18,9 +18,7 @@ function ($scope, $rootScope, log, $location, pages, $routeParams) { |
18 | 18 | |
19 | 19 | $scope.$on('$viewContentLoaded', function (event) { |
20 | 20 | |
21 | - if ($rootScope.refreshcheck == null) { | |
22 | - $location.path('/'); | |
23 | - } | |
21 | + | |
24 | 22 | // code that will be executed ... |
25 | 23 | // every time this view is loaded |
26 | 24 | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
... | ... | @@ -105,9 +105,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou |
105 | 105 | }; |
106 | 106 | |
107 | 107 | $scope.loadForModuleById = function (moduleId) { |
108 | - if ($rootScope.refreshcheck == null) { | |
109 | - $location.path('/'); | |
110 | - } | |
108 | + | |
111 | 109 | $scope.moduleId = moduleId; |
112 | 110 | $scope.activeTab = 1; |
113 | 111 | console.log('loadForModuleById is called') |
... | ... | @@ -207,9 +205,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou |
207 | 205 | |
208 | 206 | |
209 | 207 | $scope.openModuleItem = function () { |
210 | - if ($rootScope.refreshcheck == null) { | |
211 | - $location.path('/'); | |
212 | - } | |
208 | + | |
213 | 209 | var jsContentURL; |
214 | 210 | var moduleItemViewDivId; |
215 | 211 | ... | ... |