From 46ba4b94ca1bf01640dc08db9bf0dc15d4fad98f Mon Sep 17 00:00:00 2001 From: David Huynh Date: Thu, 4 Mar 2010 02:45:54 +0000 Subject: [PATCH] Hooked up language select in expression preview dialog. git-svn-id: http://google-refine.googlecode.com/svn/trunk@192 7d457c2a-affb-35e4-300a-418c747d4874 --- .../dialogs/expression-preview-dialog.js | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/scripts/dialogs/expression-preview-dialog.js b/src/main/webapp/scripts/dialogs/expression-preview-dialog.js index 35f8443bd..230f704f6 100644 --- a/src/main/webapp/scripts/dialogs/expression-preview-dialog.js +++ b/src/main/webapp/scripts/dialogs/expression-preview-dialog.js @@ -92,6 +92,17 @@ ExpressionPreviewDialog.Widget = function( $("#expression-preview-tabs").tabs(); $("#expression-preview-tabs-history").css("display", ""); $("#expression-preview-tabs-help").css("display", ""); + + var language = "gel"; + var colon = expression.indexOf(":"); + if (colon > 0) { + var l = expression.substring(0, colon); + if (l == "gel" || l == "jython" || l == "clojure") { + expression = expression.substring(colon + 1); + language = l; + } + } + this._elmts.expressionPreviewLanguageSelect[0].value = language; var self = this; this._elmts.expressionPreviewTextarea @@ -112,6 +123,8 @@ ExpressionPreviewDialog.Widget.prototype.getExpression = function(commit) { if (s.length == 0) { return null; } + + s = this._getLanguage() + ":" + s; if (commit) { $.post( "/command/log-expression?" + $.param({ project: theProject.id, expression: s }), @@ -125,6 +138,10 @@ ExpressionPreviewDialog.Widget.prototype.getExpression = function(commit) { return s; }; +ExpressionPreviewDialog.Widget.prototype._getLanguage = function() { + return this._elmts.expressionPreviewLanguageSelect[0].value; +} + ExpressionPreviewDialog.Widget.prototype._renderHelpTab = function() { var self = this; $.getJSON( @@ -261,7 +278,7 @@ ExpressionPreviewDialog.Widget.prototype.update = function() { var expression = this.expression = $.trim(this._elmts.expressionPreviewTextarea[0].value); var params = { project: theProject.id, - expression: expression, + expression: this._getLanguage() + ":" + expression, cellIndex: this._cellIndex }; this._prepareUpdate(params);