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

should be clean enough to push

Browse source
This commit is contained in:
John McLear 2015-12-23 14:35:52 +00:00
parent b519f9f156
commit 34a46d6318
4 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5006,8 +5006,14 @@ function Ace2Inner(){
});
})
/*
$(root).on("dragend", function(e){
top.console.log("dragend");
});
$(root).on("drop", function(e){
top.console.log("DROP");
if(e.target.a || e.target.localName === "a"){
e.preventDefault();
}
@ -5020,7 +5026,7 @@ function Ace2Inner(){
e: e
});
});
*/
// CompositionEvent is not implemented below IE version 8
if ( !(browser.msie && parseInt(browser.version <= 9)) && document.documentElement)
@ -5444,6 +5450,7 @@ function Ace2Inner(){
lineNumbersShown++;
var n = lineNumbersShown;
var div = odoc.createElement("DIV");
//calculate height for new line number
if(b){
var h = (b.clientHeight || b.offsetHeight);