Merge branch 'worker-alert-support' of https://github.com/kerbkerb/emscripten into incoming

Conflicts:
	AUTHORS

Author: kripken

AUTHORS

@@ -246,3 +246,5 @@ a license to everyone to use it as detailed in LICENSE.)
 * Maher Sallam <maher@sallam.me>
 * Andrey Burov <burik666@gmail.com>
 * Holland Schutte <hgschutte1@gmail.com>
+* Kerby Geffrard <kerby.geffrard@gmail.com>
+

src/library_pthread.js

@@ -242,6 +242,8 @@ var LibraryPThread = {
             Module['print']('Thread ' + e.data.threadId + ': ' + e.data.text);
           } else if (e.data.cmd === 'printErr') {
             Module['printErr']('Thread ' + e.data.threadId + ': ' + e.data.text);
+          } else if (e.data.cmd == 'alert') {
+            alert('Thread ' + e.data.threadId + ': ' + e.data.text);
           } else if (e.data.cmd === 'exit') {
             // todo 
           } else if (e.data.cmd === 'cancelDone') {

src/pthread-main.js

@@ -31,7 +31,10 @@ function threadPrintErr() {
   var text = Array.prototype.slice.call(arguments).join(' ');
   postMessage({cmd: 'printErr', text: text, threadId: selfThreadId});
 }
-
+function threadAlert() {
+  var text = Array.prototype.slice.call(arguments).join(' ');
+  postMessage({cmd: 'alert', text: text, threadId: selfThreadId});
+}
 Module['print'] = threadPrint;
 Module['printErr'] = threadPrintErr;
 
@@ -41,6 +44,8 @@ console = {
   error: threadPrintErr
 };
 
+this.alert = threadAlert;
+
 this.onmessage = function(e) {
   if (e.data.cmd === 'load') { // Preload command that is called once per worker to parse and load the Emscripten code.
     buffer = e.data.buffer;