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

Merge branch 'new'

Browse source
This commit is contained in:
Egil Moeller 2012-04-09 16:22:20 +02:00
commit f2b56e7628
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/static/js/ace2_inner.js
View file

@ -5395,7 +5395,9 @@ function Ace2Inner(){
// Init documentAttributeManager // Init documentAttributeManager
documentAttributeManager = new AttributeManager(rep, performDocumentApplyChangeset); documentAttributeManager = new AttributeManager(rep, performDocumentApplyChangeset);
editorInfo.ace_performDocumentApplyAttributesToRange = documentAttributeManager.setAttributesOnRange; editorInfo.ace_performDocumentApplyAttributesToRange = function () {
return documentAttributeManager.setAttributesOnRange.apply(documentAttributeManager, arguments);
};
$(document).ready(function(){ $(document).ready(function(){
doc = document; // defined as a var in scope outside doc = document; // defined as a var in scope outside