From d552090b5cb281d0cc09a1acd454966f970c0582 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 15 Mar 2017 15:58:38 +0530 Subject: [PATCH] Commit Changes --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 68 ++++++++++++++------------------------------------------------------ 400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html | 2 +- 2 files changed, 15 insertions(+), 55 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index d1f7519..c5b09ec 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -7674,22 +7674,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.HideSearch = function () { - if ($("#backdrop").is(":hover") || $("#termlistfilter").is(":hover") || $("#typedtermname").is(":focus")) { - $scope.IsSearchVisible = true; - document.getElementById("termlistfilter").style.display = "block"; - } - else { - //1. persist term in DAsearch but hide ul/li - if ($("#btnDATermSearch").is(":hover")) { - $scope.IsSearchVisible = false; - } - else { - //2.hide ul/li and clear DA search - $scope.IsSearchVisible = false; - document.getElementById("termlistfilter").style.display = "none"; - $scope.searchFilter = ""; - } - } + + $timeout(function () { + + $("#termlistfilter").css("display", "none"); + + + }, 1000); } @@ -8417,7 +8408,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $("#btnNormalMode").removeClass("btn-primary"); } - $('#typedtermname').val($scope.searchFilter); + $('#TypedTermName').val($scope.searchFilter); } else { @@ -8442,17 +8433,17 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo for (var i = 0; i <= $rootScope.searchListArray.length - 1; i++) { - var searchFieldVal = $("#typedtermname").val(); + var searchFieldVal = $("#TypedTermName").val(); if (searchFieldVal.length > 0) { - var flag = true; + var isValueMatchedWithTerm = true; for (var j = 0; j <= searchFieldVal.length - 1; j++) { if (searchFieldVal[j].toUpperCase() != $rootScope.searchListArray[i].name[j].toUpperCase()) { - flag = false; + isValueMatchedWithTerm = false; break; } } - if (flag == true) { + if (isValueMatchedWithTerm == true) { $rootScope.ModifiedsearchListArray.push({ "name": $rootScope.searchListArray[i].name, "id": $rootScope.searchListArray[i].id}); console.log($rootScope.ModifiedsearchListArray); } @@ -8462,7 +8453,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo var termListFilterHtml = ''; termListFilterHtml += '