From 68dc41254c171ea0fa77377657e97ad913b41144 Mon Sep 17 00:00:00 2001 From: Girish Sharma Date: Tue, 28 Jan 2014 20:42:02 +0530 Subject: [PATCH] Bug 962652 - Autocomplete popup's isOpen getter is too strict, r=msucan --- .../browser_inspector_bug_831693_combinator_suggestions.js | 3 +-- .../test/browser_inspector_bug_831693_input_suggestion.js | 3 +-- .../browser_bug896181_css_mixed_completion_new_attribute.js | 4 +--- browser/devtools/shared/autocomplete-popup.js | 2 +- browser/devtools/sourceeditor/autocomplete.js | 4 ++-- .../styleeditor/test/browser_styleeditor_autocomplete.js | 3 +-- .../browser_bug893965_css_property_completion_new_property.js | 4 +--- ...94376_css_value_completion_existing_property_value_pair.js | 4 +--- ..._bug894376_css_value_completion_new_property_value_pair.js | 4 +--- 9 files changed, 10 insertions(+), 21 deletions(-) diff --git a/browser/devtools/inspector/test/browser_inspector_bug_831693_combinator_suggestions.js b/browser/devtools/inspector/test/browser_inspector_bug_831693_combinator_suggestions.js index f51b491d836d..827a21e8a12c 100644 --- a/browser/devtools/inspector/test/browser_inspector_bug_831693_combinator_suggestions.js +++ b/browser/devtools/inspector/test/browser_inspector_bug_831693_combinator_suggestions.js @@ -89,8 +89,7 @@ function test() inspector.searchSuggestions._lastQuery.then(() => { let [key, suggestions] = keyStates[state]; let actualSuggestions = popup.getItems(); - is(popup._panel.state == "open" || popup._panel.state == "showing" - ? actualSuggestions.length: 0, suggestions.length, + is(popup.isOpen ? actualSuggestions.length: 0, suggestions.length, "There are expected number of suggestions at " + state + "th step."); actualSuggestions = actualSuggestions.reverse(); for (let i = 0; i < suggestions.length; i++) { diff --git a/browser/devtools/inspector/test/browser_inspector_bug_831693_input_suggestion.js b/browser/devtools/inspector/test/browser_inspector_bug_831693_input_suggestion.js index 41b8b40670b1..348b568e5d8e 100644 --- a/browser/devtools/inspector/test/browser_inspector_bug_831693_input_suggestion.js +++ b/browser/devtools/inspector/test/browser_inspector_bug_831693_input_suggestion.js @@ -90,8 +90,7 @@ function test() inspector.searchSuggestions._lastQuery.then(() => { let [key, suggestions] = keyStates[state]; let actualSuggestions = popup.getItems(); - is(popup._panel.state == "open" || popup._panel.state == "showing" - ? actualSuggestions.length: 0, suggestions.length, + is(popup.isOpen ? actualSuggestions.length: 0, suggestions.length, "There are expected number of suggestions at " + state + "th step."); actualSuggestions = actualSuggestions.reverse(); for (let i = 0; i < suggestions.length; i++) { diff --git a/browser/devtools/markupview/test/browser_bug896181_css_mixed_completion_new_attribute.js b/browser/devtools/markupview/test/browser_bug896181_css_mixed_completion_new_attribute.js index 3bfe29e3f702..8b9b4c0db99c 100644 --- a/browser/devtools/markupview/test/browser_bug896181_css_mixed_completion_new_attribute.js +++ b/browser/devtools/markupview/test/browser_bug896181_css_mixed_completion_new_attribute.js @@ -130,9 +130,7 @@ function test() { is(editor.input.selectionEnd, selEnd, "Selection is ending at the right location for state " + state); if (popupOpen) { - ok(editor.popup._panel.state == "open" || - editor.popup._panel.state == "showing", - "Popup is open for state " + state); + ok(editor.popup.isOpen, "Popup is open for state " + state); } else { ok(editor.popup._panel.state != "open" && diff --git a/browser/devtools/shared/autocomplete-popup.js b/browser/devtools/shared/autocomplete-popup.js index e582f787d9cd..48aea0791370 100644 --- a/browser/devtools/shared/autocomplete-popup.js +++ b/browser/devtools/shared/autocomplete-popup.js @@ -159,7 +159,7 @@ AutocompletePopup.prototype = { * Check if the autocomplete popup is open. */ get isOpen() { - return this._panel.state == "open"; + return this._panel.state == "open" || this._panel.state == "showing"; }, /** diff --git a/browser/devtools/sourceeditor/autocomplete.js b/browser/devtools/sourceeditor/autocomplete.js index 9aa8c99a7032..2b6feb7d41d4 100644 --- a/browser/devtools/sourceeditor/autocomplete.js +++ b/browser/devtools/sourceeditor/autocomplete.js @@ -30,7 +30,7 @@ function setupAutoCompletion(ctx, walker) { let keyMap = { "Tab": cm => { - if (popup && (popup.isOpen || popup._panel.state == "showing")) { + if (popup && popup.isOpen) { cycleSuggestions(ed); return; } @@ -38,7 +38,7 @@ function setupAutoCompletion(ctx, walker) { return win.CodeMirror.Pass; }, "Shift-Tab": cm => { - if (popup && (popup.isOpen || popup._panel.state == "showing")) { + if (popup && popup.isOpen) { cycleSuggestions(ed, true); return; } diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_autocomplete.js b/browser/devtools/styleeditor/test/browser_styleeditor_autocomplete.js index 781dbf5d296d..a8d1e6ed5b0b 100644 --- a/browser/devtools/styleeditor/test/browser_styleeditor_autocomplete.js +++ b/browser/devtools/styleeditor/test/browser_styleeditor_autocomplete.js @@ -125,8 +125,7 @@ function checkState() { info("After keypress for index " + index); let [key, total, current, inserted] = TEST_CASES[index]; if (total != -1) { - ok(gPopup._panel.state == "open" || gPopup._panel.state == "showing", - "Popup is open for index " + index); + ok(gPopup.isOpen, "Popup is open for index " + index); is(total, gPopup.itemCount, "Correct total suggestions for index " + index); is(current, gPopup.selectedIndex, diff --git a/browser/devtools/styleinspector/test/browser_bug893965_css_property_completion_new_property.js b/browser/devtools/styleinspector/test/browser_bug893965_css_property_completion_new_property.js index efe57d802008..59d82d9318b6 100644 --- a/browser/devtools/styleinspector/test/browser_bug893965_css_property_completion_new_property.js +++ b/browser/devtools/styleinspector/test/browser_bug893965_css_property_completion_new_property.js @@ -105,9 +105,7 @@ function checkState(event) { state); } else { - ok(editor.popup._panel.state == "open" || - editor.popup._panel.state == "showing", - "Popup is open for state " + state); + ok(editor.popup.isOpen, "Popup is open for state " + state); is(editor.popup.getItems().length, total, "Number of suggestions match for state " + state); is(editor.popup.selectedIndex, index, diff --git a/browser/devtools/styleinspector/test/browser_bug894376_css_value_completion_existing_property_value_pair.js b/browser/devtools/styleinspector/test/browser_bug894376_css_value_completion_existing_property_value_pair.js index 6a3026052108..dd1291351f8b 100644 --- a/browser/devtools/styleinspector/test/browser_bug894376_css_value_completion_existing_property_value_pair.js +++ b/browser/devtools/styleinspector/test/browser_bug894376_css_value_completion_existing_property_value_pair.js @@ -117,9 +117,7 @@ function checkState(event) { state); } else { - ok(editor.popup._panel.state == "open" || - editor.popup._panel.state == "showing", - "Popup is open for state " + state); + ok(editor.popup.isOpen, "Popup is open for state " + state); is(editor.popup.getItems().length, total, "Number of suggestions match for state " + state); is(editor.popup.selectedIndex, index, diff --git a/browser/devtools/styleinspector/test/browser_bug894376_css_value_completion_new_property_value_pair.js b/browser/devtools/styleinspector/test/browser_bug894376_css_value_completion_new_property_value_pair.js index 660fb466c17b..556adcd15813 100644 --- a/browser/devtools/styleinspector/test/browser_bug894376_css_value_completion_new_property_value_pair.js +++ b/browser/devtools/styleinspector/test/browser_bug894376_css_value_completion_new_property_value_pair.js @@ -114,9 +114,7 @@ function checkState(event) { state); } else { - ok(editor.popup._panel.state == "open" || - editor.popup._panel.state == "showing", - "Popup is open for state " + state); + ok(editor.popup.isOpen, "Popup is open for state " + state); is(editor.popup.getItems().length, total, "Number of suggestions match for state " + state); is(editor.popup.selectedIndex, index,