From 035511d2fbbb64ccb215498eebbae1288e27388a Mon Sep 17 00:00:00 2001 From: Mukul Date: Tue, 30 Jan 2018 16:37:19 +0530 Subject: [PATCH] this is scroll issue in IPAD --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js | 29 ++++++++++++++++++++--------- 400-SOURCECODE/AIAHTML5.Web/app/views/Link/Link-view.html | 69 +++++++++++++++++++++++++++++++++++---------------------------------- 2 files changed, 55 insertions(+), 43 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js index 0e7877a..0d031b5 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js @@ -29,21 +29,32 @@ function ($scope, $rootScope, log, $location, pages, $routeParams) { for (var i = 0; i < $scope.links.length; i++) { if ($scope.links[i].modname == $routeParams.modname) { $rootScope.currentActiveModuleTitle = $scope.links[i].title; - if ($rootScope.currentActiveModuleTitle == "IP 10" || $rootScope.currentActiveModuleTitle == "A.D.A.M OnDemand") + if ($rootScope.currentActiveModuleTitle == "IP 10") { - // document.getElementById('externalLink').style.height = "1024px"; - if ($uaAOD.match(/(iPod|iPhone|iPad|android)/i)) { - document.getElementById('externalLink').style.height = 2048 + "px"; + + // document.getElementById('externalLink').style.height = "1024px"; + document.getElementById('externalLink').style.height = $(window).outerHeight() - 41 + "px"; + } + + $scope.objdata = $scope.links[i].objurl; + $scope.myObj = $scope.links[i].objstyle; + if ($('#externalLink').css('display') === 'none') { + document.getElementById('externalLink').style.display = "block"; + document.getElementById('externalLinkiframe').style.display = "none"; + } + if ($rootScope.currentActiveModuleTitle == "A.D.A.M OnDemand") { + + if ($uaAOD.match(/(iPod|iPhone|iPad)/i)) { + + document.getElementById('externalLink').style.display = "none"; + document.getElementById('externalLinkiframe').style.display = "block"; + document.getElementById('externalLinkiframe').style.height = $(window).outerHeight() - 128 + "px"; + document.getElementById("externalLinkiframe").src = $scope.objdata; } else { document.getElementById('externalLink').style.height = $(window).outerHeight() - 128 + "px"; } - - - } - $scope.objdata = $scope.links[i].objurl; - $scope.myObj = $scope.links[i].objstyle; } } }); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/Link/Link-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/Link/Link-view.html index 756a49b..6e0cbf4 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/Link/Link-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/Link/Link-view.html @@ -1,34 +1,35 @@ -
-
-
-
- - -
-
-
- - - - +
+
+
+
+ + + +
+
+
+ + + + -- libgit2 0.21.4