diff --git a/HISTORY.md b/HISTORY.md index 85346faa..9785b649 100755 --- a/HISTORY.md +++ b/HISTORY.md @@ -62,6 +62,9 @@ * Chinese, thanks, Simon! * Brazilian Portuguese, thank you, Cassiano D'Andrea! +### 2021-11-18 +* gui: only pause generic hat blocks when loading a new project, not when switching to a new scene + ### 2021-11-17 * gui: set the green-flag button's background color to "active" while a thread is running * api: changed "processes" method to "isRunning" diff --git a/snap.html b/snap.html index 75035a33..f1e50fc0 100755 --- a/snap.html +++ b/snap.html @@ -20,7 +20,7 @@ - + diff --git a/src/gui.js b/src/gui.js index f9d30554..d9dfee0b 100644 --- a/src/gui.js +++ b/src/gui.js @@ -86,7 +86,7 @@ BlockVisibilityDialogMorph, ThreadManager*/ // Global stuff //////////////////////////////////////////////////////// -modules.gui = '2021-November-17'; +modules.gui = '2021-November-18'; // Declarations @@ -4717,7 +4717,7 @@ IDE_Morph.prototype.aboutSnap = function () { module, btn1, btn2, btn3, btn4, licenseBtn, translatorsBtn, world = this.world(); - aboutTxt = 'Snap! 7 - dev211117 -\nBuild Your Own Blocks\n\n' + aboutTxt = 'Snap! 7 - dev211118 -\nBuild Your Own Blocks\n\n' + 'Copyright \u24B8 2008-2021 Jens M\u00F6nig and ' + 'Brian Harvey\n' + 'jens@moenig.org, bh@cs.berkeley.edu\n\n' @@ -5813,11 +5813,18 @@ IDE_Morph.prototype.openProject = function (project) { } this.switchToScene( project.currentScene || project.scenes.at(1), - true // refresh album + true, // refresh album + null, // msg + true // pause generic WHEN hat blocks ); }; -IDE_Morph.prototype.switchToScene = function (scene, refreshAlbum, msg) { +IDE_Morph.prototype.switchToScene = function ( + scene, + refreshAlbum, + msg, + pauseHats +) { var appMode = this.isAppMode; if (!scene || !scene.stage) { return; @@ -5832,7 +5839,9 @@ IDE_Morph.prototype.switchToScene = function (scene, refreshAlbum, msg) { this.add(scene.stage); this.stage = scene.stage; this.sprites = scene.sprites; - this.stage.pauseGenericHatBlocks(); + if (pauseHats) { + this.stage.pauseGenericHatBlocks(); + } this.createCorral(!refreshAlbum); // keep scenes this.selectSprite(this.scene.currentSprite); this.corral.album.updateSelection(); diff --git a/sw.js b/sw.js index b83faf64..4b1398a2 100644 --- a/sw.js +++ b/sw.js @@ -1,4 +1,4 @@ -var snapVersion = '7-dev211117' +var snapVersion = '7-dev211118' var cacheName = 'snap-pwa', filesToCache = [