From 02cd2db96d21b85b009c76eb50b7ab6153b144b6 Mon Sep 17 00:00:00 2001 From: John Foerch Date: Thu, 5 Nov 2009 14:00:46 -0500 Subject: [PATCH] youporn.js: removed Youporn-mode doesn't work, but even if it did, it serves no purpose. It uses Conkeror's media-scraper system to find the url of the flv file for an embedded media player. However, youporn.com already provides a hyperlink to download that flv file. Additionally, even if you do want to use the media-scraper system instead of the hyperlink to download the file, Conkeror's built-in media_scrape_default finds the url just fine. In summary and conclusion, there is no reason, in triplicate, for this mode to exist. --- defaults/preferences/default-modules.js | 1 - modules/page-modes/youporn.js | 40 --------------------------------- 2 files changed, 41 deletions(-) delete mode 100644 modules/page-modes/youporn.js diff --git a/defaults/preferences/default-modules.js b/defaults/preferences/default-modules.js index 6d9b0b0..dd5f7d8 100644 --- a/defaults/preferences/default-modules.js +++ b/defaults/preferences/default-modules.js @@ -57,7 +57,6 @@ pref("conkeror.load.page-modes/google-calendar", 1); pref("conkeror.load.page-modes/google-reader", 1); pref("conkeror.load.page-modes/google-video", 1); pref("conkeror.load.page-modes/google-maps", 1); -pref("conkeror.load.page-modes/youporn", 1); pref("conkeror.load.page-modes/dailymotion", 1); pref("conkeror.load.page-modes/gmail", 0); pref("conkeror.load.page-modes/xkcd", 1); diff --git a/modules/page-modes/youporn.js b/modules/page-modes/youporn.js deleted file mode 100644 index 74782d7..0000000 --- a/modules/page-modes/youporn.js +++ /dev/null @@ -1,40 +0,0 @@ -/** - * (C) Copyright 2008 Ævar Arnfjörð Bjarmason - * - * Use, modification, and distribution are subject to the terms specified in the - * COPYING file. -**/ - -require("content-buffer.js"); -require("media.js"); - -/* We could use the wrappedJSObject to get the player_url but this is - * probably more secure, and simpler - */ -const media_youporn_flv_regexp = /var player_url = '(.*?)';/; - -function media_scrape_youporn(buffer, results) { - try { - var doc = buffer.document; - - let text = doc.documentElement.innerHTML; - let res = media_youporn_flv_regexp.exec(text); - - if (res) { - results.push(load_spec({uri: res[1], - filename_extension: "flv", - source_frame: buffer.top_frame, - mime_type: "video/x-flv"})); - } - } catch (e if !(e instanceof interactive_error)) {} -} - -define_page_mode("youporn_mode", - $display_name = "YouPorn", - $enable = function (buffer) { - buffer.page.local.media_scrapers = [media_scrape_youporn]; - media_setup_local_object_classes(buffer); - }); - -var youporn_re = build_url_regex($domain = "youporn"); -auto_mode_list.push([youporn_re, youporn_mode]); -- 2.11.4.GIT