@@ -1,10 +1,9 @@
/*
* Author: Oliver Steele
- * Copyright: Copyright 2007 by Oliver Steele. All rights reserved.
+ * Copyright: Copyright 2007-2008 by Oliver Steele. All rights reserved.
* License: MIT License
* Homepage: http://osteele.com/javascripts/functional
* Created: 2007-07-15
- * Modified: 2007-07-21
*/
Functional.install();
@@ -74,13 +73,16 @@ Evaluator.prototype.observeElements = function() {
$(elements.evalButton).click(eval);
}
-Evaluator.prototype.eval = function(text) {
+Evaluator.prototype.eval = function(textOrNode) {
var elements = this.elements,
inputElement = elements.input,
outputElement = elements.output,
transcriptElements = elements.transcript;
- if (arguments.length < 1)
- text = inputElement.value.strip().replace('\n', '');
+ var text = arguments.length < 1
+ ? inputElement.value.strip().replace('\n', '')
+ : typeof textOrNode == 'string'
+ ? textOrNode
+ : $(textOrNode).text()
inputElement.value = text;
Evaluator.scope = this.scope = this.scope || {};
text = text.replace(/^\s*var\s+/, 'Evaluator.scope.');
@@ -113,6 +115,7 @@ Evaluator.prototype.eval = function(text) {
}
this.lastRecord = {input: text, output: html};
this.options.onUpdate && this.options.onUpdate();
+ return value;
}
Evaluator.toString = function(value) {
evaluator.js
@@ -250,7 +250,8 @@ trace([1, 2, 3].map('x*x'.lambda()).map('x+1'.lambda()));
// Define an `onclick` function that abbreviates `Event.observe(_, 'click', ...)`:
var onclick = Event.observe.bind(Event).partial(_, 'click');
-// These next three statements are parallel in their effect:
-Event.observe('e1', 'click', function(){alert('1')});
-onclick('e2', function(){alert('2')});
+// These next three statements have the same effect. Click on a
+// of the buttons to execute the corresponding function.
+Event.observe('e1', 'click', function(){ alert('1'); });
+onclick('e2', function(){ alert('2'); });
onclick('e3', alert.bind(null).saturate('3'));
examples.js
@@ -1,13 +1,11 @@
-/* Copyright 2007 by Oliver Steele. Available under the MIT License. */
-
-var gEvaluator;
+/* Copyright 2007-2008 by Oliver Steele. Available under the MIT License. */
$(function() {
new DocViewer({api:['functional.js', 'to-function.js'],
examples:'examples.js',
onLoad:loaded});
function loaded() {
- gEvaluator = new Evaluator('#evaluator', {onUpdate: showEvaluator});
+ var evaluator = new Evaluator('#evaluator', {onUpdate: showEvaluator});
ieMode();
if (navigator.appName != 'Microsoft Internet Explorer')
$('#header pre').each(function() {
@@ -16,12 +14,11 @@ $(function() {
$('#evaluator').show();
resetGradients();
$(window).resize(scheduleGradientReset);
+ $('.example kbd').click(function() { evaluator.eval(this) });
$('.protodoc kbd').click(function() {
- gEvaluator.eval($(this).text());
- $.scrollTo($('#evaluator'), {speed:1000});
- });
- $('.example kbd').click(function() {
- gEvaluator.eval($(this).text());
+ var value = evaluator.eval(this);
+ typeof value == 'undefined' ||
+ $.scrollTo($('#evaluator'), {speed:1000});
});
}
});
@@ -38,3 +35,11 @@ function ieMode() {
e.show();
$('#ie-warning .close').click(function() {this.hide});
}
+
+// Emulate enough of Prototype for the example to work
+var Event = {
+ observe: function(elt, handlerName, handler) {
+ var e = $(typeof elt == 'string' ? '#' + elt : elt);
+ e[handlerName].call(e, handler);
+ }
+}
index.js
2bacadc26c1c4c2d4801bb51fc1944bf4636357f
Oliver Steele
steele@osteele.com
http://github.com/osteele/functional-javascript/commit/ae6c9613cd5a4fedc1e7cd51c06ca269d0205245
ae6c9613cd5a4fedc1e7cd51c06ca269d0205245
2008-02-14T11:08:07-08:00
2008-02-14T11:08:07-08:00
emulate Prototype, for examples
4c7519a112a021263d462a017fcc41cf935443b1
Oliver Steele
steele@osteele.com