amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-02-23 10:26:23 +00:00
Code Issues Projects Releases Wiki Activity

Fix for bug #1641.

Browse Source 
Monotone-Parent: e27ba437a27fa40967d6195b9f420b3c36988d81
Monotone-Revision: 15825926d3d6130838a6e8a925fb390321c6e5fa

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-02-10T03:17:52
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2012-02-10 03:17:52 +00:00
parent 6ef5d5bccc
commit 80934d748a
3 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2012-02-20 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/UIxMailEditor.js (onWindowResize): we now
make use of the ckeditor javascript api to reszie the container.
2012-02-16 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/UIxAttendeesEditor.js (checkAttendee):

9
UI/WebServerResources/UIxMailEditor.css
View File

@@ -127,7 +127,6 @@ hr.fieldSeparator
border: 0;
clear: both;
color: #848284;
float: left;
height: 1px;
margin: 0px;
padding: 0px;
@@ -179,14 +178,6 @@ UL#attachments LI
UL#attachments LI IMG
{ vertical-align: bottom; }
#pageContent TEXTAREA,
#cke_text
{ position: absolute;
left: 0;
right: 0;
bottom: 0;
/*top: 999em;*/ }
#pageContent TEXTAREA
{ width: 99%; }

19
UI/WebServerResources/UIxMailEditor.js
View File

@@ -622,6 +622,7 @@ function onWindowResize(event) {
textarea.setStyle({ 'top': hr.offsetTop + 'px' });
// Resize the textarea (message content)
var offsetTop = $('rightPanel').offsetTop + headerarea.getHeight();
var composeMode = UserDefaults["SOGoMailComposeMessageType"];
if (composeMode == "html") {
var editor = $('cke_text');
@@ -629,23 +630,11 @@ function onWindowResize(event) {
onWindowResize.defer();
return;
}
var ck_top = $("cke_top_text");
var ck_bottom = $("cke_bottom_text");
var content = $("cke_contents_text");
var top = hr.offsetTop;
var height = Math.floor(window.height() - top - ck_top.getHeight() - ck_bottom.getHeight());
height = height - 15;
if (Prototype.Browser.IE) {
editor.style.width = '';
editor.style.height = '';
}
editor.setStyle({ top: (top + 2) + 'px' });
content.setStyle({ height: height + 'px' });
var height = window.height() - offsetTop;
CKEDITOR.instances["text"].resize('100%', height);
}
else
textarea.rows = Math.floor((window.height() - textarea.offsetTop) / rowheight);
textarea.rows = Math.floor((window.height() - offsetTop) / rowheight);
// Resize search contacts addressbook selector
if ($("contacts").visible())