diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index cf77512..7d1eb52 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -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 = $('').appendTo('#termList') + var $el = $('').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 +} + + diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html index ae9bae2..8753d9a 100644 --- a/400-SOURCECODE/AIAHTML5.Web/index.html +++ b/400-SOURCECODE/AIAHTML5.Web/index.html @@ -49,8 +49,9 @@ #termList option:hover { - background-color: #3399FF; - color:#fff; + background-color: #3399FF !important; + color: #fff !important; + } @@ -743,10 +744,9 @@ -