Changeset 24869 for lang/javascript/opera-userjs

Timestamp:

11/26/08 00:13:49 (6 weeks ago)

Author:

drry

Message:

• fixed regexes for the SITEINFO.
  
• et cetera.
  

Files:

• lang/javascript/opera-userjs/oAutoPagerize.js (modified) (20 diffs)

lang/javascript/opera-userjs/oAutoPagerize.js

@@ -2 +2 @@
 // @name           oAutoPagerize
 // @namespace      http://ss-o.net/
-// @description    loading next page and inserting into current page. oAutoPagerize Support for Opera 9.50, GreaseKit(Safari/WebKit) and Greasemetal(Google Chrome).
+// @description    loading next page and inserting into current page. oAutoPagerize supports for Opera 9.62, GreaseKit(Safari/WebKit) and Greasemetal(Google Chrome).
 // @checkurl       http://svn.coderepos.org/share/lang/javascript/opera-userjs/oAutoPagerize.js
 // @include        http://*
@@ -18 +18 @@
 // thanks to ma.la.
 //
-// Released under the GPL license
+// Released under the GPLv3
 // http://www.gnu.org/copyleft/gpl.html
 //
@@ -54 +54 @@
         var URL = 'http://d.hatena.ne.jp/os0x/searchdiary?word=%2a%5boAutoPagerize%5d';
         var UPDATE_URL = window.opera ? 'http://ss-o.net/userjs/0AutoPagerize.SITEINFO.js' : 'http://ss-o.net/userjs/0AutoPagerize.SITEINFO.user.js';
-        var VERSION = '1.2.1';
+        var VERSION = '1.2.2';
         var AUTO_START = Set.AUTO_START || true;
         //var CACHE_EXPIRE = 24 * 60 * 60 * 1000;
@@ -97 +97 @@
                 /*
                 {
-                         url:         'http://twitter\\.com/.*'
+                         url:         'https?://(?:explore\\.)?twitter\\.com/'
                         ,nextLink:    '//div[@class="pagination"]/a[last()]'
                         ,incremental: {
@@ -109 +109 @@
                 */
                 {
-                         url:         'http://m\\.twitter\\.com/.*'
+                         url:         'http://m\\.twitter\\.com/'
                         ,nextLink:    '//h:a[@accesskey="6"]'
                         ,pageElement: '//h:body/h:ul/h:li'
@@ -115 +115 @@
                 },
                 {
-                        url:          'http://images\\.google\\..+/images\\?.+'
+                        url:          'http://images\\.google\\.(?:[^.]+\\.)?[^./]+/images\\?.'
                         ,nextLink:    'id("nn")/parent::a'
                         ,pageElement: '//table[tbody/tr/td/a[starts-with(@href, "/imgres")]]'
@@ -121 +121 @@
                 }
                 ,{
-                        url:           'http://eow\\.alc\\.co\\.jp/.*?/.*?/'
+                        url:           'http://eow\\.alc\\.co\\.jp/[^/]+'
                         ,nextLink:     'id("AutoPagerizeNextLink")'
                         ,pageElement:  'id("resultList")//ul'
-                        ,exampleUrl:   'http://eow.alc.co.jp/are/UTF-8/'
+                        ,exampleUrl:   'http://eow.alc.co.jp/%E3%81%82%E3%82%8C/UTF-8/ http://eow.alc.co.jp/are'
                 }
         ]);
@@ -169 +169 @@
         }
         var miscellaneous = [];
-        if (/^http:\/\/images\.google\..+\/images\?.+/.test(locationHref)) {
+        if (/^http:\/\/images\.google\.(?:[^.]+\.)?[^.\/]+\/images\?./.test(locationHref)) {
                 miscellaneous.push(function(){
                         //via http://furyu.tea-nifty.com/annex/2008/04/autopagerizeaut_c163.html
@@ -176 +176 @@
                         if (n) n.href = n.href.replace(/(\?)gbv=2&|&gbv=2(&?)/,'$1$2') + '&gbv=1';
                         setTimeout(function(){
-                                new Image().src='http://images.google.com/images?gbv=2&hl=ja&q=AutoPagerize?update='+(new Date()).getTime();
+                                new Image().src = 'http://images.google.com/images?gbv=2&hl=ja&q=AutoPagerize?update='+(new Date()).getTime();
                                 // for delete cookie(PREF= .. GBV=1 ..)
                         },100);
@@ -188 +188 @@
                         a.id = 'AutoPagerizeNextLink';
                         a.href = a.href.replace(/javascript:goPage\("(\d+)"\)/,'./?pg=$1');
-                }
+                };
                 miscellaneous.push(function(){
                         alc(document);
@@ -312 +312 @@
                                 document.body.appendChild(helpBack);
                                 helpBack.addEventListener('mouseover', function(e){
-                                        if(e.target == helpBack) {
+                                        if (e.target == helpBack) {
                                                 helpBack.style.display = 'none';
                                         }
@@ -328 +328 @@
                                         setTimeout(function(){
                                                 self.checkRemain();
-                                                self.wait=false;
+                                                self.wait = false;
                                         },500);
                                 }
@@ -372 +372 @@
                                 try {
                                         var x = new XMLHttpRequest();
-                                        x.onreadystatechange=function() {
+                                        x.onreadystatechange = function() {
                                                 if (x.readyState == 4) {
                                                         if (x.status <= 200 && x.status < 300) {
@@ -400 +400 @@
                                 this.removeIframe = function(){
                                         document.body.removeChild(iframe);
-                                }
+                                };
                                 this._frameLoad = function(){
                                         self.frameLoad.call(self,iframe);
-                                }
+                                };
                                 iframe.width = 1;
                                 iframe.height = 1;
@@ -437 +437 @@
                                         var pages = getElementsByXPath(this.info.pageElement, htmlDoc);
                                         var url = this.getNextURL(this.info.nextLink, htmlDoc);
-                                        if(!!this.info.incremental){
+                                        if (!!this.info.incremental) {
                                                 var exp = new RegExp(this.info.incremental.nextMatch,'i');
                                                 var _m = this.info.incremental.nextLink;
@@ -556 +556 @@
                                         i.target = TARGET_WINDOW_NAME;
                                 });
-                        }
+                        };
                         AutoPager.documentFilters.push(setTargetBlank);
                 }
@@ -573 +573 @@
                                         }
                                         nlist.push(_item);
-                                } catch (e){
+                                } catch (e) {
                                         debug(e.description,_item);
                                 }
@@ -606 +606 @@
                                 }
                         });
-                }
+                };
 
                 // initialize
@@ -658 +658 @@
 
                 function debug(message, siteinfo) {
-                        if(!DebugMode) return;
+                        if (!DebugMode) return;
                         var params = (function(site){
                                 var p = [];
-                                for (var k in site){
+                                for (var k in site) {
                                         if (k == 'data') {
                                                 var data = site[k];
-                                                for (var j in data){
+                                                for (var j in data) {
                                                         p.push(j+'='+data[j]);
                                                 }
@@ -679 +679 @@
 
                 function log() {
-                        if(!DebugMode) return;
+                        if (!DebugMode) return;
                         if (window.opera && window.opera.postError) {
                                 window.opera.postError(arguments);
-                        } else if (window.console){
+                        } else if (window.console) {
                                 console.log(arguments);
                         }