Changeset 32618 for lang/javascript

Timestamp:

04/19/09 10:16:52 (4 years ago)

Author:

hogelog

Message:

• fix bug: window infinite loop if (win.innerHeight == 0).
  

Files:

• lang/javascript/vimperator-plugins/trunk/marker_reader.js (modified) (6 diffs)

lang/javascript/vimperator-plugins/trunk/marker_reader.js

@@ -11 +11 @@
     <description>marker PageDown/PageUp.</description>
     <author mail="konbu.komuro@gmail.com" homepage="http://d.hatena.ne.jp/hogelog/">hogelog</author>
-    <version>0.0.8</version>
+    <version>0.0.10</version>
     <license>GPL</license>
     <minVersion>2.1pre</minVersion>
@@ -85 +85 @@
 
         if (win.scrollMaxY == 0) return false;
+        if (win.innerHeight == 0) return false;
         if (!win.scrollbars.visible) return false;
 
@@ -95 +96 @@
         let count = Math.ceil(win.scrollMaxY / scroll);
 
-        let insertPoint = doc.body.firstChild;
         let markers = [];
         for (let pageNum=1;pageNum<=count+1;++pageNum)
@@ -111 +111 @@
             p.style.left = "0px";
             p.style.top = Math.ceil((pageNum-1)*scroll)+"px";
-            doc.body.insertBefore(p, insertPoint);
-            //doc.body.appendChild(p);
+            doc.body.appendChild(p);
             markers.push(p);
         }
@@ -136 +135 @@
         let markers = doc.markers;
         if(!markers) markers = reader.insertMarkers(doc);
+        if(!markers && markers.length==0) return 1.0;
 
         let curPos = win.scrollY;
@@ -166 +166 @@
         function navi(win, page)
         {
-            let xpath = '//*[@id="vimperator-marker_reader-' + page + '"]';
-            let [elem] = $U.getNodesFromXPath(xpath, doc);
+            let elem = doc.getElementById("vimperator-marker_reader-" + page);
             if (elem) {
                 win.scrollTo(0, elem.offsetTop);