ADAM / AIAHTML5

Commit d0ebde2a0a65c213996295a186f69c4010dd0402

Authored by Nikita Kulshreshtha
2 parents 9a56818d 3d5dcdc4

Merge branch '#11132' into Develop

Inline Side-by-side
Showing 2 changed files with 22 additions and 4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @d0ebde2
... ... @@ -6842,7 +6842,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6842 6842 }
6843 6843  
6844 6844 $scope.jumpToTerm = function (event) {
6845   -
  6845 + // alert(event.currentTarget.value);
  6846 + $rootScope.searchSelectedText = $('#'+ event.currentTarget.id).text();
  6847 + $('#termList option[selected="selected"]').prop("selected", false);
  6848 + $('#termList option[value="' + $rootScope.searchSelectedText + '"]').prop("selected", true);
  6849 + $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
  6850 + $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" });
6846 6851 $rootScope.isLoading = true;
6847 6852  
6848 6853 $('#spinner').css('visibility', 'visible');
... ... @@ -6902,6 +6907,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6902 6907 //list manager
6903 6908 $scope.$on('listManagerEvent', function (event, data) {
6904 6909  
  6910 +
6905 6911 //if ($rootScope.MenuModuleName == "DA") {
6906 6912 // if ($rootScope.disableAnnotationtoolOnListManager == true) {
6907 6913 // $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled');
... ... @@ -7062,6 +7068,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7062 7068 $("#termList").find("option[id=" + actualTermNumber + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
7063 7069 $("div#backdrop #termlistfilter li").find("a").css({ "background-color": "#ffffff", "color": "#000000" });
7064 7070 $("div#backdrop #termlistfilter li").find("a[id=" + actualTermNumber + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
  7071 +
7065 7072 $scope.terminateCurrentlyRunningWPs();
7066 7073 //debugger
7067 7074 $rootScope.isListManagerSelected = true;
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @d0ebde2
... ... @@ -1151,8 +1151,10 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1151 1151 $rootScope.clicked = false;
1152 1152 $rootScope.x = 0;
1153 1153 $rootScope.y = 0;
1154   - $rootScope.x = parseInt(event.clientX - ($("#canvas").offset().left));
1155   - $rootScope.y = parseInt(event.clientY - ($("#canvas").offset().top));
  1154 +
  1155 + $rootScope.x = parseInt(event.clientX - ($("#canvas").offset().left));
  1156 + $rootScope.y = parseInt(event.clientY - ($("#canvas").offset().top));
  1157 +
1156 1158  
1157 1159 var canvasElement = document.getElementById("canvas");
1158 1160 var ctx = canvasElement.getContext("2d");
... ... @@ -1887,7 +1889,6 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1887 1889 $rootScope.disableAnnotationtoolOnListManager = false;
1888 1890 $rootScope.ShowListManager = function () {
1889 1891 console.log('ShowListManager')
1890   -
1891 1892 $rootScope.disableAnnotationtoolOnListManager = true;
1892 1893 $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled');
1893 1894 $('#slider-range-min-2').slider('disable');
... ... @@ -1896,12 +1897,22 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1896 1897  
1897 1898 $('#listManager').css('display', 'block');
1898 1899 $("#listManager").css("visibility", "visible");
  1900 +
  1901 + // $('#termList option[selected="selected"]').prop("selected", false);
  1902 + // $("#termList").find("option[value=" + $rootScope.searchSelectedText + "]").prop("selected", true);
  1903 + // $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
  1904 + // $("#termList").find("option[value=" + $rootScope.searchSelectedText + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
1899 1905 $('#listManager').draggable();
1900 1906  
1901 1907  
1902 1908 $rootScope.islistManagerEventAlredayDispachted = true;
1903 1909  
1904 1910 $rootScope.$broadcast('listManagerEvent', true);
  1911 +
  1912 + $('#termList option[selected="selected"]').prop("selected", false);
  1913 + $('#termList option[value="' + $rootScope.searchSelectedText + '"]').prop("selected", true);
  1914 + $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
  1915 + $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" });
1905 1916 }
1906 1917  
1907 1918 $rootScope.CloseListManager = function () {
... ...