diff options
Diffstat (limited to 'data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere')
12 files changed, 106 insertions, 34 deletions
diff --git a/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/break.js b/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/break.js index 342cd45..24fbcb8 100644 --- a/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/break.js +++ b/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/break.js @@ -28,7 +28,8 @@ vp.props({ controls: true, autoplay: autoPlay(true), - preload: preLoad() + preload: preLoad(), + loop: isLoop() }); vp.style({ width: "100%", diff --git a/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/common.js b/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/common.js index 8598dd4..cf95590 100644 --- a/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/common.js +++ b/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/common.js @@ -1,10 +1,10 @@ /* global OPTIONS:true, onPrefChange:true, LANGS:true */ /* global createNode:true, asyncGet:true, onReady:true, logify:true */ /* global preLoad:true, autoPlay:true, HANDLE_VOL_PREF_CHANGE:true */ -/* global rmChildren:true, Qlt:true, Cdc:true, chgPref:true */ +/* global rmChildren:true, Qlt:true, Cdc:true, chgPref:true, isLoop:true */ // the following jshint global rule is only because jshint support for ES6 arrow // functions is limited -/* global wrapper:true, args:true, auto:true */ +/* global wrapper:true, args:true, auto:true, lp:true */ "use strict"; //This Addons Preferences @@ -99,6 +99,7 @@ const autoPlay = (auto = false) => ((OPTIONS.autoplay === 1 || auto === true) && OPTIONS.autoplay !== 0); const preLoad = (auto = false) => ((OPTIONS.preload === 1 || auto === true) && OPTIONS.preload !== 0) ? "auto" : "metadata"; +const isLoop = (lp = false) => ((OPTIONS.loop === 1 || lp) && OPTIONS.loop !== 0); const rmChildren = (prnt) => { while (prnt && prnt.firstChild) diff --git a/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/dailymotion.js b/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/dailymotion.js index f83b1ce..59dd351 100644 --- a/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/dailymotion.js +++ b/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/dailymotion.js @@ -35,6 +35,7 @@ controls: true, autoplay: autoPlay(), preload: preLoad(), + loop: isLoop(), poster: poster }); vp.style({ diff --git a/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/facebook.js b/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/facebook.js index 43d241c..608b48c 100644 --- a/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/facebook.js +++ b/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/facebook.js @@ -14,7 +14,8 @@ vp.props({ controls: true, autoplay: autoPlay(true), - preload: preLoad() + preload: preLoad(), + loop: isLoop() }); vp.style({ width: "100%", diff --git a/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/flashgot-YouTubeSwf.js b/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/flashgot-YouTubeSwf.js index 8bb4723..8f36a47 100644 --- a/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/flashgot-YouTubeSwf.js +++ b/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/flashgot-YouTubeSwf.js @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ***** END LICENSE BLOCK *****/ /* the following jshint rules are added by Moez Bouhlel to pass diff --git a/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/metacafe.js b/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/metacafe.js index 7fc9cc2..f689666 100644 --- a/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/metacafe.js +++ b/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/metacafe.js @@ -28,6 +28,7 @@ vp.props({ autoplay: autoPlay(true), preload: preLoad(), + loop: isLoop(), controls: true }); vp.style({ @@ -52,6 +53,7 @@ vp.props({ autoplay: autoPlay(false), preload: preLoad(), + loop: isLoop(), controls: true }); vp.style({ diff --git a/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/video-player.js b/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/video-player.js index 1c578e2..8cbe2bb 100644 --- a/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/video-player.js +++ b/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/video-player.js @@ -225,6 +225,7 @@ VP.prototype.setupLBP = function() { this.container.style.marginLeft = "0px"; }; VP.prototype.setupContextMenu = function(idx) { + /* jshint maxstatements:false */ this._contextMenu = createNode("menu", { type: "context", //"popup", id: "h5vew-contextmenu" @@ -293,7 +294,20 @@ VP.prototype.setupContextMenu = function(idx) { onclick: (e) => this.slctLang(e.target.label) })); - + var loopMenu = createNode("menu", { + id: "h5vew-menu-loop", + label: "Loop Video" + }); + ["Never", "Always", "Default"].forEach((n, i) => { + loopMenu.appendChild(createNode("menuitem", { + type: "radio", + label: n, + radiogroup: "menu-loop", + checked: (OPTIONS.loop === i), + onclick: (e) => + chgPref("loop", i) + })); + }); var autoNextMenu = createNode("menuitem", { id: "h5vew-menu-autonext", type: "checkbox", @@ -310,6 +324,14 @@ VP.prototype.setupContextMenu = function(idx) { this._contextMenu.removeChild(disableMenu); } }); + var aboutMenu = createNode("menuitem", { + id: "h5vew-menu-about", + label: "About HTML5 Video EveryWhere", + onclick: () => + window.open("http://lejenome.github.io/html5-video-everywhere#v=" + + OPTIONS.addon.version + "&id=" + OPTIONS.addon.id, + "h5vew-about", "width=550,height=280,menubar=no,toolbar=no,location=no,status=no,chrome=on,modal=on") + }); const prefChanged = (name) => { if (name === "autoNext") autoNextMenu.checked = OPTIONS.autoNext; @@ -319,8 +341,10 @@ VP.prototype.setupContextMenu = function(idx) { this._contextMenu.appendChild(cdcMenu); if (this._langs.length > 0) this._contextMenu.appendChild(langMenu); + this._contextMenu.appendChild(loopMenu); this._contextMenu.appendChild(autoNextMenu); this._contextMenu.appendChild(disableMenu); + this._contextMenu.appendChild(aboutMenu); this.container.appendChild(this._contextMenu); // TODO: fix assigning contextMenu and uncommant createNode("video") ^ this.container.contextmenu = "h5vew-contextmenu"; diff --git a/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/vimeo.js b/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/vimeo.js index d0cede6..39701a8 100644 --- a/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/vimeo.js +++ b/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/vimeo.js @@ -33,6 +33,7 @@ className: conf.className, autoplay: autoPlay(), preload: preLoad(), + loop: isLoop(), controls: true, poster: conf.poster, volume: OPTIONS.volume / 100 diff --git a/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/youtube.js b/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/youtube.js index b8eef42..b7d3840 100644 --- a/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/youtube.js +++ b/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/data/youtube.js @@ -25,23 +25,25 @@ var player_container = getPlayerContainer(conf); if (!player_container) return; + var seek = getSeek(); vp = new VP(player_container); - vp.srcs(conf.fmts, FMT_WRAPPER, (fmt) => fmt.url); - vp.containerProps({ - className: conf.className || "" - }); + vp.srcs(conf.fmts, FMT_WRAPPER, (fmt) => fmt.url + seek); + //vp.containerProps({ + // className: conf.className || "" + //}); vp.props({ id: "video_player", className: conf.className || "", - autoplay: autoPlay(!conf.isEmbed), + autoplay: autoPlay(location.search.search("autoplay=") === -1 ? !conf.isEmbed : location.search.search("autoplay=0") === -1), preload: preLoad(), + loop: isLoop(location.search.search("loop=1") !== -1), controls: true, poster: conf.poster || "", volume: OPTIONS.volume / 100 }); - vp.style({ - position: "relative" - }); + //vp.style({ + // position: "relative" + //}); vp.tracksList((conf.tracks || []).map(i => i.lc), (lang, resolve, reject) => { var o = conf.tracks.find((i) => i.lc === lang); if (o === undefined) @@ -90,7 +92,7 @@ vp.srcs(conf.fmts, FMT_WRAPPER); if (conf && conf.isWatch) vp.containerProps({ - className: " player-height player-width" + className: " player-height player-width player-api" }); if (conf && conf.isChannel) vp.containerProps({ @@ -135,7 +137,7 @@ conf.className = "c4-player-container"; //+ " html5-main-video" } else { conf.id = location.search.slice(1).match(/v=([^/?#]*)/)[1]; - conf.className = "player-width player-height"; + conf.className = "player-width player-height player-api"; } if (!conf.id) reject({ @@ -301,7 +303,25 @@ webvtt += (i + 1) + "\n" + tl1 + " --> " + tl2 + "\n" + els[i].textContent + "\n\n"; } - resolve("data:text/vtt;base64," + btoa(webvtt.replace("'", "'", "g"))); + resolve("data:text/vtt;base64," + btoa(window.unescape( + encodeURIComponent(webvtt.replace("'", "'", "g"))))); }); } + + function getSeek() { + var seek = 0; + if (location.search.search("start=") > -1) { + seek = location.search.match(/start=(\d+)/); + seek = seek ? parseInt(seek[1]) : 0; + } else if (location.search.search(/[&?]t=\d/) > -1) { + seek = location.search.match(/[&?]t=([^&]*)/)[1]; + var h = seek.match(/(\d+)h/); + var m = seek.match(/(\d+)m/); + var s = seek.match(/(\d+)s/); + seek = (h ? parseInt(h[1]) : 0) * 3600 + + (m ? parseInt(m[1]) : 0) * 60 + + (s ? parseInt(s[1]) : 0); + } + return seek > 0 ? ("#t=" + seek) : ""; + } }());
\ No newline at end of file diff --git a/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/lib/facebook.js b/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/lib/facebook.js index d252044..1198b28 100644 --- a/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/lib/facebook.js +++ b/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/lib/facebook.js @@ -1,5 +1,5 @@ "use strict"; -var match = [/https?:\/\/(www\.|beta\.)?facebook.com\/video.php\?.*/]; +var match = [/https?:\/\/(www\.|beta\.)?facebook.com\/(.*\/videos\/.*|video.php\?.*)/]; var inject = [ "facebook.js" ]; diff --git a/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/lib/flashgot-YouTube.js b/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/lib/flashgot-YouTube.js index 9e9e1da..3507fb8 100644 --- a/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/lib/flashgot-YouTube.js +++ b/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/lib/flashgot-YouTube.js @@ -15,11 +15,12 @@ You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
***** END LICENSE BLOCK *****/
/* Modified By Moez Bouhlel to be used on HTML5-Video-EveryWhere */
/* jshint laxbreak:true, maxstatements:false, evil:true, latedef:false */
+/* jshint maxdepth:4 */
/* jshint maxcomplexity:false, -W116 */
/* global args:false */
"use strict";
@@ -491,6 +492,8 @@ Youtube.fix_signature = function(data, fmts, swf_url, cb) { if (sig) {
fg.log("Fmt", itag, "url fixed:", sig);
fmts[itag].url += "&signature=" + encodeURIComponent(sig);
+ if(!sig.match(/^[0-9A-Z]{40}\.[0-9A-Z]{40}$/))
+ fg.setPref("media.YouTube.decode_signature_func", "");
} else {
fg.log("Failed to fix fmt", itag, "signature");
delete fmts[itag];
diff --git a/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/lib/main.js b/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/lib/main.js index bcf9685..d416289 100644 --- a/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/lib/main.js +++ b/data/extensions/html5-video-everywhere@lejenome.me/resources/html5-video-everywhere/lib/main.js @@ -6,7 +6,7 @@ const { const { add, remove } = require("sdk/util/array"); -const data = require("sdk/self").data; +const _self = require("sdk/self"); const pageMod = require("sdk/page-mod"); const events = require("sdk/system/events"); const staticArgs = require("sdk/system").staticArgs; @@ -24,11 +24,17 @@ const allDrivers = { "metacafe": require("./metacafe"), "youtube": require("./youtube") }; -var disabledDrivers = prefs.disable.split(",").map(i => i.trim()); const drivers = (Array.isArray(staticArgs.drivers) ? staticArgs.drivers : - Object.keys(allDrivers)).filter(i => - disabledDrivers.indexOf(i) === -1 + Object.keys(allDrivers)).filter(drvName => + prefs["disable" + drvName] === false +); + +//ensure preferences match the state of disabled drivers +Object.keys(allDrivers).filter(drvName => + drivers.indexOf(drvName) === -1 +).forEach(drvName => + prefs["disable" + drvName] = true ); @@ -40,16 +46,16 @@ const onWorkerAttach = (drvName, listen) => (worker) => { _prefs[pref] = prefs[pref]; _prefs.driver = drvName; _prefs.production = staticArgs.production; + _prefs.addon = { + id: _self.id, + version: _self.version + }; worker.port.emit("preferences", _prefs); add(workers, worker); worker.port.on("prefChang", (pref) => prefs[pref.name] = pref.val); - worker.port.on("disable", () => { - disabledDrivers.push(drvName); - prefs.disable = disabledDrivers.join(","); - remove(drivers, drvName); - pageMods[drvName].destroy(); - }); + worker.port.on("disable", () => + prefs["disable" + drvName] = true); for (let evt in listen) { logify("Add listener:", evt); worker.port.on(evt, (obj) => { @@ -61,15 +67,18 @@ const onWorkerAttach = (drvName, listen) => (worker) => { }); }; -for (let drvName of drivers) { + +drivers.forEach(setupDriver); + +function setupDriver(drvName) { var driver = allDrivers[drvName]; if (driver.match === void(0)) - continue; + return; var scripts, styles; scripts = common.inject.concat(driver.inject) - .map(i => data.url(i)); + .map(i => _self.data.url(i)); styles = common.style.concat(driver.style || []) - .map(i => data.url(i)); + .map(i => _self.data.url(i)); pageMods[drvName] = pageMod.PageMod({ include: driver.match, contentScriptFile: scripts, @@ -110,7 +119,16 @@ require("sdk/simple-prefs").on("", function prefChangeHandler(pref) { prefs.volume = 100; else if (pref === "volume" && prefs.volume < 0) prefs.volume = 0; - else + else if (pref.startsWith("disable")) { + let drvName = /^disable(.+)/.exec(pref)[1]; + if (prefs[pref] === false) { + add(drivers, drvName); + setupDriver(drvName); + } else { + remove(drivers, drvName); + pageMods[drvName].destroy(); + } + } else workersPrefHandler(pref); }); |