aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/assets/js/media.js
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-11-12 02:48:36 -0500
committerGitHub <noreply@github.com>2017-11-12 02:48:36 -0500
commit2b51bc4bfa86863ed14b550fe3281840587ab038 (patch)
tree0fd7276e326ed0901b1af980d07d57f3bbb7d7eb /app/src/main/assets/js/media.js
parentec7fdc2521463d0a773bb9d0be454f3b2a60eee3 (diff)
downloadfrost-2b51bc4bfa86863ed14b550fe3281840587ab038.tar.gz
frost-2b51bc4bfa86863ed14b550fe3281840587ab038.tar.bz2
frost-2b51bc4bfa86863ed14b550fe3281840587ab038.zip
enhancement/video-player (#480)v1.6.3
* Add toolbar visibility toggle and draw it over viewer * Set contract bindings once available * Fix video url param error and prepare progressanimator * Add gif support and better transitions * Interface a lot of things * Reorder back press * Clean up files and fix selector * Add gif support * Redraw bounds when necessary
Diffstat (limited to 'app/src/main/assets/js/media.js')
-rw-r--r--app/src/main/assets/js/media.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/src/main/assets/js/media.js b/app/src/main/assets/js/media.js
index 852a1e8c..f1a5ac3c 100644
--- a/app/src/main/assets/js/media.js
+++ b/app/src/main/assets/js/media.js
@@ -9,7 +9,7 @@ if (!window.hasOwnProperty('frost_media')) {
* Commonality; check for valid target
*/
var element = e.target || e.srcElement;
- if (!element.hasAttribute("data-sigil") || !element.getAttribute("data-sigil").includes("playInlineVideo")) return;
+ if (!element.hasAttribute("data-sigil") || !element.getAttribute("data-sigil").toLowerCase().includes("inlinevideo")) return;
console.log("Found inline video");
element = element.parentNode;
if (!element.hasAttribute("data-store")) return;
@@ -20,8 +20,8 @@ if (!window.hasOwnProperty('frost_media')) {
return;
}
if (!dataStore.src) return;
- console.log("Inline video", dataStore.src);
- if (typeof Frost !== 'undefined') Frost.loadVideo(dataStore.src);
+ console.log("Inline video " + dataStore.src);
+ if (typeof Frost !== 'undefined') Frost.loadVideo(dataStore.src, dataStore.animatedGifVideo);
e.stopPropagation();
e.preventDefault();
return;