diff options
| author | Gubolin <gubolin@fantasymail.de> | 2015-03-20 20:18:12 +0100 |
|---|---|---|
| committer | Gubolin <gubolin@fantasymail.de> | 2015-03-20 20:18:12 +0100 |
| commit | c8de6a00e38e52bfc4b9b3a095cbcad1861687de (patch) | |
| tree | 60a7563a44281ed8aedabffc0f617e82fa54bee9 /gui.js | |
| parent | b6d846444e44d41842e253b7276cd590d7163349 (diff) | |
| parent | fdd2ecf7d91d8026d3ca42c4bd52774877c72645 (diff) | |
| download | snap-c8de6a00e38e52bfc4b9b3a095cbcad1861687de.tar.gz snap-c8de6a00e38e52bfc4b9b3a095cbcad1861687de.zip | |
Merge branch 'master' into development
Diffstat (limited to 'gui.js')
| -rw-r--r-- | gui.js | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -69,7 +69,7 @@ SpeechBubbleMorph*/ // Global stuff //////////////////////////////////////////////////////// -modules.gui = '2015-February-28'; +modules.gui = '2015-March-15'; // Declarations @@ -2379,10 +2379,10 @@ IDE_Morph.prototype.settingsMenu = function () { addPreference( 'Cache Inputs', function () { - SyntaxElementMorph.prototype.isCachingInputs = - !SyntaxElementMorph.prototype.isCachingInputs; + BlockMorph.prototype.isCachingInputs = + !BlockMorph.prototype.isCachingInputs; }, - SyntaxElementMorph.prototype.isCachingInputs, + BlockMorph.prototype.isCachingInputs, 'uncheck to stop caching\ninputs (for debugging the evaluator)', 'check to cache inputs\nboosts recursion', true @@ -2711,7 +2711,7 @@ IDE_Morph.prototype.aboutSnap = function () { module, btn1, btn2, btn3, btn4, licenseBtn, translatorsBtn, world = this.world(); - aboutTxt = 'Snap! 4.0\nBuild Your Own Blocks\n\n--- beta ---\n\n' + aboutTxt = 'Snap! 4.0\nBuild Your Own Blocks\n\n--- rc ---\n\n' + 'Copyright \u24B8 2015 Jens M\u00F6nig and ' + 'Brian Harvey\n' + 'jens@moenig.org, bh@cs.berkeley.edu\n\n' |