summaryrefslogtreecommitdiff
path: root/src/static/js/ace.js
diff options
context:
space:
mode:
authorEgil Moeller <egil.moller@freecode.no>2012-03-27 22:36:48 +0200
committerEgil Moeller <egil.moller@freecode.no>2012-03-27 22:36:48 +0200
commit6120a0b7aa0213a2699913b0629053d7aa4ff349 (patch)
treeffe2555ea8661fdb161d4c060d5d0cca51f2ebbc /src/static/js/ace.js
parent668725b89273c6df0efb8aea731755e98a868c56 (diff)
parentbeec69ac1c7f87925133013f54d26d6497b0da04 (diff)
downloadetherpad-lite-6120a0b7aa0213a2699913b0629053d7aa4ff349.zip
Merge branch 'develop' of git://github.com/Pita/etherpad-lite
Diffstat (limited to 'src/static/js/ace.js')
-rw-r--r--src/static/js/ace.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/static/js/ace.js b/src/static/js/ace.js
index 69becb17..4dfcc64e 100644
--- a/src/static/js/ace.js
+++ b/src/static/js/ace.js
@@ -29,6 +29,7 @@ Ace2Editor.registry = {
};
var hooks = require('./pluginfw/hooks');
+var _ = require('./underscore');
function Ace2Editor()
{
@@ -70,7 +71,7 @@ function Ace2Editor()
function doActionsPendingInit()
{
- $.each(actionsPendingInit, function(i,fn){
+ _.each(actionsPendingInit, function(fn,i){
fn()
});
actionsPendingInit = [];
@@ -87,7 +88,7 @@ function Ace2Editor()
'setUserChangeNotificationCallback', 'setAuthorInfo',
'setAuthorSelectionRange', 'callWithAce', 'execCommand', 'replaceRange'];
- $.each(aceFunctionsPendingInit, function(i,fnName){
+ _.each(aceFunctionsPendingInit, function(fnName,i){
var prefix = 'ace_';
var name = prefix + fnName;
editor[fnName] = pendingInit(function(){