diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 2e37ee0..dd9e921 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -428,7 +428,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //da-body-views functions $scope.openBodyView = function () { - + //Check if browser 'REFRESHED' or 'RELOADED' + if ($rootScope.CommonData != null) { //0. we will initially append container to load body //check if localstorage has any settings @@ -455,7 +456,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $rootScope.isVisibleLogin = false; $scope.loadSearchDataForBodyView(); - console.log('currentBodyViewId pickjed from localStorage: ' + currentBodyViewId); var openViews; @@ -569,7 +569,20 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo }, 350); } - + } + else + {console.log('Reload occured, Redirecting to landing page.') + $location.path('/'); + /*Code commented due to unavailability of modules list on 'da-view-list' view*/ + /* console.log('Reloading json data for body view => BROWSER REFRESH ISSUE...'); + $scope.loadDissectibleAnatomyData(); + + if ((typeof($rootScope.MenuModuleName) == "undefined") || $rootScope.MenuModuleName == null) { + $rootScope.MenuModuleName = "DA"; + }*/ + + + } } angular.element(document).ready(function (e) { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index 111dc7f..7b965f1 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -3541,9 +3541,10 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic } - $rootScope.CheckRefresh = function (e) { + $rootScope.CheckRefresh = function (e) { + //Checking if 'REFRESHED' or 'RELOADED' if ((e.keyCode === 116) || (e.keyCode == 82 && e.ctrlKey)) - $location.path('/'); + $location.path('/'); //Redirecting to landing page }; }] ); \ No newline at end of file