diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 7cc58c0..aa35cc1 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -8387,6 +8387,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.ShowSearch = function () { + var primaryLexiconIndex; for (var i = 0; i <= $rootScope.vocabTermDataArray.length - 1; i++) { if ($rootScope.vocabTermDataArray[i].language == $rootScope.lexiconLanguageArray[0].language) { @@ -8445,6 +8446,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $rootScope.searchListArray.push({ "name": $(this).find("a").html(), "id": $(this).find("a").attr("id") }); }); }, 100); + } else { $rootScope.loadSearchData(); @@ -8452,8 +8454,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.ShowSearch(); } } - + }, 500); + + $timeout(function () { + if ($rootScope.prevId != null && $rootScope.prevId != undefined && $rootScope.prevId != '') { + $("div#backdrop #termlistfilter li").find("a").css({ "background-color": "#ffffff", "color": "#000000" }); + $("div#backdrop #termlistfilter li").find("a[id=" + $rootScope.prevId + "]").css({ "background-color": "#3399FF", "color": "#ffffff" }); + + } }, 500); } @@ -8667,6 +8676,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.HighlightBodyOnListManagerSelection = function (actualTermNumber, isTermListOptionClicked) { + //$rootScope.SelectedTermList = $("#termList").find("option[id=" + actualTermNumber + "]").val(); $rootScope.searchSelectedText = $("#" + actualTermNumber).text(); $rootScope.slectedActualTermNumber = actualTermNumber; @@ -8695,9 +8705,6 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l // $("#termList").find("option").attr('selected', false); $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" }); $("#termList").find("option[id=" + actualTermNumber + "]").css({ "background-color": "#3399FF", "color": "#ffffff" }); - $("div#backdrop #termlistfilter li").find("a").css({ "background-color": "#ffffff", "color": "#000000" }); - $("div#backdrop #termlistfilter li").find("a[id=" + actualTermNumber + "]").css({ "background-color": "#3399FF", "color": "#ffffff" }); - $scope.terminateCurrentlyRunningWPs(); $rootScope.isListManagerSelected = true;