Commit 8d6c131d7a43314ce18da1c87c5ff7e89d1708ac
Merge branch 'CALandscapeIssue' into Develop-IPAD-MAC
Showing
1 changed file
with
4 additions
and
1 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
... | ... | @@ -560,7 +560,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
560 | 560 | theme: 'success', |
561 | 561 | currentController: 'CAController', |
562 | 562 | parentSlug: 'clinical-animations', |
563 | - content: '<script src="' + $scope.playerScript + '"></script><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}); $("#caVideoPanel").css("width", "100%"); }videojs("#playerinlineVideo").pause();$("#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 id="pid" class="row"><div id="divplayerinlineVideo" class="col-sm-12" align="center" width="640" height="480"><video width="640" height="360"' + | |
563 | + content: '<script src="' + $scope.playerScript + '"></script><script>$(document).ready(function(){videojs("#playerinlineVideo").pause();$("#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 id="pid" class="row"><div id="divplayerinlineVideo" class="col-sm-12" align="center" width="640" height="480"><video width="640" height="360"' + | |
564 | 564 | 'class="ADAM_Video video-js vjs-default-skin vjs-big-play-centered" type="$videoType" id="playerinlineVideo"' + |
565 | 565 | ' poster="' + $scope.poster + '"' + |
566 | 566 | 'controls="true" preload="none" allowfullscreen="true" allowscriptaccess="always" ' + |
... | ... | @@ -611,6 +611,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
611 | 611 | if ($('.jsPanel-content').length > 0) { |
612 | 612 | $('.video-subtitle').css('margin-bottom', blackBorderHeight); |
613 | 613 | $('#divplayerinlineVideo').css('background', '#fff'); |
614 | + //Android > Clinical Animations > The animation does not fit to the screen in the Landscape mode. | |
615 | + var $ua = navigator.userAgent; | |
616 | + if (($ua.match(/(iPod|iPhone|iPad|android)/i))) { $('.jsPanel-content').css("width", "100%"); } | |
614 | 617 | } |
615 | 618 | |
616 | 619 | } | ... | ... |