Commit 26e1133e6be6cbcf0b60d4cd2d63c4171cdcd50b
Merge branch 'ATToolbar_2' into Develop-IPAD-MAC
Showing
1 changed file
with
14 additions
and
1 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -1292,7 +1292,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -1292,7 +1292,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
1292 | }); | 1292 | }); |
1293 | 1293 | ||
1294 | $rootScope.loadSearchData = function () { | 1294 | $rootScope.loadSearchData = function () { |
1295 | - | 1295 | + |
1296 | //$("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" }); | 1296 | //$("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" }); |
1297 | var imageId = $rootScope.imageId; | 1297 | var imageId = $rootScope.imageId; |
1298 | var promise = ModuleService.getTermTextDataForAAImage(imageId) | 1298 | var promise = ModuleService.getTermTextDataForAAImage(imageId) |
@@ -1361,6 +1361,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -1361,6 +1361,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
1361 | console.log(' error: ' + error.statusText); | 1361 | console.log(' error: ' + error.statusText); |
1362 | } | 1362 | } |
1363 | ) | 1363 | ) |
1364 | + | ||
1365 | + | ||
1364 | } | 1366 | } |
1365 | 1367 | ||
1366 | 1368 | ||
@@ -1667,6 +1669,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -1667,6 +1669,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
1667 | } | 1669 | } |
1668 | $rootScope.isshowAllPinsBtnAfterHideClicked = true; | 1670 | $rootScope.isshowAllPinsBtnAfterHideClicked = true; |
1669 | $scope.showItemsForSearch = function () { | 1671 | $scope.showItemsForSearch = function () { |
1672 | + | ||
1670 | if($rootScope.isshowAllPinsBtnAfterHideClicked == true){ | 1673 | if($rootScope.isshowAllPinsBtnAfterHideClicked == true){ |
1671 | console.log('showItemsForSearch is called'); | 1674 | console.log('showItemsForSearch is called'); |
1672 | //this check is for log only because we are writing length so need to check if its not null or undefined | 1675 | //this check is for log only because we are writing length so need to check if its not null or undefined |
@@ -1677,6 +1680,15 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -1677,6 +1680,15 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
1677 | 1680 | ||
1678 | $scope.IsSearchVisible = true; | 1681 | $scope.IsSearchVisible = true; |
1679 | document.getElementById("termlistfilter").style.display = "block"; | 1682 | document.getElementById("termlistfilter").style.display = "block"; |
1683 | + | ||
1684 | + $("#backdrop > #searchListDivAA > #termlistfilter > li").each(function (key, value) { | ||
1685 | + | ||
1686 | + if ($(this).find("a").html() == document.getElementById("selectedTermName").value) { | ||
1687 | + $("#termlistfilter li a").css({ "background-color": "#ffffff", "color": "#000000" }); | ||
1688 | + $(this).find("a").css({ "background-color": "#3399FF", "color": "#ffffff" }); | ||
1689 | + } | ||
1690 | + }); | ||
1691 | + | ||
1680 | } | 1692 | } |
1681 | else { | 1693 | else { |
1682 | $rootScope.loadSearchData(); | 1694 | $rootScope.loadSearchData(); |
@@ -1711,6 +1723,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -1711,6 +1723,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
1711 | } | 1723 | } |
1712 | 1724 | ||
1713 | $scope.highlightPinBasedOnSerachItem = function (id) { | 1725 | $scope.highlightPinBasedOnSerachItem = function (id) { |
1726 | + | ||
1714 | $scope.searchItemId = id; | 1727 | $scope.searchItemId = id; |
1715 | $scope.searchItemText = $("#" + id).text(); | 1728 | $scope.searchItemText = $("#" + id).text(); |
1716 | $rootScope.searchSelectedText = $("#" + id).text(); | 1729 | $rootScope.searchSelectedText = $("#" + id).text(); |