Author: orudyy
Date: Wed Jul 20 09:46:59 2016
New Revision: 1753475
URL: http://svn.apache.org/viewvc?rev=1753475&view=rev
Log:
QPID-7248: Restore an ability to search query by pressing 'enter' key in
advanced mode controls
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryWidget.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/query/QueryWidget.html
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryWidget.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryWidget.js?rev=1753475&r1=1753474&r2=1753475&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryWidget.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryWidget.js
Wed Jul 20 09:46:59 2016
@@ -28,6 +28,7 @@ define(["dojo/_base/declare",
"dojo/text!query/QueryCloneDialogForm.html",
"dojo/text!query/QuerySaveDialogForm.html",
"dojo/store/Memory",
+ "dijit/registry",
"dojox/html/entities",
"dgrid/extensions/ColumnReorder",
"dgrid/extensions/ColumnHider",
@@ -53,6 +54,7 @@ define(["dojo/_base/declare",
queryCloneDialogFormTemplate,
querySaveDialogFormTemplate,
Memory,
+ registry,
entities,
ColumnReorder,
ColumnHider,
@@ -296,6 +298,7 @@ define(["dojo/_base/declare",
saveButtonTooltip: null,
cloneButtonTooltip: null,
deleteButtonTooltip: null,
+ searchForm: null,
/**
* constructor parameter
@@ -386,8 +389,7 @@ define(["dojo/_base/declare",
this.standardWhereExpressionBuilder.on("change",
lang.hitch(this, this._standardModeWhereChanged));
// search & mode buttons
- this.advancedSearchButton.on("click", lang.hitch(this,
this.search));
- this.standardSearchButton.on("click", lang.hitch(this,
this.search));
+ this.searchForm.on("submit", lang.hitch(this,
function(){this.search(); return false;}));
this.modeButton.on("click", lang.hitch(this,
this._showModeSwitchWarningIfRequired));
var rowsPerPage = valuePresent &&
this.preference.value.limit ? this.preference.value.limit : 100;
@@ -497,16 +499,27 @@ define(["dojo/_base/declare",
{
this._setSelectClause(this.advancedSelect.value);
this._queryChanged();
+ this._submitIfEnterPressed();
},
_advancedModeWhereChanged: function ()
{
this._resultsGrid.setWhere(this.advancedWhere.value);
this._queryChanged();
+ this._submitIfEnterPressed();
},
_advancedModeOrderByChanged: function ()
{
this._resultsGrid.setOrderBy(this.advancedOrderBy.value);
this._queryChanged();
+ this._submitIfEnterPressed();
+ },
+ _submitIfEnterPressed: function ()
+ {
+ if (this._enterPressed)
+ {
+ this._enterPressed = false;
+ this.searchForm.submit();
+ }
},
_toggleSearchButton: function (select)
{
@@ -847,10 +860,13 @@ define(["dojo/_base/declare",
{
evt.preventDefault();
evt.stopPropagation();
- this._setSelectClause(this.advancedSelect.value);
- this._resultsGrid.setWhere(this.advancedWhere.value);
-
this._resultsGrid.setOrderBy(this.advancedOrderBy.value);
- this.search();
+
+ // set flag for Enter being pressed
+ this._enterPressed = true;
+
+ // move focus out and back into widget to provoke
triggering of on change event
+ this.advancedSearchButton.focus();
+ registry.getEnclosingWidget(evt.target).focus();
}
},
_modeChanged: function ()
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/query/QueryWidget.html
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/query/QueryWidget.html?rev=1753475&r1=1753474&r2=1753475&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/query/QueryWidget.html
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/query/QueryWidget.html
Wed Jul 20 09:46:59 2016
@@ -47,8 +47,8 @@
<div class="clear"></div>
</div>
+ <form data-dojo-attach-point="searchForm" data-dojo-type="dijit/form/Form">
<div class="dijit queryToolBar">
-
<span data-dojo-attach-point="standardSearch">
<span data-dojo-type="qpid/management/query/DropDownSelect"
data-dojo-attach-point="standardSelectChooser"
@@ -59,15 +59,14 @@
data-dojo-attach-point="standardWhereChooser"
data-dojo-props="title: 'Specify Filtering
Conditions',label:'Conditions'">
</span>
- <div data-dojo-type="dijit/form/Button"
+ <input type="submit"
+ data-dojo-type="dijit/form/Button"
data-dojo-attach-point="standardSearchButton"
- data-dojo-props="title: 'Search'">Search</div>
+ data-dojo-props="title: 'Search', label:'Search'"/>
<div data-dojo-attach-point="standardWhereExpressionBuilder"
data-dojo-type="qpid/management/query/WhereExpression"
class="dijitToolbar"></div>
</span>
-
-
<table data-dojo-attach-point="advancedSearch"
class="advancedSearchItem" style="display:none">
<colgroup>
<col span="1" class="searchLabel"/>
@@ -113,12 +112,14 @@
promptMessage: 'Use JMS filter
syntax to specify where conditions'" rows="1"></textarea>
</td>
<td colspan="1">
- <div data-dojo-type="dijit/form/Button"
+ <input type="submit"
+ data-dojo-type="dijit/form/Button"
data-dojo-attach-point="advancedSearchButton"
- data-dojo-props="title: 'Search'">Search</div>
+ data-dojo-props="title: 'Search', label:'Search'"/>
</td>
</tr>
</table>
</div>
+ </form>
<div data-dojo-attach-point="queryResultGrid" jsid='grid'></div>
</div>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
