diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2013-06-13 21:42:10 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2013-06-13 21:42:10 +0000 |
| commit | 9ef4eff6aea4ec1135f7b12ff8f22dc296cc91ba (patch) | |
| tree | fa8363f922cbc0bdde1838b744e2ed36c23c0bc9 /modules/gallery/views | |
| parent | 9569b43035de9645e82271896e302c8d082d960a (diff) | |
| parent | a3d06cc5bca05cc1b892872f494e83a24837d06f (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/gallery/views')
| -rw-r--r-- | modules/gallery/views/form_uploadify.html.php | 2 | ||||
| -rw-r--r-- | modules/gallery/views/movieplayer.html.php | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php index 4963d185..bba6db73 100644 --- a/modules/gallery/views/form_uploadify.html.php +++ b/modules/gallery/views/form_uploadify.html.php @@ -25,7 +25,7 @@ $("#g-uploadify").uploadify({ width: 298, height: 32, - uploader: "<?= url::file("lib/uploadify/uploadify.php") ?>", + uploader: "<?= url::file("lib/uploadify/uploadify.swf.php") ?>", script: "<?= url::site("uploader/add_photo/{$album->id}") ?>", scriptData: <?= json_encode($script_data) ?>, fileExt: "<?= implode(";", $extensions) ?>", diff --git a/modules/gallery/views/movieplayer.html.php b/modules/gallery/views/movieplayer.html.php index f78cc91a..e4046906 100644 --- a/modules/gallery/views/movieplayer.html.php +++ b/modules/gallery/views/movieplayer.html.php @@ -11,7 +11,8 @@ defaultVideoHeight: <?= $height ?>, startVolume: 1.0, features: ["playpause", "progress", "current", "duration", "volume", "fullscreen"], - pluginPath: "<?= url::abs_file("lib/mediaelementjs/") ?>" + pluginPath: "<?= url::abs_file("lib/mediaelementjs/") ?>", + flashName: "flashmediaelement.swf.php" }, <?= json_encode($player_options) ?>) ); </script> |