diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index b69421b..b8abee9 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -389,7 +389,10 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$rootScope.male = "";
$rootScope.female = "active";
}
+
+
+
}
@@ -621,8 +624,17 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
+
+
+
angular.element(document).ready(function (e) {
+ var $ua = navigator.userAgent;
+ // var $event = ($ua.match(/(iPod|iPhone|iPad|android)/i));
+ if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
+ $("#layerChangeSlider").css("pointer-events", "auto");
+ }
+
$(document).on("click", "#daImagePanel .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () {
$rootScope.selectedBodySystemName = 'All';
$rootScope.selectedBodySystemId = 0;
@@ -4278,7 +4290,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.createTransparencyBox = function () {
-
+
$scope.isTransparencyBtnClicked = true;
//do not create TBOX if in extarct mode otherwise create
@@ -4302,11 +4314,18 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.horizontlScrollPosition = canvasDiv.scrollLeft;
var canvasDiv = document.getElementById('canvasDiv');
+ canvasDiv.addEventListener("touchstart", mouseDownListener);
+
+ canvasDiv.addEventListener("touchmove", mouseMoveListener);
+
+ canvasDiv.addEventListener("touchend", mouseUpListener);
+
canvasDiv.addEventListener("mousedown", mouseDownListener);
canvasDiv.addEventListener("mousemove", mouseMoveListener);
- canvasDiv.addEventListener("mouseup", mouseUpListener)
+ canvasDiv.addEventListener("mouseup", mouseUpListener);
+
}
else {
@@ -4335,7 +4354,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
function mouseDownListener(e) {
-
+ e.preventDefault();
//Dated:18-07-2016 Issue#4975: Transparency box should not be clickable if it is already selected.
var tCanvas = document.getElementById('transparencyCanvas');
if ($('#transparencyScale').css("visibility") == 'visible') {
@@ -4383,6 +4402,10 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
document.getElementById('canvasDiv').removeEventListener("mousedown", mouseDownListener);
+
+ document.getElementById('canvasDiv').removeEventListener("touchstart", mouseDownListener);
+
+
//Dated:19-07-2016 Issue#4975: Transparency box should not be clickable if it is already selected.
if ($("#txtlayerNumber").val() != 0 && $rootScope.currentLayerNumber != undefined) {
$('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($rootScope.currentLayerNumber));
@@ -4392,7 +4415,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
function mouseMoveListener(e) {
-
+ e.preventDefault();
var canvasDiv = document.getElementById('canvasDiv');
$scope.verticalScrollPosition = canvasDiv.scrollTop;
$scope.horizontlScrollPosition = canvasDiv.scrollLeft;
@@ -4419,7 +4442,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
function mouseUpListener(e) {
-
+ e.preventDefault();
$scope.DisableUI();
$scope.isTBDrawnOnBodyRegion = false;
@@ -4641,8 +4664,6 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
-
-
//
// $('#transparencyScale').modal('show');
@@ -4658,8 +4679,14 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
document.getElementById('canvasDiv').removeEventListener("mousedown", mouseDownListener);
document.getElementById('canvasDiv').removeEventListener("mousemove", mouseMoveListener);
-
document.getElementById('canvasDiv').removeEventListener("mouseup", mouseUpListener);
+
+
+ document.getElementById('canvasDiv').removeEventListener("touchstart", mouseDownListener);
+ document.getElementById('canvasDiv').removeEventListener("touchmove", mouseMoveListener);
+ document.getElementById('canvasDiv').removeEventListener("touchend", mouseUpListener);
+
+
// document.getElementById('canvasDiv').removeEventListener("mousemove", mouseMoveListener);
$('#btnTranparency').removeClass('btn-black');
@@ -8519,6 +8546,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.ShowSearch = function () {
+
var primaryLexiconIndex;
for (var i = 0; i <= $rootScope.vocabTermDataArray.length - 1; i++) {
if ($rootScope.vocabTermDataArray[i].language == $rootScope.lexiconLanguageArray[0].language) {
@@ -8577,6 +8605,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$rootScope.searchListArray.push({ "name": $(this).find("a").html(), "id": $(this).find("a").attr("id") });
});
}, 100);
+
}
else {
$rootScope.loadSearchData();
@@ -8584,9 +8613,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.ShowSearch();
}
}
-
+ }, 500);
- }, 500);
+
}
@@ -8799,7 +8828,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.HighlightBodyOnListManagerSelection = function (actualTermNumber, isTermListOptionClicked) {
-
+
$scope.DisableUI();
$rootScope.searchSelectedText = $("#" + actualTermNumber).text();
@@ -8829,9 +8858,6 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
// $("#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" });
- $("div#backdrop #termlistfilter li").find("a[id=" + actualTermNumber + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
-
$scope.terminateCurrentlyRunningWPs();
$rootScope.isListManagerSelected = true;
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 84a75c1..6218ffe 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -3758,7 +3758,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
$rootScope.disableAnnotationtoolOnListManager = false;
$rootScope.ShowListManager = function () {
-
+
$rootScope.switchCanvas();
$("#annotationpaintbrushsize").attr("href", "#");
$("#annotationpainteraser").attr("href", "#");
@@ -3788,6 +3788,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
$('#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.searchOption = $('#termList option[value="' + $rootScope.searchSelectedText + '"]').attr("id");
+ $("div#backdrop #searchListDivAA #termlistfilter li").find("a").css({ "background-color": "#ffffff", "color": "#000000" });
+ $("div#backdrop #searchListDivAA #termlistfilter li").find("a[id=" + $rootScope.searchOption + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
}, 1000);
}
else {
@@ -3829,6 +3832,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
$('#bodySystems option[value="' + $rootScope.selectedBodySystemName + '"]').prop("selected", true);
$("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
$('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" });
+
}, 1000);
}
$("#optionsListManagerTab").addClass("active");
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
index 5339c85..9c01ea0 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -854,12 +854,18 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
if ($scope.MultiLanguageAnnationArray.length > 0) {
for (var i = 0; i <= $scope.MultiLanguageAnnationArray.length - 1; i++) {
var MultipleLanguage = $scope.MultiLanguageAnnationArray[i];
+ $rootScope.clickedPinAnnotation = $scope.MultiLanguageAnnationArray[0];
$("#speechBubble" + PinId).append("" + MultipleLanguage + "
");
}
}
else {
console.log('MultiLanguageAnnationArray.length is :' + $scope.MultiLanguageAnnationArray.length)
}
+
+
+
+
+
if ($scope.longestAnnotation != null || $scope.longestAnnotation != undefined) {
if ($scope.longestAnnotation.length <= 10) {
@@ -1139,13 +1145,16 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
$scope.showAnnotation(selectedPinData, false, true, false);
}
-
-
+ $('#termList option[selected="selected"]').prop("selected", false);
+ $('#termList option[value="' + $rootScope.clickedPinAnnotation + '"]').prop("selected", true);
+ $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
+ $('#termList option[value="' + $rootScope.clickedPinAnnotation + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" });
+ $rootScope.clickedPinAnnotationID = $('#termList option[value="' + $rootScope.clickedPinAnnotation + '"]').attr("id");
+ $("div#backdrop #searchListDivAA #termlistfilter li").find("a").css({ "background-color": "#ffffff", "color": "#000000" });
+ $("div#backdrop #searchListDivAA #termlistfilter li").find("a[id=" + $rootScope.clickedPinAnnotationID + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
}
}).drawLayers();
-
-
}