Commit 76648f30357b4a1d7b83b6a67f0a7e39ab133f41
1 parent
7d277807
this is for the bug 20295 url paste on another browser
Showing
11 changed files
with
52 additions
and
8 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
@@ -6,6 +6,9 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | @@ -6,6 +6,9 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | ||
6 | $scope.threeDAnatomyData; | 6 | $scope.threeDAnatomyData; |
7 | $scope.Id; | 7 | $scope.Id; |
8 | $scope.$on('$viewContentLoaded', function (event) { | 8 | $scope.$on('$viewContentLoaded', function (event) { |
9 | + if ($rootScope.refreshcheck == null) { | ||
10 | + $location.path('/'); | ||
11 | + } | ||
9 | $scope.scroll(); | 12 | $scope.scroll(); |
10 | var promise = DataService.getJson('~/../content/data/json/3da/3da_dat_contentlist.json') | 13 | var promise = DataService.getJson('~/../content/data/json/3da/3da_dat_contentlist.json') |
11 | promise.then( | 14 | promise.then( |
@@ -86,7 +89,9 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | @@ -86,7 +89,9 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | ||
86 | } | 89 | } |
87 | 90 | ||
88 | $scope.Open3DModelBody = function () { | 91 | $scope.Open3DModelBody = function () { |
89 | - | 92 | + if ($rootScope.refreshcheck == null) { |
93 | + $location.path('/'); | ||
94 | + } | ||
90 | $rootScope.isLoading = true; | 95 | $rootScope.isLoading = true; |
91 | $('#spinner').css('visibility', 'visible'); | 96 | $('#spinner').css('visibility', 'visible'); |
92 | //alert(localStorage.getItem("currentBodyViewId")); | 97 | //alert(localStorage.getItem("currentBodyViewId")); |
400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js
@@ -12,6 +12,9 @@ function ($scope, $rootScope, pages, log, $location) { | @@ -12,6 +12,9 @@ function ($scope, $rootScope, pages, log, $location) { | ||
12 | //alert("scroll"); | 12 | //alert("scroll"); |
13 | } | 13 | } |
14 | $scope.$on('$viewContentLoaded', function (event) { | 14 | $scope.$on('$viewContentLoaded', function (event) { |
15 | + if ($rootScope.refreshcheck == null) { | ||
16 | + $location.path('/'); | ||
17 | + } | ||
15 | // code that will be executed ... | 18 | // code that will be executed ... |
16 | // every time this view is loaded | 19 | // every time this view is loaded |
17 | 20 |
400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js
@@ -19,6 +19,9 @@ function ($scope, $rootScope, pages, log, $location) { | @@ -19,6 +19,9 @@ function ($scope, $rootScope, pages, log, $location) { | ||
19 | //$rootScope.currentActiveModuleTitle = pages[10].name; | 19 | //$rootScope.currentActiveModuleTitle = pages[10].name; |
20 | 20 | ||
21 | $scope.$on('$viewContentLoaded', function (event) { | 21 | $scope.$on('$viewContentLoaded', function (event) { |
22 | + if ($rootScope.refreshcheck == null) { | ||
23 | + $location.path('/'); | ||
24 | + } | ||
22 | // code that will be executed ... | 25 | // code that will be executed ... |
23 | // every time this view is loaded | 26 | // every time this view is loaded |
24 | 27 |
400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js
@@ -13,6 +13,9 @@ function ($scope, $rootScope, pages, log, $location) { | @@ -13,6 +13,9 @@ function ($scope, $rootScope, pages, log, $location) { | ||
13 | } | 13 | } |
14 | 14 | ||
15 | $scope.$on('$viewContentLoaded', function (event) { | 15 | $scope.$on('$viewContentLoaded', function (event) { |
16 | + if ($rootScope.refreshcheck == null) { | ||
17 | + $location.path('/'); | ||
18 | + } | ||
16 | // code that will be executed ... | 19 | // code that will be executed ... |
17 | // every time this view is loaded | 20 | // every time this view is loaded |
18 | 21 |
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
@@ -27,6 +27,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | @@ -27,6 +27,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | ||
27 | }; | 27 | }; |
28 | 28 | ||
29 | $scope.$on('$viewContentLoaded', function (event) { | 29 | $scope.$on('$viewContentLoaded', function (event) { |
30 | + if ($rootScope.refreshcheck == null) { | ||
31 | + $location.path('/'); | ||
32 | + } | ||
33 | + | ||
30 | // code that will be executed ... | 34 | // code that will be executed ... |
31 | // every time this view is loaded | 35 | // every time this view is loaded |
32 | 36 | ||
@@ -460,7 +464,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | @@ -460,7 +464,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | ||
460 | } | 464 | } |
461 | 465 | ||
462 | $scope.openBodyView = function () { | 466 | $scope.openBodyView = function () { |
463 | - | 467 | + if ($rootScope.refreshcheck == null) { |
468 | + $location.path('/'); | ||
469 | + } | ||
464 | if ($rootScope.disableAnnotationTB == true) | 470 | if ($rootScope.disableAnnotationTB == true) |
465 | { | 471 | { |
466 | $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled'); | 472 | $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled'); |
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
@@ -32,6 +32,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | @@ -32,6 +32,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | ||
32 | }; | 32 | }; |
33 | 33 | ||
34 | $scope.$on('$viewContentLoaded', function (event) { | 34 | $scope.$on('$viewContentLoaded', function (event) { |
35 | + if ($rootScope.refreshcheck == null) { | ||
36 | + $location.path('/'); | ||
37 | + } | ||
35 | // code that will be executed ... | 38 | // code that will be executed ... |
36 | // every time this view is loaded | 39 | // every time this view is loaded |
37 | 40 | ||
@@ -528,7 +531,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | @@ -528,7 +531,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | ||
528 | } | 531 | } |
529 | 532 | ||
530 | $scope.openBodyView = function () { | 533 | $scope.openBodyView = function () { |
531 | - | 534 | + if ($rootScope.refreshcheck == null) { |
535 | + $location.path('/'); | ||
536 | + } | ||
532 | $rootScope.isLoading = true; | 537 | $rootScope.isLoading = true; |
533 | $('#spinner').css('visibility', 'visible'); | 538 | $('#spinner').css('visibility', 'visible'); |
534 | $scope.voId = localStorage.getItem("currentBodyViewId"); | 539 | $scope.voId = localStorage.getItem("currentBodyViewId"); |
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
@@ -19,7 +19,9 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location) { | @@ -19,7 +19,9 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location) { | ||
19 | } | 19 | } |
20 | //load json data | 20 | //load json data |
21 | $scope.loadCurriculumBuiderData = function () { | 21 | $scope.loadCurriculumBuiderData = function () { |
22 | - | 22 | + if ($rootScope.refreshcheck == null) { |
23 | + $location.path('/'); | ||
24 | + } | ||
23 | //get current path | 25 | //get current path |
24 | var currentURL = $location.path(); | 26 | var currentURL = $location.path(); |
25 | var selectedModuleName = ''; | 27 | var selectedModuleName = ''; |
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -376,7 +376,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -376,7 +376,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
376 | 376 | ||
377 | //load json data for body view | 377 | //load json data for body view |
378 | $scope.loadDissectibleAnatomyData = function () { | 378 | $scope.loadDissectibleAnatomyData = function () { |
379 | - | 379 | + if ($rootScope.refreshcheck == null) { |
380 | + $location.path('/'); | ||
381 | + } | ||
380 | //get current path | 382 | //get current path |
381 | var currentURL = $location.path(); | 383 | var currentURL = $location.path(); |
382 | var selectedModuleName = ''; | 384 | var selectedModuleName = ''; |
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
@@ -13,6 +13,9 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | @@ -13,6 +13,9 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | ||
13 | $scope.dragableId = ""; | 13 | $scope.dragableId = ""; |
14 | $scope.blReviewAttempt = false; | 14 | $scope.blReviewAttempt = false; |
15 | $scope.$on('$viewContentLoaded', function (event) { | 15 | $scope.$on('$viewContentLoaded', function (event) { |
16 | + if ($rootScope.refreshcheck == null) { | ||
17 | + $location.path('/'); | ||
18 | + } | ||
16 | // code that will be executed ... | 19 | // code that will be executed ... |
17 | // every time this view is loaded | 20 | // every time this view is loaded |
18 | 21 | ||
@@ -88,6 +91,9 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | @@ -88,6 +91,9 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | ||
88 | 91 | ||
89 | 92 | ||
90 | $scope.GetQuizByTopic = function () { | 93 | $scope.GetQuizByTopic = function () { |
94 | + if ($rootScope.refreshcheck == null) { | ||
95 | + $location.path('/'); | ||
96 | + } | ||
91 | var keywords = $location.search(); | 97 | var keywords = $location.search(); |
92 | $scope.LabExerciseName = keywords.labexercise; | 98 | $scope.LabExerciseName = keywords.labexercise; |
93 | $scope.LabExerciseModules = null; | 99 | $scope.LabExerciseModules = null; |
400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js
1 | 'use strict'; | 1 | 'use strict'; |
2 | 2 | ||
3 | -AIA.controller("LinkController", ["$scope", "$rootScope","$log", "pages", "$routeParams", | ||
4 | -function ($scope, $rootScope, log, pages, $routeParams) { | 3 | +AIA.controller("LinkController", ["$scope", "$rootScope", "$log", "$location", "pages", "$routeParams", |
4 | +function ($scope, $rootScope, log, $location, pages, $routeParams) { | ||
5 | 5 | ||
6 | //$rootScope.currentActiveModuleTitle = Modules[10].Name; | 6 | //$rootScope.currentActiveModuleTitle = Modules[10].Name; |
7 | //$rootScope.currentActiveModuleTitle = $routeParams.modname; | 7 | //$rootScope.currentActiveModuleTitle = $routeParams.modname; |
@@ -17,6 +17,10 @@ function ($scope, $rootScope, log, pages, $routeParams) { | @@ -17,6 +17,10 @@ function ($scope, $rootScope, log, pages, $routeParams) { | ||
17 | ]; | 17 | ]; |
18 | 18 | ||
19 | $scope.$on('$viewContentLoaded', function (event) { | 19 | $scope.$on('$viewContentLoaded', function (event) { |
20 | + | ||
21 | + if ($rootScope.refreshcheck == null) { | ||
22 | + $location.path('/'); | ||
23 | + } | ||
20 | // code that will be executed ... | 24 | // code that will be executed ... |
21 | // every time this view is loaded | 25 | // every time this view is loaded |
22 | 26 |
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -92,7 +92,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -92,7 +92,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
92 | }; | 92 | }; |
93 | 93 | ||
94 | $scope.loadForModuleById = function (moduleId) { | 94 | $scope.loadForModuleById = function (moduleId) { |
95 | - | 95 | + if ($rootScope.refreshcheck == null) { |
96 | + $location.path('/'); | ||
97 | + } | ||
96 | $scope.moduleId = moduleId; | 98 | $scope.moduleId = moduleId; |
97 | $scope.activeTab = 1; | 99 | $scope.activeTab = 1; |
98 | console.log('loadForModuleById is called') | 100 | console.log('loadForModuleById is called') |
@@ -186,6 +188,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -186,6 +188,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
186 | 188 | ||
187 | 189 | ||
188 | $scope.openModuleItem = function () { | 190 | $scope.openModuleItem = function () { |
191 | + if ($rootScope.refreshcheck == null) { | ||
192 | + $location.path('/'); | ||
193 | + } | ||
189 | var jsContentURL; | 194 | var jsContentURL; |
190 | var moduleItemViewDivId; | 195 | var moduleItemViewDivId; |
191 | 196 |