diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index b8abee9..04e4753 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -635,6 +635,73 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $("#layerChangeSlider").css("pointer-events", "auto"); } + + //to get slider working on ipad + var $ua = navigator.userAgent; + if (($ua.match(/(iPod|iPhone|iPad|android)/i))) { + $("#layerChangeSlider").css("pointer-events", "auto"); + // on identity mode click + $("#btnZoom").removeAttr("onclick"); + $("#btnZoom").on("touchstart", function () { + if ($(".btn-annotation").hasClass("activebtncolor")) //Bug #14928 + $(".btn-annotation").removeClass("activebtncolor"); + //Dissectible Anatomy > Extract and Annotations displays apart on the page after click on Zoom-in. + $(".com").remove(); + $("#bord").remove(); + console.log('OnZoom is called outside '); + var scope = angular.element(document.getElementById("daView")).scope(); + scope.$apply(function () { + scope.enableZoom(); + }); + }); + // on transparency mode click + $("#btnTranparency").removeAttr("onclick"); + $("#btnTranparency").on("touchstart", function () { + console.log('OnEnableExtract is called outside '); + var scope = angular.element(document.getElementById("daView")).scope(); + scope.$apply(function () { + scope.createTransparencyBox('true'); + }); + }); + // on normal mode click + $("#btnNormalMode").removeAttr("onclick"); + $("#btnNormalMode").on("touchstart", function () { + console.log('OnEnableNormalMode is called outside '); + $("#btnTranparency").removeClass("disabled"); + var scope = angular.element(document.getElementById("daView")).scope(); + scope.$apply(function () { + scope.enableNormalMode(); + }); + }); + // on extract mode click + $("#btnExtract").removeAttr("onclick"); + $("#btnExtract").on("touchstart", function () { + console.log('OnEnableExtract is called outside '); + var scope = angular.element(document.getElementById("daView")).scope(); + scope.$apply(function () { + scope.enableExtract('true'); + }); + }); + // on highlight mode click + $("#btnHighLight").removeAttr("onclick"); + $("#btnHighLight").on("touchstart", function () { + console.log('OnEnableHighlight is called outside '); + var scope = angular.element(document.getElementById("daView")).scope(); + scope.$apply(function () { + scope.enableHighlight(); + }); + }); + // on show/hide mode click + $("#btnStrutureBox").removeAttr("onclick"); + $("#btnStrutureBox").on("touchstart", function () { + console.log('OnBodySystem chnaged is called outside '); + var scope = angular.element(document.getElementById("daView")).scope(); + scope.$apply(function () { + scope.enableShowHideStructureBox(); + }); + }); + } + $(document).on("click", "#daImagePanel .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () { $rootScope.selectedBodySystemName = 'All'; $rootScope.selectedBodySystemId = 0; @@ -4314,11 +4381,12 @@ 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("touchstart", mouseDownListener); - canvasDiv.addEventListener("touchend", mouseUpListener); + canvasDiv.addEventListener("touchmove", mouseMoveListener); + + canvasDiv.addEventListener("touchend", mouseUpListener); canvasDiv.addEventListener("mousedown", mouseDownListener); @@ -4355,6 +4423,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l function mouseDownListener(e) { e.preventDefault(); + //to prevent screen scroll on ipad while drawing TB + 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') { @@ -4416,6 +4486,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l function mouseMoveListener(e) { e.preventDefault(); + //to prevent screen scroll on ipad while drawing TB + e.preventDefault(); + var canvasDiv = document.getElementById('canvasDiv'); $scope.verticalScrollPosition = canvasDiv.scrollTop; $scope.horizontlScrollPosition = canvasDiv.scrollLeft; @@ -4445,6 +4518,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l e.preventDefault(); $scope.DisableUI(); + //to prevent screen scroll on ipad while drawing TB + e.preventDefault(); + $scope.isTBDrawnOnBodyRegion = false; $(".com").remove(); @@ -4683,10 +4759,10 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l document.getElementById('canvasDiv').removeEventListener("touchstart", mouseDownListener); + document.getElementById('canvasDiv').removeEventListener("touchmove", mouseMoveListener); - document.getElementById('canvasDiv').removeEventListener("touchend", mouseUpListener); - - + + document.getElementById('canvasDiv').removeEventListener("touchend", mouseUpListener); // document.getElementById('canvasDiv').removeEventListener("mousemove", mouseMoveListener); $('#btnTranparency').removeClass('btn-black'); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index 9c01ea0..d0ce0d5 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -1865,7 +1865,43 @@ function onZoom(scope) { $(document).ready(function () { + var $ua = navigator.userAgent; + if (($ua.match(/(iPod|iPhone|iPad|android)/i))) { + //hide pin button clicked + $("#hidePinBtn").removeAttr("onclick"); + $("#hidePinBtn").on("touchstart", function () { + var rootScope = angular.element(document.getElementById("aaDetailPageDiv")).scope(); + rootScope.$apply(function () { + rootScope.hidePins(event); + }); + }); + //selected pin button clicked + $("#selectedPin").removeAttr("onclick"); + $("#selectedPin").on("touchstart", function () { + console.log('showSelectedPins is called') + var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope(); + scope.$apply(function () { + scope.showSelectedPins(event); + }); + }); + //all pin button clicked + $("#allPinBtn").removeAttr("onclick"); + $("#allPinBtn").on("touchstart", function () { + var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope(); + scope.$apply(function () { + scope.showAllPinsAfterHide(event); + }); + }); + //comment-box button clicked + $("#comment-box").removeAttr("onclick"); + $("#comment-box").on("touchstart", function () { + var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope(); + scope.$apply(function () { + scope.ShowHideAnnotation(event); + }); + }); + } $(".slider").slider({ min: 25, max: 100,