Merge branch 'AIA_Develop' of https://gitlab.ebix.com/ADAM/AIAHTML5 into AIA_Develop

Sandeep Kumar
2 parents 672a1e70 adc5afdd
Showing 5 changed files with 52 additions and 25 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
400-SOURCECODE/AIAHTML5.Web/content/images/favicon.ico
400-SOURCECODE/AIAHTML5.Web/index.aspx
@@ -395,7 +395,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
             setTimeout(function () {
             var cleintht=imfgEle.clientHeight;
             if(cleintht>0)
-                $('.jsPanel-content').css('height', cleintht);
+                $('#CBSourceImagePanel .jsPanel-content').css('height', cleintht);
             $scope.CBEnableUI();
             }, 200)
@@ -139,7 +139,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                         'updatedWhiteImageMRDataList':[],
                         'updatedGrayDataList':[],
                         'updatedGrayMRDataList':[],
-                        
+                        'SearchTimeStampValue':0,
                     });          
@@ -231,7 +231,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                         'updatedWhiteImageDataList':[],
                         'updatedWhiteImageMRDataList':[],
                         'updatedGrayDataList':[],
-                        'updatedGrayMRDataList':[],
+                        'updatedGrayMRDataList': [],
+                        'SearchTimeStampValue': 0,
                     });          
                 }          
@@ -1235,7 +1236,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             $("#Skeletal").attr("id", "Skeletal_" + $rootScope.MULTI_VIEW_ID);
             $("#Urinary").attr("id", "Urinary_" + $rootScope.MULTI_VIEW_ID);
-            var $all = $("#da-input_" + $rootScope.MULTI_VIEW_ID).prepend('<input type="text" class="form-control input-sm pull-left da-search" id="typedTermName_' +  $rootScope.MULTI_VIEW_ID + '" onclick="OnSearch(event)" ondblclick="OnSearch(event)" ng-model="searchFilter" ng-change="resetSearchListView()" ng-blur="HideSearch()" placeholder=" search..." />')
+            var $all = $("#da-input_" + $rootScope.MULTI_VIEW_ID).prepend('<input type="text" class="form-control input-sm pull-left da-search" id="typedTermName_' + $rootScope.MULTI_VIEW_ID + '" onclick="OnSearch(event)" ondblclick="OnSearch(event)" ng-model="searchFilter" ng-keyup="resetSearchListView($event)" ng-blur="HideSearch()" placeholder=" search..." />')
             $compile($all)($scope);
         }
@@ -9690,6 +9691,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             $scope.SetwindowStoreData(windowviewid,'isSearchClicked',true);
             console.log('ShowSearch is called');
+            // clear time stamp on text box click
+            $scope.SetwindowStoreData(windowviewid, 'SearchTimeStampValue', 0);
             var primaryLexiconIndx = $scope.GetwindowStoreData(windowviewid, 'primaryLexiconInd');
@@ -9706,6 +9709,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                     if ($('#searchListDiv_' + windowviewid).html() != "")
                         $('#searchListDiv_' + windowviewid).empty();
                     //Delay compile of ul li so that the remove of li is completed.
+                    $timeout(function () {
                     $scope.isSearchDataLoaded = true;
                     var ColoredImageSRC=$scope.GetwindowStoreData(windowviewid,'ColoredImageSRC');
@@ -9728,10 +9732,11 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                             $('#spinner').css('visibility', 'hidden');
                         }
                     }
-
+                    }, 500);
                     console.log("primary language: " + vocabTermDataArray[primaryLexiconIndx].language);
+                    $timeout(function () {
                     $rootScope.a = primaryLexiconIndx;
                     $scope.vocabArray = vocabTermDataArray;
@@ -9747,6 +9752,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                     $("#termlistfilter_" + windowviewid).css("display", "block");
+                    }, 150);//Bug#39757
+
                     $timeout(function () {
                         $("#termlistfilter_" + windowviewid + " > li").each(function (key, value) {
@@ -10581,41 +10588,60 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
         }
-        $scope.resetSearchListView = function () {
+        $scope.resetSearchListView = function (event) {
+
+            var len = (event.target.id).split("_").length;
+            var windowviewid = (event.target.id).split("_")[len - 1];
-            // $scope.ShowSearch();
-            $scope.showFilteredTerms()
+            var oldtimestamp = $scope.GetwindowStoreData(windowviewid, 'SearchTimeStampValue');
+
+            //var newSearchValue = $("#typedTermName_" + windowviewid).val();           
+            var date = new Date();
+            var newtimestamp = date.getTime();
+         
+           // console.log('search text value: ' + newSearchValue);
+          
+            var oldtimestamp = $scope.GetwindowStoreData(windowviewid, 'SearchTimeStampValue');
+        
+            if ((newtimestamp - oldtimestamp) > 1000) {
+               
+                $scope.SetwindowStoreData(windowviewid, 'SearchTimeStampValue', newtimestamp);
+                $scope.showFilteredTerms(windowviewid);
+            }
+          
         }
-        $scope.showFilteredTerms = function () {
-            var len=  (event.target.id).split("_").length;
-            var windowviewid = (event.target.id).split("_")[len-1];
+ 
+        $scope.showFilteredTerms = function (windowviewid) {
-            if ($('#searchListDiv_' + windowviewid).html() != "") {
-                $('#searchListDiv_' + windowviewid).empty();
-            }
+            console.log('showFilteredTerms is called' );
+            
+            $('#searchListDiv_' + windowviewid).empty();
+
             var vocabTermDataArray = $scope.GetwindowStoreData(windowviewid, 'vocabTermDataArray');
             $scope.vocabArray = vocabTermDataArray;
             $rootScope.a = $scope.GetwindowStoreData(windowviewid, 'primaryLexiconInd');
-            $scope.sFilter = $("#typedTermName_" + windowviewid).val();
+            $scope.sFilter = $("#typedTermName_" + windowviewid).val();;
             var $e2 = $('<ul id="termlistfilter_' + windowviewid + '" 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 vocabArray[a].vocabTermTxt| filter:{ _TermText: sFilter}| limitTo : 10">' +
             '<a id="{{item._ActualTermNumber}}" href="" onclick="selectTerm(event)">{{item._TermText}}</a>' +
             ' </li></ul>').appendTo('#searchListDiv_' + windowviewid);
             $compile($e2)($scope);
             $("#termlistfilter_" + windowviewid).css("display", "block");
-            $timeout(function () {
-                $("#termlistfilter_" + windowviewid + " > li").each(function (key, value) {
+            
-                    if ($(this).find("a").html() == document.getElementById("typedTermName_" + windowviewid).value) {
-                        $("#termlistfilter_" + windowviewid + " li a").css({ "background-color": "#ffffff", "color": "#000000" });
-                        $(this).find("a").css({ "background-color": "#3399FF", "color": "#ffffff" });
-                    }
-                });
+            //$timeout(function () {
+            //    $("#termlistfilter_" + windowviewid + " > li").each(function (key, value) {
+
+            //        if ($(this).find("a").html() == document.getElementById("typedTermName_" + windowviewid).value) {
+            //            $("#termlistfilter_" + windowviewid + " li a").css({ "background-color": "#ffffff", "color": "#000000" });
+            //            $(this).find("a").css({ "background-color": "#3399FF", "color": "#ffffff" });
+            //        }
+            //    });
-            }, 100);
+            //}, 100);
         };
         $scope.ApplySearch = function () {
             var len=  (event.currentTarget.id).split("_").length;
@@ -10744,7 +10770,7 @@ function OnSearch(event) {
         var len=  (event.currentTarget.id).split("_").length;
         var windowviewid = (event.currentTarget.id).split("_")[len-1];
         scope.ShowSearch(windowviewid);
-    });
+    });   
 }
 function selectTerm(event) {
@@ -848,7 +848,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
             $("#canvasDiv").scrollTop($rootScope.CanvasDivTopPosition);
         });
        // $(document).on("click", "#" + $scope.jsPanelID +" .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function (event) {
-        $(document).on("click", " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () {
+        $(document).on("click", "#" + $scope.jsPanelID +" .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () {
        // $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () {
             $scope.setActiveTab(parseInt($rootScope.getLocalStorageValue("activeTab")));
@@ -14,6 +14,7 @@
     <!--<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">-->
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0 maximum-scale=1.0" />
     <title>A.D.A.M. Interactive Anatomy</title>
+    <link rel="icon" type="image/x-icon" href="/content/images/favicon.ico">
     <link href="themes/default/css/bootstrap/3.3.6/bootstrap.css?v=1.0.0" rel="stylesheet" />