diff --git a/cloud.js b/cloud.js index 56ac6fef..3faf327c 100644 --- a/cloud.js +++ b/cloud.js @@ -29,7 +29,7 @@ /*global modules, IDE_Morph, SnapSerializer, hex_sha512, alert, nop*/ -modules.cloud = '2013-April-04'; +modules.cloud = '2013-April-08'; // Global stuff @@ -37,7 +37,7 @@ var Cloud; var SnapCloud = new Cloud( 'https://snapcloud.miosoft.com/miocon/app/login?_app=SnapCloud' - // '192.168.2.108:8087/miocon/app/login?_app=SnapCloud' + //'192.168.2.108:8087/miocon/app/login?_app=SnapCloud' // 'localhost/miocon/app/login?_app=SnapCloud' ); @@ -129,6 +129,7 @@ Cloud.prototype.getPublicProject = function ( // where the values are url-component encoded // callBack is a single argument function, errorCall take two args var request = new XMLHttpRequest(), + responseList, myself = this; try { request.open( @@ -153,10 +154,12 @@ Cloud.prototype.getPublicProject = function ( request.responseText ); } else { + responseList = myself.parseResponse( + request.responseText + ); callBack.call( null, - request.responseText, - 'Published Project' + responseList[0].SourceCode ); } } else { diff --git a/gui.js b/gui.js index 6e180608..b886f96b 100644 --- a/gui.js +++ b/gui.js @@ -68,7 +68,7 @@ sb, CommentMorph, CommandBlockMorph*/ // Global stuff //////////////////////////////////////////////////////// -modules.gui = '2013-April-04'; +modules.gui = '2013-April-08'; // Declarations @@ -246,11 +246,24 @@ IDE_Morph.prototype.openIn = function (world) { this.toggleAppMode(true); this.runScripts(); } else if (location.hash.substr(0, 9) === '#present:') { + myself.showMessage('Fetching project\nfrom the cloud...'); SnapCloud.getPublicProject( location.hash.substr(9), function (projectData) { - myself.rawOpenProjectString(projectData); - myself.toggleAppMode(true); + var msg; + myself.nextSteps([ + function () { + msg = myself.showMessage('Opening project...'); + }, + function () { + myself.rawOpenCloudDataString(projectData); + }, + function () { + msg.destroy(); + myself.toggleAppMode(true); + myself.runScripts(); + } + ]); }, this.cloudError() ); diff --git a/history.txt b/history.txt index a7d86f76..3cee62b2 100755 --- a/history.txt +++ b/history.txt @@ -1589,3 +1589,7 @@ ______ 130405 ------ * renaming variable blobs now features a drop-down with reachable variable names and a picture of the block to be renamed + +130408 +------ +* Cloud, GUI: Sharing / Unsharing projects finalization \ No newline at end of file