From a517d9a33a47a2308cec1c9bfb1138abf181a909 Mon Sep 17 00:00:00 2001
From: shadlaws <shad@shadlaws.com>
Date: Mon, 4 Mar 2013 23:44:50 +0100
Subject: Follow-on to #2033 - Change variables and js script loading for Flash
 Flowplayer. - changed movie_img event variable names to have "flash" in them.
 - moved flowplayer.js loading from page.html.php to movieplayer-flash. -
 removed conditional loading for small, photo-specific JS files in
 page.html.php to keep combined JS consistent between page types (better for
 caching).

---
 modules/gallery/views/movieplayer-flash.html.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'modules/gallery/views')

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 ?>));
-- 
cgit v1.2.3