Commit 3448008b4cc2813bb1ce30fa98e9e78cbf50a3c8
1 parent
8ababc7f
23751 : Atlas Anatomy > Selected body system pin's annotation should be highligh…
…t in the Search List and List manager.
Showing
1 changed file
with
11 additions
and
4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -8387,6 +8387,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | @@ -8387,6 +8387,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | ||
8387 | 8387 | ||
8388 | 8388 | ||
8389 | $scope.ShowSearch = function () { | 8389 | $scope.ShowSearch = function () { |
8390 | + | ||
8390 | var primaryLexiconIndex; | 8391 | var primaryLexiconIndex; |
8391 | for (var i = 0; i <= $rootScope.vocabTermDataArray.length - 1; i++) { | 8392 | for (var i = 0; i <= $rootScope.vocabTermDataArray.length - 1; i++) { |
8392 | if ($rootScope.vocabTermDataArray[i].language == $rootScope.lexiconLanguageArray[0].language) { | 8393 | if ($rootScope.vocabTermDataArray[i].language == $rootScope.lexiconLanguageArray[0].language) { |
@@ -8445,6 +8446,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | @@ -8445,6 +8446,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | ||
8445 | $rootScope.searchListArray.push({ "name": $(this).find("a").html(), "id": $(this).find("a").attr("id") }); | 8446 | $rootScope.searchListArray.push({ "name": $(this).find("a").html(), "id": $(this).find("a").attr("id") }); |
8446 | }); | 8447 | }); |
8447 | }, 100); | 8448 | }, 100); |
8449 | + | ||
8448 | } | 8450 | } |
8449 | else { | 8451 | else { |
8450 | $rootScope.loadSearchData(); | 8452 | $rootScope.loadSearchData(); |
@@ -8452,8 +8454,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | @@ -8452,8 +8454,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | ||
8452 | $scope.ShowSearch(); | 8454 | $scope.ShowSearch(); |
8453 | } | 8455 | } |
8454 | } | 8456 | } |
8455 | - | 8457 | + }, 500); |
8458 | + | ||
8456 | 8459 | ||
8460 | + $timeout(function () { | ||
8461 | + if ($rootScope.prevId != null && $rootScope.prevId != undefined && $rootScope.prevId != '') { | ||
8462 | + $("div#backdrop #termlistfilter li").find("a").css({ "background-color": "#ffffff", "color": "#000000" }); | ||
8463 | + $("div#backdrop #termlistfilter li").find("a[id=" + $rootScope.prevId + "]").css({ "background-color": "#3399FF", "color": "#ffffff" }); | ||
8464 | + | ||
8465 | + } | ||
8457 | }, 500); | 8466 | }, 500); |
8458 | 8467 | ||
8459 | } | 8468 | } |
@@ -8667,6 +8676,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | @@ -8667,6 +8676,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | ||
8667 | 8676 | ||
8668 | 8677 | ||
8669 | $scope.HighlightBodyOnListManagerSelection = function (actualTermNumber, isTermListOptionClicked) { | 8678 | $scope.HighlightBodyOnListManagerSelection = function (actualTermNumber, isTermListOptionClicked) { |
8679 | + | ||
8670 | //$rootScope.SelectedTermList = $("#termList").find("option[id=" + actualTermNumber + "]").val(); | 8680 | //$rootScope.SelectedTermList = $("#termList").find("option[id=" + actualTermNumber + "]").val(); |
8671 | $rootScope.searchSelectedText = $("#" + actualTermNumber).text(); | 8681 | $rootScope.searchSelectedText = $("#" + actualTermNumber).text(); |
8672 | $rootScope.slectedActualTermNumber = actualTermNumber; | 8682 | $rootScope.slectedActualTermNumber = actualTermNumber; |
@@ -8695,9 +8705,6 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | @@ -8695,9 +8705,6 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | ||
8695 | // $("#termList").find("option").attr('selected', false); | 8705 | // $("#termList").find("option").attr('selected', false); |
8696 | $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" }); | 8706 | $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" }); |
8697 | $("#termList").find("option[id=" + actualTermNumber + "]").css({ "background-color": "#3399FF", "color": "#ffffff" }); | 8707 | $("#termList").find("option[id=" + actualTermNumber + "]").css({ "background-color": "#3399FF", "color": "#ffffff" }); |
8698 | - $("div#backdrop #termlistfilter li").find("a").css({ "background-color": "#ffffff", "color": "#000000" }); | ||
8699 | - $("div#backdrop #termlistfilter li").find("a[id=" + actualTermNumber + "]").css({ "background-color": "#3399FF", "color": "#ffffff" }); | ||
8700 | - | ||
8701 | $scope.terminateCurrentlyRunningWPs(); | 8708 | $scope.terminateCurrentlyRunningWPs(); |
8702 | 8709 | ||
8703 | $rootScope.isListManagerSelected = true; | 8710 | $rootScope.isListManagerSelected = true; |