Commit ada01f0b86cdbaaf6ec5dbce0d975d8fb4407968
1 parent
6de18d92
the module is not open if we click on 3d module after cliking On back button the
Showing
1 changed file
with
27 additions
and
25 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
| @@ -10,8 +10,9 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | @@ -10,8 +10,9 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | ||
| 10 | var selectedModuleName = ''; | 10 | var selectedModuleName = ''; |
| 11 | //set module title | 11 | //set module title |
| 12 | angular.forEach($rootScope.userModules, function (value, key) { | 12 | angular.forEach($rootScope.userModules, function (value, key) { |
| 13 | - if (value.slug === currentURL.replace('/', '')) { | ||
| 14 | - selectedModuleName = value.name; | 13 | + // if (value.slug === currentURL.replace('/', '')) { |
| 14 | + if (value.slug === "3d-anatomy-list") { | ||
| 15 | + selectedModuleName = value.name; | ||
| 15 | } | 16 | } |
| 16 | $rootScope.currentActiveModuleTitle = selectedModuleName; | 17 | $rootScope.currentActiveModuleTitle = selectedModuleName; |
| 17 | }) | 18 | }) |
| @@ -114,30 +115,31 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | @@ -114,30 +115,31 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | ||
| 114 | //once you get id in scope push detail in jspanel content | 115 | //once you get id in scope push detail in jspanel content |
| 115 | 116 | ||
| 116 | var openViews; | 117 | var openViews; |
| 117 | - if ($rootScope.openViews.length > 0) { | ||
| 118 | - openViews = new jinqJs() | ||
| 119 | - .from($rootScope.openViews) | ||
| 120 | - .where("BodyViewId==" + $scope.voId3D) | ||
| 121 | - .select(); | ||
| 122 | - } | ||
| 123 | - var counter = 1; | 118 | + //if ($rootScope.openViews.length > 0) { |
| 119 | + // openViews = new jinqJs() | ||
| 120 | + // .from($rootScope.openViews) | ||
| 121 | + // .where("BodyViewId==" + $scope.voId3D) | ||
| 122 | + // .select(); | ||
| 123 | + //} | ||
| 124 | + //var counter = 1; | ||
| 124 | var tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson"); | 125 | var tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson"); |
| 125 | - | ||
| 126 | - if (openViews != null && openViews.length > 0) { | ||
| 127 | - angular.forEach(openViews, function (value, key) { | ||
| 128 | - | ||
| 129 | - if (value.body - views == tittle) { | ||
| 130 | - tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson") + counter++; | ||
| 131 | - $rootScope.currentActiveViewTitle = tittle; | ||
| 132 | - localStorage.setItem("currentViewTitle", tittle); | ||
| 133 | - } | ||
| 134 | - | ||
| 135 | - }); | ||
| 136 | - } | ||
| 137 | - else { | ||
| 138 | - localStorage.setItem("currentViewTitle", tittle); | ||
| 139 | - | ||
| 140 | - } | 126 | + $rootScope.currentActiveViewTitle = tittle; |
| 127 | + localStorage.setItem("currentViewTitle", tittle); | ||
| 128 | + //if (openViews != null && openViews.length > 0) { | ||
| 129 | + // angular.forEach(openViews, function (value, key) { | ||
| 130 | + | ||
| 131 | + // if (value.body - views == tittle) { | ||
| 132 | + // tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson") + counter++; | ||
| 133 | + // $rootScope.currentActiveViewTitle = tittle; | ||
| 134 | + // localStorage.setItem("currentViewTitle", tittle); | ||
| 135 | + // } | ||
| 136 | + | ||
| 137 | + // }); | ||
| 138 | + //} | ||
| 139 | + //else { | ||
| 140 | + // localStorage.setItem("currentViewTitle", tittle); | ||
| 141 | + | ||
| 142 | + //} | ||
| 141 | 143 | ||
| 142 | // alert($rootScope.getLocalStorageValue("currentViewTitle")); | 144 | // alert($rootScope.getLocalStorageValue("currentViewTitle")); |
| 143 | 145 |