Commit 2d180b538aa618b5840dcdfe1dd9815b7d2e6472
Merge branch 'textDescWithCA' of http://52.6.196.163/ADAM/AIAHTML5 into Develop-IPAD-MAC
Showing
1 changed file
with
1 additions
and
1 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
| ... | ... | @@ -575,7 +575,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
| 575 | 575 | ' kind="captions" srclang="en" label="On"><object width="640" height="360"' + |
| 576 | 576 | ' type="application/x-shockwave-flash" data="//vjs.zencdn.net/3.2/video-js.swf"><param name="allowfullscreen" value="true">' + |
| 577 | 577 | ' <param name="allowscriptaccess" value="always"><param name="movie" value="//vjs.zencdn.net/3.2/video-js.swf">' + |
| 578 | - ' <param name="flashvars" ng-value="controls=true&file=' + $scope.clickedCAVideo + '"><img ng-src="content/images/common/player/frameaccuracy_logo.jpg" style="height:80%;" alt="Here we are" title="No video playback capabilities"></object></video><div class="col-sm-12 well video-subtitle"><div id="sid" align="left" style="height:40px;overflow-y:scroll !important"><p>' + $scope.clickedCASummary + '</p></div><button id="btnTxtOnOff" class="btn btn-primary pull-right">Text Off</button></div></div></div>', | |
| 578 | + ' <param name="flashvars" ng-value="controls=true&file=' + $scope.clickedCAVideo + '"><img ng-src="content/images/common/player/frameaccuracy_logo.jpg" style="height:80%;" alt="Here we are" title="No video playback capabilities"></object></video><div class="col-sm-12 well video-subtitle"><div id="sid" align="left" style="height:40px;overflow-y:scroll !important;-webkit-overflow-scrolling:touch !important;"><p>' + $scope.clickedCASummary + '</p></div><button id="btnTxtOnOff" class="btn btn-primary pull-right">Text Off</button></div></div></div>', | |
| 579 | 579 | |
| 580 | 580 | //ajax: { |
| 581 | 581 | // url: 'app/views/ca/ca-view-detail.html' | ... | ... |