Bug 790891 - Search operators are hardcoded in debugger.xul, r=past

This commit is contained in:
Victor Porof 2012-09-14 00:00:19 +03:00
parent 5072915748
commit efd55eb052
2 changed files with 22 additions and 12 deletions

View File

@ -59,9 +59,12 @@ let DebuggerView = {
this._stepInButton = document.getElementById("step-in");
this._stepOutButton = document.getElementById("step-out");
this._scriptsSearchbox = document.getElementById("scripts-search");
this._globalOperatorButton = document.getElementById("global-operator");
this._tokenOperatorButton = document.getElementById("token-operator");
this._lineOperatorButton = document.getElementById("line-operator");
this._globalOperatorLabel = document.getElementById("global-operator-label");
this._globalOperatorButton = document.getElementById("global-operator-button");
this._tokenOperatorLabel = document.getElementById("token-operator-label");
this._tokenOperatorButton = document.getElementById("token-operator-button");
this._lineOperatorLabel = document.getElementById("line-operator-label");
this._lineOperatorButton = document.getElementById("line-operator-button");
},
/**
@ -79,12 +82,16 @@ let DebuggerView = {
this._scriptsSearchbox.setAttribute("placeholder",
L10N.getFormatStr("emptyFilterText", [LayoutHelpers.prettyKey(this._fileSearchKey)]));
this._globalOperatorButton.setAttribute("value",
this._globalOperatorLabel.setAttribute("value",
L10N.getFormatStr("searchPanelGlobal", [LayoutHelpers.prettyKey(this._globalSearchKey)]));
this._tokenOperatorButton.setAttribute("value",
this._tokenOperatorLabel.setAttribute("value",
L10N.getFormatStr("searchPanelToken", [LayoutHelpers.prettyKey(this._tokenSearchKey)]));
this._lineOperatorButton.setAttribute("value",
this._lineOperatorLabel.setAttribute("value",
L10N.getFormatStr("searchPanelLine", [LayoutHelpers.prettyKey(this._lineSearchKey)]));
this._globalOperatorButton.setAttribute("label", SEARCH_GLOBAL_FLAG);
this._tokenOperatorButton.setAttribute("label", SEARCH_TOKEN_FLAG);
this._lineOperatorButton.setAttribute("label", SEARCH_LINE_FLAG);
},
/**
@ -255,8 +262,11 @@ let DebuggerView = {
_stepInButton: null,
_stepOutButton: null,
_scriptsSearchbox: null,
_globalOperatorLabel: null,
_globalOperatorButton: null,
_tokenOperatorLabel: null,
_tokenOperatorButton: null,
_lineOperatorLabel: null,
_lineOperatorButton: null
};

View File

@ -105,19 +105,19 @@
<vbox>
<label class="description" value="&debuggerUI.searchPanelTitle;"/>
<hbox align="center">
<button class="operator" label="!"
<button id="global-operator-button" class="operator"
onclick="DebuggerView.Scripts._onGlobalSearch()"/>
<label id="global-operator" class="plain operator"/>
<label id="global-operator-label" class="plain operator"/>
</hbox>
<hbox align="center">
<button class="operator" label="#"
<button id="token-operator-button" class="operator"
onclick="DebuggerView.Scripts._onTokenSearch()"/>
<label id="token-operator" class="plain operator"/>
<label id="token-operator-label" class="plain operator"/>
</hbox>
<hbox align="center">
<button class="operator" label=":"
<button id="line-operator-button" class="operator"
onclick="DebuggerView.Scripts._onLineSearch()"/>
<label id="line-operator" class="plain operator"/>
<label id="line-operator-label" class="plain operator"/>
</hbox>
</vbox>
</panel>