Merge branch 'RefactorCode' into Develop

Nikita Kulshreshtha
2 parents 00de6fce 61c754de
Showing 2 changed files with 43 additions and 11 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/index.html
@@ -527,10 +527,33 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         $('#daBodyview').css("width", $(window).outerWidth());
     }
-    angular.element(document).ready(function () {
-
-    })
-
+    angular.element(document).ready(function (e) {
+        // function setScrollBarPosition() {
+           // var CanvasDivWidthAftrMin = $("#canvasDiv").width() / 2;
+           // $("#canvasDiv").scrollLeft(CanvasDivWidthAftrMin);
+           //}
+           // $("#daImagePanel").resize(checkWidth);
+
+        $(document).on("mouseover", "#termList option", function (e) {
+            $('#termList option[selected="selected"]').attr("selected", false);
+            $(this).attr("selected", true);
+            });
+          
+           $(document).keypress(function (e) {
+                if ($('#termList option[selected="selected"]').attr("id") == "undefined") {
+                    return false;
+                }
+                else {
+                    var originator = e.keyCode || e.which;
+                   // alert($('#termList option[selected="selected"]').attr("id"));
+                    if ($('#termList option[selected="selected"]').attr("id")) {
+                        if (e.keyCode == 13) {
+                            onListManagerTermSelection($('#termList option[selected="selected"]').attr("id"));
+                        }
+                    }
+                }
+            });
+       })
     $scope.loadSearchDataForBodyView = function () {
@@ -7034,7 +7057,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             $rootScope.prevId = actualTermNumber;
-            $("#termList").find("option").attr('selected', false);
+          //  $("#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" });
@@ -7395,7 +7418,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 for (var j = 0; j < $scope.VocabTermTxt.length; j++) {
-                    var $el = $('<option  id=' + $scope.VocabTermTxt[j]._ActualTermNumber + '>' + $scope.VocabTermTxt[j]._TermText + '</option>').appendTo('#termList')
+                    var $el = $('<option id=' + $scope.VocabTermTxt[j]._ActualTermNumber + '>' + $scope.VocabTermTxt[j]._TermText + '</option>').appendTo('#termList')
                     $compile($el)($scope);
                 }
@@ -7510,7 +7533,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     }
+    //$rootScope.termListEnterEvent = function (event) {
+     //   $(document).("")
+        //debugger;
+        //alert(event.currentTarget.id);
+        //$('#termList option[selected="selected"]').attr("selected", false);
+        // alert("sss");
+    //}
 }]
@@ -7651,4 +7681,6 @@ function onListManagerTermSelection(id) {
         scope.HighlightBodyOnListManagerSelection(id);
     });
-}
 \ No newline at end of file
+}
+
+
@@ -49,8 +49,9 @@
         #termList option:hover {
-            background-color: #3399FF;
-            color:#fff;
+           background-color: #3399FF !important;
+           color: #fff !important;
+           
         }
@@ -743,10 +744,9 @@
                         </div>
-
                         <!--DA > List Manager > Multiple structure selection should not be available.-->
                         <div class="form-group">
-                            <select id="termList" class="form-control"  size="10" onclick="if (typeof (this.selectedIndex) != 'undefined') onListManagerTermSelection(this.options[this.selectedIndex].id)"></select>
+                            <select id="termList" class="form-control" size="10" onclick="if (typeof (this.selectedIndex) != 'undefined') onListManagerTermSelection(this.options[this.selectedIndex].id)"></select>
                         </div>
                     </div>