s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Hooked up language select in expression preview dialog.

Browse Source 
git-svn-id: http://google-refine.googlecode.com/svn/trunk@192 7d457c2a-affb-35e4-300a-418c747d4874
This commit is contained in:
David Huynh 2010-03-04 02:45:54 +00:00
parent 1695e2f8f1
commit 46ba4b94ca
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/webapp/scripts/dialogs/expression-preview-dialog.js
View File

@ -93,6 +93,17 @@ ExpressionPreviewDialog.Widget = function(
$("#expression-preview-tabs-history").css("display", ""); $("#expression-preview-tabs-history").css("display", "");
$("#expression-preview-tabs-help").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; var self = this;
this._elmts.expressionPreviewTextarea this._elmts.expressionPreviewTextarea
.attr("value", this.expression) .attr("value", this.expression)
@ -112,6 +123,8 @@ ExpressionPreviewDialog.Widget.prototype.getExpression = function(commit) {
if (s.length == 0) { if (s.length == 0) {
return null; return null;
} }
s = this._getLanguage() + ":" + s;
if (commit) { if (commit) {
$.post( $.post(
"/command/log-expression?" + $.param({ project: theProject.id, expression: s }), "/command/log-expression?" + $.param({ project: theProject.id, expression: s }),
@ -125,6 +138,10 @@ ExpressionPreviewDialog.Widget.prototype.getExpression = function(commit) {
return s; return s;
}; };
ExpressionPreviewDialog.Widget.prototype._getLanguage = function() {
return this._elmts.expressionPreviewLanguageSelect[0].value;
}
ExpressionPreviewDialog.Widget.prototype._renderHelpTab = function() { ExpressionPreviewDialog.Widget.prototype._renderHelpTab = function() {
var self = this; var self = this;
$.getJSON( $.getJSON(
@ -261,7 +278,7 @@ ExpressionPreviewDialog.Widget.prototype.update = function() {
var expression = this.expression = $.trim(this._elmts.expressionPreviewTextarea[0].value); var expression = this.expression = $.trim(this._elmts.expressionPreviewTextarea[0].value);
var params = { var params = {
project: theProject.id, project: theProject.id,
expression: expression, expression: this._getLanguage() + ":" + expression,
cellIndex: this._cellIndex cellIndex: this._cellIndex
}; };
this._prepareUpdate(params); this._prepareUpdate(params);