Changeset 14888

Timestamp:

06/30/08 08:29:19 (5 years ago)

Author:

javascripter

Message:

取得済みURLのチェック、継ぎ足し位置をAutoPagerize互換に、細かいバグの修正。

Files:

• lang/javascript/userscripts/autopageloader.user.js (modified) (7 diffs)

lang/javascript/userscripts/autopageloader.user.js

@@ -60 +60 @@
   var Cache = new Class();
   Cache.reset = function () {
-    GM_setValue('cache', '{}');
+    GM_setValue('cache', 'new Object()');
   }
   Cache.normalize = function () {
@@ -155 +155 @@
     onscroll: function () {
       if (this.state == 'on') {
-        var pos = this._insertBefore.getBoundingClientRect().top;
+        var pos = $X('following::*',
+                     this._insertPoint).shift().getBoundingClientRect().top ||
+                  window.scrollMaxY - window.scrollY;
         if (pos - window.innerHeight < Config.remain_height) this.loadNext();
       }
@@ -182 +184 @@
           }
           this.state = 'on';
-          AutoPageLoader.documentFilters.forEach(function (fn) { fn(doc); });
+          AutoPageLoader.documentFilters.forEach(bind(function (fn) {
+            fn(doc, this._nextUrl, this._info);
+          }, this));
           var navi = document.createElement('div');
           navi.innerHTML = 'page: <a class="autopagerize_link" href"' +
@@ -190 +194 @@
               df.appendChild(elem);
             });
-          this._insertBefore.parentNode.insertBefore(df, this._insertBefore);
+          insertAfter(this._insertPoint, df);
           AutoPageLoader.filters.forEach(function (fn) { fn(pageElements); });
-          this._insertBefore = nextElement(pageElements.pop());
+          this._insertPoint = pageElements.pop();
           var nElem = $X(this._info.nextLink, doc).shift();
           if (nElem == null) {
@@ -198 +202 @@
             return;
           }
+          this._loaded.push(this._nextUrl);
           this._nextUrl = nElem.href;
+          if (this._loaded.indexOf(this._nextUrl) != -1) this.state = 'finish';
         }, this),
         3000,
@@ -211 +217 @@
       this.state = Config.auto_start ? 'on': 'off';
       this._page = 1;
-      this._insertBefore = this._info.insertBefore ?
-                            $X(this._info.insertBefore).pop() :
-                            nextElement($X(this._info.pageElement).pop());
+      this._insertPoint = this._info.insertBefore ?
+                            $X(this._info.insertBefore).shift() :
+                            $X(this._info.pageElement).pop();
       this._nextUrl = $X(this._info.nextLink).shift().href;
+      this._loaded = [];
       window.addEventListener('scroll',
                               this._scroll = bind(this.onscroll, this),
@@ -314 +321 @@
       fn.apply(thisObj, arguments);
 
-  function nextElement(elem)
-    $X('./following::*', elem).shift();
+  function insertAfter(elem, newElem)
+    elem.nextSibling ?
+      elem.parentNode.insertBefore(newElem, elem.nextSibling) :
+      elem.parentNode.appendChild(newElem);
 
   function $X (exp, context, type /* want type */) {