r10957@agentz-office (orig r3251): agentzh | 2008-08-17 17:11:36 +0800

fixed the prev/next button for wikipedia git-svn-id: http://svn.openfoundry.org/searchall/trunk@521 1fb3952c-a762-dc11-853b-000bcdefe56b
agentzh · Aug 17, 2008 · a69024f · a69024f
1 parent 3774fa9
commit a69024f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/js/fmt-view.js b/js/fmt-view.js
@@ -23,10 +23,10 @@ SearchAll.patterns = {
         //'www.google.cn'   : "div.g[h2]",
         //'www.google.com'  : "div.g[h2]",
 
-        'www.google.cn'   : "div#res>div>div.g",
+        //'www.google.cn'   : "div#res>div>div.g",
-        //'www.google.cn'  : "div#res>div>ol>li",
+        'www.google.cn'  : "div#res>div>ol>li",
-        'www.google.com'  : "div#res>div>div.g",
+        //'www.google.com'  : "div#res>div>div.g",
-        //'www.google.com'  : "div#res>div>ol>li",
+        'www.google.com'  : "div#res>div>ol>li",
 
         'www.yisou.com'   : "div.web>ol>li",
         'so.sohu.com'     : "body>div#content>div",

diff --git a/js/prev-next.js b/js/prev-next.js
@@ -30,6 +30,9 @@ SearchAll.PrevNext.gotoNext = function (i) {
                     links = $("img[@alt*='Next']", doc).parent('a');
                     if (links.length == 0) {
                         links = $("a:contains('次へ')", doc);
+                        if (links.length == 0) {
+                            links = $("a:contains('next')", doc);
+                        }
                     }
                 }
             }
@@ -91,6 +94,9 @@ SearchAll.PrevNext.gotoPrev = function (i) {
                     links = $("img[@alt*='Prev']", doc).parent('a');
                     if (links.length == 0) {
                         links = $("a:contains('前へ')", doc);
+                        if (links.length == 0) {
+                            links = $("a:contains('previous')", doc);
+                        }
                     }
                 }
             }

diff --git a/lib/SearchAll/App.pm b/lib/SearchAll/App.pm
@@ -49,7 +49,7 @@ use XUL::App schema {
             id is 'searchall@yahoo.cn',
             name is 'SearchAll',
             description is 'A side-by-side search engine comparison tool',
-            version is '0.4.28',
+            version is '0.4.30',
             targets {
                 Firefox => ['2.0' => '3.0.*'],
                 Mozilla => ['1.5' => '1.8'],