From 124960e756c4eac24dab6f16f68b078e9b2dc08c Mon Sep 17 00:00:00 2001 From: David Huynh Date: Wed, 17 Mar 2010 22:42:59 +0000 Subject: [PATCH] Made "search for match" dialog commit on fb-select event. git-svn-id: http://google-refine.googlecode.com/svn/trunk@315 7d457c2a-affb-35e4-300a-418c747d4874 --- .../scripts/views/data-table-cell-ui.js | 39 ++++++++++++------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/src/main/webapp/scripts/views/data-table-cell-ui.js b/src/main/webapp/scripts/views/data-table-cell-ui.js index 78f7bb720..8d62ec43c 100644 --- a/src/main/webapp/scripts/views/data-table-cell-ui.js +++ b/src/main/webapp/scripts/views/data-table-cell-ui.js @@ -193,19 +193,20 @@ DataTableCellUI.prototype._searchForMatch = function() { var body = $('
').addClass("dialog-body").appendTo(frame); var footer = $('
').addClass("dialog-footer").appendTo(frame); - $('

').text("Search Freebase for topic to match " + this._cell.v).appendTo(body); + var html = $( + '
' + + '' + + '' + + '' + + '' + + '' + + '
Search Freebase for topic to match ' + this._cell.v + '
Match other cells with same content
' + ).appendTo(body); + + var elmts = DOM.bind(html); - var input = $('').attr("value", this._cell.v).appendTo($('

').appendTo(body)); var match = null; - input.suggest({}).bind("fb-select", function(e, data) { - match = data; - }); - - var pSimilar = $('

').appendTo(body); - var checkSimilar = $('').appendTo(pSimilar); - $('').text(" Match other cells with the same content as well").appendTo(pSimilar); - - $('').text("Match").click(function() { + var commit = function() { if (match != null) { var params = { judgment: "matched", @@ -214,7 +215,7 @@ DataTableCellUI.prototype._searchForMatch = function() { topicName: match.name, types: $.map(match.type, function(elmt) { return elmt.id; }).join(",") }; - if (checkSimilar[0].checked) { + if (elmts.checkSimilar[0].checked) { params.similarValue = self._cell.v; params.columnName = Gridworks.cellIndexToColumn(self._cellIndex).name; @@ -228,14 +229,24 @@ DataTableCellUI.prototype._searchForMatch = function() { DialogSystem.dismissUntil(level - 1); } - }).appendTo(footer); + }; + $('').text("Match").click(commit).appendTo(footer); $('').text("Cancel").click(function() { DialogSystem.dismissUntil(level - 1); }).appendTo(footer); var level = DialogSystem.showDialog(frame); - input.focus().data("suggest").textchange(); + + elmts.input + .attr("value", this._cell.v) + .suggest({}) + .bind("fb-select", function(e, data) { + match = data; + commit(); + }) + .focus() + .data("suggest").textchange(); }; DataTableCellUI.prototype._postProcessOneCell = function(command, params, columnStatsChanged) {