diff options
| -rw-r--r-- | gui.js | 9 | ||||
| -rwxr-xr-x | history.txt | 5 | ||||
| -rw-r--r-- | morphic.js | 2 | ||||
| -rw-r--r-- | objects.js | 2 |
4 files changed, 13 insertions, 5 deletions
@@ -68,7 +68,7 @@ sb, CommentMorph, CommandBlockMorph*/ // Global stuff //////////////////////////////////////////////////////// -modules.gui = '2013-April-09'; +modules.gui = '2013-April-10'; // Declarations @@ -253,7 +253,6 @@ IDE_Morph.prototype.openIn = function (world) { this.shield.color = this.color; this.shield.setExtent(this.parent.extent()); this.parent.add(this.shield); - myself.showMessage('Fetching project\nfrom the cloud...'); SnapCloud.getPublicProject( location.hash.substr(9), @@ -264,7 +263,11 @@ IDE_Morph.prototype.openIn = function (world) { msg = myself.showMessage('Opening project...'); }, function () { - myself.rawOpenCloudDataString(projectData); + if (projectData.indexOf('<snapdata') === 0) { + myself.rawOpenCloudDataString(projectData); + } else if (projectData.indexOf('<project') === 0) { + myself.rawOpenProjectString(projectData); + } }, function () { myself.shield.destroy(); diff --git a/history.txt b/history.txt index 6637ee7..7f841e3 100755 --- a/history.txt +++ b/history.txt @@ -1607,3 +1607,8 @@ ______ * GUI: Feedback msg when sharing / unsharing projects * GUI: Shield (hide) IDE while opening a shared project for presentation * GUI: Support for debugging shared projects + +130410 +------ +* Fixes for type casting and dragging dialogs by buttons, thanks, Nathan! +* Fix for loading shared projects in different formats (cloud data and plain project data) @@ -1033,7 +1033,7 @@ /*global window, HTMLCanvasElement, getMinimumFontHeight, FileReader, Audio, FileList, getBlurredShadowSupport*/ -var morphicVersion = '2013-April-09'; +var morphicVersion = '2013-April-10'; var modules = {}; // keep track of additional loaded modules var useBlurredShadows = getBlurredShadowSupport(); // check for Chrome-bug @@ -120,7 +120,7 @@ PrototypeHatBlockMorph*/ // Global stuff //////////////////////////////////////////////////////// -modules.objects = '2013-April-08'; +modules.objects = '2013-April-10'; var SpriteMorph; var StageMorph; |
