diff options
author | Bharat Mediratta <bharat@menalto.com> | 2013-03-04 15:34:11 -0800 |
---|---|---|
committer | Bharat Mediratta <bharat@menalto.com> | 2013-03-04 15:34:11 -0800 |
commit | 24475e914ffb5f639f35b500e29b2743cf2216c7 (patch) | |
tree | 0c626d201dc05cdd69a4f6c103b5f759b1012c32 /modules/gallery/views | |
parent | 0fb8e202c9b41973d96a89f7ecea3007722fa022 (diff) | |
parent | a517d9a33a47a2308cec1c9bfb1138abf181a909 (diff) |
Merge pull request #187 from shadlaws/2033_followon
Follow-on to #2033 - Change variables and js script loading for Flash Fl...
Diffstat (limited to 'modules/gallery/views')
-rw-r--r-- | modules/gallery/views/movieplayer-flash.html.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/gallery/views/movieplayer-flash.html.php b/modules/gallery/views/movieplayer-flash.html.php index 6d3cee2a..12303bf4 100644 --- a/modules/gallery/views/movieplayer-flash.html.php +++ b/modules/gallery/views/movieplayer-flash.html.php @@ -1,4 +1,5 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> +<script type="text/javascript" src="<?= url::file("lib/flowplayer-flash/flowplayer.js") ?>"></script> <?= html::anchor($url, "", $attrs) ?> <script type="text/javascript"> var id = "<?= $attrs["id"] ?>"; @@ -23,7 +24,7 @@ "src": "<?= url::abs_file("lib/flowplayer-flash/flowplayer.swf") ?>", "wmode": "transparent", "provider": "pseudostreaming" - }, <?= json_encode($fp_params) ?>), + }, <?= json_encode($fp_flash_params) ?>), $.extend(true, { "plugins": { "pseudostreaming": { @@ -42,7 +43,7 @@ set_movie_size(parseInt(clip.metaData.width), parseInt(clip.metaData.height)); } } - }, <?= json_encode($fp_config) ?>) + }, <?= json_encode($fp_flash_config) ?>) ).ipad(); // set movie size using width and height passed from movie_img function $("document").ready(set_movie_size(<?= $width ?>, <?= $height ?>)); |