orangain
null+****@clear*****
Tue Sep 10 22:21:50 JST 2013
orangain 2013-09-10 22:21:50 +0900 (Tue, 10 Sep 2013) New Revision: a7e44092b6ef987b5716703340256d667e0d4487 https://github.com/groonga/groonga/commit/a7e44092b6ef987b5716703340256d667e0d4487 Merged 1a34eef: Merge pull request #103 from orangain/feature-web-admin Message: admin: submit search form with the enter key It needed to click the submit button. Modified files: data/html/admin/index.html data/html/admin/js/groonga-admin.js Modified: data/html/admin/index.html (+28 -26) =================================================================== --- data/html/admin/index.html 2013-09-10 21:00:36 +0900 (3e9b77a) +++ data/html/admin/index.html 2013-09-10 22:21:50 +0900 (9dfa32c) @@ -140,32 +140,34 @@ </ul> <div id="table-tab-recordlist"> <input type="checkbox" id="table-tab-recordlist-full-checkbox" /><label for="table-tab-recordlist-full-checkbox">管理モード</label> - <div id="table-tab-recordlist-form-simple"> - <label for="tab-recordlist-simplequery">検索クエリ: </label><input type="text" id="tab-recordlist-simplequery"> - <select id="tab-recordlist-simplequerytype"> - <option value="query">query</option> - <option value="filter">filter</option> - </select> - <input type="checkbox" id="tab-recordlist-incremental" /><label for="tab-recordlist-incremental" id="tab-recordlist-incremental-label">インクリメンタル検索</label> - </div> - <div id="table-tab-recordlist-form-full"> - <table> - <tr><td>match_columns</td><td><input type="text" id="tab-recordlist-match_columns" /></td></tr> - <tr><td>query</td><td><input type="text" id="tab-recordlist-query" /></td></tr> - <tr><td>filter</td><td><input type="text" id="tab-recordlist-filter" /></td></tr> - <tr><td>scorer</td><td><input type="text" id="tab-recordlist-scorer" /></td></tr> - <tr><td>sortby</td><td><input type="text" id="tab-recordlist-sortby" /></td></tr> - <tr><td>output_columns</td><td><input type="text" id="tab-recordlist-output_columns" /></td></tr> - <tr><td>offset</td><td><input type="text" id="tab-recordlist-offset" /></td></tr> - <tr><td>limit</td><td><input type="text" id="tab-recordlist-limit" /></td></tr> - <tr><td>drilldown</td><td><input type="text" id="tab-recordlist-drilldown" /></td></tr> - <tr><td>drilldown_sortby</td><td><input type="text" id="tab-recordlist-drilldown_sortby" /></td></tr> - <tr><td>drilldown_output_columns</td><td><input type="text" id="tab-recordlist-drilldown_output_columns" /></td></tr> - <tr><td>drilldown_offset</td><td><input type="text" id="tab-recordlist-drilldown_offset" /></td></tr> - <tr><td>drilldown_limit</td><td><input type="text" id="tab-recordlist-drilldown_limit" /></td></tr> - </table> - </div> - <input type="button" id="tab-recordlist-submit" value="検索"/> + <form id="tab-recordlist-form"> + <div id="table-tab-recordlist-form-simple"> + <label for="tab-recordlist-simplequery">検索クエリ: </label><input type="text" id="tab-recordlist-simplequery"> + <select id="tab-recordlist-simplequerytype"> + <option value="query">query</option> + <option value="filter">filter</option> + </select> + <input type="checkbox" id="tab-recordlist-incremental" /><label for="tab-recordlist-incremental" id="tab-recordlist-incremental-label">インクリメンタル検索</label> + </div> + <div id="table-tab-recordlist-form-full"> + <table> + <tr><td>match_columns</td><td><input type="text" id="tab-recordlist-match_columns" /></td></tr> + <tr><td>query</td><td><input type="text" id="tab-recordlist-query" /></td></tr> + <tr><td>filter</td><td><input type="text" id="tab-recordlist-filter" /></td></tr> + <tr><td>scorer</td><td><input type="text" id="tab-recordlist-scorer" /></td></tr> + <tr><td>sortby</td><td><input type="text" id="tab-recordlist-sortby" /></td></tr> + <tr><td>output_columns</td><td><input type="text" id="tab-recordlist-output_columns" /></td></tr> + <tr><td>offset</td><td><input type="text" id="tab-recordlist-offset" /></td></tr> + <tr><td>limit</td><td><input type="text" id="tab-recordlist-limit" /></td></tr> + <tr><td>drilldown</td><td><input type="text" id="tab-recordlist-drilldown" /></td></tr> + <tr><td>drilldown_sortby</td><td><input type="text" id="tab-recordlist-drilldown_sortby" /></td></tr> + <tr><td>drilldown_output_columns</td><td><input type="text" id="tab-recordlist-drilldown_output_columns" /></td></tr> + <tr><td>drilldown_offset</td><td><input type="text" id="tab-recordlist-drilldown_offset" /></td></tr> + <tr><td>drilldown_limit</td><td><input type="text" id="tab-recordlist-drilldown_limit" /></td></tr> + </table> + </div> + <input type="submit" id="tab-recordlist-submit" value="検索"/> + </form> <div id="tab-recordlist-table"> </div> <input type="button" id="recordlist-remove-record" value="選択レコード削除"> Modified: data/html/admin/js/groonga-admin.js (+3 -2) =================================================================== --- data/html/admin/js/groonga-admin.js 2013-09-10 21:00:36 +0900 (0c3f1c4) +++ data/html/admin/js/groonga-admin.js 2013-09-10 22:21:50 +0900 (8f2e676) @@ -171,7 +171,7 @@ function GroongaAdmin() { $('#tablelist-remove-table').click(function() { that.removetable(); }); - $('#tab-recordlist-submit').click(function() { + $('#tab-recordlist-form').submit(function() { if ($('#table-tab-recordlist-full-checkbox').attr('checked')) { // full var d = { @@ -192,6 +192,7 @@ function GroongaAdmin() { $('#tab-recordlist-simplequerytype').val(), 1); } + return false; }); this._initializeSideMenu(); this.update_tablelist(); @@ -1161,7 +1162,7 @@ jQuery.extend(GroongaAdmin.prototype, { dataType: 'json', success: function() { if (--completecount == 0) { - $('#tab-recordlist-submit').click(); + $('#tab-recordlist-form').submit(); alert('レコードを削除しました。'); } else if (completecount < 0){ that.hideloading(); -------------- next part -------------- HTML����������������������������...Download