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

Always use var in javascript for loops

Browse source 
Otherwise it may re-use global functions.
This commit is contained in:
Christian Dywan 2012-03-11 22:25:08 +01:00
parent c6bdd62f67
commit 5e2b7fdca7
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extensions/formhistory/formhistory.c
View file

@ -193,7 +193,7 @@ formhistory_navigation_decision_cb (WebKitWebView* web_view,
The field separator is "|||" */ The field separator is "|||" */
const gchar* script = "function dumpForm (inputs) {" const gchar* script = "function dumpForm (inputs) {"
" var out = '';" " var out = '';"
" for (i=0;i<inputs.length;i++) {" " for (var i = 0; i < inputs.length; i++) {"
" if (inputs[i].getAttribute('autocomplete') == 'off' && " " if (inputs[i].getAttribute('autocomplete') == 'off' && "
" inputs[i].type == 'text')" " inputs[i].type == 'text')"
" continue;" " continue;"

2
midori/main.c
View file

@ -1572,7 +1572,7 @@ speeddial_new_from_file (const gchar* config,
g_string_append_len (script, json_content, json_length); g_string_append_len (script, json_content, json_length);
g_string_append (script, "); " g_string_append (script, "); "
"var keyfile = '';" "var keyfile = '';"
"for (i in json['shortcuts']) {" "for (var i in json['shortcuts']) {"
"var tile = json['shortcuts'][i];" "var tile = json['shortcuts'][i];"
"keyfile += '[Dial ' + tile['id'].substring (1) + ']\\n'" "keyfile += '[Dial ' + tile['id'].substring (1) + ']\\n'"
" + 'uri=' + tile['href'] + '\\n'" " + 'uri=' + tile['href'] + '\\n'"

6
midori/midori-view.c
View file

@ -1478,7 +1478,7 @@ webkit_web_view_load_finished_cb (WebKitWebView* web_view,
JSContextRef js_context = webkit_web_frame_get_global_context (web_frame); JSContextRef js_context = webkit_web_frame_get_global_context (web_frame);
/* Icon: URI, News Feed: $URI|title */ /* Icon: URI, News Feed: $URI|title */
gchar* value = sokoke_js_script_eval (js_context, gchar* value = sokoke_js_script_eval (js_context,
"(function (l) { var f = new Array (); for (i in l) " "(function (l) { var f = new Array (); for (var i in l) "
"{ var t = l[i].type; var r = l[i].rel; " "{ var t = l[i].type; var r = l[i].rel; "
"if (t && (t.indexOf ('rss') != -1 || t.indexOf ('atom') != -1)) " "if (t && (t.indexOf ('rss') != -1 || t.indexOf ('atom') != -1)) "
"f.push ('$' + l[i].href + '|' + l[i].title);" "f.push ('$' + l[i].href + '|' + l[i].title);"
@ -1894,7 +1894,7 @@ gtk_widget_key_press_event_cb (WebKitWebView* web_view,
" border:1px solid gray; padding:0 0.1em 0.2em 0.1em !important;" " border:1px solid gray; padding:0 0.1em 0.2em 0.1em !important;"
" position:absolute; display:inline !important; }');" " position:absolute; display:inline !important; }');"
" var label_count = 0;" " var label_count = 0;"
" for (i in document.links) {" " for (var i in document.links) {"
" if (document.links[i].href && document.links[i].insertBefore) {" " if (document.links[i].href && document.links[i].insertBefore) {"
" var child = document.createElement ('span');" " var child = document.createElement ('span');"
" if (document.links[i].accessKey && isNaN (document.links[i].accessKey)) {" " if (document.links[i].accessKey && isNaN (document.links[i].accessKey)) {"
@ -3704,7 +3704,7 @@ static gchar* list_netscape_plugins ()
JSContextRef js_context = webkit_web_frame_get_global_context (web_frame); JSContextRef js_context = webkit_web_frame_get_global_context (web_frame);
/* Joins available plugins like this: URI1|title1,URI2|title2 */ /* Joins available plugins like this: URI1|title1,URI2|title2 */
gchar* value = sokoke_js_script_eval (js_context, gchar* value = sokoke_js_script_eval (js_context,
"function plugins (l) { var f = new Array (); for (i in l) " "function plugins (l) { var f = new Array (); for (var i in l) "
"{ var p = l[i].name + '|' + l[i].filename; " "{ var p = l[i].name + '|' + l[i].filename; "
"if (f.indexOf (p) == -1) f.push (p); } return f; }" "if (f.indexOf (p) == -1) f.push (p); } return f; }"
"plugins (navigator.plugins)", NULL); "plugins (navigator.plugins)", NULL);