From 88cf393d8afcbd5c7b89014546609496b2739cab Mon Sep 17 00:00:00 2001 From: Ioannis Kostomanolakis Date: Wed, 22 Aug 2012 15:48:57 +0200 Subject: [PATCH 1/3] fix for Safari bug in lib/event_emitter.js --- lib/ace/lib/event_emitter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ace/lib/event_emitter.js b/lib/ace/lib/event_emitter.js index 5818864d..3b413280 100644 --- a/lib/ace/lib/event_emitter.js +++ b/lib/ace/lib/event_emitter.js @@ -53,7 +53,7 @@ EventEmitter._dispatchEvent = function(eventName, e) { if (!listeners.length && !defaultHandler) return; - e = e || {}; + e = ( e === Object( e ) ) ? e : {}; if (!e.type) e.type = eventName; From a7be7bf147572ce275225fde07a5c96d29e6e0e0 Mon Sep 17 00:00:00 2001 From: Ioannis Kostomanolakis Date: Fri, 31 Aug 2012 12:10:03 +0200 Subject: [PATCH 2/3] Comment with @ throws exception in IE9/10 --- lib/ace/edit_session/fold_line.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ace/edit_session/fold_line.js b/lib/ace/edit_session/fold_line.js index 5206dffc..83df49ba 100644 --- a/lib/ace/edit_session/fold_line.js +++ b/lib/ace/edit_session/fold_line.js @@ -178,7 +178,7 @@ function FoldLine(foldData, folds) { && fold.start.row != row) { //throwing here breaks whole editor - //@todo properly handle this + //TODO: properly handle this window.console && window.console.log(row, column, fold); } else if (fold.start.row == row) { folds = this.folds; From 6611b4ef6472c1e92aa8be2ff79934d6afd10e7b Mon Sep 17 00:00:00 2001 From: nightwing Date: Sat, 1 Sep 2012 16:11:20 +0400 Subject: [PATCH 3/3] better check for 'objectness' --- lib/ace/lib/event_emitter.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/ace/lib/event_emitter.js b/lib/ace/lib/event_emitter.js index 3b413280..17ac8e3f 100644 --- a/lib/ace/lib/event_emitter.js +++ b/lib/ace/lib/event_emitter.js @@ -53,7 +53,9 @@ EventEmitter._dispatchEvent = function(eventName, e) { if (!listeners.length && !defaultHandler) return; - e = ( e === Object( e ) ) ? e : {}; + if (typeof e != "object" || !e) + e = {}; + if (!e.type) e.type = eventName;