Commit 5fa5c33457084e718e07285aa101a08ccbdbeffa
1 parent
a6e09ea9
toobox bug fixed in 3D module
Showing
1 changed file
with
5 additions
and
5 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
... | ... | @@ -353,15 +353,15 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location |
353 | 353 | $scope.jsPanelWidth = 900; |
354 | 354 | |
355 | 355 | $scope.jsPanelHeight = $scope.ThreeDOpenInOtherModules.size.height; |
356 | - if ($scope.ThreeDOpenInOtherModules.size.height > 750) | |
357 | - $scope.jsPanelHeight = 750; | |
356 | + if ($scope.ThreeDOpenInOtherModules.size.height > 560) | |
357 | + $scope.jsPanelHeight = 560; | |
358 | 358 | $scope.jsPanelLeft = 320; |
359 | 359 | $scope.jsPanelTop = $rootScope.cBModulejsPanelTop(); |
360 | 360 | |
361 | 361 | } |
362 | 362 | else { |
363 | - $scope.jsPanelWidth = $(window).outerWidth() - 23; | |
364 | - $scope.jsPanelHeight = $(window).outerHeight() - 104; | |
363 | + $scope.jsPanelWidth = $(window).outerWidth() - 10; | |
364 | + $scope.jsPanelHeight = $(window).outerHeight() - 105; | |
365 | 365 | $scope.jsPanelLeft = 1; |
366 | 366 | $scope.jsPanelTop = 70; |
367 | 367 | } |
... | ... | @@ -374,7 +374,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location |
374 | 374 | theme: 'success', |
375 | 375 | currentController: '3dAController', |
376 | 376 | parentSlug: $scope.Get3DwindowStoreData(windowviewid, 'parentSlugName'), |
377 | - content: '<div class="col-sm-12" >' + | |
377 | + content: '<div class="col-sm-12" style="height: 560px;overflow: auto;" >' + | |
378 | 378 | '<object data="' + Selected3DImagePath + '" width="100%" height="800px" type="image/svg+xml" id="threedImage_' + windowviewid + '" onload="AnimationOnLoad(event)"></object>' + |
379 | 379 | '</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}); $("#ThreeDImagePanel_' + windowviewid + '").css("width", "100%"); }});</script>', |
380 | 380 | title: tittle, | ... | ... |