Changeset 18597

Timestamp:

09/02/08 00:06:54 (3 months ago)

Author:

drry

Message:

• 正規表現を修正しました。
  
• ほか。
  

Files:

• lang/javascript/userscripts/poptip.user.js (modified) (23 diffs)

lang/javascript/userscripts/poptip.user.js

@@ -28 +28 @@
                Add 2 rules to SITEINFO (Slashdot.org, YouTube in Hatena Bookmark)
 20080824 0.0.9 "excludeUrl" option
-               Add 2 rules to SITEINFO (Yahoo Chiebukuro, Hatena Keyword)
+               Add 2 rules to SITEINFO (Yahoo! Chiebukuro, Hatena Keyword)
 */
 
@@ -46 +46 @@
 var SITEINFO = [
     {
-        url: '^http://mixi\\.jp/*',
+        url: '^http://mixi\\.jp/',
         linkElement: 'id("mymixiList")//td/a',
         popupElement: 'id("profile")',
         disabled: false,
-        style : { 
-            backgroundColor : 'white',
-            borderWidth : '1px',
-            borderColor: 'orange',
-            borderStyle: 'solid'
-        }
-    },
-    {
-        url: '^http://mixi\\.jp/*',
+        style: {
+            backgroundColor: 'white',
+            border: '1px solid orange'
+        }
+    },
+    {
+        url: '^http://mixi\\.jp/',
         targetElement: 'id("myProfile")//div[@class="contents01"]/img',
         linkElement: 'id("myProfile")//div[@class="contents03"]//a',
         popupElement: 'id("editPhotoArea")',
         disabled: false,
-        style : { 
-            backgroundColor : 'white',
-            borderWidth : '1px',
-            borderColor: 'orange',
-            borderStyle: 'solid'
+        style: {
+            backgroundColor: 'white',
+            border: '1px solid orange'
         }
     },
     {
         description: 'mixi community recent topics',
-        url: '^http://mixi\\.jp/*',
+        url: '^http://mixi\\.jp/',
         linkElement: 'id("communityList")//td/a',
         popupElement: 'id("newCommunityTopic")//dl',
-        style : { 
-            backgroundColor : 'white',
-            borderWidth : '1px',
-            padding : '8px',
-            borderColor: 'orange',
-            borderStyle: 'solid'
+        style: {
+            backgroundColor: 'white',
+            border: '1px solid orange',
+            padding: '8px'
         },
         containerHTML: '<h2>Recent Topics</h2><popup:container/>'
@@ -89 +83 @@
         linkElement: 'id("log_color")/ul/li/a',
         popupElement: 'id("profile")',
-        style : {
-                border: "solid 1px gray",
+        style: {
+                border: "1px solid gray",
                 width: "400px"
         }
     },
     {
-        url: '^http://(www|)flickr\\.com/.*',
+        url: '^http://(?:www\\.)?flickr\\.com/',
         linkElement: '//span[@class="photo_container pc_s"]/a',
         popupElement: '//div[@class="photoImgDiv"]//img',
-        style : {
+        style: {
             padding: '0px'
         }
@@ -104 +98 @@
     {
         descript: 'Flickr Exif info',
-        url: '^http://(www|)flickr\\.com/.*',
+        url: '^http://(?:www\\.)?flickr\\.com/',
         linkElement: '//li[@class="Stats"]/a[.="More properties"]',
         popupElement: 'id("GoodStuff")',
         stripe: true,
-        style : {
-            backgroundColor : 'white',
-            padding : '4px;',
-            margin : '4px;',
-            border : 'solid 1px #444'
-        }
-    },
-    {
-        url: '^http://(www|)flickr\\.com/.*',
+        style: {
+            backgroundColor: 'white',
+            padding: '4px;',
+            margin: '4px;',
+            border: '1px solid #444'
+        }
+    },
+    {
+        url: '^http://(?:www\\.)?flickr\\.com/',
         linkElement: '//span[@class="photo_container pc_s"]/a',
         popupElement: '//div[@class="photoImgDiv"]//img',
-        style : { 
-            backgroundColor : 'white'
+        style: {
+            backgroundColor: 'white'
         }
     },
@@ -129 +123 @@
         linkElement: '//div[@class="inner"]/ul/li/nobr/a',
         popupElement: '//div[@class="inner"]/ul',
-       stripe: true,
+        stripe: true,
         style: {
             fontSize: '80%',
             textAlign: 'left',
-            padding : '4px;',
-            margin : '4px;',
-            border : 'solid 1px #444'
+            padding: '4px;',
+            margin: '4px;',
+            border: '1px solid #444'
         }
     },
     {
         description: 'Hatena Bookmark',
-        url: '^http://b\\.hatena\\.ne\\.jp/*',
+        url: '^http://b\\.hatena\\.ne\\.jp/',
         linkElement: '//div[@class="entry-footer"]//*//a',
         popupElement: 'id("entry-info")//blockquote',
         delay: 1000,
-       stripe: true,
+        stripe: true,
         style: {
             fontSize: '80%'
@@ -151 +145 @@
     {
         description: 'Hatena Bookmark',
-        url: '^http://b\\.hatena\\.ne\\.jp/*',
+        url: '^http://b\\.hatena\\.ne\\.jp/',
         linkElement: '//dd[@class="users"]//a',
         popupElement: 'id("entry-info")//blockquote',
@@ -157 +151 @@
         style: {
             fontSize: '80%',
-            border: 'solid 1px blue'
+            border: '1px solid blue'
         }
     },
     {
         description: 'Hatena Diary Keyword',
-        url: '^http://d\\.hatena\\.ne\\.jp/*',
-        excludeUrl: '^http://d\\.hatena\\.ne\\.jp/keyword/.*',
+        url: '^http://d\\.hatena\\.ne\\.jp/',
+        excludeUrl: '^http://d\\.hatena\\.ne\\.jp/keyword/',
         linkElement: '//a[@class="keyword"]',
         popupElement: '//div[@class="box-curve-bar"]//div[@class="section"]',
         delay: 1000,
-       stripe: true,
+        stripe: true,
         style: {
             fontSize: '80%',
             padding: '2px',
-            border: 'solid 1px blue',
+            border: '1px solid blue',
             color: 'black',
             backgroundColor: 'white',
@@ -179 +173 @@
     {
         description: 'Hatena Keyword',
-        url: '^http://d\\.hatena\\.ne\\.jp/keyword/.*',
+        url: '^http://d\\.hatena\\.ne\\.jp/keyword/',
         linkElement: '//a[@class="keyword"]',
         popupElement: 'id("body")//div[@class="keyword-body"]/div[@class="section"]/p',
         delay: 1000,
-       stripe: true,
+        stripe: true,
         style: {
             fontSize: '80%',
             padding: '2px',
-            border: 'solid 1px blue',
+            border: '1px solid blue',
             color: 'black',
             backgroundColor: 'white',
@@ -194 +188 @@
     },
     {
-        url: '^http://mixi\\.jp/(search|list)_community\\.pl.*',
+        url: '^http://mixi\\.jp/(?:search|list)_community\\.pl',
         linkElement: '//div[@class="iconList03"]//a',
         popupElement: 'id("newCommunityTopic")//dl',
-        style : { 
-            backgroundColor : 'white',
-            borderWidth : '1px',
-            padding : '8px',
-            borderColor: 'orange',
-            borderStyle: 'solid'
-        }
-    },
-    {
-        description: 'Yahoo Chiebukuro related question',
+        style: {
+            backgroundColor: 'white',
+            border: '1px solid orange',
+            padding: '8px'
+        }
+    },
+    {
+        description: 'Yahoo! Chiebukuro related question',
         url: '^http://detail\\.chiebukuro\\.yahoo\\.co\\.jp/qa/question_detail/.+',
         linkElement: 'id("recommend")//dd[@class="recombox"]/a',
         popupElement: '//div[@class="bestAnswer Extends-details"]//div[@class="qa"]',
-        style : { 
-            backgroundColor : 'white',
-            borderWidth : '1px',
-            padding : '8px',
-            borderColor: 'blue',
-            fontSize: '80%',
-            textAlign: 'left',
-            borderStyle: 'solid'
+        style: {
+            backgroundColor: 'white',
+            borderWidth: '1px solid blue',
+            padding: '8px',
+            fontSize: '80%',
+            textAlign: 'left'
         },
         containerHTML: '<h2>Best Answer</h2><popup:container/>'
     },
-
     {
         description: 'Twitter icon enlargement',
-        url: '^http://twitter\\.com/*',
+        url: '^http://twitter\\.com/',
         targetElement: '//td[@class="thumb vcard author"]//img[@class="photo fn"]',
-        linkElement:  '//td[@class="thumb vcard author"]//a[@class="url"]',
+        linkElement: '//td[@class="thumb vcard author"]//a[@class="url"]',
         linkReplaceRule: {
-            pattern : 'http://twitter.com/',
-            replacement : 'http://twitter.com/account/profile_image/'
+            pattern: 'http://twitter.com/',
+            replacement: 'http://twitter.com/account/profile_image/'
         },
         popupElement: 'id("content")/div/p/img',
@@ -235 +224 @@
     {
         description: 'Twitter timeline',
-        url: '^http://twitter\\.com/*',
-        linkElement:  'id("content")//td[@class="content"]/strong/a',
+        url: '^http://twitter\\.com/',
+        linkElement: 'id("content")//td[@class="content"]/strong/a',
         popupElement: 'id("side")',
         disabled: true,
@@ -246 +235 @@
     {
         description: 'Twitter following & followers',
-        url: '^http://twitter\\.com.*/(friends|followers)',
+        url: '^http://twitter\\.com/.+?/(?:friends|followers)',
         targetElement: '//td[@class="thumb"]//img[@class="photo fn"]',
-        linkElement:  '//td[@class="thumb"]//a[@rel="contact"]',
+        linkElement: '//td[@class="thumb"]//a[@rel="contact"]',
         popupElement: 'id("side")',
         style: {
@@ -257 +246 @@
     {
         description: 'Hatena Fotolife',
-        url: '^http://f\\.hatena\\.ne\\.jp/.*',
+        url: '^http://f\\.hatena\\.ne\\.jp/',
         linkElement: '//ul[@class="fotolist"]/li/a',
         popupElement: 'id("container")/div[2]/div[3]/img',
-        style : {
+        style: {
         }
     },
     {
         description: 'Pixiv thumbnails',
-        url: '^http://www\\.pixiv\\.net/tags\\.php\\?tag=.*',
+        url: '^http://www\\.pixiv\\.net/tags\\.php\\?tag=',
         linkElement: 'id("illust_c5")/ul/li/a[1]',
         popupElement: 'id("content2")/div[6]/a/img',
-        style : {
-            border : 'solid 1px black'
+        style: {
+            border: '1px solid black'
         }
     },
     {
         description: 'Amazon.co.jp ListMania',
-        url: '^http://www\\.amazon\\.co\\.jp/.*/lm/.*',
+        url: '^http://www\\.amazon\\.co\\.jp/.+?/lm/',
         targetElement: '//td[@class="listItem"]/a/img[position()=1]',
-        linkElement:  '//td[@class="listItem"]//strong/a',
+        linkElement: '//td[@class="listItem"]//strong/a',
         popupElement: 'id("productDescription")',
         stripe: true,
-        style : {
-            fontSize : '80%',
-            width : '500px',
-            padding : '5px',
-            border : 'solid 1px orange'
+        style: {
+            fontSize: '80%',
+            width: '500px',
+            padding: '5px',
+            border: '1px solid orange'
         }
     },
     {
         description: 'Amazon.co.jp SearchResult',
-        url: '^http://www\\.amazon\\.co\\.jp/s/.*',
-        linkElement:  '//td[@class="imageColumn"]//a',
+        url: '^http://www\\.amazon\\.co\\.jp/s/',
+        linkElement: '//td[@class="imageColumn"]//a',
         popupElement: 'id("productDescription")',
         delay: 300,
         stripe: true,
-        style : {
-            fontSize : '80%',
-            width : '500px',
-            padding : '5px',
-            border : 'solid 1px orange'
+        style: {
+            fontSize: '80%',
+            width: '500px',
+            padding: '5px',
+            border: '1px solid orange'
         }
     },
     {
         description: 'slashdot.jp recent 3 stories',
-        url: '^http://slashdot\\.(jp|org)/topics\\.(pl|shtml)',
+        url: '^http://slashdot\\.(?:jp|org)/topics\\.(?:pl|shtml)',
         exampleUrl: 'http://slashdot.jp/topics.pl',
         targetElement: '//div[@class="generalbody"]/table//td[@align="center"]/a/img',
         linkElement: '//div[@class="generalbody"]/table//td[@align="center"]/a',
         popupElement: '//div[@class="search-results"][position()<4]',
-        style : {
-            border : 'solid 1px black',
-            padding : '4px',
-            fontSize : '80%'
+        style: {
+            border: '1px solid black',
+            padding: '4px',
+            fontSize: '80%'
         }
     },
     {
         description: 'Youtube in Hatena Bookmark',
-        url: '^http://b\\.hatena\\.ne\\.jp/.*',
+        url: '^http://b\\.hatena\\.ne\\.jp/',
         linkElement: '//a[contains(@href,"youtube.com/") and contains(text(),"users")]',
         popupElement: 'id("video")',
@@ -348 +337 @@
         // Right
         popupAreaObj.style.left = targetDimension.left + targetDimension.width + 'px';
-        popupAreaObj.style.top = targetDimension.top +  'px';
+        popupAreaObj.style.top = targetDimension.top + 'px';
         var dimension = getDimension(this);
         if (dimension.width > targetDimension.offsetRight) popupAreaObj.style.width = targetDimension.offsetRight + 'px';
@@ -371 +360 @@
     if (popupAreaObj._currentTarget == target) this.style.display = 'none';
 };
-popupAreaObj.append = function (elm) {
+popupAreaObj.append = function(elm) {
     while (this.childNodes.length > 0) this.removeChild(this.firstChild);
     this.appendChild(elm);
-}
+};
 popupAreaObj._currentTarget = null;
 
-function PopupManager () {
-    this.init = function () {
+function PopupManager() {
+    this.init = function() {
         document.body.appendChild(popupAreaObj);
         this.maxZIndex = 0;
@@ -388 +377 @@
             }
         }
-        popupAreaObj.style.zIndex = this.maxZIndex + 2;
+        popupAreaObj.style.zIndex = this.maxZIndex + 2;
 
         for (var i in SITEINFO) {
             if (SITEINFO[i].disabled) continue;
-            if (!location.href.match(new RegExp(SITEINFO[i].url)) || (SITEINFO[i].excludeUrl && location.href.match(new RegExp(SITEINFO[i].excludeUrl)))) continue; 
+            if (!location.href.match(new RegExp(SITEINFO[i].url)) || (SITEINFO[i].excludeUrl && location.href.match(new RegExp(SITEINFO[i].excludeUrl)))) continue;
             var targetElementList = getElementsByXPath((SITEINFO[i].targetElement)?SITEINFO[i].targetElement:SITEINFO[i].linkElement);
             var linkElementList = getElementsByXPath(SITEINFO[i].linkElement);
@@ -409 +398 @@
                     if (rule.pattern && rule.replacement) url = url.replace(new RegExp(rule.pattern), rule.replacement);
                 }
-                this.setEvent (targetElementList[j], url, SITEINFO[i].popupElement, 
+                this.setEvent (targetElementList[j], url, SITEINFO[i].popupElement,
                     {
                         style:SITEINFO[i].style,
@@ -427 +416 @@
         targetElement.lock = function() {
             targetElement._locked = true;
-        }
+        };
         targetElement.unlock = function(e) {
             targetElement._locked = false;
             if (targetElement._mouseOut) targetElement.removePopupElement();
-        }
+        };
 
         targetElement.removePopupElement = function() {
-                    setTimeout(function () {
+                    setTimeout(function() {
                         if (!targetElement._mouseOut) return;
                         if (!targetElement._locked) popupAreaObj.hide(targetElement);
                     }, HIDE_DELAY_MSEC);
-            
-        }
-        targetElement.addPopupElement = function () {
+
+        };
+        targetElement.addPopupElement = function() {
             if (targetElement._elementCache != null) {
                 popupAreaObj.append(targetElement._elementCache);
@@ -462 +451 @@
                             }
                         }
-                        if (option.containerHTML) {
+                        if (option.containerHTML) {
                             elmContainer.innerHTML = option.containerHTML;
                             var tmpList = elmContainer.getElementsByTagName('popup:container');
@@ -470 +459 @@
                                 }
                             }
-                        } else {
+                        } else {
                                 for (var elementIndex in elementList) {
                                     elmContainer.appendChild(elementList[elementIndex]);
                                 }
-                        }
+                        }
                         targetElement._elementCache = elmContainer;
                         elmContainer.addEventListener('mouseover', targetElement.lock, true);
@@ -482 +471 @@
                     } catch (ex) {}
                  }
-            }
+            };
             http.send(null);
         };
         targetElement.addEventListener ('mouseout',
-            function(){
+            function() {
                 try {
                     targetElement._mouseOut = true;
                     targetElement.removePopupElement();
-                } catch (ex){}
+                } catch (ex) {}
             },
             true);
 
         targetElement.addEventListener ('mouseover',
-            function(){
+            function() {
                 targetElement._mouseOut = false;
-                setTimeout(function () {
+                setTimeout(function() {
                     if (targetElement._mouseOut) return;
                     targetElement.addPopupElement();
@@ -503 +492 @@
             },
             true);
-    }
+    };
 }
 
 (new PopupManager()).init();
 
-function DimensionInfo (left, top, width, height) {
+function DimensionInfo(left, top, width, height) {
     this.top = top;
     this.left = left;
@@ -530 +519 @@
     var dimension;
     if (elm) {
-        dimension = new DimensionInfo(elm.offsetLeft,elm.offsetTop,elm.offsetWidth,elm.offsetHeight);
+        dimension = new DimensionInfo(elm.offsetLeft, elm.offsetTop, elm.offsetWidth, elm.offsetHeight);
         if (elm.offsetParent ) {
             tmp = _getDimension(elm.offsetParent);
@@ -545 +534 @@
 
 function createHTMLDocumentByString(str) {
-    var html = str.replace(/<!DOCTYPE.*?>/, '').replace(/<html.*?>/, '').replace(/<\/html>.*/, '')
-    var htmlDoc  = document.implementation.createDocument(null, 'html', null)
-    var fragment = createDocumentFragmentByString(html)
+    var html = str.replace(/<!DOCTYPE\s[^>]+>|<html(?:\s[^>]*)?>|<\/html\s*>.*/, '');
+    var htmlDoc  = document.implementation.createDocument(null, 'html', null);
+    var fragment = createDocumentFragmentByString(html);
     try {
-        fragment = htmlDoc.adoptNode(fragment)
-    } catch(e) {
-        fragment = htmlDoc.importNode(fragment, true)
-    }
-    htmlDoc.documentElement.appendChild(fragment)
-   return htmlDoc
+        fragment = htmlDoc.adoptNode(fragment);
+    } catch (e) {
+        fragment = htmlDoc.importNode(fragment, true);
+    }
+    htmlDoc.documentElement.appendChild(fragment);
+    return htmlDoc;
 }
 
 function createDocumentFragmentByString(str) {
-    var range = document.createRange()
-    range.setStartAfter(document.body)
-    return range.createContextualFragment(str)
+    var range = document.createRange();
+    range.setStartAfter(document.body);
+    return range.createContextualFragment(str);
 }
 
 function getElementsByXPath(xpath, node) {
-    var node = node || document
-    var doc = node.ownerDocument ? node.ownerDocument : node
+    var node = node || document;
+    var doc = node.ownerDocument ? node.ownerDocument : node;
     var nodesSnapshot = doc.evaluate(xpath, node, null,
-        XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null)
-    var data = []
-    for (var i = 0; i < nodesSnapshot.snapshotLength; i++) {
-        data.push(nodesSnapshot.snapshotItem(i))
-    }
-    return data
-}
+        XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
+    var data = [];
+    for (var i = 0, l = nodesSnapshot.snapshotLength; i < l; i++) {
+        data.push(nodesSnapshot.snapshotItem(i));
+    }
+    return data;
+}