Merge branch 'master' of https://github.com/ajaxorg/ace

Conflicts:
	support/pilot

lib/ace/edit_session.js

@@ -869,7 +869,7 @@ var EditSession = function(text, mode) {
         TAB_SPACE = 5;
 
     this.$computeWrapSplits = function(textLine, wrapLimit, tabSize) {
-        textLine = textLine.trimRight();
+        textLine = lang.stringTrimRight(textLine);
         if (textLine.length == 0) {
             return [];
         }

lib/ace/worker/worker.js

@@ -105,7 +105,7 @@ onmessage = function(e) {
         var clazz = require(msg.module)[msg.classname];
         main = new clazz(sender);
     } 
-    else if (msg.event) {
+    else if (msg.event && sender) {
         sender._dispatchEvent(msg.event, msg.data);
     }
 };

lib/ace/worker/worker_client.js

@@ -82,8 +82,7 @@ var WorkerClient = function(topLevelNamespaces, packagedJs, module, classname) {
             if (!src) {
                 continue;
             }
-
-            var m = src.match(/^(.*\/)ace\.js$|^(.*\/)ace-uncompressed\.js$/);
+            var m = src.match(/^(?:(.*\/)ace\.js|(.*\/)ace-uncompressed\.js)(?:\?|$)/);
             if (m) {
                 return m[1] || m[2];
             }