From 5361fb29c592cc5634784f12b34767ecb1cff541 Mon Sep 17 00:00:00 2001
From: drry
Date: Mon, 22 Sep 2008 16:58:33 +0000
Subject:  * 正規表現を修正しました。  * ほか。  * 酔っ払いコミット。

git-svn-id: http://svn.coderepos.org/share/lang/javascript/vimperator-plugins/trunk@19745 d0d07461-0603-4401-acd4-de1884942a52
---
 haiku.js | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'haiku.js')

diff --git a/haiku.js b/haiku.js
index bc07897..428594e 100644
--- a/haiku.js
+++ b/haiku.js
@@ -103,24 +103,22 @@
         liberator.echo(html, true);
     }
     function convert(str){
-        function createHTML(all, extension){
+        function createHTML(url){
             var str = '';
-            if (/\.(jpe?g|gif|png|bmp)$/.test(extension)){
-                str = '<img src="'+all+'"/>';
-            } else if (/^http:\/\/www\.youtube\.com\/(?:watch\?v=|v\/)([-\w]+)$/.test(all)){
+            if (/\.(?:jpe?g|gif|png|bmp)$/.test(url)){
+                str = '<img src="'+url+'"/>';
+            } else if (/^http:\/\/www\.youtube\.com\/(?:watch\?v=|v\/)([-\w]+)$/.test(url)){
                 var url = "http://www.youtube.com/v/" + RegExp.$1;
                 str = '<a href="#" class="hl-URL">' + url + '</a>\n' +
-                      '<div><object height="250" width="300">' +
-                      '<param name="movie" value="' + url + '">' +
-                      '<param name="wmode" value="transparent">' +
-                      '<embed src="' + url + '" type="application/x-shockwave-flash" wmode="transparent" height="250" width="300">' +
+                      '<div><object height="250" width="300" data="' + url + '" type="application/x-shockwave-flash">' +
+                      '<param name="wmode" value="transparent"/>' +
                       '</object></div>';
             } else {
-                str = '<a href="#" class="hl-URL">'+all+'</a>';
+                str = '<a href="#" class="hl-URL">'+url+'</a>';
             }
             return str;
         }
-        return str.replace(/https?:\/\/[^\/]+?\/([^\s]*)/g, createHTML);
+        return str.replace(/https?:\/\/[-\w!#$%&'()*+,.\/:;=?@~]+/g, createHTML);
     }
     liberator.commands.addUserCommand(["haiku"], "Change Haiku status",
         function(arg, special){
@@ -151,12 +149,12 @@
             }
 
             arg = arg.replace(/%URL%/g, liberator.buffer.URL)
-                .replace(/%TITLE%/g, liberator.buffer.title);
+                     .replace(/%TITLE%/g, liberator.buffer.title);
 
             if (special && arg.match(/^\+\s*(.*)/))
                 favHaiku(username, password, RegExp.$1)
             else
-            if (special && arg.match(/^\-\s*(.*)/))
+            if (special && arg.match(/^-\s*(.*)/))
                 unfavHaiku(username, password, RegExp.$1)
             else
             if (special || arg.length == 0)
-- 
cgit v1.2.3