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

Merge branch 'johnyma22'

Browse source 
Conflicts:
	node/utils/Minify.js
	src/static/js/pad.js
	src/static/js/pad_docbar.js
	src/static/js/pad_editbar.js
	src/static/js/pad_savedrevs.js
	static/css/timeslider.css
	static/pad.html
This commit is contained in:
Egil Moeller 2012-04-01 13:27:38 +02:00
commit 33c53e61c2
13 changed files with 179 additions and 552 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/static/js/pad_docbar.js
View file

@ -449,7 +449,7 @@ var paddocbar = (function()
handleResizePage: function()
{
// Side-step circular reference. This should be injected.
var padsavedrevs = require('./pad_savedrevs').padsavedrevs;
var padsavedrevs = require('./pad_savedrevs');
padsavedrevs.handleResizePage();
},
hideLaterIfNoOtherInteraction: function()