null+****@clear*****
null+****@clear*****
2012年 4月 6日 (金) 17:13:03 JST
Kouhei Sutou 2012-04-06 17:13:03 +0900 (Fri, 06 Apr 2012) New Revision: 5612090fb1f7ed2761094eda290a50607bcd6a88 Log: admin suggest: show result in a tab Modified files: data/html/admin/index.html data/html/admin/js/groonga-admin.js Modified: data/html/admin/index.html (+12 -8) =================================================================== --- data/html/admin/index.html 2012-04-06 16:48:25 +0900 (b6497b6) +++ data/html/admin/index.html 2012-04-06 17:13:03 +0900 (3225b8e) @@ -265,14 +265,18 @@ <input type="button" id="suggest-submit" value="検索" /> </p> </form> - <h2>提案一覧</h2> - <div id="suggest-result-suggest"> - </div> - <h2>補完一覧</h2> - <div id="suggest-result-complete"> - </div> - <h2>補正一覧</h2> - <div id="suggest-result-correct"> + <div id="suggest-result-tabs"> + <ul> + <li><a href="#suggest-result-tab-suggest">提案</a></li> + <li><a href="#suggest-result-tab-complete">補完</a></li> + <li><a href="#suggest-result-tab-correct">補正</a></li> + </ul> + <div id="suggest-result-tab-suggest"> + </div> + <div id="suggest-result-tab-complete"> + </div> + <div id="suggest-result-tab-correct"> + </div> </div> </div> </div> Modified: data/html/admin/js/groonga-admin.js (+18 -10) =================================================================== --- data/html/admin/js/groonga-admin.js 2012-04-06 16:48:25 +0900 (9493fbf) +++ data/html/admin/js/groonga-admin.js 2012-04-06 17:13:03 +0900 (a917a2b) @@ -276,6 +276,7 @@ jQuery.extend(GroongaAdmin.prototype, { this._initializeSuggestDatasetComplete(); this._initializeSuggestQueryComplete(); this._initializeSuggestSubmit(); + this._initializeSuggestResult(); }, _initializeSuggestDatasetComplete: function() { var that = this; @@ -344,32 +345,39 @@ jQuery.extend(GroongaAdmin.prototype, { $("#suggest-submit").click(function (event) { var dataset = $("#suggest-dataset").val(); var query = $("#suggest-query").val(); - var types = ["complete", "suggest", "correct"]; + var type = that._suggestResultType; $.ajax({ url: "/d/suggest", data: { query: query, - types: types.join("|"), + types: type, table: "item_" + dataset, column: "kana", limit: 25, }, dataType: "jsonp", success: function (data, textStatus, jqXHR) { - $.each(types, function(index, type) { - var response = data[1][type]; - response.shift(); - var $result = $("#suggest-result-" + type); - $result - .empty() - .append($("<div/>").html(that._createResultTable(response, 1, 1))); - }); + var response = data[1][type]; + response.shift(); + var $result = $("#suggest-result-tab-" + type); + $result + .empty() + .append($("<div/>").html(that._createResultTable(response, 1, 1))); }, error: function(jqXHR, textStatus, errorThrown) { } }); }); }, + _initializeSuggestResult: function() { + var that = this; + $("#suggest-result-tabs").tabs({ + show: function (event, ui) { + that._suggestResultType = ui.panel.id.replace(/^suggest-result-tab-/, ""); + $("#suggest-submit").click(); + } + }); + }, _selectTab: function(name) { this.stop_status_timer(); this._$databaseTabs.hide();