[Xfce4-commits] <midori:master> Check a and link elements for next/ previous page

[Christian Dywan]

Updating branch refs/heads/master
         to ab04194ee4e433e8f15598fc81a093d2b167aded (commit)
       from e06c2052a07460e307fa7f0f6f7ca6a4ffd6841a (commit)

commit ab04194ee4e433e8f15598fc81a093d2b167aded
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sun Mar 13 14:53:25 2011 +0100

    Check a and link elements for next/ previous page

 midori/midori-view.c |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/midori/midori-view.c b/midori/midori-view.c
index 39bdb89..4749c9d 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -4997,12 +4997,15 @@ midori_view_get_previous_page (MidoriView* view)
     web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view));
     js_context = webkit_web_frame_get_global_context (web_frame);
     katze_assign (uri, sokoke_js_script_eval (js_context,
-        "(function (l) { for (i in l) "
+        "(function (tags) {"
+        "for (tag in tags) {"
+        "var l = document.getElementsByTagName (tag);"
+        "for (i in l) { "
         "if ((l[i].rel && l[i].rel.toLowerCase () == 'prev') "
         " || (l[i].innerHTML"
         "  && l[i].innerHTML.toLowerCase ().indexOf ('prev') != -1)) "
-        "{ return l[i].href; } return 0; })("
-        "document.getElementsByTagName ('a'));", NULL));
+        "{ return l[i].href; } } } return 0; })("
+        "{ link:'link', a:'a' });", NULL));
     return uri && uri[0] != '0' ? uri : NULL;
 }
 
@@ -5031,12 +5034,15 @@ midori_view_get_next_page (MidoriView* view)
     web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view));
     js_context = webkit_web_frame_get_global_context (web_frame);
     katze_assign (uri, sokoke_js_script_eval (js_context,
-        "(function (l) { for (i in l) "
+        "(function (tags) {"
+        "for (tag in tags) {"
+        "var l = document.getElementsByTagName (tag);"
+        "for (i in l) { "
         "if ((l[i].rel && l[i].rel.toLowerCase () == 'next') "
         " || (l[i].innerHTML"
         "  && l[i].innerHTML.toLowerCase ().indexOf ('next') != -1)) "
-        "{ return l[i].href; } return 0; })("
-        "document.getElementsByTagName ('a'));", NULL));
+        "{ return l[i].href; } } } return 0; })("
+        "{ link:'link', a:'a' });", NULL));
     return uri && uri[0] != '0' ? uri : NULL;
 }