Commit 367ede342d93e327c7702160c76347449a1f920e
1 parent
29913a17
24284 : iPad > The page does not fit to the screen in the Landscape mode.
Showing
3 changed files
with
10 additions
and
5 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
@@ -158,7 +158,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | @@ -158,7 +158,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | ||
158 | parentSlug: '3d-anatomy-list', | 158 | parentSlug: '3d-anatomy-list', |
159 | content: '<div class="col-sm-12">' + | 159 | content: '<div class="col-sm-12">' + |
160 | '<object data="' + $scope.Selected3DImagePath + '" width="100%" height="800px" type="image/svg+xml"></object>' + | 160 | '<object data="' + $scope.Selected3DImagePath + '" width="100%" height="800px" type="image/svg+xml"></object>' + |
161 | - '</div>', | 161 | + '</div><script>$(document).ready(function(){var $ua = navigator.userAgent; if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {var threeDivWidth = $("#ThreeDView").css("width");$("#ThreeDView").css({"left":"0px","width":"100%","min-idth": threeDivWidth}); var jspanelContainerWidth = $(".jsPanel-content").css("width"); $(".jsPanel-content").css({ "width": "100%", "min-width": jspanelContainerWidth}); $("#3DImagePanel").css("width", "100%"); }});</script>', |
162 | title: $rootScope.getLocalStorageValue("currentViewTitle"), | 162 | title: $rootScope.getLocalStorageValue("currentViewTitle"), |
163 | position: { | 163 | position: { |
164 | top: 70, | 164 | top: 70, |
@@ -175,7 +175,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | @@ -175,7 +175,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | ||
175 | { | 175 | { |
176 | "module": $rootScope.currentActiveModuleTitle, "bodyView": tittle, "state": 'max', "BodyViewId": $rootScope.currentBodyViewId, | 176 | "module": $rootScope.currentActiveModuleTitle, "bodyView": tittle, "state": 'max', "BodyViewId": $rootScope.currentBodyViewId, |
177 | "slug": $rootScope.currentSlug | 177 | "slug": $rootScope.currentSlug |
178 | - }); | 178 | + });zz |
179 | 179 | ||
180 | 180 | ||
181 | } | 181 | } |
@@ -194,6 +194,8 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | @@ -194,6 +194,8 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | ||
194 | 194 | ||
195 | } | 195 | } |
196 | 196 | ||
197 | + | ||
198 | + | ||
197 | }] | 199 | }] |
198 | 200 | ||
199 | 201 |
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
@@ -618,7 +618,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | @@ -618,7 +618,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | ||
618 | '<div class="col-sm-12 img-thumbnail" align="center">' + | 618 | '<div class="col-sm-12 img-thumbnail" align="center">' + |
619 | '<img src="' + $scope.clickedCIImage + '" alt="" title="" class="img-responsive "><div class="col-sm-12 well img-subtitle">' + | 619 | '<img src="' + $scope.clickedCIImage + '" alt="" title="" class="img-responsive "><div class="col-sm-12 well img-subtitle">' + |
620 | '<div align="left" id="sid"><p>' + $scope.clickedCISummary + '</p></div><button id="btnTxtOnOff" class="btn btn-primary pull-right">Text Off</button>' + | 620 | '<div align="left" id="sid"><p>' + $scope.clickedCISummary + '</p></div><button id="btnTxtOnOff" class="btn btn-primary pull-right">Text Off</button>' + |
621 | - '<script>$(document).ready(function(){$("#btnTxtOnOff").click(function(){if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");$("#sid").css("visibility","hidden");}else{$(this).text("Text Off");$("#sid").css("visibility","visible");}});});</script></div>' + | 621 | + '<script>$(document).ready(function(){ var $ua = navigator.userAgent;if(($ua.match(/(iPod|iPhone|iPad|android)/i))) { var jspanelContainerWidth = $(".jsPanel-content").css("width"); $(".jsPanel-content").css({ "width": "100%", "min-width": jspanelContainerWidth });$("#ciImagePanel").css("width", "100%"); }$("#btnTxtOnOff").click(function(){if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");$("#sid").css("visibility","hidden");}else{$(this).text("Text Off");$("#sid").css("visibility","visible");}});});</script></div>' + |
622 | '</div></div>', | 622 | '</div></div>', |
623 | //ajax: { | 623 | //ajax: { |
624 | // url: 'app/views/ci/ci-view-detail.html' | 624 | // url: 'app/views/ci/ci-view-detail.html' |
@@ -742,9 +742,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | @@ -742,9 +742,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | ||
742 | } | 742 | } |
743 | } | 743 | } |
744 | 744 | ||
745 | -}] | ||
746 | - | ||
747 | 745 | ||
746 | + | ||
747 | +}] | ||
748 | ); | 748 | ); |
749 | 749 | ||
750 | 750 |
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -598,6 +598,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | @@ -598,6 +598,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | ||
598 | //to get slider working on ipad | 598 | //to get slider working on ipad |
599 | var $ua = navigator.userAgent; | 599 | var $ua = navigator.userAgent; |
600 | if (($ua.match(/(iPod|iPhone|iPad|android)/i))) { | 600 | if (($ua.match(/(iPod|iPhone|iPad|android)/i))) { |
601 | + var jspanelContainerWidth = $(".jsPanel-content").css("width"); | ||
602 | + $(".jsPanel-content").css({ "width": "100%", "min-width": jspanelContainerWidth }); | ||
603 | + $("#daImagePanel").css("width", "100%"); | ||
601 | $("#layerChangeSlider").css("pointer-events", "auto"); | 604 | $("#layerChangeSlider").css("pointer-events", "auto"); |
602 | // on identity mode click | 605 | // on identity mode click |
603 | $("#btnZoom").removeAttr("onclick"); | 606 | $("#btnZoom").removeAttr("onclick"); |