Commit 68ae50e89ffdc8f12433234e627ae8bac5cda53f
1 parent
f174ddbc
Commit Changes
Showing
3 changed files
with
48 additions
and
17 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
| ... | ... | @@ -594,7 +594,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
| 594 | 594 | } |
| 595 | 595 | |
| 596 | 596 | angular.element(document).ready(function (e) { |
| 597 | - | |
| 597 | + $(document).on("click", "#daImagePanel .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () { | |
| 598 | + $rootScope.searchSelectedText = ''; | |
| 599 | + }); | |
| 598 | 600 | $("#layerChangeSlider").slider({ |
| 599 | 601 | orientation: "vertical", |
| 600 | 602 | range: "max", | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
| ... | ... | @@ -3148,7 +3148,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
| 3148 | 3148 | |
| 3149 | 3149 | $rootScope.disableAnnotationtoolOnListManager = false; |
| 3150 | 3150 | $rootScope.ShowListManager = function () { |
| 3151 | - | |
| 3151 | + | |
| 3152 | 3152 | $rootScope.switchCanvas(); |
| 3153 | 3153 | $("#annotationpaintbrushsize").attr("href", "#"); |
| 3154 | 3154 | $("#annotationpainteraser").attr("href", "#"); |
| ... | ... | @@ -3170,28 +3170,55 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
| 3170 | 3170 | $rootScope.islistManagerEventAlredayDispachted = true; |
| 3171 | 3171 | |
| 3172 | 3172 | $rootScope.$broadcast('listManagerEvent', true); |
| 3173 | - | |
| 3173 | + | |
| 3174 | 3174 | if ($rootScope.selectedBodySystemName == undefined && $rootScope.slectedActualTermNumber == undefined) { |
| 3175 | - $('#termList option[selected="selected"]').prop("selected", false); | |
| 3176 | - $('#termList option[value="' + $rootScope.searchSelectedText + '"]').prop("selected", true); | |
| 3177 | - $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" }); | |
| 3178 | - $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" }); | |
| 3179 | - } | |
| 3175 | + if ($location.path() == "/module-item-view") { | |
| 3176 | + $timeout(function () { | |
| 3177 | + $('#termList option[selected="selected"]').prop("selected", false); | |
| 3178 | + $('#termList option[value="' + $rootScope.searchSelectedText + '"]').prop("selected", true); | |
| 3179 | + $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" }); | |
| 3180 | + $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" }); | |
| 3181 | + }, 1000); | |
| 3182 | + } | |
| 3183 | + else { | |
| 3184 | + $('#termList option[selected="selected"]').prop("selected", false); | |
| 3185 | + $('#termList option[value="' + $rootScope.searchSelectedText + '"]').prop("selected", true); | |
| 3186 | + $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" }); | |
| 3187 | + $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" }); | |
| 3188 | + } | |
| 3189 | + } | |
| 3180 | 3190 | else { |
| 3181 | 3191 | |
| 3182 | 3192 | if ($rootScope.selectedBodySystemId == undefined) { |
| 3183 | 3193 | $rootScope.selectedBodySystemId = 0; |
| 3184 | - $rootScope.refreshTermListOnSystemSelection($rootScope.selectedBodySystemId); | |
| 3194 | + if ($location.path() == "/module-item-view") { | |
| 3195 | + $scope.refreshTermListOnAASystemSelection($rootScope.selectedBodySystemId); | |
| 3196 | + } | |
| 3197 | + else { | |
| 3198 | + if ($location.path() == "/module-item-view") { | |
| 3199 | + $scope.refreshTermListOnAASystemSelection($rootScope.selectedBodySystemId); | |
| 3200 | + } | |
| 3201 | + else { | |
| 3202 | + $rootScope.refreshTermListOnSystemSelection($rootScope.selectedBodySystemId); | |
| 3203 | + } | |
| 3204 | + | |
| 3205 | + } | |
| 3185 | 3206 | } |
| 3186 | 3207 | else { |
| 3187 | - $rootScope.refreshTermListOnSystemSelection($rootScope.selectedBodySystemId); | |
| 3208 | + if ($location.path() == "/module-item-view") { | |
| 3209 | + $scope.refreshTermListOnAASystemSelection($rootScope.selectedBodySystemId); | |
| 3210 | + } | |
| 3211 | + else { | |
| 3212 | + $rootScope.refreshTermListOnSystemSelection($rootScope.selectedBodySystemId); | |
| 3213 | + } | |
| 3214 | + | |
| 3188 | 3215 | } |
| 3189 | - | |
| 3216 | + $timeout(function () { | |
| 3190 | 3217 | $('#bodySystems option[selected="selected"]').prop("selected", false); |
| 3191 | 3218 | $('#bodySystems option[value="' + $rootScope.selectedBodySystemName + '"]').prop("selected", true); |
| 3192 | 3219 | $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" }); |
| 3193 | 3220 | $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" }); |
| 3194 | - | |
| 3221 | + }, 1000); | |
| 3195 | 3222 | } |
| 3196 | 3223 | $("#optionsListManagerTab").addClass("active"); |
| 3197 | 3224 | var viewNameAftrSplit = $("#viewName").val().split(" "); | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
| ... | ... | @@ -317,6 +317,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou |
| 317 | 317 | $(document).on("click", "#ImagePanel .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () { |
| 318 | 318 | $scope.setActiveTab(parseInt(localStorage.getItem("activeTab"))); |
| 319 | 319 | $(".tools").css("z-index", "15000"); |
| 320 | + $rootScope.searchSelectedText = ''; | |
| 320 | 321 | //if (localStorage.getItem("activeTab") != null) { |
| 321 | 322 | |
| 322 | 323 | // $rootScope.isListViewRowClicked = true; |
| ... | ... | @@ -1259,7 +1260,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou |
| 1259 | 1260 | else |
| 1260 | 1261 | { |
| 1261 | 1262 | |
| 1262 | - $scope.refreshTermListOnAASystemSelection($rootScope.bodySystemSeletedId); | |
| 1263 | + $rootScope.refreshTermListOnAASystemSelection($rootScope.bodySystemSeletedId); | |
| 1263 | 1264 | } |
| 1264 | 1265 | $timeout(function () { |
| 1265 | 1266 | $("#totalTerms").empty(); |
| ... | ... | @@ -1269,7 +1270,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou |
| 1269 | 1270 | |
| 1270 | 1271 | |
| 1271 | 1272 | |
| 1272 | - $scope.refreshTermListOnAASystemSelection = function (bodySystemId) { | |
| 1273 | + $rootScope.refreshTermListOnAASystemSelection = function (bodySystemId) { | |
| 1274 | + | |
| 1273 | 1275 | $rootScope.bodySystemSeletedId = bodySystemId; |
| 1274 | 1276 | $('#termList').empty(); |
| 1275 | 1277 | var bodySystemName = $("#AABodySystems #" + bodySystemId).val(); |
| ... | ... | @@ -1595,9 +1597,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou |
| 1595 | 1597 | |
| 1596 | 1598 | function refreshTermListOnSystemSel(bodySystemId) { |
| 1597 | 1599 | |
| 1598 | - var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope(); | |
| 1599 | - scope.$apply(function () { | |
| 1600 | - scope.refreshTermListOnAASystemSelection(bodySystemId); | |
| 1600 | + var rootScope = angular.element(document.getElementById("aaDetailPageDiv")).scope(); | |
| 1601 | + rootScope.$apply(function () { | |
| 1602 | + rootScope.refreshTermListOnAASystemSelection(bodySystemId); | |
| 1601 | 1603 | }); |
| 1602 | 1604 | } |
| 1603 | 1605 | ... | ... |