mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-29 11:49:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

merge latest develop

Browse source
This commit is contained in:
John McLear 2015-04-11 16:16:03 +01:00
commit 4234681efd
12 changed files with 80 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4955,7 +4955,10 @@ function Ace2Inner(){
// Don't paste on middle click of links
$(root).on("paste", function(e){
if(e.target.a){
// TODO: this breaks pasting strings into URLS when using
// Control C and Control V -- the Event is never available
// here.. :(
if(e.target.a || e.target.localName === "a"){
e.preventDefault();
}
})

1
src/static/js/broadcast_slider.js
View file

@ -166,6 +166,7 @@ function loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded)
padmodals.showModal("disconnected");
}
// Throttle seems like overkill here... Not sure why we do it!
var fixPadHeight = _.throttle(function(){
var height = $('#timeslider-top').height();
$('#editorcontainerbox').css({marginTop: height});