enable persistent storage via browserfs, works with saves, for some reason with savestates it hangs

https://github.com/jvilk/BrowserFS
https://github.com/Modernizr/Modernizr

emscripten/modernizr.js

@@ -0,0 +1,374 @@
+/* Modernizr 2.8.3 (Custom Build) | MIT & BSD
+ * Build: http://modernizr.com/download/#-localstorage-shiv-cssclasses-load
+ */
+;
+
+
+
+window.Modernizr = (function( window, document, undefined ) {
+
+    var version = '2.8.3',
+
+    Modernizr = {},
+
+    enableClasses = true,
+
+    docElement = document.documentElement,
+
+    mod = 'modernizr',
+    modElem = document.createElement(mod),
+    mStyle = modElem.style,
+
+    inputElem  ,
+
+
+    toString = {}.toString,    tests = {},
+    inputs = {},
+    attrs = {},
+
+    classes = [],
+
+    slice = classes.slice,
+
+    featureName,
+
+
+
+    _hasOwnProperty = ({}).hasOwnProperty, hasOwnProp;
+
+    if ( !is(_hasOwnProperty, 'undefined') && !is(_hasOwnProperty.call, 'undefined') ) {
+      hasOwnProp = function (object, property) {
+        return _hasOwnProperty.call(object, property);
+      };
+    }
+    else {
+      hasOwnProp = function (object, property) { 
+        return ((property in object) && is(object.constructor.prototype[property], 'undefined'));
+      };
+    }
+
+
+    if (!Function.prototype.bind) {
+      Function.prototype.bind = function bind(that) {
+
+        var target = this;
+
+        if (typeof target != "function") {
+            throw new TypeError();
+        }
+
+        var args = slice.call(arguments, 1),
+            bound = function () {
+
+            if (this instanceof bound) {
+
+              var F = function(){};
+              F.prototype = target.prototype;
+              var self = new F();
+
+              var result = target.apply(
+                  self,
+                  args.concat(slice.call(arguments))
+              );
+              if (Object(result) === result) {
+                  return result;
+              }
+              return self;
+
+            } else {
+
+              return target.apply(
+                  that,
+                  args.concat(slice.call(arguments))
+              );
+
+            }
+
+        };
+
+        return bound;
+      };
+    }
+
+    function setCss( str ) {
+        mStyle.cssText = str;
+    }
+
+    function setCssAll( str1, str2 ) {
+        return setCss(prefixes.join(str1 + ';') + ( str2 || '' ));
+    }
+
+    function is( obj, type ) {
+        return typeof obj === type;
+    }
+
+    function contains( str, substr ) {
+        return !!~('' + str).indexOf(substr);
+    }
+
+
+    function testDOMProps( props, obj, elem ) {
+        for ( var i in props ) {
+            var item = obj[props[i]];
+            if ( item !== undefined) {
+
+                            if (elem === false) return props[i];
+
+                            if (is(item, 'function')){
+                                return item.bind(elem || obj);
+                }
+
+                            return item;
+            }
+        }
+        return false;
+    }
+
+
+
+    tests['localstorage'] = function() {
+        try {
+            localStorage.setItem(mod, mod);
+            localStorage.removeItem(mod);
+            return true;
+        } catch(e) {
+            return false;
+        }
+    };
+
+
+    for ( var feature in tests ) {
+        if ( hasOwnProp(tests, feature) ) {
+                                    featureName  = feature.toLowerCase();
+            Modernizr[featureName] = tests[feature]();
+
+            classes.push((Modernizr[featureName] ? '' : 'no-') + featureName);
+        }
+    }
+
+
+
+     Modernizr.addTest = function ( feature, test ) {
+       if ( typeof feature == 'object' ) {
+         for ( var key in feature ) {
+           if ( hasOwnProp( feature, key ) ) {
+             Modernizr.addTest( key, feature[ key ] );
+           }
+         }
+       } else {
+
+         feature = feature.toLowerCase();
+
+         if ( Modernizr[feature] !== undefined ) {
+                                              return Modernizr;
+         }
+
+         test = typeof test == 'function' ? test() : test;
+
+         if (typeof enableClasses !== "undefined" && enableClasses) {
+           docElement.className += ' ' + (test ? '' : 'no-') + feature;
+         }
+         Modernizr[feature] = test;
+
+       }
+
+       return Modernizr; 
+     };
+
+
+    setCss('');
+    modElem = inputElem = null;
+
+    ;(function(window, document) {
+                var version = '3.7.0';
+
+            var options = window.html5 || {};
+
+            var reSkip = /^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i;
+
+            var saveClones = /^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i;
+
+            var supportsHtml5Styles;
+
+            var expando = '_html5shiv';
+
+            var expanID = 0;
+
+            var expandoData = {};
+
+            var supportsUnknownElements;
+
+        (function() {
+          try {
+            var a = document.createElement('a');
+            a.innerHTML = '<xyz></xyz>';
+                    supportsHtml5Styles = ('hidden' in a);
+
+            supportsUnknownElements = a.childNodes.length == 1 || (function() {
+                        (document.createElement)('a');
+              var frag = document.createDocumentFragment();
+              return (
+                typeof frag.cloneNode == 'undefined' ||
+                typeof frag.createDocumentFragment == 'undefined' ||
+                typeof frag.createElement == 'undefined'
+              );
+            }());
+          } catch(e) {
+                    supportsHtml5Styles = true;
+            supportsUnknownElements = true;
+          }
+
+        }());
+
+            function addStyleSheet(ownerDocument, cssText) {
+          var p = ownerDocument.createElement('p'),
+          parent = ownerDocument.getElementsByTagName('head')[0] || ownerDocument.documentElement;
+
+          p.innerHTML = 'x<style>' + cssText + '</style>';
+          return parent.insertBefore(p.lastChild, parent.firstChild);
+        }
+
+            function getElements() {
+          var elements = html5.elements;
+          return typeof elements == 'string' ? elements.split(' ') : elements;
+        }
+
+            function getExpandoData(ownerDocument) {
+          var data = expandoData[ownerDocument[expando]];
+          if (!data) {
+            data = {};
+            expanID++;
+            ownerDocument[expando] = expanID;
+            expandoData[expanID] = data;
+          }
+          return data;
+        }
+
+            function createElement(nodeName, ownerDocument, data){
+          if (!ownerDocument) {
+            ownerDocument = document;
+          }
+          if(supportsUnknownElements){
+            return ownerDocument.createElement(nodeName);
+          }
+          if (!data) {
+            data = getExpandoData(ownerDocument);
+          }
+          var node;
+
+          if (data.cache[nodeName]) {
+            node = data.cache[nodeName].cloneNode();
+          } else if (saveClones.test(nodeName)) {
+            node = (data.cache[nodeName] = data.createElem(nodeName)).cloneNode();
+          } else {
+            node = data.createElem(nodeName);
+          }
+
+                                                    return node.canHaveChildren && !reSkip.test(nodeName) && !node.tagUrn ? data.frag.appendChild(node) : node;
+        }
+
+            function createDocumentFragment(ownerDocument, data){
+          if (!ownerDocument) {
+            ownerDocument = document;
+          }
+          if(supportsUnknownElements){
+            return ownerDocument.createDocumentFragment();
+          }
+          data = data || getExpandoData(ownerDocument);
+          var clone = data.frag.cloneNode(),
+          i = 0,
+          elems = getElements(),
+          l = elems.length;
+          for(;i<l;i++){
+            clone.createElement(elems[i]);
+          }
+          return clone;
+        }
+
+            function shivMethods(ownerDocument, data) {
+          if (!data.cache) {
+            data.cache = {};
+            data.createElem = ownerDocument.createElement;
+            data.createFrag = ownerDocument.createDocumentFragment;
+            data.frag = data.createFrag();
+          }
+
+
+          ownerDocument.createElement = function(nodeName) {
+                    if (!html5.shivMethods) {
+              return data.createElem(nodeName);
+            }
+            return createElement(nodeName, ownerDocument, data);
+          };
+
+          ownerDocument.createDocumentFragment = Function('h,f', 'return function(){' +
+                                                          'var n=f.cloneNode(),c=n.createElement;' +
+                                                          'h.shivMethods&&(' +
+                                                                                                                getElements().join().replace(/[\w\-]+/g, function(nodeName) {
+            data.createElem(nodeName);
+            data.frag.createElement(nodeName);
+            return 'c("' + nodeName + '")';
+          }) +
+            ');return n}'
+                                                         )(html5, data.frag);
+        }
+
+            function shivDocument(ownerDocument) {
+          if (!ownerDocument) {
+            ownerDocument = document;
+          }
+          var data = getExpandoData(ownerDocument);
+
+          if (html5.shivCSS && !supportsHtml5Styles && !data.hasCSS) {
+            data.hasCSS = !!addStyleSheet(ownerDocument,
+                                                                                'article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}' +
+                                                                                    'mark{background:#FF0;color:#000}' +
+                                                                                    'template{display:none}'
+                                         );
+          }
+          if (!supportsUnknownElements) {
+            shivMethods(ownerDocument, data);
+          }
+          return ownerDocument;
+        }
+
+            var html5 = {
+
+                'elements': options.elements || 'abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output progress section summary template time video',
+
+                'version': version,
+
+                'shivCSS': (options.shivCSS !== false),
+
+                'supportsUnknownElements': supportsUnknownElements,
+
+                'shivMethods': (options.shivMethods !== false),
+
+                'type': 'default',
+
+                'shivDocument': shivDocument,
+
+                createElement: createElement,
+
+                createDocumentFragment: createDocumentFragment
+        };
+
+            window.html5 = html5;
+
+            shivDocument(document);
+
+    }(this, document));
+
+    Modernizr._version      = version;
+
+    docElement.className = docElement.className.replace(/(^|\s)no-js(\s|$)/, '$1$2') +
+
+                                                    (enableClasses ? ' js ' + classes.join(' ') : '');
+
+    return Modernizr;
+
+})(this, this.document);
+/*yepnope1.5.4|WTFPL*/
+(function(a,b,c){function d(a){return"[object Function]"==o.call(a)}function e(a){return"string"==typeof a}function f(){}function g(a){return!a||"loaded"==a||"complete"==a||"uninitialized"==a}function h(){var a=p.shift();q=1,a?a.t?m(function(){("c"==a.t?B.injectCss:B.injectJs)(a.s,0,a.a,a.x,a.e,1)},0):(a(),h()):q=0}function i(a,c,d,e,f,i,j){function k(b){if(!o&&g(l.readyState)&&(u.r=o=1,!q&&h(),l.onload=l.onreadystatechange=null,b)){"img"!=a&&m(function(){t.removeChild(l)},50);for(var d in y[c])y[c].hasOwnProperty(d)&&y[c][d].onload()}}var j=j||B.errorTimeout,l=b.createElement(a),o=0,r=0,u={t:d,s:c,e:f,a:i,x:j};1===y[c]&&(r=1,y[c]=[]),"object"==a?l.data=c:(l.src=c,l.type=a),l.width=l.height="0",l.onerror=l.onload=l.onreadystatechange=function(){k.call(this,r)},p.splice(e,0,u),"img"!=a&&(r||2===y[c]?(t.insertBefore(l,s?null:n),m(k,j)):y[c].push(l))}function j(a,b,c,d,f){return q=0,b=b||"j",e(a)?i("c"==b?v:u,a,b,this.i++,c,d,f):(p.splice(this.i++,0,a),1==p.length&&h()),this}function k(){var a=B;return a.loader={load:j,i:0},a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=s?l:n.parentNode,l=a.opera&&"[object Opera]"==o.call(a.opera),l=!!b.attachEvent&&!l,u=r?"object":l?"script":"img",v=l?"script":u,w=Array.isArray||function(a){return"[object Array]"==o.call(a)},x=[],y={},z={timeout:function(a,b){return b.length&&(a.timeout=b[0]),a}},A,B;B=function(a){function b(a){var a=a.split("!"),b=x.length,c=a.pop(),d=a.length,c={url:c,origUrl:c,prefixes:a},e,f,g;for(f=0;f<d;f++)g=a[f].split("="),(e=z[g.shift()])&&(c=e(c,g));for(f=0;f<b;f++)c=x[f](c);return c}function g(a,e,f,g,h){var i=b(a),j=i.autoCallback;i.url.split(".").pop().split("?").shift(),i.bypass||(e&&(e=d(e)?e:e[a]||e[g]||e[a.split("/").pop().split("?")[0]]),i.instead?i.instead(a,e,f,g,h):(y[i.url]?i.noexec=!0:y[i.url]=1,f.load(i.url,i.forceCSS||!i.forceJS&&"css"==i.url.split(".").pop().split("?").shift()?"c":c,i.noexec,i.attrs,i.timeout),(d(e)||d(j))&&f.load(function(){k(),e&&e(i.origUrl,h,g),j&&j(i.origUrl,h,g),y[i.url]=2})))}function h(a,b){function c(a,c){if(a){if(e(a))c||(j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}),g(a,j,b,0,h);else if(Object(a)===a)for(n in m=function(){var b=0,c;for(c in a)a.hasOwnProperty(c)&&b++;return b}(),a)a.hasOwnProperty(n)&&(!c&&!--m&&(d(j)?j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}:j[n]=function(a){return function(){var b=[].slice.call(arguments);a&&a.apply(this,b),l()}}(k[n])),g(a[n],j,b,n,h))}else!c&&l()}var h=!!a.test,i=a.load||a.both,j=a.callback||f,k=j,l=a.complete||f,m,n;c(h?a.yep:a.nope,!!i),i&&c(i)}var i,j,l=this.yepnope.loader;if(e(a))g(a,0,l,0);else if(w(a))for(i=0;i<a.length;i++)j=a[i],e(j)?g(j,0,l,0):w(j)?B(j):Object(j)===j&&h(j,l);else Object(a)===a&&h(a,l)},B.addPrefix=function(a,b){z[a]=b},B.addFilter=function(a){x.push(a)},B.errorTimeout=1e4,null==b.readyState&&b.addEventListener&&(b.readyState="loading",b.addEventListener("DOMContentLoaded",A=function(){b.removeEventListener("DOMContentLoaded",A,0),b.readyState="complete"},0)),a.yepnope=k(),a.yepnope.executeStack=h,a.yepnope.injectJs=function(a,c,d,e,i,j){var k=b.createElement("script"),l,o,e=e||B.errorTimeout;k.src=a;for(o in d)k.setAttribute(o,d[o]);c=j?h:c||f,k.onreadystatechange=k.onload=function(){!l&&g(k.readyState)&&(l=1,c(),k.onload=k.onreadystatechange=null)},m(function(){l||(l=1,c(1))},e),i?k.onload():n.parentNode.insertBefore(k,n)},a.yepnope.injectCss=function(a,c,d,e,g,i){var e=b.createElement("link"),j,c=i?h:c||f;e.href=a,e.rel="stylesheet",e.type="text/css";for(j in d)e.setAttribute(j,d[j]);g||(n.parentNode.insertBefore(e,n),m(c,0))}})(this,document);
+Modernizr.load=function(){yepnope.apply(window,[].slice.call(arguments,0));};
+;

emscripten/template2.html

@@ -7,6 +7,9 @@
   <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Share+Tech+Mono">
   <script src="//code.jquery.com/jquery-1.10.2.js"></script>
   <script src="//code.jquery.com/ui/1.11.4/jquery-ui.js"></script>
+  <script src="modernizr.js"></script>
+  <script type="text/javascript" src="browserfs.js"></script>
+
   <style>
     .emscripten { padding-right: 0; margin-left: auto; margin-right: auto; display: block; }
     textarea.emscripten { border: 0px; font-family: 'Share Tech Mono'; font-size: 12px; width: 100%; overflow:hide; resize:none; color:black; }
@@ -31,12 +34,10 @@
   <h3>Settings</h3>
   <div class="emscripten">
 
+
+
       <button id="content" onclick="document.getElementById('rom').click()">Upload content</button>
       <input style="display: none" type="file" id="rom" name="upload" onclick="document.getElementById('content').click();" onchange="runEmulator(event.target.files);" multiple /></p>
-      <button id="saves" onclick="document.getElementById('savefiles').click()">Upload saves</button>
-      <input style="display: none" type="file" id="savefiles" name="upload" onclick="document.getElementById('saves').click();" onchange="uploadSaveFiles(event.target.files);" multiple /></p>	  
-      <button id="states" onclick="document.getElementById('savestates').click()">Upload states</button>
-      <input style="display: none" type="file" id="savestates" name="upload" onclick="document.getElementById('states').click();" onchange="uploadSaveStateFiles(event.target.files);" multiple /></p>	  
       <input type="checkbox" id="resize"><label for="resize">Resize canvas</label></p>	  
       <input type="checkbox" id="pointerLock" checked><label for="pointerLock">Lock/hide mouse pointer</label></p>
       <input type="button" value="Fullscreen" onclick="Module.requestFullScreen(document.getElementById('pointerLock').checked, document.getElementById('resize').checked)"></p>
@@ -52,6 +53,6 @@
    <progress value="0" max="100" id="progress" hidden=0></progress>  
 </div>
 <script type="text/javascript" src="web.js"></script>
-<script type="text/javascript" src="retroarch.js"></script> 
+<script type="text/javascript" src="gambatte.js"></script> 
 </body>
 </html>

emscripten/web.js

@@ -1,84 +1,122 @@
-      var count = 0;
-	  var filename = "";
-	  var firstRun = true;
-      function runEmulator(files){
-		if(firstRun)
-		{
-		  Module.FS_createFolder('/', 'etc', true, true);
-		  Module.FS_createFolder('/', 'retroarch', true, true);
-		  Module.FS_createFolder('/retroarch', 'content', true, true);		  
-		  Module.FS_createFolder('/retroarch', 'saves', true, true);
-		  Module.FS_createFolder('/retroarch', 'states', true, true);
-		  Module.FS_createFolder('/retroarch', 'system', true, true);
-		  firstRun = false;
-		}	
-		
-        count = files.length;
-        for (var i = 0; i < files.length; i++) {
-          filereader = new FileReader();
-          filereader.file_name = files[i].name;
-          filereader.onload = function(){initFromData(this.result, '/retroarch/content/' + this.file_name)};
-          filereader.readAsArrayBuffer(files[i]);
-        }
-      }
+var count = 0;
+var filename = "";
+var firstRun = true;
+
+
+function setupFolders()
+{
+   if (Modernizr.localstorage) {
+     console.log("local storage available");
+	 
+	 if(localStorage.getItem("initialized")!="true")
+		 
+		 {
+           FS.createFolder('/data','content',true,true);
+           FS.createFolder('/data','saves',true,true);
+           FS.createFolder('/data','states',true,true);
+	       FS.createFolder('/data','system',true,true);		   
+		   localStorage.setItem("initialized","true");
+		   console.log(localStorage.getItem("initialized"));
+		 }
+   }
+}
+
+function setupBFS() {
+  var lsfs = new BrowserFS.FileSystem.LocalStorage();
+  BrowserFS.initialize(lsfs);
+  var BFS = new BrowserFS.EmscriptenFS();
+  FS.createFolder(FS.root, 'data', true, true);
+  FS.mount(BFS, {root: '/'}, '/data');
+}
+
+function runEmulator(files)
+{
+   console.log("runEmulator");
+   setupBFS();   
+
+   if(firstRun)
+   {
+         setupFolders();
+		 
+		 Module.FS_createFolder('/', 'etc', true, true);
+		 Module.FS_createFolder('/', 'retroarch', true, true);
+         firstRun = false;
+   }	
+   
+   count = files.length;
+   for (var i = 0; i < files.length; i++) 
+   {
+      filereader = new FileReader();
+      filereader.file_name = files[i].name;
+      filereader.onload = function(){initFromData(this.result, '/retroarch/' + this.file_name)};
+      filereader.readAsArrayBuffer(files[i]);
+
+
+
+    }
+}
 	  
-      function uploadSaveFiles(files){	
-        count = files.length;
-        for (var i = 0; i < files.length; i++) {
-          filereader = new FileReader();
-          filereader.file_name = files[i].name;
-          filereader.onload = function(){initFromData(this.result, '/retroarch/saves/' + this.file_name)};
-          filereader.readAsArrayBuffer(files[i]);
-        }
-      }	  
+function uploadSaveFiles(files)
+{
+   console.log("uploadSaveFiles");
+
+   count = files.length;
+   for (var i = 0; i < files.length; i++) 
+   {
+      filereader = new FileReader();
+      filereader.file_name = files[i].name;
+      filereader.onload = function(){initFromData(this.result, '/data/saves/' + this.file_name)};
+      filereader.readAsArrayBuffer(files[i]);
+    }
+}	  
 	  
 	  
-      function uploadSaveStateFiles(files){	
-        count = files.length;
-        for (var i = 0; i < files.length; i++) {
-          filereader = new FileReader();
-          filereader.file_name = files[i].name;
-          filereader.onload = function(){initFromData(this.result, '/retroarch/states/' + this.file_name)};
-          filereader.readAsArrayBuffer(files[i]);
-        }
-      }	  	  
-	   
-      function initFromData(data, name){
-		var dataView = new Uint8Array(data);
-		Module.FS_createDataFile('/', name, dataView, true, false);
-        count--;
-        if (count === 0) {
-          var config = 'input_player1_select = shift\n';
-          var latency = parseInt(document.getElementById('latency').value, 10);
-          if (isNaN(latency)) latency = 96;
-          config += 'audio_latency = ' + latency + '\n'
-          if (document.getElementById('vsync').checked)
-            config += 'video_vsync = true\n';
-          else
-            config += 'video_vsync = false\n';
-		  config += 'rgui_browser_directory = /retroarch/content/\n';
-		  config += 'savefile_directory = /retroarch/saves/\n';
-		  config += 'savestate_directory = /retroarch/states/\n';
-		  config += 'system_directory = /retroarch/system/\n';
-          Module.FS_createDataFile('/etc', 'retroarch.cfg', config, true, true);
-          document.getElementById('canvas_div').style.display = 'block';
-          document.getElementById('vsync').disabled = true;
-          document.getElementById('vsync-label').style.color = 'gray';
-          document.getElementById('latency').disabled = true;
-          document.getElementById('latency-label').style.color = 'gray';
-          Module['callMain'](Module['arguments']);
-        }
-      }
-      // connect to canvas
-      var Module = {
-	     noInitialRun: true,
-		  arguments: ["--verbose", "--menu"],
-        preRun: [],
-        postRun: [],
-        print: (function() {
-          var element = document.getElementById('output');
-          element.value = ''; // clear browser cache
-          return function(text) {
+function initFromData(data, name)
+{
+
+   console.log("initFromData");
+
+   var dataView = new Uint8Array(data);
+   Module.FS_createDataFile('/', name, dataView, true, false);
+   count--;
+   if (count === 0) 
+   {
+      var config = 'input_player1_select = shift\n';
+      var latency = parseInt(document.getElementById('latency').value, 10);
+      if (isNaN(latency)) 
+         latency = 96;
+      
+      config += 'audio_latency = ' + latency + '\n'
+      if (document.getElementById('vsync').checked)
+         config += 'video_vsync = true\n';
+      else
+         config += 'video_vsync = false\n';
+         config += 'rgui_browser_directory = /retroarch/\n';
+	 config += 'savefile_directory = /data/saves\n';
+	 config += 'savestate_directory = /data/states\n';
+	 config += 'system_directory = /data/system/\n';
+         Module.FS_createDataFile('/etc', 'retroarch.cfg', config, true, true);
+         document.getElementById('canvas_div').style.display = 'block';
+         document.getElementById('vsync').disabled = true;
+         document.getElementById('vsync-label').style.color = 'gray';
+         document.getElementById('latency').disabled = true;
+         document.getElementById('latency-label').style.color = 'gray';
+         Module['callMain'](Module['arguments']);
+   }
+}
+
+var Module = 
+{
+   noInitialRun: true,
+   arguments: ["--verbose", "--menu"],
+   preRun: [],
+   postRun: [],
+   print: (function()
+   {
+      var element = document.getElementById('output');
+      element.value = ''; // clear browser cache
+      return function(text) 
+      {
             text = Array.prototype.slice.call(arguments).join(' ');
             // These replacements are necessary if you render to raw HTML
             //text = text.replace(/&/g, "&amp;");
@@ -87,36 +125,47 @@
             //text = text.replace('\n', '<br>', 'g');
             element.value += text + "\n";
             element.scrollTop = 99999; // focus on bottom
-          };
-        })(),
-        printErr: function(text) {
-          var text = Array.prototype.slice.call(arguments).join(' ');
-          var element = document.getElementById('output');
-          element.value += text + "\n";
-          element.scrollTop = 99999; // focus on bottom
-        },
-        canvas: document.getElementById('canvas'),
-        setStatus: function(text) {
-          if (Module.setStatus.interval) clearInterval(Module.setStatus.interval);
-          var m = text.match(/([^(]+)\((\d+(\.\d+)?)\/(\d+)\)/);
-          var statusElement = document.getElementById('status');
-          var progressElement = document.getElementById('progress');
-          if (m) {
-            text = m[1];
-            progressElement.value = parseInt(m[2])*100;
-            progressElement.max = parseInt(m[4])*100;
-            progressElement.hidden = false;
-          } else {
-            progressElement.value = null;
-            progressElement.max = null;
-            progressElement.hidden = true;
-          }
-          statusElement.innerHTML = text;
-        },
-        totalDependencies: 0,
-        monitorRunDependencies: function(left) {
-          this.totalDependencies = Math.max(this.totalDependencies, left);
-          Module.setStatus(left ? 'Preparing... (' + (this.totalDependencies-left) + '/' + this.totalDependencies + ')' : 'All downloads complete.');
-        }
-      };
-      Module.setStatus('Downloading...');
+       };
+   })(),
+        
+   printErr: function(text) 
+   {
+      var text = Array.prototype.slice.call(arguments).join(' ');
+      var element = document.getElementById('output');
+      element.value += text + "\n";
+      element.scrollTop = 99999; // focus on bottom
+   },
+   
+   canvas: document.getElementById('canvas'),
+   setStatus: function(text) 
+   {
+      if (Module.setStatus.interval) 
+         clearInterval(Module.setStatus.interval);
+      var m = text.match(/([^(]+)\((\d+(\.\d+)?)\/(\d+)\)/);
+      var statusElement = document.getElementById('status');
+      var progressElement = document.getElementById('progress');
+      if (m) 
+      {
+         text = m[1];
+         progressElement.value = parseInt(m[2])*100;
+         progressElement.max = parseInt(m[4])*100;
+         progressElement.hidden = false;
+      } 
+      else 
+      {
+         progressElement.value = null;
+         progressElement.max = null;
+         progressElement.hidden = true;
+       }
+       statusElement.innerHTML = text;
+   },
+
+   totalDependencies: 0,
+   monitorRunDependencies: function(left) 
+   {
+      this.totalDependencies = Math.max(this.totalDependencies, left);
+      Module.setStatus(left ? 'Preparing... (' + (this.totalDependencies-left) + '/' + this.totalDependencies + ')' : 'All downloads complete.');
+   }
+};
+
+Module.setStatus('Downloading...');