ADAM / AIAHTML5

Commit eb800128eefe88fa486b6238086eb021ab83d11e

Authored by Nikita Kulshreshtha
2 parents 00de6fce 61c754de

Merge branch 'RefactorCode' into Develop

Inline Side-by-side
Showing 2 changed files with 43 additions and 11 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @eb80012
... ... @@ -527,10 +527,33 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
527 527 $('#daBodyview').css("width", $(window).outerWidth());
528 528 }
529 529  
530   - angular.element(document).ready(function () {
531   -
532   - })
533   -
  530 + angular.element(document).ready(function (e) {
  531 + // function setScrollBarPosition() {
  532 + // var CanvasDivWidthAftrMin = $("#canvasDiv").width() / 2;
  533 + // $("#canvasDiv").scrollLeft(CanvasDivWidthAftrMin);
  534 + //}
  535 + // $("#daImagePanel").resize(checkWidth);
  536 +
  537 + $(document).on("mouseover", "#termList option", function (e) {
  538 + $('#termList option[selected="selected"]').attr("selected", false);
  539 + $(this).attr("selected", true);
  540 + });
  541 +
  542 + $(document).keypress(function (e) {
  543 + if ($('#termList option[selected="selected"]').attr("id") == "undefined") {
  544 + return false;
  545 + }
  546 + else {
  547 + var originator = e.keyCode || e.which;
  548 + // alert($('#termList option[selected="selected"]').attr("id"));
  549 + if ($('#termList option[selected="selected"]').attr("id")) {
  550 + if (e.keyCode == 13) {
  551 + onListManagerTermSelection($('#termList option[selected="selected"]').attr("id"));
  552 + }
  553 + }
  554 + }
  555 + });
  556 + })
534 557  
535 558 $scope.loadSearchDataForBodyView = function () {
536 559  
... ... @@ -7034,7 +7057,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7034 7057  
7035 7058  
7036 7059 $rootScope.prevId = actualTermNumber;
7037   - $("#termList").find("option").attr('selected', false);
  7060 + // $("#termList").find("option").attr('selected', false);
7038 7061 $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
7039 7062 $("#termList").find("option[id=" + actualTermNumber + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
7040 7063 $("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
7395 7418  
7396 7419  
7397 7420 for (var j = 0; j < $scope.VocabTermTxt.length; j++) {
7398   - var $el = $('<option id=' + $scope.VocabTermTxt[j]._ActualTermNumber + '>' + $scope.VocabTermTxt[j]._TermText + '</option>').appendTo('#termList')
  7421 + var $el = $('<option id=' + $scope.VocabTermTxt[j]._ActualTermNumber + '>' + $scope.VocabTermTxt[j]._TermText + '</option>').appendTo('#termList')
7399 7422 $compile($el)($scope);
7400 7423 }
7401 7424  
... ... @@ -7510,7 +7533,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7510 7533  
7511 7534 }
7512 7535  
  7536 + //$rootScope.termListEnterEvent = function (event) {
  7537 + // $(document).("")
  7538 + //debugger;
  7539 + //alert(event.currentTarget.id);
  7540 + //$('#termList option[selected="selected"]').attr("selected", false);
  7541 + // alert("sss");
7513 7542  
  7543 + //}
7514 7544  
7515 7545 }]
7516 7546  
... ... @@ -7651,4 +7681,6 @@ function onListManagerTermSelection(id) {
7651 7681 scope.HighlightBodyOnListManagerSelection(id);
7652 7682 });
7653 7683  
7654   -}
7655 7684 \ No newline at end of file
  7685 +}
  7686 +
  7687 +
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @eb80012
... ... @@ -49,8 +49,9 @@
49 49  
50 50  
51 51 #termList option:hover {
52   - background-color: #3399FF;
53   - color:#fff;
  52 + background-color: #3399FF !important;
  53 + color: #fff !important;
  54 +
54 55 }
55 56  
56 57  
... ... @@ -743,10 +744,9 @@
743 744  
744 745 </div>
745 746  
746   -
747 747 <!--DA > List Manager > Multiple structure selection should not be available.-->
748 748 <div class="form-group">
749   - <select id="termList" class="form-control" size="10" onclick="if (typeof (this.selectedIndex) != 'undefined') onListManagerTermSelection(this.options[this.selectedIndex].id)"></select>
  749 + <select id="termList" class="form-control" size="10" onclick="if (typeof (this.selectedIndex) != 'undefined') onListManagerTermSelection(this.options[this.selectedIndex].id)"></select>
750 750 </div>
751 751  
752 752 </div>
... ...