mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'develop' of git://github.com/Pita/etherpad-lite

Browse source
This commit is contained in:
Egil Moeller 2012-03-27 22:36:48 +02:00
commit 6120a0b7aa
20 changed files with 1197 additions and 295 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/static/js/ace.js
View file

@ -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(){