Changeset 19907

Timestamp:

09/25/08 20:43:51 (5 years ago)

Author:

os0x

Message:

• ver 1.1.3
  
• Opera9.5以降用に最適化(Array#forEachなど)
  
• デフォルトのICONサイズを16から8に変更
  

Files:

• lang/javascript/opera-userjs/oAutoPagerize.js (modified) (22 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.(opera-optimized and Safari3 support..)
+// @description    loading next page and inserting into current page. oAutoPagerize Support for Opera9.50, GreaseKit(Safari/WebKit) and Greasemetal(Google Chrome).
 // @checkurl       http://svn.coderepos.org/share/lang/javascript/opera-userjs/oAutoPagerize.js
 // @include        http://*
@@ -22 +22 @@
 //
 // UPDATE INFO (Only Japanese) http://d.hatena.ne.jp/os0x/searchdiary?word=%2a%5boAutoPagerize%5d
-// 
+//
 
 (function(){
@@ -53 +53 @@
         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.1.2';
+        var VERSION = '1.1.3';
         var AUTO_START = Set.AUTO_START || true;
         //var CACHE_EXPIRE = 24 * 60 * 60 * 1000;
@@ -84 +84 @@
                 error      : '#ff00ff'
         };
-        var ICON_SIZE = Set.ICON_SIZE || 16;
+        var ICON_SIZE = Set.ICON_SIZE || 8;
         if (Set.COLOR) (function(c){
                 for (var i in c) {
@@ -110 +110 @@
         }
 
-        var forEach = function(arr,fun,obj) {
-                for(var i=0,l=arr.length;i<l;i++) fun.call(obj,arr[i],i,arr);
-        };
-        var forMap = function(arr,callback,obj) {
-                var _arr = [];
-                for(var i = 0, len = arr.length; i < len; i++) {
-                        _arr.push(callback.call(obj,arr[i],i,arr));
-                }
-                return _arr;
-        };
         var TOP_SITEINFO = Set.TOP_SITEINFO.concat([
                 /*
@@ -197 +187 @@
         var autopager = function() {
                 if (miscellaneous.length) {
-                        forEach(miscellaneous,function(f){f();});
+                        miscellaneous.forEach(function(f){f();});
                 }
                 log('autopagerize loading');
+                var docRoot = document.documentElement.clientHeight < document.body.clientHeight ? document.documentElement : document.body;
 
                 var AutoPager = function() {this.initialize.apply(this, arguments);};
@@ -228 +219 @@
                                 this.initHelp();
                                 this.icon.addEventListener("mouseover", function(){self.viewHelp()}, false);
-                                var scrollHeight = getScrollHeight();
+                                var scrollHeight = docRoot.scrollHeight;
                                 var bottom = getElementPosition(this.insertPoint).top || this.getPageElementsBottom() || (Math.round(scrollHeight * 0.8));
                                 this.remainHeight = scrollHeight - bottom + BASE_REMAIN_HEIGHT;
@@ -334 +325 @@
                         }
                         ,checkRemain:function() {
-                                var remain = document.documentElement.scrollHeight - window.innerHeight - window.pageYOffset;
+                                var remain = docRoot.scrollHeight - window.innerHeight - window.pageYOffset;
                                 if (this.state && remain < this.remainHeight) {
                                         this.request();
@@ -431 +422 @@
                         }
                         ,loaded:function(htmlDoc) {
-                                forEach(AutoPager.documentFilters,function(i) {
+                                AutoPager.documentFilters.forEach(function(i) {
                                         i(htmlDoc, this.requestURL, this.info)
                                 }, this);
@@ -464 +455 @@
                                 }
                                 if (this.createHTMLDocumentMode && !window.opera) {
-                                        pages = forMap(pages,function (page) {
+                                        pages = pages.map(function (page) {
                                                 page = document.importNode(page, true);
                                                 return page;
@@ -471 +462 @@
                                 this.loadedURLs[this.requestURL] = true;
                                 this.addPage(htmlDoc, pages);
-                                forEach(AutoPager.filters,function(i) {
+                                AutoPager.filters.forEach(function(i) {
                                         i(pages);
                                 });
@@ -505 +496 @@
                                 insertParentNode.insertBefore(root, this.insertPoint);
                                 var self = this;
-                                forEach(pages,function(i) {
+                                pages.forEach(function(i) {
                                         insertParentNode.insertBefore(i, self.insertPoint);
-                                })
+                                });
                         }
                         ,initIcon:function() {
@@ -554 +545 @@
                         var setTargetBlank = function(doc) {
                                 var anchers = getElementsByXPath('descendant-or-self::a[@href and not(contains(@class,"autopagerize_link") or starts-with(@href,"javascript:") or starts-with(@href,"#"))]', doc);
-                                forEach(anchers,function(i) {
+                                anchers.forEach(function(i) {
                                         i.target = TARGET_WINDOW_NAME;
                                 });
@@ -565 +556 @@
                         var s = (new Date).getTime();
                         var nlist = [];
-                        var m = [];
                         for (var i = 0;i < list.length;++i) {
                                 try {
@@ -571 +561 @@
                                         _item.regurl = new RegExp(_item.url);
                                         if (!_item.nextLink || !_item.pageElement) continue;
-                                        if (!_item.regurl.test('http://a')) {
-                                                m.push(_item.url);
-                                        } else {
+                                        if (_item.regurl.test('http://a')) {
                                                 MICROFORMATs.push(_item);
                                         }
@@ -581 +569 @@
                                 }
                         }
-                        var regexp = new RegExp(m.join('|'));
-                        if (regexp.test(locationHref)) {
-                                for (var i = 0,l = nlist.length;i < l; ++i) {
-                                        var info = nlist[i];
-                                        try {
-                                                if (ap) {
-                                                } else if (!info.regurl.test(locationHref)) {
-                                                } else if (!getFirstElementByXPath(info.nextLink)) {
-                                                        // ignore microformats case.
-                                                        if (!info.regurl.test('http://a')) {
-                                                                debug("nextLink not found.", list[i])
-                                                        }
-                                                } else if (!getFirstElementByXPath(info.pageElement)) {
-                                                        if (!info.regurl.test('http://a')) {
-                                                                debug("pageElement not found.", list[i])
-                                                        }
-                                                } else {
-                                                        ap = new AutoPager(info);
-                                                        window.AutoPagerize.AutoPagerObject = ap;
-                                                        break;
+                        for (var i = 0,l = nlist.length;i < l; ++i) {
+                                var info = nlist[i];
+                                try {
+                                        if (ap) {
+                                        } else if (!info.regurl.test(locationHref)) {
+                                        } else if (!getFirstElementByXPath(info.nextLink)) {
+                                                // ignore microformats case.
+                                                if (!info.regurl.test('http://a')) {
+                                                        debug("nextLink not found.", list[i])
                                                 }
-                                        } catch(e) {
-                                                log('error at launchAutoPager()'+e);
-                                                continue;
-                                        }
+                                        } else if (!getFirstElementByXPath(info.pageElement)) {
+                                                if (!info.regurl.test('http://a')) {
+                                                        debug("pageElement not found.", list[i])
+                                                }
+                                        } else {
+                                                ap = new AutoPager(info);
+                                                window.AutoPagerize.AutoPagerObject = ap;
+                                                break;
+                                        }
+                                } catch(e) {
+                                        log('error at launchAutoPager()'+e);
+                                        continue;
                                 }
                         }
                         log('launchAutoPager...fin:'+((new Date).getTime()-s));
-                        forEach(MICROFORMATs,function(format){
+                        MICROFORMATs.forEach(function(format){
                                 if (!ap && getFirstElementByXPath(format.nextLink) && getFirstElementByXPath(format.pageElement)) {
                                         ap = new AutoPager(format);
@@ -630 +615 @@
                 var ap = null;
                 launchAutoPager(TOP_SITEINFO.concat(SITEINFO,BOTTOM_SITEINFO));
-                SITEINFO = null;
 
                 // utility functions.
@@ -646 +630 @@
                         var html = String(str);// Thx! jAutoPagerize#HTMLResource.createDocumentFromString http://svn.coderepos.org/share/lang/javascript/userscripts/jautopagerize.user.js
                         html = html.replace(/<script[^>]*>[\S\s]*?<\/script\s*>|<\/?(?:i?frame|html|script|object)(?:\s*|\s+[^<>]+)>/gi, " ");
-                        var htmlDoc  = document.implementation.createHTMLDocument ?
+                        var htmlDoc = document.implementation.createHTMLDocument ?
                                         document.implementation.createHTMLDocument('hogehoge') :
                                         document.implementation.createDocument(null, 'html', null);
@@ -661 +645 @@
 
                 function createDocumentFragmentByString(str,htmlDoc) {
-                        var range = htmlDoc.createRange();
-                        range.selectNodeContents(htmlDoc.documentElement);
+                        var range = document.createRange();
+                        range.setStartAfter(document.body);
                         return range.createContextualFragment(str);
                 }
@@ -719 +703 @@
                                 'paddingTop', 'paddingBottom',
                                 'marginTop', 'marginBottom'];
-                        forEach(prop,function(i) {
+                        prop.forEach(function(i) {
                                 var h = parseInt(c_style[i]);
                                 if (typeof h == 'number') {
@@ -727 +711 @@
                         var top = getElementPosition(elem).top;
                         return top ? (top + height) : null;
-                }
-                function getScrollHeight() {
-                        return Math.max(document.documentElement.scrollHeight, document.body.scrollHeight);
                 }
                 function pathToURL(path) {
@@ -738 +719 @@
                 function $X(exp, context, type /* want type */) {
                         if ($X.forceRelative) {
-                                exp = exp.replace(/id\(\s*(["'])([^"']+)\1\s*\)/g, './/*[@id="$2"]'); 
+                                exp = exp.replace(/id\(\s*(["'])([^"']+)\1\s*\)/g, './/*[@id="$2"]');
                                 exp = exp.indexOf("(//") == 0
                                         ? "(.//" + exp.substring(3)