jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	support/pilot
This commit is contained in:
Joe Walker 2011-04-07 06:18:56 +01:00
commit 6af328f0f4
18 changed files with 890 additions and 685 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/ace/edit_session.js
View file

@ -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 [];
}

2
lib/ace/worker/worker.js
View file

@ -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);
}
};

3
lib/ace/worker/worker_client.js
View file

@ -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];
}