remove commented code and fixed for

Shashi Bhushan Kumar
1 parent 0585407e
Showing 2 changed files with 20 additions and 19 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/filters/AIAFilter.js
@@ -8920,7 +8920,6 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$filter&quot;,&quot;$
                         if ($('#searchListDiv').html() != "")
                             $('#searchListDiv').empty();
                         //Delay compile of ul li so that the remove of li is completed.
-                        $timeout(function () {
                             $scope.isSearchDataLoaded = true;
@@ -8944,13 +8943,13 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$filter&quot;,&quot;$
                                 }
                             }
-                        }, 500);
+ 
                         $scope.IsSearchVisible = true;
                         console.log("primary language: " + $rootScope.vocabTermDataArray[primaryLexiconIndx].language);
                         $rootScope.a = primaryLexiconIndx;
-                        var $e2 = $('<ul id="termlistfilter" class="form-control dropdown-menu" style="height:130px;width:100%;overflow-y:scroll;position:absolute;display:none;z-index:60001;"><li ng-repeat="item in vocabTermDataArray[a].vocabTermTxt| filter:{ _TermText: searchFilter}">' +
+                        var $e2 = $('<ul id="termlistfilter" class="form-control dropdown-menu" style="height:130px;width:100%;overflow-y:scroll;position:absolute;display:none;z-index:60001;"><li ng-repeat="item in vocabTermDataArray[a].vocabTermTxt| filter:{ _TermText: searchFilter} | limitTo : 10">' +
                                                                    '<a id="{{item._ActualTermNumber}}" href="" onclick="selectTerm(event)">{{item._TermText}}</a>' +
                                                               ' </li></ul>').appendTo('#searchListDiv')
                         $compile($e2)($scope);
@@ -8958,27 +8957,22 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$filter&quot;,&quot;$
                         console.log('termlistfilter is created and complied');
                         document.getElementById("termlistfilter").style.display = "block";
-                        $timeout(function () {
+
                             $("#backdrop > #searchListDiv > #termlistfilter > li").each(function (key, value) {
                                 if ($(this).find("a").html() == document.getElementById("typedTermName").value) {
                                     $("#termlistfilter li a").css({ "background-color": "#ffffff", "color": "#000000" });
                                     $(this).find("a").css({ "background-color": "#3399FF", "color": "#ffffff" });
                                 }
                             });
-                        }, 100);
-                        $timeout(function () {
                             $rootScope.searchListArray = [];
                             $("#backdrop > #searchListDiv > #termlistfilter > li").each(function (key, value) {
                                 $rootScope.searchListArray.push({ "name": $(this).find("a").html(), "id": $(this).find("a").attr("id") });
                             });
-                        }, 100);
+
                     }
                     else {
                         $rootScope.loadSearchData();
-                        //if ($rootScope.vocabTermDataArray[primaryLexiconIndx].vocabTermTxt.length > 0) {
-                        //    $scope.ShowSearch();
-                        //}
                     }
                 }, 500);
@@ -9809,13 +9803,15 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$filter&quot;,&quot;$
             if ($('#searchListDiv').html() != "") {
                 $('#searchListDiv').empty();
             }
+            //Bug 39757
+            $timeout(function () {
             $rootScope.a = $scope.primaryLexiconInd;
             var $e2 = $('<ul id="termlistfilter" class="form-control dropdown-menu ng-scope" style="height:132px;width:100%;overflow-y:scroll;position:absolute;display:block;z-index:60001;"><li class="ng-scope" ng-repeat="item in vocabTermDataArray[a].vocabTermTxt| startsWithLetter:{ _TermText: searchFilter}| limitTo : 10">' +
             '<a id="{{item._ActualTermNumber}}" href="" onclick="selectTerm(event)">{{item._TermText}}</a>' +
             ' </li></ul>').appendTo('#searchListDiv')
             $compile($e2)($scope);
             document.getElementById("termlistfilter").style.display = "block";
-            $timeout(function () {
+
                 $("#backdrop > #searchListDiv > #termlistfilter > li").each(function (key, value) {
                     if ($(this).find("a").html() == document.getElementById("typedTermName").value) {
                         $("#termlistfilter li a").css({ "background-color": "#ffffff", "color": "#000000" });
@@ -9909,7 +9905,8 @@ function enableShowHideStructureBox() {
 function OnSearch() {
     console.log('Show Search is called outside ');
     var scope = angular.element(document.getElementById("daView")).scope();
-    scope.$apply(function () {
+    //Bug 39757
+    scope.$evalAsync(function () {
         scope.ShowSearch();
     });
 }
@@ -2,15 +2,19 @@
     return function (items, letter) {
         var filtered = [];
-        var letterMatch = new RegExp("^" + letter._TermText, 'i');
-        for (var i = 0; i < items.length; i++) {
-            var item = items[i];
-            //if (letterMatch.test(item._TermText.substring(0, 1))) {
-            if (letterMatch.test(item._TermText)) {
+            var letterMatch = new RegExp("^" + letter._TermText, 'i');
+            for (var i = 0; i < items.length; i++) {
+                var item = items[i];
+                //Bug 39757
+                if (letterMatch.test(item._TermText)) {
-                filtered.push(item);
+                    filtered.push(item);
+                }
+                //Bug 39757
+                if (filtered.length > 10) {
+                    break;
+                }
             }
-        }
         return filtered;
     };
 });
 \ No newline at end of file