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

Merge remote branch 'Spielmeister/master' into master

Browse source
This commit is contained in:
nightwing 2012-09-01 16:17:15 +04:00
commit 7bd83a46d9
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/ace/edit_session/fold_line.js
View file

@ -178,7 +178,7 @@ function FoldLine(foldData, folds) {
&& fold.start.row != row) && fold.start.row != row)
{ {
//throwing here breaks whole editor //throwing here breaks whole editor
//@todo properly handle this //TODO: properly handle this
window.console && window.console.log(row, column, fold); window.console && window.console.log(row, column, fold);
} else if (fold.start.row == row) { } else if (fold.start.row == row) {
folds = this.folds; folds = this.folds;

4
lib/ace/lib/event_emitter.js
View file

@ -53,7 +53,9 @@ EventEmitter._dispatchEvent = function(eventName, e) {
if (!listeners.length && !defaultHandler) if (!listeners.length && !defaultHandler)
return; return;
e = e || {}; if (typeof e != "object" || !e)
e = {};
if (!e.type) if (!e.type)
e.type = eventName; e.type = eventName;