ADAM / AIAHTML5

Commit f154bac1929805299cfa148dd8d871edcbb8cf6b

Authored by unknown
1 parent 367ede34

Commit Changes

Inline Side-by-side
Showing 2 changed files with 7 additions and 2 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
  View file @f154bac
... ... @@ -556,7 +556,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
556 556 theme: 'success',
557 557 currentController: 'CAController',
558 558 parentSlug: 'clinical-animations',
559   - 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"' +
  559 + 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"' +
560 560 'class="ADAM_Video video-js vjs-default-skin vjs-big-play-centered" type="$videoType" id="playerinlineVideo"' +
561 561 ' poster="' + $scope.poster + '"' +
562 562 'controls="true" preload="none" allowfullscreen="true" allowscriptaccess="always" ' +
... ... @@ -692,7 +692,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
692 692 }
693 693 }
694 694  
695   -
  695 +
696 696 }]
697 697  
698 698  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @f154bac
... ... @@ -1853,6 +1853,11 @@ function onZoom(scope) {
1853 1853 $(document).ready(function () {
1854 1854 var $ua = navigator.userAgent;
1855 1855 if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
  1856 +
  1857 + var jspanelContainerWidth = $(".jsPanel-content").css("width");
  1858 + $(".jsPanel-content").css({ "width": "100%", "min-width": jspanelContainerWidth });
  1859 + $("#ImagePanel").css("width", "100%");
  1860 +
1856 1861 //hide pin button clicked
1857 1862 $("#hidePinBtn").removeAttr("onclick");
1858 1863 $("#hidePinBtn").on("touchstart", function () {
... ...