diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js index b817fddb6..6b9d84022 100644 --- a/UI/WebServerResources/MailerUI.js +++ b/UI/WebServerResources/MailerUI.js @@ -838,13 +838,14 @@ function onHeaderClick(event) { document.messageListAjaxRequest.aborted = true; document.messageListAjaxRequest.abort(); } - url = ApplicationBaseURL + currentMailbox + "/" + this.link; - if (!this.link.match(/noframe=/)) + var link = this.getAttribute('href'); + url = ApplicationBaseURL + currentMailbox + "/" + link; + if (!link.match(/noframe=/)) url += "&noframe=1"; document.messageListAjaxRequest = triggerAjaxRequest(url, messageListCallback); - event.preventDefault(); + preventDefault(event); } function onSearchFormSubmit() { diff --git a/UI/WebServerResources/SOGoDragHandles.js b/UI/WebServerResources/SOGoDragHandles.js index bcd4b1942..c3c6793d5 100644 --- a/UI/WebServerResources/SOGoDragHandles.js +++ b/UI/WebServerResources/SOGoDragHandles.js @@ -40,13 +40,13 @@ var SOGoDragHandlesInterface = { this.origLeft = this.leftBlock.offsetWidth; delta = 0; this.origRight = this.rightBlock.offsetLeft - 5; - document.body.style.cursor = "e-resize"; + document.body.setStyle({ cursor: "e-resize" }); } else if (this.dhType == 'vertical') { this.origY = this.offsetTop; this.origUpper = this.upperBlock.offsetHeight; delta = event.clientY - this.offsetTop - 5; this.origLower = this.lowerBlock.offsetTop - 5; - document.body.style.cursor = "n-resize"; + document.body.setStyle({ cursor: "n-resize" }); } this.stopHandleDraggingBound = this.stopHandleDragging.bindAsEventListener(this); Event.observe(document.body, "mouseup", this.stopHandleDraggingBound, true); @@ -64,13 +64,13 @@ var SOGoDragHandlesInterface = { if (this.dhType == 'horizontal') { var deltaX = Math.floor(event.clientX - this.origX - (this.offsetWidth / 2)); - this.rightBlock.style.left = (this.origRight + deltaX) + 'px'; - this.leftBlock.style.width = (this.origLeft + deltaX) + 'px'; + this.rightBlock.setStyle({ left: (this.origRight + deltaX) + 'px' }); + this.leftBlock.setStyle({ width: (this.origLeft + deltaX) + 'px' }); } else if (this.dhType == 'vertical') { var deltaY = Math.floor(event.clientY - this.origY - (this.offsetHeight / 2)); - this.lowerBlock.style.top = (this.origLower + deltaY - delta) + 'px'; - this.upperBlock.style.height = (this.origUpper + deltaY - delta) + 'px'; + this.lowerBlock.setStyle({ top: (this.origLower + deltaY - delta) + 'px' }); + this.upperBlock.setStyle({ height: (this.origUpper + deltaY - delta) + 'px' }); } Event.stopObserving(document.body, "mouseup", this.stopHandleDraggingBound, true); @@ -91,7 +91,7 @@ var SOGoDragHandlesInterface = { var hX = event.clientX; if (hX > -1) { var newLeft = Math.floor(hX - (width / 2)); - this.style.left = newLeft + 'px'; + this.setStyle({ left: newLeft + 'px' }); event.cancelBubble = true; return false; @@ -101,7 +101,7 @@ var SOGoDragHandlesInterface = { var hY = event.clientY; if (hY > -1) { var newTop = Math.floor(hY - (height / 2)) - delta; - this.style.top = newTop + 'px'; + this.setStyle({ top: newTop + 'px' }); event.cancelBubble = true; return false; @@ -117,9 +117,9 @@ var SOGoDragHandlesInterface = { if (this.offsetLeft > lLeft) { var leftdelta = this.rightBlock.offsetLeft - this.offsetLeft; - this.style.left = lLeft + 'px'; - this.leftBlock.style.width = '0px'; - this.rightBlock.style.left = (lLeft + leftdelta) + 'px'; + this.setStyle({ left: lLeft + 'px' }); + this.leftBlock.setStyle({ width: '0px' }); + this.rightBlock.setStyle({ left: (lLeft + leftdelta) + 'px' }); } } else if (this.dhType == 'vertical') { var uTop = this.upperBlock.offsetTop; @@ -127,9 +127,9 @@ var SOGoDragHandlesInterface = { if (this.offsetTop > uTop) { var topdelta = this.lowerBlock.offsetTop - this.offsetTop; - this.style.top = uTop + 'px'; - this.upperBlock.style.width = '0px'; - this.lowerBlock.style.top = (uTop + topdelta) + 'px'; + this.setStyle({ top: uTop + 'px' }); + this.upperBlock.setStyle({ width: '0px' }); + this.lowerBlock.setStyle({ top: (uTop + topdelta) + 'px' }); } } }