Merge commit 'upstream/master'

1 files changed, 15 insertions, 0 deletions

diff --git a/modules/gallery/views/movieplayer.html.php b/modules/gallery/views/movieplayer.html.php
new file mode 100644
index 00000000..e8cabd31
--- /dev/null
+++ b/modules/gallery/views/movieplayer.html.php
@@ -0,0 +1,15 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<?= html::anchor($item->file_url(true), "", $attrs) ?>
+<script>
+  flowplayer("<?= $attrs["id"] ?>", "<?= url::abs_file("lib/flowplayer.swf") ?>", {
+    plugins: {
+      h264streaming: {
+        url: "<?= url::abs_file("lib/flowplayer.h264streaming.swf") ?>"
+      },
+      controls: {
+        autoHide: 'always',
+        hideDelay: 2000
+      }
+    }
+  })
+</script>