debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Go back to conservative page next from 0.2.6

Browse source 
This reverts to behaviour as of commit c2be3d67cf.
This commit is contained in:
Christian Dywan 2010-10-30 21:53:44 +02:00
parent a0c0207133
commit 985912a9cd
1 changed files with 12 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
midori/midori-view.c
View file

@ -4854,42 +4854,12 @@ midori_view_get_previous_page (MidoriView* view)
web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_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); js_context = webkit_web_frame_get_global_context (web_frame);
katze_assign (uri, sokoke_js_script_eval (js_context, katze_assign (uri, sokoke_js_script_eval (js_context,
"(function (g) {" "(function (l) { for (i in l) "
"var ind = ['prev','←','<'];" "if ((l[i].rel && l[i].rel == 'prev') "
"var nind = ['next','→','>'];" " || (l[i].innerHTML"
"for (h in g) {" " && l[i].innerHTML.toLowerCase ().indexOf ('prev') != -1)) "
"l = g[h];" "{ return l[i].href; } return 0; })("
"for (i in l)" "document.getElementsByTagName ('a'));", NULL));
"if (l[i].rel && (l[i].rel == ind[0]))"
"return l[i].href;"
"for (j in ind)"
"for (i in l)"
"if (l[i].innerHTML"
"&& (l[i].innerHTML.toLowerCase ().indexOf (ind[j]) != -1)"
"&& (l[i].innerHTML.toLowerCase ().indexOf (nind[j]) == -1))"
"return l[i].href;"
"var wa = window.location.href.split (/\\d+/);"
"var wn = window.location.href.split (/[^\\d]+/);"
"wn = wn.slice (1,wn.length - 1);"
"var cand = [];"
"for (i in wn)"
"{"
"cand[i] = '';"
"for (j = 0; j <= i; j++)"
"{"
"cand[i] += wa[j];"
"if (wn[j])"
"cand[i] += parseInt (wn[j]) - ((i == j) ? 1 : 0);"
"}"
"}"
"for (j in cand)"
"for (i in l)"
"if (cand[j].length && l[i].href && (l[i].href.indexOf (cand[j]) == 0))"
"return l[i].href;"
"}"
"return 0;"
"}) ([document.getElementsByTagName ('link'),"
"document.getElementsByTagName ('a')]);", NULL));
return uri && uri[0] != '0' ? uri : NULL; return uri && uri[0] != '0' ? uri : NULL;
} }
@ -4918,42 +4888,12 @@ midori_view_get_next_page (MidoriView* view)
web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_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); js_context = webkit_web_frame_get_global_context (web_frame);
katze_assign (uri, sokoke_js_script_eval (js_context, katze_assign (uri, sokoke_js_script_eval (js_context,
"(function (g) {" "(function (l) { for (i in l) "
"var ind = ['next','→','&gt;'];" "if ((l[i].rel && l[i].rel == 'next') "
"var nind = ['prev','←','&lt;'];" " || (l[i].innerHTML"
"for (h in g) {" " && l[i].innerHTML.toLowerCase ().indexOf ('next') != -1)) "
"l = g[h];" "{ return l[i].href; } return 0; })("
"for (i in l)" "document.getElementsByTagName ('a'));", NULL));
"if (l[i].rel && (l[i].rel == ind[0]))"
"return l[i].href;"
"for (j in ind)"
"for (i in l)"
"if (l[i].innerHTML"
"&& (l[i].innerHTML.toLowerCase ().indexOf (ind[j]) != -1)"
"&& (l[i].innerHTML.toLowerCase ().indexOf (nind[j]) == -1))"
"return l[i].href;"
"var wa = window.location.href.split (/\\d+/);"
"var wn = window.location.href.split (/[^\\d]+/);"
"wn = wn.slice (1,wn.length - 1);"
"var cand = [];"
"for (i in wn)"
"{"
"cand[i] = '';"
"for (j = 0; j <= i; j++)"
"{"
"cand[i] += wa[j];"
"if (wn[j])"
"cand[i] += parseInt (wn[j]) + ((i == j) ? 1 : 0);"
"}"
"}"
"for (j in cand)"
"for (i in l)"
"if (cand[j].length && l[i].href && (l[i].href.indexOf (cand[j]) == 0))"
"return l[i].href;"
"}"
"return 0;"
"}) ([document.getElementsByTagName ('link'),"
"document.getElementsByTagName ('a')]);", NULL));
return uri && uri[0] != '0' ? uri : NULL; return uri && uri[0] != '0' ? uri : NULL;
} }