improved error handling with preproc (empty status & server only runs when build successful); added 1 example: selectionFlower; added <IE9 alert to template

This commit is contained in:
fjenett
2011-06-04 10:38:43 +00:00
parent dbddec591a
commit c3dbecf291
5 changed files with 146 additions and 18 deletions

View File

@@ -280,7 +280,9 @@ public class JavaScriptEditor extends Editor
*/
public void handleStartServer ()
{
handleExport( false );
statusEmpty();
boolean success = handleExport( false );
if ( !success ) return;
File serverRoot = new File(sketch.getFolder(), JavaScriptBuild.EXPORTED_FOLDER_NAME);
@@ -338,25 +340,29 @@ public class JavaScriptEditor extends Editor
/**
* Call the export method of the sketch and handle the gui stuff
*/
public void handleExport ( boolean openFolder )
public boolean handleExport ( boolean openFolder )
{
if (handleExportCheckModified()) {
if (handleExportCheckModified())
{
toolbar.activate(JavaScriptToolbar.EXPORT);
try {
boolean success = jsMode.handleExport(sketch);
if ( success && openFolder ) {
if ( success && openFolder )
{
File appletJSFolder = new File(sketch.getFolder(), JavaScriptBuild.EXPORTED_FOLDER_NAME );
Base.openFolder(appletJSFolder);
statusNotice("Finished exporting.");
} else {
// error message already displayed by handleExport
} else if ( !success ) {
// error message already displayed by handleExport
return false;
}
} catch (Exception e) {
statusError(e);
}
toolbar.deactivate(JavaScriptToolbar.EXPORT);
}
return true;
}
/**