diff --git a/HISTORY.md b/HISTORY.md index bec61b64..a9707115 100755 --- a/HISTORY.md +++ b/HISTORY.md @@ -49,6 +49,7 @@ ### 2021-10-29 * objects: flood-fill edge case fix, thanks, Dariusz! +* gui: removed obsolete dev comments ### 2021-10-28 * introduced default values for expandable slot specs diff --git a/snap.html b/snap.html index 90c1064b..6d80a2ec 100755 --- a/snap.html +++ b/snap.html @@ -20,7 +20,7 @@ - + diff --git a/src/gui.js b/src/gui.js index 16e34e43..51b80fd5 100644 --- a/src/gui.js +++ b/src/gui.js @@ -85,7 +85,7 @@ Animation, BoxMorph, BlockDialogMorph, RingMorph, Project, ZERO, BLACK*/ // Global stuff //////////////////////////////////////////////////////// -modules.gui = '2021-October-28'; +modules.gui = '2021-October-29'; // Declarations @@ -279,7 +279,8 @@ IDE_Morph.prototype.init = function (isAutoFill) { this.filePicker = null; // incrementally saving projects to the cloud is currently unused - this.hasChangedMedia = false; // +++ sceneify, or get of it + // and needs to be extended to work with scenes before reactivation + this.hasChangedMedia = false; this.isAnimating = true; this.paletteWidth = 200; // initially same as logo width @@ -2283,7 +2284,7 @@ IDE_Morph.prototype.setProjectName = function (string) { if (name !== projectScene.name) { projectScene.name = name; projectScene.stage.version = Date.now(); - this.recordUnsavedChanges(); // +++ sceneify this + this.recordUnsavedChanges(); if (projectScene === this.scene) { this.controlBar.updateLabel(); } @@ -2300,7 +2301,7 @@ IDE_Morph.prototype.setProjectNotes = function (string) { if (string !== projectScene.notes) { projectScene.notes = string; projectScene.stage.version = Date.now(); - this.recordUnsavedChanges(); // +++ sceneify this + this.recordUnsavedChanges(); if (projectScene === this.scene) { this.controlBar.updateLabel(); } @@ -4944,7 +4945,7 @@ IDE_Morph.prototype.editNotes = function () { dialog.action = (note) => { this.scene.notes = note; - this.recordUnsavedChanges(); // +++ sceneify this + this.recordUnsavedChanges(); }; dialog.justDropped = () => text.edit(); @@ -9020,7 +9021,12 @@ LibraryImportDialogMorph.prototype.cachedLibrary = function (key) { return this.libraryCache[key]; }; -LibraryImportDialogMorph.prototype.importLibrary = function () { // +++ clean up +LibraryImportDialogMorph.prototype.importLibrary = function () { + // browsing and importing libraries needs to be redesigned because of + // custom categories introduced in v7. + // currently caching libraries is ignored when loading a library + // to avoid creating custom categories that were only looked at + // in the libraries browser. if (!this.listField.selected) {return; } var // blocks, @@ -9031,7 +9037,7 @@ LibraryImportDialogMorph.prototype.importLibrary = function () { // +++ clean up // restore captured user-blocks categories SpriteMorph.prototype.customCategories = this.originalCategories; -/* + /* if (this.hasCached(selectedLibrary)) { blocks = this.cachedLibrary(selectedLibrary); blocks.forEach(def => { @@ -9041,7 +9047,7 @@ LibraryImportDialogMorph.prototype.importLibrary = function () { // +++ clean up }); ide.showMessage(localize('Imported') + ' ' + localize(libraryName), 2); } else { -*/ + */ ide.showMessage(localize('Loading') + ' ' + localize(libraryName)); ide.getURL( ide.resourceURL('libraries', selectedLibrary), @@ -9050,7 +9056,7 @@ LibraryImportDialogMorph.prototype.importLibrary = function () { // +++ clean up this.isLoadingLibrary = true; } ); -// } + // } }; LibraryImportDialogMorph.prototype.displayBlocks = function (libraryKey) { @@ -10804,11 +10810,11 @@ SceneIconMorph.prototype.renameScene = function () { answer, scene ); - scene.stage.version = Date.now(); // +++ also do this in other places + scene.stage.version = Date.now(); if (scene === ide.scene) { ide.controlBar.updateLabel(); } - ide.recordUnsavedChanges(); // ++++ sceneify unsaved changes + ide.recordUnsavedChanges(); } } ).prompt(