From b4c45e33e93067dcf208de58dd0a2de19c0107cf Mon Sep 17 00:00:00 2001 From: Matt Pass Date: Thu, 25 Oct 2012 11:46:32 +0100 Subject: [PATCH] Better clearing of mouseDown, hide serverMessage mouseDown = false being set now on scoll on iFrame (of File Manager) and via CM instance for editor, so old method removed Set serverMessages' display to inline-block when showing, none in 0.2s when hiding --- lib/ice-coder.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/ice-coder.js b/lib/ice-coder.js index 8576c4d..ff7026a 100644 --- a/lib/ice-coder.js +++ b/lib/ice-coder.js @@ -1035,7 +1035,7 @@ var ICEcoder = { // Get the mouse position on demand getMouseXY: function(e,area) { - var tempX, tempY, scrollTop, winW; + var tempX, tempY, scrollTop; top.ICEcoder.mouseX = e.pageX ? e.pageX : e.clientX + document.body.scrollLeft; top.ICEcoder.mouseY = e.pageY ? e.pageY : e.clientY + document.body.scrollTop; @@ -1046,8 +1046,6 @@ var ICEcoder = { if (area=="editor") { top.ICEcoder.mouseX += top.ICEcoder.filesW; } - winW = window.innerWidth ? window.innerWidth : document.body.clientWidth; - if (top.ICEcoder.mouseX > (winW-20)) {top.ICEcoder.mouseDown=false}; top.ICEcoder.dragCursorTest(); }, @@ -1075,7 +1073,12 @@ var ICEcoder = { var serverMessage; serverMessage = document.getElementById('serverMessage'); - if (message) {serverMessage.innerHTML = message}; + if (message) { + serverMessage.innerHTML = message; + serverMessage.style.display = "inline-block"; + } else { + setTimeout(function() {serverMessage.style.display = "none"},200); + } serverMessage.style.opacity = message ? 1 : 0; },