mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-25 01:46:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch 'develop' of github.com:ether/etherpad-lite into require-kernel-change

Browse source
This commit is contained in:
John McLear 2014-11-28 00:01:47 +00:00
commit 422cfec27a
13 changed files with 43 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -35,7 +35,7 @@ var isNodeText = Ace2Common.isNodeText,
htmlPrettyEscape = Ace2Common.htmlPrettyEscape,
noop = Ace2Common.noop;
var hooks = require('./pluginfw/hooks');
var browser = require('./browser').browser;
function Ace2Inner(){
@ -51,7 +51,6 @@ function Ace2Inner(){
var SkipList = require('./skiplist');
var undoModule = require('./undomodule').undoModule;
var AttributeManager = require('./AttributeManager');
var browser = require('./browser');
var DEBUG = false; //$$ build script replaces the string "var DEBUG=true;//$$" with "var DEBUG=false;"
// changed to false