reverted morphic "unclosable menu prevention"

because it broke the search box in the project dialog
pull/95/head
jmoenig 2020-11-02 23:16:53 +01:00
rodzic 23a8285b38
commit 8734e3640b
3 zmienionych plików z 4 dodań i 4 usunięć

Wyświetl plik

@ -27,6 +27,7 @@
* blocks: tweaked drop-shadows for comments
* objects, threads: added new CUT FROM command to the pen category
* updated German translation with new "cut from %spr" entry
* morphic: reverted "unclosable menu prevention", because it broke the search box in the project dialog
### 2020-10-28
* gui: tweaked wait-until-assets-are-loaded mechanism

Wyświetl plik

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Snap! 6.3.0 - dev - Build Your Own Blocks</title>
<link rel="icon" href="src/favicon.ico">
<script src="src/morphic.js?version=2020-10-27"></script>
<script src="src/morphic.js?version=2020-11-02"></script>
<script src="src/symbols.js?version=2020-10-07"></script>
<script src="src/widgets.js?version=2020-10-06"></script>
<script src="src/blocks.js?version=2020-11-02"></script>

Wyświetl plik

@ -1280,7 +1280,7 @@
/*global window, HTMLCanvasElement, FileReader, Audio, FileList, Map*/
var morphicVersion = '2020-October-27';
var morphicVersion = '2020-November-02';
var modules = {}; // keep track of additional loaded modules
var useBlurredShadows = true;
@ -8400,8 +8400,7 @@ MenuMorph.prototype.destroy = function () {
if (this.hasFocus) {
this.world.keyboardFocus = null;
}
const isActiveMenu = this.world.activeMenu === this;
if (!this.isListContents && isActiveMenu) {
if (!this.isListContents) {
this.world.activeMenu = null;
}
MenuMorph.uber.destroy.call(this);