From a6d7244af1977495a5b2390bec2f3ed152dbe70c Mon Sep 17 00:00:00 2001 From: John Foerch Date: Sun, 2 Dec 2012 00:55:38 -0500 Subject: [PATCH] text_entry_minibuffer_state $match_required renamed to $require_match --- modules/buffer.js | 2 +- modules/commands.js | 4 ++-- modules/content-buffer.js | 2 +- modules/download-manager.js | 4 ++-- modules/element.js | 2 +- modules/history.js | 6 +++--- modules/index-webjump.js | 4 ++-- modules/media.js | 2 +- modules/minibuffer-completion.js | 4 ++-- modules/minibuffer-read-mime-type.js | 2 +- modules/minibuffer-read.js | 36 ++++++++++++++++++------------------ 11 files changed, 34 insertions(+), 34 deletions(-) diff --git a/modules/buffer.js b/modules/buffer.js index 37592a0..20cbd1c 100644 --- a/modules/buffer.js +++ b/modules/buffer.js @@ -815,7 +815,7 @@ minibuffer.prototype.read_buffer = function () { $history = arguments.$history, $completer = completer, $enable_icons = read_buffer_show_icons, - $match_required = true, + $require_match = true, $auto_complete = "buffer", $auto_complete_initial = true, $auto_complete_delay = 0, diff --git a/modules/commands.js b/modules/commands.js index 2123365..a5d6aa8 100644 --- a/modules/commands.js +++ b/modules/commands.js @@ -771,7 +771,7 @@ interactive("charset-prefix", $completer = prefix_completer( $completions = charsets, $get_string = function (x) x.toLowerCase()), - $match_required, + $require_match, $space_completes); }, $prefix); @@ -792,7 +792,7 @@ interactive("reload-with-charset", $completer = prefix_completer( $completions = charsets, $get_string = function (x) x.toLowerCase()), - $match_required, + $require_match, $space_completes); reload(I.buffer, false, null, forced_charset); }); diff --git a/modules/content-buffer.js b/modules/content-buffer.js index 1c43316..37d256f 100644 --- a/modules/content-buffer.js +++ b/modules/content-buffer.js @@ -406,7 +406,7 @@ minibuffer.prototype.read_url = function () { $initial_value = arguments.$initial_value, $auto_complete = "url", $select = minibuffer_read_url_select_initial, - $match_required = false); + $require_match = false); if (!possibly_valid_url(result) && !get_webjump(result)) result = try_read_url_handlers(result); if (result == "") // well-formedness check. (could be better!) diff --git a/modules/download-manager.js b/modules/download-manager.js index e1de34b..b2a30b0 100644 --- a/modules/download-manager.js +++ b/modules/download-manager.js @@ -1046,7 +1046,7 @@ if (use_downloads_jsm) { }, $auto_complete = "download", $auto_complete_initial = true, - $match_required = true); + $require_match = true); var result = yield this.read(forward_keywords(arguments)); yield co_return(result); }; @@ -1067,7 +1067,7 @@ if (use_downloads_jsm) { $get_value = function (x) x), $auto_complete = "download", $auto_complete_initial = true, - $match_required = true); + $require_match = true); var result = yield this.read(forward_keywords(arguments)); yield co_return(result); }; diff --git a/modules/element.js b/modules/element.js index 28ac598..8f26fe5 100644 --- a/modules/element.js +++ b/modules/element.js @@ -238,7 +238,7 @@ define_browser_object_class("scrape-url", $initial_value = null, $auto_complete = "url", $select, - $match_required = false); + $require_match = false); yield co_return(result); }, $hint = "choose scraped URL"); diff --git a/modules/history.js b/modules/history.js index fd20e6a..5035a20 100644 --- a/modules/history.js +++ b/modules/history.js @@ -7,13 +7,13 @@ * COPYING file. **/ -define_keywords("$use_history", "$use_bookmarks", "$match_required", +define_keywords("$use_history", "$use_bookmarks", "$require_match", "$sort_order"); function history_completer () { keywords(arguments, $sort_order = "visitcount_descending"); var use_history = arguments.$use_history; var use_bookmarks = arguments.$use_bookmarks; - let match_required = arguments.$match_required; + let require_match = arguments.$require_match; var sort_order = Ci.nsINavHistoryQueryOptions[ "SORT_BY_" + arguments.$sort_order.toUpperCase()]; return function (input, pos, conservative) { @@ -39,7 +39,7 @@ function history_completer () { get_description: function (i) root.getChild(i).title, get_input_state: function (i) [root.getChild(i).uri], destroy: function () { root.containerOpen = false; }, - get_match_required: function() match_required + get_require_match: function() require_match }; } } diff --git a/modules/index-webjump.js b/modules/index-webjump.js index 17b9f63..ac01862 100644 --- a/modules/index-webjump.js +++ b/modules/index-webjump.js @@ -118,7 +118,7 @@ index_webjump.prototype = { get_string: function (i) data[i][0], get_description: function (i) data[i][1], get_input_state: function (i) [data[i][0]], - get_match_required: function() require + get_require_match: function() require }; yield co_return(c); }, @@ -221,7 +221,7 @@ interactive("webjump-get-index", $history = "webjump", $completer = all_word_completer( $completions = completions), - $match_required = true); + $require_match = true); var jmp = index_webjumps[key]; if (jmp) jmp.get_index(I.buffer); diff --git a/modules/media.js b/modules/media.js index b533c16..b639cd5 100644 --- a/modules/media.js +++ b/modules/media.js @@ -87,7 +87,7 @@ define_browser_object_class("media", null, }); let result = yield I.buffer.window.minibuffer.read( $prompt = prompt, - $match_required, + $require_match, $completer = completer, $auto_complete_initial, $auto_complete = "media"); diff --git a/modules/minibuffer-completion.js b/modules/minibuffer-completion.js index f1811b9..ab15731 100644 --- a/modules/minibuffer-completion.js +++ b/modules/minibuffer-completion.js @@ -282,7 +282,7 @@ function merge_completers (completers) { var count = 0; for (let i = 0; i < completers.length; ++i) { let r = yield completers[i](input, pos, conservative); - if (r != null && (r.count > 0 || "get_match_required" in r)) { + if (r != null && (r.count > 0 || "get_require_match" in r)) { results.push(r); count += r.count; } @@ -324,7 +324,7 @@ function merge_completers (completers) { get_input_state: forward('get_input_state'), get_icon: forward('get_icon'), destroy: forward('destroy'), - get_match_required: combine_or('get_match_required') + get_require_match: combine_or('get_require_match') }); }; } diff --git a/modules/minibuffer-read-mime-type.js b/modules/minibuffer-read-mime-type.js index 6622c71..6943c97 100644 --- a/modules/minibuffer-read-mime-type.js +++ b/modules/minibuffer-read-mime-type.js @@ -32,7 +32,7 @@ minibuffer.prototype.read_viewable_mime_type = function () { forward_keywords(arguments), $completer = prefix_completer( $completions = viewable_mime_type_list), - $match_required, + $require_match, $space_completes); yield co_return(result); }; diff --git a/modules/minibuffer-read.js b/modules/minibuffer-read.js index e79f1d7..d453ebe 100644 --- a/modules/minibuffer-read.js +++ b/modules/minibuffer-read.js @@ -86,15 +86,15 @@ completions_tree_view.prototype = { * * completer * - * match_required + * require_match * - * default_completion only used if match_required is set to true + * default_completion only used if require_match is set to true * * $valiator [optional] * specifies a function */ define_keywords("$keymap", "$history", "$validator", - "$completer", "$match_required", "$default_completion", + "$completer", "$require_match", "$default_completion", "$auto_complete", "$auto_complete_initial", "$auto_complete_conservative", "$auto_complete_delay", "$enable_icons", "$space_completes"); @@ -140,9 +140,9 @@ function text_entry_minibuffer_state (minibuffer) { this.completions_timer_ID = null; this.completions_display_element = null; this.selected_completion_index = -1; - this.match_required = !!arguments.$match_required; - this.match_required_default = this.match_required; - if (this.match_required) + this.require_match = !!arguments.$require_match; + this.require_match_default = this.require_match; + if (this.require_match) this.default_completion = arguments.$default_completion; this.enable_icons = arguments.$enable_icons; } @@ -310,14 +310,14 @@ text_entry_minibuffer_state.prototype = { this.completions_valid = true; this.applied_common_prefix = false; - if (c && ("get_match_required" in c)) - this.match_required = c.get_match_required(); - if (this.match_required == null) - this.match_required = this.match_required_default; + if (c && ("get_require_match" in c)) + this.require_match = c.get_require_match(); + if (this.require_match == null) + this.require_match = this.require_match_default; if (c && c.count > 0) { var i = -1; - if (this.match_required) { + if (this.require_match) { if (c.count == 1) i = 0; else if (c.default_completion != null) @@ -350,7 +350,7 @@ text_entry_minibuffer_state.prototype = { var m = this.minibuffer; var c = this.completions; - if (this.completions_valid && c && !this.match_required && i >= 0 && i < c.count) + if (this.completions_valid && c && !this.require_match && i >= 0 && i < c.count) m.set_input_state(c.get_input_state(i)); } }; @@ -428,7 +428,7 @@ function exit_minibuffer (window) { var match = null; - if (s.completer && s.match_required) { + if (s.completer && s.require_match) { if (! s.completions_valid || s.completions === undefined) s.update_completions(false /* not conservative */, false /* don't update */); @@ -452,7 +452,7 @@ function exit_minibuffer (window) { } var deferred = s.deferred; if (deferred) { - if (s.match_required) { + if (s.require_match) { deferred.resolve(match); } else { @@ -523,7 +523,7 @@ minibuffer.prototype.read_command = function () { $get_string = function (x) x.name, $get_description = function (x) x.shortdoc || "", $get_value = function (x) x.name), - $match_required, + $require_match, $space_completes); var result = yield this.read(forward_keywords(arguments)); yield co_return(result); @@ -540,7 +540,7 @@ minibuffer.prototype.read_user_variable = function () { $get_string = function (x) x, $get_description = function (x) user_variables[x].shortdoc || "", $get_value = function (x) x), - $match_required, + $require_match, $space_completes); var result = yield this.read(forward_keywords(arguments)); yield co_return(result); @@ -575,7 +575,7 @@ minibuffer.prototype.read_preference = function () { out += " (" + pretty_print_value(default_value) + ")"; return out; }), - $match_required, + $require_match, $space_completes); var result = yield this.read(forward_keywords(arguments)); yield co_return(result); @@ -594,7 +594,7 @@ minibuffer.prototype.read_object_property = function () { for (var i in o) push(i); }), - $match_required, + $require_match, $space_completes); yield co_return(result); }; -- 2.11.4.GIT