From 227ae3888a30238285916a3aa1e0ea8ee0746c88 Mon Sep 17 00:00:00 2001 From: Jordan Bates Date: Sat, 25 May 2013 13:40:35 -0700 Subject: [PATCH] Vimeo, Liveleak, and Vocaroo wmodes --- builds/4chan-X.js | 8 ++++---- builds/4chan-X.user.js | 8 ++++---- builds/crx/script.js | 8 ++++---- src/Linkification/Linkify.coffee | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/builds/4chan-X.js b/builds/4chan-X.js index 45d6b6ce4..a6f04458e 100644 --- a/builds/4chan-X.js +++ b/builds/4chan-X.js @@ -4436,7 +4436,7 @@ style: 'border: 0; width: 150px; height: 45px;', el: function() { return $.el('object', { - innerHTML: "" + innerHTML: "" }); } }, @@ -4444,7 +4444,7 @@ regExp: /.*(?:vimeo.com\/)([^#\&\?]*).*/, el: function() { return $.el('iframe', { - src: "//player.vimeo.com/video/" + this.name + src: "//player.vimeo.com/video/" + this.name + "?wmode=opaque" }); }, title: { @@ -4459,8 +4459,8 @@ LiveLeak: { regExp: /.*(?:liveleak.com\/view.+i=)([0-9a-z_]+)/, el: function() { - return $.el('iframe', { - src: "http://www.liveleak.com/e/" + this.name + "?autostart=true" + return $.el('object', { + innerHTML: "" }); } }, diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 79b0df103..d7de01cda 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -4420,7 +4420,7 @@ style: 'border: 0; width: 150px; height: 45px;', el: function() { return $.el('object', { - innerHTML: "" + innerHTML: "" }); } }, @@ -4428,7 +4428,7 @@ regExp: /.*(?:vimeo.com\/)([^#\&\?]*).*/, el: function() { return $.el('iframe', { - src: "//player.vimeo.com/video/" + this.name + src: "//player.vimeo.com/video/" + this.name + "?wmode=opaque" }); }, title: { @@ -4443,8 +4443,8 @@ LiveLeak: { regExp: /.*(?:liveleak.com\/view.+i=)([0-9a-z_]+)/, el: function() { - return $.el('iframe', { - src: "http://www.liveleak.com/e/" + this.name + "?autostart=true" + return $.el('object', { + innerHTML: "" }); } }, diff --git a/builds/crx/script.js b/builds/crx/script.js index 28ccf2b49..a83e47790 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -4422,7 +4422,7 @@ style: 'border: 0; width: 150px; height: 45px;', el: function() { return $.el('object', { - innerHTML: "" + innerHTML: "" }); } }, @@ -4430,7 +4430,7 @@ regExp: /.*(?:vimeo.com\/)([^#\&\?]*).*/, el: function() { return $.el('iframe', { - src: "//player.vimeo.com/video/" + this.name + src: "//player.vimeo.com/video/" + this.name + "?wmode=opaque" }); }, title: { @@ -4445,8 +4445,8 @@ LiveLeak: { regExp: /.*(?:liveleak.com\/view.+i=)([0-9a-z_]+)/, el: function() { - return $.el('iframe', { - src: "http://www.liveleak.com/e/" + this.name + "?autostart=true" + return $.el('object', { + innerHTML: "" }); } }, diff --git a/src/Linkification/Linkify.coffee b/src/Linkification/Linkify.coffee index 411239dbd..776cb059e 100644 --- a/src/Linkification/Linkify.coffee +++ b/src/Linkification/Linkify.coffee @@ -161,13 +161,13 @@ Linkify = style: 'border: 0; width: 150px; height: 45px;' el: -> $.el 'object', - innerHTML: "" + innerHTML: "" Vimeo: regExp: /.*(?:vimeo.com\/)([^#\&\?]*).*/ el: -> $.el 'iframe', - src: "//player.vimeo.com/video/#{@name}" + src: "//player.vimeo.com/video/#{@name}?wmode=opaque" title: api: -> "https://vimeo.com/api/oembed.json?url=http://vimeo.com/#{@name}" text: -> JSON.parse(@responseText).title @@ -175,8 +175,8 @@ Linkify = LiveLeak: regExp: /.*(?:liveleak.com\/view.+i=)([0-9a-z_]+)/ el: -> - $.el 'iframe', - src: "http://www.liveleak.com/e/#{@name}?autostart=true" + $.el 'object', + innerHTML: "" audio: regExp: /(.*\.(mp3|ogg|wav))$/