summaryrefslogtreecommitdiff
path: root/gui.js
diff options
context:
space:
mode:
authorMichael Ball <cycomachead@gmail.com>2014-11-24 15:13:51 -0800
committerMichael Ball <cycomachead@gmail.com>2014-11-24 15:13:51 -0800
commit94f94467b5be3d05f108620d1a17f6d4179bf621 (patch)
tree0d62b96277a2c919d28632850cb5d8938ec69092 /gui.js
parent9e5fb9a4cba980c977d4e11e5c9a4e7f9c8596db (diff)
parent4be96bb240ea8518fa95218cba7111846af93baa (diff)
downloadsnap-94f94467b5be3d05f108620d1a17f6d4179bf621.tar.gz
snap-94f94467b5be3d05f108620d1a17f6d4179bf621.zip
Merge branch 'master' of git://github.com/jmoenig/Snap--Build-Your-Own-Blocks into shared-url
* 'master' of git://github.com/jmoenig/Snap--Build-Your-Own-Blocks: (34 commits) tail-call-elimination for reporters - experiment allow recursive reporters to be stopped by user updated history fixed #131 Fixed #34 Fixed #644 Fixed #372 Fixed #416 Fixed #318 Fix “stop this block” primitive for tail-call-elimination Fix "stop this block"’s lexical awareness Add a new Favicon to Snap! (Clearer Lambda) integrate translation update push morphic.js version date fix ‘line’ option in ‘split’ block for Windows files integrate percent sign fix for JSLint Updated the “About” Dialog renamed Process::callback to "onComplete" Fixed #364 avoid “freezing” when calling LAUNCH on empty ring Fixed #642, avoid “freezing” when calling CONS on non-list/null ...
Diffstat (limited to 'gui.js')
-rw-r--r--gui.js9
1 files changed, 5 insertions, 4 deletions
diff --git a/gui.js b/gui.js
index 6052953..f53d597 100644
--- a/gui.js
+++ b/gui.js
@@ -69,7 +69,7 @@ SpeechBubbleMorph*/
// Global stuff ////////////////////////////////////////////////////////
-modules.gui = '2014-October-06';
+modules.gui = '2014-November-20';
// Declarations
@@ -190,7 +190,7 @@ IDE_Morph.prototype.init = function (isAutoFill) {
// additional properties:
this.cloudMsg = null;
- this.source = 'local';
+ this.source = SnapCloud.username ? 'cloud' : 'local';
this.serializer = new SnapSerializer();
this.globalVariables = new VariableFrame();
@@ -2511,8 +2511,9 @@ IDE_Morph.prototype.aboutSnap = function () {
+ 'jens@moenig.org, bh@cs.berkeley.edu\n\n'
+ 'Snap! is developed by the University of California, Berkeley\n'
- + ' with support from the National Science Foundation '
- + 'and MioSoft. \n'
+ + ' with support from the National Science Foundation, '
+ + 'MioSoft, \n'
+ + 'and the Communications Design Group at SAP Labs. \n'
+ 'The design of Snap! is influenced and inspired by Scratch,\n'
+ 'from the Lifelong Kindergarten group at the MIT Media Lab\n\n'