diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index db73aad..28b8044 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -6842,7 +6842,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
}
$scope.jumpToTerm = function (event) {
-
+ // alert(event.currentTarget.value);
+ $rootScope.searchSelectedText = $('#'+ event.currentTarget.id).text();
+ $('#termList option[selected="selected"]').prop("selected", false);
+ $('#termList option[value="' + $rootScope.searchSelectedText + '"]').prop("selected", true);
+ $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
+ $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" });
$rootScope.isLoading = true;
$('#spinner').css('visibility', 'visible');
@@ -6902,6 +6907,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
//list manager
$scope.$on('listManagerEvent', function (event, data) {
+
//if ($rootScope.MenuModuleName == "DA") {
// if ($rootScope.disableAnnotationtoolOnListManager == true) {
// $('#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
$("#termList").find("option[id=" + actualTermNumber + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
$("div#backdrop #termlistfilter li").find("a").css({ "background-color": "#ffffff", "color": "#000000" });
$("div#backdrop #termlistfilter li").find("a[id=" + actualTermNumber + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
+
$scope.terminateCurrentlyRunningWPs();
//debugger
$rootScope.isListManagerSelected = true;
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 3225d1f..213d0a7 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -1151,8 +1151,10 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
$rootScope.clicked = false;
$rootScope.x = 0;
$rootScope.y = 0;
- $rootScope.x = parseInt(event.clientX - ($("#canvas").offset().left));
- $rootScope.y = parseInt(event.clientY - ($("#canvas").offset().top));
+
+ $rootScope.x = parseInt(event.clientX - ($("#canvas").offset().left));
+ $rootScope.y = parseInt(event.clientY - ($("#canvas").offset().top));
+
var canvasElement = document.getElementById("canvas");
var ctx = canvasElement.getContext("2d");
@@ -1887,7 +1889,6 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
$rootScope.disableAnnotationtoolOnListManager = false;
$rootScope.ShowListManager = function () {
console.log('ShowListManager')
-
$rootScope.disableAnnotationtoolOnListManager = true;
$('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled');
$('#slider-range-min-2').slider('disable');
@@ -1896,12 +1897,22 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
$('#listManager').css('display', 'block');
$("#listManager").css("visibility", "visible");
+
+ // $('#termList option[selected="selected"]').prop("selected", false);
+ // $("#termList").find("option[value=" + $rootScope.searchSelectedText + "]").prop("selected", true);
+ // $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
+ // $("#termList").find("option[value=" + $rootScope.searchSelectedText + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
$('#listManager').draggable();
$rootScope.islistManagerEventAlredayDispachted = true;
$rootScope.$broadcast('listManagerEvent', true);
+
+ $('#termList option[selected="selected"]').prop("selected", false);
+ $('#termList option[value="' + $rootScope.searchSelectedText + '"]').prop("selected", true);
+ $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
+ $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" });
}
$rootScope.CloseListManager = function () {