commit conkeror for openSUSE:Factory

Hello community, here is the log from the commit of package conkeror for openSUSE:Factory checked in at 2016-09-30 15:35:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/conkeror (Old) and /work/SRC/openSUSE:Factory/.conkeror.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "conkeror" Changes: -------- --- /work/SRC/openSUSE:Factory/conkeror/conkeror.changes 2016-06-11 00:00:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.conkeror.new/conkeror.changes 2016-09-30 15:35:19.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Sep 29 07:36:30 UTC 2016 - sleep_walker@opensuse.org + +- bump to 1.0.3 release +- remove patches: + fix-for-old-make.patch +- new patches: + 0001-Use-new-nsIPermission-api.patch + 0001-modules-download-manager.js-Fix-bug-preventing-compl.patch + 0001-application.ini-Fix-Goanna-version-number.patch + +------------------------------------------------------------------- Old: ---- conkeror-ab02f17.tar.gz fix-for-old-make.patch New: ---- 0001-Use-new-nsIPermission-api.patch 0001-application.ini-Fix-Goanna-version-number.patch 0001-modules-download-manager.js-Fix-bug-preventing-compl.patch conkeror-1.0.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ conkeror.spec ++++++ --- /var/tmp/diff_new_pack.DD0EOu/_old 2016-09-30 15:35:21.000000000 +0200 +++ /var/tmp/diff_new_pack.DD0EOu/_new 2016-09-30 15:35:21.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package conkeror # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,19 +16,21 @@ # -%define revision ab02f17 - Name: conkeror -Version: 1.0 +Version: 1.0.3 Release: 0 Summary: Keyboard-oriented customizable and extensible web browser License: MPL-1.1 or GPL-2.0 or LGPL-2.1 Group: Productivity/Networking/Web/Browsers Url: http://conkeror.org -# wget 'http://repo.or.cz/w/conkeror.git?a=snapshot;h=master;sf=tgz' -Source0: %{name}-%{revision}.tar.gz +Source0: %{name}-%{version}.tar.gz Source1: %{name}.svg -Patch0: fix-for-old-make.patch +# PATCH-FIX-UPSTREAM +Patch0: 0001-Use-new-nsIPermission-api.patch +# PATCH-FIX-UPSTREAM +Patch1: 0001-modules-download-manager.js-Fix-bug-preventing-compl.patch +# PATCH-FIX-UPSTREAM +Patch2: 0001-application.ini-Fix-Goanna-version-number.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: hicolor-icon-theme %if 0%{?suse_version} @@ -47,8 +49,10 @@ interactive help system. %prep -%setup -q -n %{name}-%{revision} +%setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build make ++++++ 0001-Use-new-nsIPermission-api.patch ++++++

From dc67cae174477498b2f2c7f5d0bc63971a210df2 Mon Sep 17 00:00:00 2001 From: Matt Lundin Date: Mon, 27 Jun 2016 21:37:38 -0500 Subject: [PATCH] Use new nsIPermission api

* modules/permission-manager.js: Use new api for Mozilla/Firefox versions 42 and up. The new api uses protocol://domain instead of a simple domain (e.g., https://google.com instead of google.com). --- modules/permission-manager.js | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/modules/permission-manager.js b/modules/permission-manager.js index b2d54e1..803b329 100644 --- a/modules/permission-manager.js +++ b/modules/permission-manager.js @@ -96,7 +96,11 @@ interactive("permission-manager", "View or edit the host-specific " let max_type_len = 0; while (e.hasMoreElements()) { let p = e.getNext().QueryInterface(Ci.nsIPermission); - let host = p.host; + let host; + if (version_compare(get_mozilla_version(), "42.0") >= 0) + host = p.principal.origin; + else + host = p.host; let type = p.type; let cap = p.capability; if (max_host_len < host.length) @@ -128,9 +132,13 @@ interactive("permission-manager", "View or edit the host-specific " file_buf += "\n"; } + let example = (version_compare(get_mozilla_version(), "42.0") >= 0) ? + "https://google.com" : "google.com"; + let url_type = (version_compare(get_mozilla_version(), "42.0") >= 0) ? + "protocol://domain" : "domain"; file_buf += "\n" + - "# entry syntax (one per line): <domain> <type> <permission>\n\n" + - "# example: google.com popup allow\n\n" + + "# entry syntax (one per line): <" + url_type + "> <type> <permission>\n\n" + + "# example: " + example + " popup allow\n\n" + word_wrap("The <domain> must be a valid domain name. Depending on the <type>, only exact " + "matches may be used, or alternatively it may match any sub-domain if a more " + @@ -243,14 +251,23 @@ interactive("permission-manager", "View or edit the host-specific " } delete existing_perms[""+[host,type]]; } - if (add) - permission_manager.add(make_uri("http://" + host), type, cap); + if (add) { + if (version_compare(get_mozilla_version(), "42.0") >= 0) { + permission_manager.add(make_uri(host), type, cap); + } else { + permission_manager.add(make_uri("http://" + host), type, cap); + } + } } let num_removed = 0; for (let [k,v] in Iterator(existing_perms)) { let [host,type] = k.split(",",2); ++num_removed; - permission_manager.remove(host,type); + if (version_compare(get_mozilla_version(), "42.0") >= 0) { + permission_manager.remove(make_uri(host),type); + } else { + permission_manager.remove(host,type); + } } let msg; if (num_added == 0 && num_changed == 0 && num_removed == 0) -- 2.10.0 ++++++ 0001-application.ini-Fix-Goanna-version-number.patch ++++++

From 745311e9564654c99d4dcfad60fca8646a273130 Mon Sep 17 00:00:00 2001 From: Scott Jaderholm Date: Mon, 27 Jun 2016 22:31:38 -0700 Subject: [PATCH] application.ini: Fix Goanna version number

--- application.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application.ini b/application.ini index 2b96b31..7257ace 100644 --- a/application.ini +++ b/application.ini @@ -10,7 +10,7 @@ MinVersion=2.0 MaxVersion=* [Goanna] -MinVersion=1.9.1 +MinVersion=2.0 MaxVersion=* [XRE] -- 2.10.0 ++++++ 0001-modules-download-manager.js-Fix-bug-preventing-compl.patch ++++++

From ec37576ae232914d64ba7601bf3f88f2127a293c Mon Sep 17 00:00:00 2001 From: Dimitris Papavasiliou Date: Fri, 9 Jan 2015 16:10:25 +0200 Subject: [PATCH] modules/download-manager.js: Fix bug preventing completion of downloads.

--- modules/download-manager.js | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/download-manager.js b/modules/download-manager.js index ecd032b..f66d736 100644 --- a/modules/download-manager.js +++ b/modules/download-manager.js @@ -1052,24 +1052,24 @@ function download_completer (completions) { }; } all_word_completer.call(this, forward_keywords(arguments), - $completions = completions); + $completions = completions, + $get_string = function (x) { + if (use_downloads_jsm) + return x.target.path; + else + return x.displayName; + }, + $get_description = function (x) { + if (use_downloads_jsm) + return x.source.url; + else + return x.source.spec + }); } download_completer.prototype = { constructor: download_completer, __proto__: all_word_completer.prototype, - toString: function () "#", - get_string: function (x) { - if (use_downloads_jsm) - return x.target.path; - else - return x.displayName; - }, - get_description: function (x) { - if (use_downloads_jsm) - return x.source.url; - else - return x.source.spec - } + toString: function () "#" }; minibuffer.prototype.read_download = function () { -- 2.10.0 ++++++ conkeror-ab02f17.tar.gz -> conkeror-1.0.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-ab02f17/application.ini new/conkeror-1.0.3/application.ini --- old/conkeror-ab02f17/application.ini 2016-04-14 00:57:39.000000000 +0200 +++ new/conkeror-1.0.3/application.ini 2016-06-07 23:11:29.000000000 +0200 @@ -2,12 +2,16 @@ Vendor=conkeror.mozdev.org Name=conkeror ID={a79fe89b-6662-4ff4-8e88-09950ad4dfde} -Version=1.0.0 +Version=1.0.3 BuildID=git [Gecko] MinVersion=2.0 MaxVersion=* +[Goanna] +MinVersion=1.9.1 +MaxVersion=* + [XRE] EnableExtensionManager=1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-ab02f17/components/application.js new/conkeror-1.0.3/components/application.js --- old/conkeror-ab02f17/components/application.js 2016-04-14 00:57:39.000000000 +0200 +++ new/conkeror-1.0.3/components/application.js 2016-06-07 23:11:29.000000000 +0200 @@ -99,7 +99,7 @@ this.loading_urls.join(",\n")); if (url.substr(-4) == ".jsx") { var scopename = url.substr(url.lastIndexOf('/')+1) - .replace('-', '_', 'g'); + .replace(/-/g, '_'); var dot = scopename.indexOf("."); if (dot > -1) scopename = scopename.substr(0, dot); @@ -222,7 +222,7 @@ return false; if (dot > 0) feature = feature.substr(0, dot); - feature = feature.replace('_', '-', 'g'); + feature = feature.replace(/_/g, '-'); if (this.featurep(feature)) return true; try { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-ab02f17/conkeror.in new/conkeror-1.0.3/conkeror.in --- old/conkeror-ab02f17/conkeror.in 2016-04-14 00:57:39.000000000 +0200 +++ new/conkeror-1.0.3/conkeror.in 2016-06-07 23:11:29.000000000 +0200 @@ -5,4 +5,4 @@ # Use, modification, and distribution are subject to the # terms specified in the COPYING file. -exec firefox --app "@datadir@/application.ini" "$@" +XUL_APP_FILE="@datadir@/application.ini" exec firefox "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-ab02f17/modules/buffer.js new/conkeror-1.0.3/modules/buffer.js --- old/conkeror-ab02f17/modules/buffer.js 2016-04-14 00:57:39.000000000 +0200 +++ new/conkeror-1.0.3/modules/buffer.js 2016-06-07 23:11:29.000000000 +0200 @@ -1094,12 +1094,14 @@ define_keywords("$display_name", "$doc"); function buffer_mode (name, enable, disable) { keywords(arguments); - this.name = name.replace("-","_","g"); - this.hyphen_name = name.replace("_","-","g"); - if (enable) + this.name = name.replace(/-/g, "_"); + this.hyphen_name = name.replace(/_/g, "-"); + if (enable) { this._enable = enable; - if (disable) + } + if (disable) { this._disable = disable; + } this.display_name = arguments.$display_name; this.doc = arguments.$doc; this.enable_hook = this.name + "_enable_hook"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-ab02f17/modules/commands.js new/conkeror-1.0.3/modules/commands.js --- old/conkeror-ab02f17/modules/commands.js 2016-04-14 00:57:39.000000000 +0200 +++ new/conkeror-1.0.3/modules/commands.js 2016-06-07 23:11:29.000000000 +0200 @@ -10,17 +10,26 @@ define_coroutine_hook("before_quit_hook", RUN_HOOK_UNTIL_FAILURE); define_hook("quit_hook"); -function quit () { +function quit (I, restart) { var res = yield before_quit_hook.run(); if (res) { quit_hook.run(); var appStartup = Cc["@mozilla.org/toolkit/app-startup;1"] .getService(Ci.nsIAppStartup); - appStartup.quit(appStartup.eAttemptQuit); + if (restart) { + appStartup.quit(appStartup.eRestart | appStartup.eAttemptQuit); + } else { + appStartup.quit(appStartup.eAttemptQuit); + } } } interactive("quit", "Quit Conkeror", quit); +interactive("restart", + "Restart Conkeror", + function (I) { + yield quit(I, true); + }); function show_conkeror_version (window) { var xulrunner_version = Cc['@mozilla.org/xre/app-info;1'] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-ab02f17/modules/element.js new/conkeror-1.0.3/modules/element.js --- old/conkeror-ab02f17/modules/element.js 2016-04-14 00:57:39.000000000 +0200 +++ new/conkeror-1.0.3/modules/element.js 2016-06-07 23:11:29.000000000 +0200 @@ -58,7 +58,7 @@ // keywords: $hint function define_browser_object_class (name, doc, handler) { keywords(arguments); - var varname = 'browser_object_'+name.replace('-','_','g'); + var varname = 'browser_object_'+name.replace(/-/g , '_'); var ob = conkeror[varname] = new browser_object_class(name, doc, handler, forward_keywords(arguments)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-ab02f17/modules/env.js new/conkeror-1.0.3/modules/env.js --- old/conkeror-ab02f17/modules/env.js 2016-04-14 00:57:39.000000000 +0200 +++ new/conkeror-1.0.3/modules/env.js 2016-06-07 23:11:29.000000000 +0200 @@ -60,10 +60,11 @@ var home = getenv('HOME') || getenv('USERPROFILE') || getenv('HOMEDRIVE') + getenv('HOMEPATH'); - home = home.replace("/", "\\", "g"); + home = home.replace(/\//g, "\\"); dir.initWithPath(home); - } else + } else { dir.initWithPath(getenv('HOME')); + } return dir; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-ab02f17/modules/mode.js new/conkeror-1.0.3/modules/mode.js --- old/conkeror-ab02f17/modules/mode.js 2016-04-14 00:57:39.000000000 +0200 +++ new/conkeror-1.0.3/modules/mode.js 2016-06-07 23:11:29.000000000 +0200 @@ -10,7 +10,7 @@ define_keywords("$doc"); function define_global_mode (name, enable, disable) { keywords(arguments, $doc = null); - var hyphen_name = name.replace("_","-","g"); + var hyphen_name = name.replace(/_/g,"-"); var state = name + "_enabled"; this[state] = false; var enable_hook_name = hyphen_name + "-enable-hook"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-ab02f17/modules/mouse.js new/conkeror-1.0.3/modules/mouse.js --- old/conkeror-ab02f17/modules/mouse.js 1970-01-01 01:00:00.000000000 +0100 +++ new/conkeror-1.0.3/modules/mouse.js 2016-06-07 23:11:29.000000000 +0200 @@ -0,0 +1,114 @@ +/** + * (C) Copyright 2016 Ivy Foster + * + * Use, modification, and distribution are subject to the terms specified in the + * COPYING file. +**/ + +// Reference: https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent + +define_variable ( + "click_handler", [], + "An array of functions to run on click events. " + + "The function will be passed two arguments: " + + "the current window and the mouse event.\n" + + "To create an event, set 'click_handler[n] = some_function;', " + + "where n is the total value of the buttons pressed.\n" + + "left = 1\n" + "right = 2\n" + "middle = 4\n" + + "button4 = 8\n" + "button5 = 16\n\n" + + "For instance, click_handler.3 would run when " + + "left and right are pressed together.\n" + + "For more information, see " + + "https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/buttons." +); + +function handle_mouse_click (event) { + var chord = 0; + + // Translate MouseEvent.button events into MouseEvent.buttons events. + switch (event.button) { + case 0: + chord = 1; + break; + case 1: + chord = 4; + break; + case 2: + chord = 2; + break; + case 3: + chord = 8; + break; + case 4: + chord = 16; + break; + } + + chord += event.buttons; + + if (click_handler[chord]) { + click_handler[chord](this.ownerDocument.defaultView, event); + } +} + +define_variable( + "clicks_in_new_buffer_target", OPEN_NEW_BUFFER, + "Destination for new buffers created by clicks. " + + "Set to one the constants OPEN_NEW_BUFFER, " + + "OPEN_NEW_BUFFER_BACKGROUND, or OPEN_NEW_WINDOW.\n" + + "Default is OPEN_NEW_BUFFER." +); + +function clicked_link_in_new_buffer (window, event) { + let element = event.target; + let anchor = null; + if (element instanceof Ci.nsIDOMHTMLAnchorElement || + element instanceof Ci.nsIDOMHTMLAreaElement) { + anchor = element; + } else { + for (let p = element.parentNode; + p != null && p.tagName.toLowerCase() != "html"; + p = p.parentNode) { + if (p.tagName.toLowerCase() == "a") { + anchor = p; + break; + } else { return; } + } + } + + event.preventDefault(); + event.stopPropagation(); + let spec = load_spec(anchor); + let buffer = window.buffers.current; + create_buffer(window, + buffer_creator(content_buffer, + $opener = buffer, + $load = spec), + clicks_in_new_buffer_target); +} + +function handle_click_add_listener(buffer) { + buffer.browser.addEventListener("click", handle_mouse_click, true); +} + +function handle_click_remove_listener(buffer) { + buffer.browser.removeEventListener("click", handle_mouse_click, true); +} + +function mouse_click_event_mode_enable() { + add_hook("create_buffer_hook", handle_click_add_listener); + for_each_buffer(handle_click_add_listener); +} + +function mouse_click_event_mode_disable() { + remove_hook("create_buffer_hook", handle_click_add_listener); + for_each_buffer(handle_click_remove_listener); +} + +define_global_mode("mouse_click_event_mode", + mouse_click_event_mode_enable, mouse_click_event_mode_disable +); + +mouse_click_event_mode(true); + +provide("mouse"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-ab02f17/modules/new-tabs.js new/conkeror-1.0.3/modules/new-tabs.js --- old/conkeror-ab02f17/modules/new-tabs.js 2016-04-14 00:57:39.000000000 +0200 +++ new/conkeror-1.0.3/modules/new-tabs.js 2016-06-07 23:11:29.000000000 +0200 @@ -24,6 +24,12 @@ define_variable("tab_bar_show_index", true, "Whether or not to show the tab index in each tab."); +define_variable("tab_bar_smooth_scroll", true, + "Whether or not tab bar should scroll smoothly."); + +define_variable("tab_bar_flex_tabs", false, + "Whether or not tabs should use flex layout."); + /** * Constructs a tab bar for the given window. */ @@ -31,6 +37,9 @@ window.tab_bar = this; var scrollbox = create_XUL(window, "arrowscrollbox"); scrollbox.setAttribute("id", "tab2-bar"); + if (!tab_bar_smooth_scroll) { + scrollbox.setAttribute("smoothscroll", false); + } scrollbox.setAttribute("orient", "horizontal"); var after = window.buffers.container; this.window = window; @@ -115,6 +124,9 @@ // Create a tab and add it to the tab bar var tab = create_XUL(buffer.window, "hbox"); tab.buffer = buffer; + if (tab_bar_flex_tabs) { + tab.setAttribute("flex", "1"); + } tab.setAttribute("class", "tab2"); tab.addEventListener("click", function (event) { if (event.button == tab_bar_button_select) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-ab02f17/modules/page-modes/key-kill.js new/conkeror-1.0.3/modules/page-modes/key-kill.js --- old/conkeror-ab02f17/modules/page-modes/key-kill.js 2016-04-14 00:57:39.000000000 +0200 +++ new/conkeror-1.0.3/modules/page-modes/key-kill.js 2016-06-07 23:11:29.000000000 +0200 @@ -5,14 +5,23 @@ * COPYING file. **/ -function key_kill_event_kill (event) { - var elem = event.target; - if (elem instanceof Ci.nsIDOMHTMLInputElement || - elem instanceof Ci.nsIDOMHTMLTextAreaElement) - { - return; - } - event_kill(event); +define_variable("key_kill_input_fields", false, + "When true, key-kill-mode will operate in input fields and textareas."); + +{ let mozilla_version_below_25 = version_compare(get_mozilla_version(), "25.0") < 0; + function key_kill_event_kill (event) { + var elem = event.target; + if (!key_kill_input_fields && + (elem instanceof Ci.nsIDOMHTMLInputElement || + elem instanceof Ci.nsIDOMHTMLTextAreaElement)) + { + return; + } + if (mozilla_version_below_25) { + event.preventDefault(); + } + event.stopPropagation(); + } } define_page_mode("key-kill-mode", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-ab02f17/modules/page-modes/wikipedia.js new/conkeror-1.0.3/modules/page-modes/wikipedia.js --- old/conkeror-ab02f17/modules/page-modes/wikipedia.js 2016-04-14 00:57:39.000000000 +0200 +++ new/conkeror-1.0.3/modules/page-modes/wikipedia.js 2016-06-07 23:11:29.000000000 +0200 @@ -77,7 +77,7 @@ */ function define_wikipedia_webjumps() { if (arguments.length == 0) - var prefixes = [i for (i in wikipedia_versions)]; + var prefixes = object_keys(wikipedia_versions); else prefixes = Array.slice(arguments); for each (let i in prefixes) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-ab02f17/modules/rc.js new/conkeror-1.0.3/modules/rc.js --- old/conkeror-ab02f17/modules/rc.js 2016-04-14 00:57:39.000000000 +0200 +++ new/conkeror-1.0.3/modules/rc.js 2016-06-07 23:11:29.000000000 +0200 @@ -16,19 +16,25 @@ function load_rc () { var path; var rcfile = get_pref("conkeror.rcfile"); - if (rcfile.length == 0) - //FIXME: log that the rc is disabled + if (rcfile.length == 0) { + dumpln("w: preference conkeror.rcfile is unset"); return; + } path = make_file(rcfile); + if (! path.exists()) { - if (file_symlink_p(path)) + if (file_symlink_p(path)) { dumpln("w: broken symlink, \""+rcfile+"\""); - else if (pref_has_user_value("conkeror.rcfile")) + } else if (pref_has_user_value("conkeror.rcfile")) { dumpln("w: preference conkeror.rcfile is set to "+ "non-existent path, \""+rcfile+"\""); - //FIXME: else log that the rc does not exist + } else { + dumpln("w: conkeror.rcfile \"" + rcfile + + "\" does not exist"); + } return; } + var files = []; var ret; if (path.isDirectory()) { @@ -36,16 +42,18 @@ while (entries.hasMoreElements()) { var entry = entries.getNext(); entry.QueryInterface(Ci.nsIFile); - if (entry.leafName.substr(-3).toLowerCase() == '.js') + if (entry.leafName.substr(-3).toLowerCase() == '.js') { files.push(entry); + } } files.sort(function (a, b) { - if (a.leafName < b.leafName) + if (a.leafName < b.leafName) { return -1; - else if (a.leafName > b.leafName) + } else if (a.leafName > b.leafName) { return 1; - else + } else { return 0; + } }); path.appendRelativePath("a"); ret = path.path.substr(0, path.path.length - 1) + "*.js"; @@ -56,15 +64,14 @@ var obs = Cc["@mozilla.org/observer-service;1"] .getService(Ci.nsIObserverService); obs.notifyObservers(null, "startupcache-invalidate", null); - for (var i = 0; files[i]; i++) { + for (var file of files) { try { - load(files[i]); + load(file); + dumpln("i: loaded rc file " + file.leafName) } catch (e) { dump_error(e); } } - //FIXME: log what was loaded instead of returning the value to be - // logged by the caller. return ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-ab02f17/modules/string.js new/conkeror-1.0.3/modules/string.js --- old/conkeror-ab02f17/modules/string.js 2016-04-14 00:57:39.000000000 +0200 +++ new/conkeror-1.0.3/modules/string.js 2016-06-07 23:11:29.000000000 +0200 @@ -17,8 +17,8 @@ function shell_quote (str) { - var s = str.replace("\"", "\\\"", "g"); - s = s.replace("$", "\$", "g"); + var s = str.replace(/"/g, "\\\""); + s = s.replace(/\$/g, "\\$"); return s; } @@ -76,7 +76,7 @@ return str.replace(/&/g, '&') .replace(//g, '>') - .replace('"', '"', 'g'); + .replace(/\"/g, '"'); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-ab02f17/modules/utils.js new/conkeror-1.0.3/modules/utils.js --- old/conkeror-ab02f17/modules/utils.js 2016-04-14 00:57:39.000000000 +0200 +++ new/conkeror-1.0.3/modules/utils.js 2016-06-07 23:11:29.000000000 +0200 @@ -27,12 +27,15 @@ function make_file (path) { - if (path instanceof Ci.nsILocalFile) + if (path instanceof Ci.nsILocalFile) { return path; - if (path == "~") + } + if (path == "~") { return get_home_directory(); - if (WINDOWS) - path = path.replace("/", "\\", "g"); + } + if (WINDOWS) { + path = path.replace(/\//g, "\\"); + } if ((POSIX && path.substring(0,2) == "~/") || (WINDOWS && path.substring(0,2) == "~\\")) {