From 1527faaa990a51d4184042d34c033ec347ae18db Mon Sep 17 00:00:00 2001 From: John Foerch Date: Sun, 12 Feb 2012 15:03:05 -0500 Subject: [PATCH] dailymotion, youtube: update for change to page_mode.test --- modules/page-modes/dailymotion.js | 6 ++++-- modules/page-modes/youtube.js | 11 +++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/modules/page-modes/dailymotion.js b/modules/page-modes/dailymotion.js index cf2e3e9..564a968 100644 --- a/modules/page-modes/dailymotion.js +++ b/modules/page-modes/dailymotion.js @@ -34,8 +34,10 @@ function media_scrape_dailymotion(buffer, results) { mime_type: "video/x-flv"})); } +var dailymotion_mode_test = build_url_regexp($domain = /(?:[^\/]*\.)?dailymotion/); + define_page_mode("dailymotion-mode", - build_url_regexp($domain = /(?:[^\/]*\.)?dailymotion/), + dailymotion_mode_test, function enable (buffer) { media_setup_local_object_classes(buffer); }, @@ -44,6 +46,6 @@ define_page_mode("dailymotion-mode", page_mode_activate(dailymotion_mode); -media_scrapers.unshift([dailymotion_mode.test, media_scrape_dailymotion]); +media_scrapers.unshift([dailymotion_mode_test, media_scrape_dailymotion]); provide("dailymotion"); diff --git a/modules/page-modes/youtube.js b/modules/page-modes/youtube.js index 0d7d26b..38e0440 100644 --- a/modules/page-modes/youtube.js +++ b/modules/page-modes/youtube.js @@ -82,7 +82,7 @@ function youtube_scrape_text (results, frame, url, id, text) { function youtube_scrape_buffer (buffer, results) { var url = buffer.current_uri.spec; - var id = regexp_exec(youtube_mode.test, url, 1); + var id = regexp_exec(youtube_mode_test, url, 1); if (! id) yield co_return(); var text = buffer.document.documentElement.innerHTML; @@ -128,9 +128,12 @@ function youtube_scrape_embedded (buffer, results) { } } -define_page_mode("youtube-mode", +var youtube_mode_test = build_url_regexp($domain = /(?:[a-z]+\.)?youtube/, - $path = /watch\?(?:.*?&)?v=([A-Za-z0-9\-_]+)/), + $path = /watch\?(?:.*?&)?v=([A-Za-z0-9\-_]+)/); + +define_page_mode("youtube-mode", + youtube_mode_test, function enable (buffer) { media_setup_local_object_classes(buffer); }, @@ -140,6 +143,6 @@ define_page_mode("youtube-mode", page_mode_activate(youtube_mode); media_scrapers.unshift([/.*/, youtube_scrape_embedded]); -media_scrapers.unshift([youtube_mode.test, youtube_scrape_buffer]); +media_scrapers.unshift([youtube_mode_test, youtube_scrape_buffer]); provide("youtube"); -- 2.11.4.GIT