ADAM / AIAHTML5

Commit 3d5dcdc4be27db95ebf8ae5b2a8b56b2b471c3e5

Authored by unknown
1 parent 1423cfe2

DA > Annotation search from Search List is not highlight in the List manager.

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