diff --git a/lib/ace/edit_session.js b/lib/ace/edit_session.js index 3ef0d64c..932a9e3d 100644 --- a/lib/ace/edit_session.js +++ b/lib/ace/edit_session.js @@ -969,10 +969,8 @@ var EditSession = function(text, mode) { try { this.$worker = this.$mode.createWorker(this); } catch (e) { - if (typeof console == "object") { - console.log("Could not load worker"); - console.log(e); - } + if (typeof console == "object" && console.error) + console.log("Could not load worker", e); this.$worker = null; } }; diff --git a/lib/ace/placeholder_test.js b/lib/ace/placeholder_test.js index 97e561fd..f674ccff 100644 --- a/lib/ace/placeholder_test.js +++ b/lib/ace/placeholder_test.js @@ -43,6 +43,7 @@ var assert = require("./test/assertions"); var JavaScriptMode = require("./mode/javascript").Mode; var PlaceHolder = require("./placeholder").PlaceHolder; var UndoManager = require("./undomanager").UndoManager; +require("./multi_select") module.exports = { @@ -89,7 +90,7 @@ module.exports = { editor.insert('v'); assert.equal(session.doc.getValue(), "var v$a = 10;\nconsole.log(v$a, v$a);"); next(); - }, 10); + }, 20); }, "test: detaching placeholder" : function() { diff --git a/lib/ace/test/all_browser.js b/lib/ace/test/all_browser.js index 9b5742dd..1ffbb01a 100644 --- a/lib/ace/test/all_browser.js +++ b/lib/ace/test/all_browser.js @@ -47,6 +47,7 @@ var testNames = [ "ace/multi_select_test", "ace/mouse/mouse_handler_test", "ace/occur_test", + "ace/placeholder_test", "ace/range_test", "ace/range_list_test", "ace/search_test",