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

Merge branch 'develop' of github.com:ether/etherpad-lite into caret-refactor

Browse source
This commit is contained in:
John McLear 2013-03-26 21:35:14 +00:00
commit 2252f4c5ea
50 changed files with 405 additions and 239 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1013,6 +1013,11 @@ function Ace2Inner(){
return caughtErrors.slice();
};
editorInfo.ace_getDocument = function()
{
return doc;
};
editorInfo.ace_getDebugProperty = function(prop)
{
if (prop == "debugger")