From 037af6890fe6fdb84a08d3c86083e847c90ec0ad Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 22 Oct 2013 08:17:26 -0400
Subject: [PATCH] Fix vulnerability in handling _session argument of utils/save-prefs (#1489382)
---
skins/larry/ui.js | 542 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 434 insertions(+), 108 deletions(-)
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index 8038aa7..36b5235 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -7,8 +7,6 @@
* License. It is allowed to copy, distribute, transmit and to adapt the work
* by keeping credits to the original autors in the README file.
* See http://creativecommons.org/licenses/by-sa/3.0/ for details.
- *
- * $Id$
*/
@@ -23,7 +21,7 @@
dragmessagemenu: { sticky:1 },
groupmenu: { above:1 },
mailboxmenu: { above:1 },
- composeoptionsmenu: { editable:1, overlap:1 },
+ spellmenu: { callback: spellmenu },
// toggle: #1486823, #1486930
'attachment-form': { editable:1, above:1, toggle:!bw.ie&&!bw.linux },
'upload-form': { editable:1, toggle:!bw.ie&&!bw.linux }
@@ -45,6 +43,19 @@
this.hide_header_row = hide_header_row;
+ // set minimal mode on small screens (don't wait for document.ready)
+ if (window.$ && document.body) {
+ var minmode = rcmail.get_cookie('minimalmode');
+ if (parseInt(minmode) || (minmode === null && $(window).height() < 850)) {
+ $(document.body).addClass('minimal');
+ }
+
+ if (bw.tablet) {
+ $('#viewport').attr('content', "width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0");
+ }
+ }
+
+
/**
*
*/
@@ -54,14 +65,29 @@
}
/**
- *
+ * Initialize UI
+ * Called on document.ready
*/
function init()
{
+ rcmail.addEventListener('message', message_displayed);
+
+ /*** prepare minmode functions ***/
+ $('#taskbar a').each(function(i,elem){
+ $(elem).append('<span class="tooltip">' + $('.button-inner', this).html() + '</span>')
+ });
+
+ $('#taskbar .minmodetoggle').click(function(e){
+ var ismin = $(document.body).toggleClass('minimal').hasClass('minimal');
+ rcmail.set_cookie('minimalmode', ismin?1:0);
+ $(window).resize();
+ });
+
+ /*** mail task ***/
if (rcmail.env.task == 'mail') {
rcmail.addEventListener('menu-open', show_listoptions);
rcmail.addEventListener('menu-save', save_listoptions);
- rcmail.addEventListener('aftertoggle-editor', function(){ window.setTimeout(function(){ layout_composeview() }, 100); });
+ rcmail.addEventListener('responseafterlist', function(e){ switch_view_mode(rcmail.env.threading ? 'thread' : 'list') });
var dragmenu = $('#dragmessagemenu');
if (dragmenu.length) {
@@ -69,42 +95,61 @@
popups.dragmessagemenu = dragmenu;
}
- var previewframe = $('#mailpreviewframe').is(':visible');
- $('#mailpreviewtoggle').addClass(previewframe ? 'enabled' : 'closed').click(function(e){ toggle_preview_pane(e); return false });
- $('#maillistmode').addClass(rcmail.env.threading ? '' : 'selected').click(function(e){ switch_view_mode('list'); return false });
- $('#mailthreadmode').addClass(rcmail.env.threading ? 'selected' : '').click(function(e){ switch_view_mode('thread'); return false });
-
if (rcmail.env.action == 'show' || rcmail.env.action == 'preview') {
- layout_messageview();
+ rcmail.addEventListener('aftershow-headers', function() { layout_messageview(); });
+ rcmail.addEventListener('afterhide-headers', function() { layout_messageview(); });
+ $('#previewheaderstoggle').click(function(e){ toggle_preview_headers(this); return false });
}
else if (rcmail.env.action == 'compose') {
+ rcmail.addEventListener('aftertoggle-editor', function(){ window.setTimeout(function(){ layout_composeview() }, 200); });
rcmail.addEventListener('aftersend-attachment', show_uploadform);
+ rcmail.addEventListener('add-recipient', function(p){ show_header_row(p.field, true); });
layout_composeview();
- $('#composeoptionstoggle').parent().click(function(){
- $('#composeoptionstoggle').toggleClass('enabled');
+ // Show input elements with non-empty value
+ var field, fields = ['cc', 'bcc', 'replyto', 'followupto'];
+ for (var f=0; f < fields.length; f++) {
+ if ((field = $('#_'+fields[f])) && field.length && field.val() != '')
+ show_header_row(fields[f], true);
+ }
+
+ $('#composeoptionstoggle').click(function(){
+ $('#composeoptionstoggle').toggleClass('remove');
$('#composeoptions').toggle();
layout_composeview();
return false;
}).css('cursor', 'pointer');
+ // toggle compose options if opened in new window and they were visible before
+ var opener_rc = rcmail.opener();
+ if (opener_rc && opener_rc.env.action == 'compose' && $('#composeoptionstoggle', opener.document).hasClass('remove'))
+ $('#composeoptionstoggle').click();
+
new rcube_splitter({ id:'composesplitterv', p1:'#composeview-left', p2:'#composeview-right',
- orientation:'v', relative:true, start:248, min:150, size:12 }).init();
+ orientation:'v', relative:true, start:248, min:170, size:12, render:layout_composeview }).init();
}
else if (rcmail.env.action == 'list' || !rcmail.env.action) {
- mailviewsplit = new rcube_splitter({ id:'mailviewsplitter', p1:'#mailview-top', p2:'#mailview-bottom',
- orientation:'h', relative:true, start:310, min:150, size:0, offset:-22 });
- if (previewframe)
- mailviewsplit.init();
+ var previewframe = $('#mailpreviewframe').is(':visible');
+ $('#mailpreviewtoggle').addClass(previewframe ? 'enabled' : 'closed').click(function(e){ toggle_preview_pane(e); return false });
+ $('#maillistmode').addClass(rcmail.env.threading ? '' : 'selected').click(function(e){ switch_view_mode('list'); return false });
+ $('#mailthreadmode').addClass(rcmail.env.threading ? 'selected' : '').click(function(e){ switch_view_mode('thread'); return false });
- rcmail.addEventListener('setquota', update_quota);
+ mailviewsplit = new rcube_splitter({ id:'mailviewsplitter', p1:'#mailview-top', p2:'#mailview-bottom',
+ orientation:'h', relative:true, start:310, min:150, size:12, offset:4 });
+ if (previewframe)
+ mailviewsplit.init();
+
+ new rcube_scroller('#folderlist-content', '#folderlist-header', '#folderlist-footer');
+
+ rcmail.addEventListener('setquota', update_quota);
}
if ($('#mailview-left').length) {
new rcube_splitter({ id:'mailviewsplitterv', p1:'#mailview-left', p2:'#mailview-right',
- orientation:'v', relative:true, start:248, min:150, size:12, callback:render_mailboxlist, render:resize_leftcol }).init();
+ orientation:'v', relative:true, start:226, min:150, size:12, callback:render_mailboxlist, render:resize_leftcol }).init();
}
}
+ /*** settings task ***/
else if (rcmail.env.task == 'settings') {
rcmail.addEventListener('init', function(){
var tab = '#settingstabpreferences';
@@ -117,54 +162,131 @@
if (rcmail.env.action == 'folders') {
new rcube_splitter({ id:'folderviewsplitter', p1:'#folderslist', p2:'#folder-details',
- orientation:'v', relative:true, start:305, min:150, size:12 }).init();
+ orientation:'v', relative:true, start:266, min:180, size:12 }).init();
+
+ new rcube_scroller('#folderslist-content', '#folderslist-header', '#folderslist-footer');
+
+ rcmail.addEventListener('setquota', update_quota);
}
- else if (rcmail.env.action.indexOf('identit') >= 0) {
+ else if (rcmail.env.action == 'identities') {
new rcube_splitter({ id:'identviewsplitter', p1:'#identitieslist', p2:'#identity-details',
- orientation:'v', relative:true, start:305, min:150, size:12 }).init();
+ orientation:'v', relative:true, start:266, min:180, size:12 }).init();
+ }
+ else if (rcmail.env.action == 'preferences' || !rcmail.env.action) {
+ new rcube_splitter({ id:'prefviewsplitter', p1:'#sectionslist', p2:'#preferences-box',
+ orientation:'v', relative:true, start:266, min:180, size:12 }).init();
}
}
+ /*** addressbook task ***/
else if (rcmail.env.task == 'addressbook') {
rcmail.addEventListener('afterupload-photo', show_uploadform);
+ rcmail.addEventListener('beforepushgroup', push_contactgroup);
+ rcmail.addEventListener('beforepopgroup', pop_contactgroup);
if (rcmail.env.action == '') {
new rcube_splitter({ id:'addressviewsplitterd', p1:'#addressview-left', p2:'#addressview-right',
orientation:'v', relative:true, start:226, min:150, size:12, render:resize_leftcol }).init();
new rcube_splitter({ id:'addressviewsplitter', p1:'#addresslist', p2:'#contacts-box',
- orientation:'v', relative:true, start:296, min:220, size:12 }).init();
- }
+ orientation:'v', relative:true, start:286, min:270, size:12 }).init();
+ new rcube_scroller('#directorylist-content', '#directorylist-header', '#directorylist-footer');
+ }
+ }
+
+ // set min-width to show all toolbar buttons
+ var screen = $('.minwidth');
+ if (screen.length) {
+ screen.css('min-width', $('.toolbar').width() + $('#quicksearchbar').parent().width() + 20);
}
// turn a group of fieldsets into tabs
$('.tabbed').each(function(idx, elem){ init_tabs(elem); })
- $(document.body).bind('mouseup', function(e){
- var config, obj, target = e.target;
- for (var id in popups) {
- obj = popups[id];
- config = popupconfig[id];
- if (obj.is(':visible')
- && target.id != id+'link'
- && !config.toggle
- && (!config.editable || !target_overlaps(target, obj.get(0)))
- && (!config.sticky || !rcube_mouse_is_over(e, obj.get(0)))
- ) {
- var myid = id+'';
- window.setTimeout(function(){ show_popupmenu(myid, false) }, 10);
- }
+ // decorate select elements
+ $('select.decorated').each(function(){
+ if (bw.opera) {
+ $(this).removeClass('decorated');
+ return;
}
- })
- .bind('keyup', function(e){
- if (e.keyCode == 27) {
- for (var id in popups) {
- if (popups[id].is(':visible'))
- show_popup(id, false);
- }
- }
+
+ var select = $(this),
+ height = Math.max(select.height(), 26) - 2,
+ width = select.width() - 22,
+ title = $('option', this).first().text();
+
+ if ($('option:selected', this).val() != '')
+ title = $('option:selected', this).text();
+
+ var overlay = $('<a class="menuselector"><span class="handle">' + title + '</span></a>')
+ .css('position', 'absolute')
+ .offset(select.position())
+ .insertAfter(select);
+
+ overlay.children().width(width).height(height).css('line-height', (height - 1) + 'px');
+
+ select.change(function() {
+ var val = $('option:selected', this).text();
+ $(this).next().children().html(val);
+ });
+
+ var parent = select.parent();
+ if (parent.css('position') != 'absolute')
+ parent.css('position', 'relative');
+
+ // re-set original select width to fix click action and options width in some browsers
+ select.width(overlay.width());
});
-
- $(window).resize(resize);
+
+ $(document.body)
+ .bind('mouseup', body_mouseup)
+ .bind('keyup', function(e){
+ if (e.keyCode == 27) {
+ for (var id in popups) {
+ if (popups[id].is(':visible'))
+ show_popup(id, false);
+ }
+ }
+ });
+
+ $('iframe').load(function(e){
+ // this = iframe
+ try {
+ var doc = this.contentDocument ? this.contentDocument : this.contentWindow ? this.contentWindow.document : null;
+ $(doc).mouseup(body_mouseup);
+ }
+ catch (e) {
+ // catch possible "Permission denied" error in IE
+ };
+ })
+ .contents().mouseup(body_mouseup);
+
+ // don't use $(window).resize() due to some unwanted side-effects
+ window.onresize = resize;
+ resize();
+ }
+
+ /**
+ * Handler for mouse-up events on the document body.
+ * This will close all open popup menus
+ */
+ function body_mouseup(e)
+ {
+ var config, obj, target = e.target;
+ if (target.className == 'inner')
+ target = e.target.parentNode;
+ for (var id in popups) {
+ obj = popups[id];
+ config = popupconfig[id];
+ if (obj.is(':visible')
+ && target.id != id+'link'
+ && !config.toggle
+ && (!config.editable || !target_overlaps(target, obj.get(0)))
+ && (!config.sticky || !rcube_mouse_is_over(e, obj.get(0)))
+ ) {
+ var myid = id+'';
+ window.setTimeout(function(){ show_popupmenu(myid, false) }, 10);
+ }
+ }
}
/**
@@ -172,22 +294,77 @@
*/
function resize()
{
- if (rcmail.env.task == 'mail' && (rcmail.env.action == 'show' || rcmail.env.action == 'preview')) {
- layout_messageview();
+ if (rcmail.env.task == 'mail') {
+ if (rcmail.env.action == 'show' || rcmail.env.action == 'preview')
+ layout_messageview();
+ else if (rcmail.env.action == 'compose')
+ layout_composeview();
}
- if (rcmail.env.task == 'mail' && rcmail.env.action == 'compose') {
- layout_composeview();
+
+ // make iframe footer buttons float if scrolling is active
+ $('body.iframe .footerleft').each(function(){
+ var footer = $(this),
+ body = $(document.body),
+ floating = footer.hasClass('floating'),
+ overflow = body.outerHeight(true) > $(window).height();
+
+ if (overflow != floating) {
+ var action = overflow ? 'addClass' : 'removeClass';
+ footer[action]('floating');
+ body[action]('floatingbuttons');
+ }
+ });
+ }
+
+ /**
+ * Triggered when a new user message is displayed
+ */
+ function message_displayed(p)
+ {
+ // show a popup dialog on errors
+ if (p.type == 'error' && rcmail.env.task != 'login') {
+ if (me.message_timer) {
+ window.clearTimeout(me.message_timer);
+ }
+ if (!me.messagedialog) {
+ me.messagedialog = $('<div>').addClass('popupdialog').hide();
+ }
+
+ var msg = p.message,
+ pos = $(p.object).offset();
+ pos.top -= (rcmail.env.task == 'login' ? 20 : 160);
+
+ if (me.messagedialog.is(':visible'))
+ msg = me.messagedialog.html() + '<p>' + p.message + '</p>';
+
+ me.messagedialog.html(msg)
+ .dialog({
+ resizable: false,
+ closeOnEscape: true,
+ dialogClass: 'popupmessage ' + p.type,
+ title: env.errortitle,
+ close: function() {
+ me.messagedialog.dialog('destroy').hide();
+ },
+ position: ['center', pos.top],
+ hide: { effect:'drop', direction:'down' },
+ width: 420,
+ minHeight: 90
+ }).show();
+
+ me.message_timer = window.setTimeout(function(){ me.messagedialog.dialog('close'); }, Math.max(2000, p.timeout / 2));
}
}
+
/**
* Adjust UI objects of the mail view screen
*/
function layout_messageview()
{
- $('#messagecontent').css('top', ($('#messageheader').outerHeight() + 10) + 'px');
+ $('#messagecontent').css('top', ($('#messageheader').outerHeight() + 1) + 'px');
$('#message-objects div a').addClass('button');
-
+
if (!$('#attachment-list li').length) {
$('div.rightcol').hide();
$('div.leftcol').css('margin-right', '0');
@@ -197,41 +374,54 @@
function render_mailboxlist(splitter)
{
+ // TODO: implement smart shortening of long folder names
}
function resize_leftcol(splitter)
{
- if (splitter)
- $('#quicksearchbar input').css('width', (splitter.pos - 70) + 'px');
+ // STUB
}
function layout_composeview()
{
var body = $('#composebody'),
+ form = $('#compose-content'),
bottom = $('#composeview-bottom'),
- w, h;
+ w, h, bh, ovflw, btns = 0,
+ minheight = 300,
- bottom.css('height', (bottom.parent().height() - bottom.position().top) + 'px');
+ bh = (form.height() - bottom.position().top);
+ ovflw = minheight - bh;
+ btns = ovflw > -100 ? 0 : 40;
+ bottom.css('height', Math.max(minheight, bh) + 'px');
+ form.css('overflow', ovflw > 0 ? 'auto' : 'hidden');
- w = body.parent().width() - 8;
- h = body.parent().height() - 36;
+ w = body.parent().width() - 5;
+ h = body.parent().height() - 16;
body.width(w).height(h);
- if (window.tinyMCE && tinyMCE.get('composebody')) {
- $('#composebody_tbl').width((w+12)+'px').height('').css('margin-top', '1px');
- $('#composebody_ifr').width((w+12)+'px').height((h-22)+'px');
- }
- else {
- $('#googie_edit_layer').height(h+'px');
- }
+ $('#composebody_tbl').width((w+8)+'px').height('').css('margin-top', '1px');
+ $('#composebody_ifr').width((w+8)+'px').height((h-40)+'px');
+ $('#googie_edit_layer').height(h+'px');
+// $('#composebodycontainer')[(btns ? 'addClass' : 'removeClass')]('buttons');
+// $('#composeformbuttons')[(btns ? 'show' : 'hide')]();
+
+ var abooks = $('#directorylist');
+ $('#compose-contacts .scroller').css('top', abooks.position().top + abooks.outerHeight());
}
function update_quota(p)
{
- var y = p.total ? Math.ceil(p.percent / 100 * 20) * 24 : 0;
+ var step = 24, step_count = 20,
+ y = p.total ? Math.ceil(p.percent / 100 * step_count) * step : 0;
+
+ // never show full-circle if quota is close to 100% but below.
+ if (p.total && y == step * step_count && p.percent < 100)
+ y -= step;
+
$('#quotadisplay').css('background-position', '0 -'+y+'px');
}
@@ -299,7 +489,7 @@
$('select').css('visibility', show?'hidden':'inherit');
$('select', obj).css('visibility', 'inherit');
}
-
+
return show;
}
@@ -325,14 +515,14 @@
var button = $(e.target),
frame = $('#mailpreviewframe'),
visible = !frame.is(':visible'),
- splitter = mailviewsplit.pos || parseInt(bw.get_cookie('mailviewsplitter') || 320),
+ splitter = mailviewsplit.pos || parseInt(rcmail.get_cookie('mailviewsplitter') || 320),
topstyles, bottomstyles, uid;
frame.toggle();
button.removeClass().addClass(visible ? 'enabled' : 'closed');
if (visible) {
- $('#mailview-top').css({ bottom:'auto' });
+ $('#mailview-top').removeClass('fullheight').css({ bottom:'auto' });
$('#mailview-bottom').css({ height:'auto' });
rcmail.env.contentframe = 'messagecontframe';
@@ -351,7 +541,7 @@
rcmail.env.contentframe = null;
rcmail.show_contentframe(false);
- $('#mailview-top').css({ height:'auto', bottom:'28px' });
+ $('#mailview-top').addClass('fullheight').css({ height:'auto', bottom:'28px' });
$('#mailview-bottom').css({ top:'auto', height:'26px' });
if (mailviewsplit.handle)
@@ -362,6 +552,23 @@
rcmail.message_list.scrollto(uid);
rcmail.command('save-pref', { name:'preview_pane', value:(visible?1:0) });
+ }
+
+
+ /**
+ * Switch between short and full headers display in message preview
+ */
+ function toggle_preview_headers(button)
+ {
+ $('#preview-shortheaders').toggle();
+ var full = $('#preview-allheaders').toggle(),
+ button = $('a#previewheaderstoggle');
+
+ // add toggle button to full headers table
+ if (full.is(':visible'))
+ button.attr('href', '#hide').removeClass('add').addClass('remove')
+ else
+ button.attr('href', '#details').removeClass('remove').addClass('add')
}
@@ -411,6 +618,42 @@
}
+ function spellmenu(show)
+ {
+ var link, li,
+ lang = rcmail.spellcheck_lang(),
+ menu = popups.spellmenu,
+ ul = $('ul', menu);
+
+ if (!ul.length) {
+ ul = $('<ul class="toolbarmenu selectable">');
+
+ for (i in rcmail.env.spell_langs) {
+ li = $('<li>');
+ link = $('<a href="#"></a>').text(rcmail.env.spell_langs[i])
+ .addClass('active').data('lang', i)
+ .click(function() {
+ rcmail.spellcheck_lang_set($(this).data('lang'));
+ });
+
+ link.appendTo(li);
+ li.appendTo(ul);
+ }
+
+ ul.appendTo(menu);
+ }
+
+ // select current language
+ $('li', ul).each(function() {
+ var el = $('a', this);
+ if (el.data('lang') == lang)
+ el.addClass('selected');
+ else if (el.hasClass('selected'))
+ el.removeClass('selected');
+ });
+ }
+
+
/**
*
*/
@@ -428,21 +671,11 @@
$('input[name="sort_col"][value="'+rcmail.env.sort_col+'"]').prop('checked', true);
$('input[name="sort_ord"][value="DESC"]').prop('checked', rcmail.env.sort_order == 'DESC');
$('input[name="sort_ord"][value="ASC"]').prop('checked', rcmail.env.sort_order != 'DESC');
- $('input[name="view"][value="thread"]').prop('checked', rcmail.env.threading ? true : false);
- $('input[name="view"][value="list"]').prop('checked', rcmail.env.threading ? false : true);
- // list columns
- var found, cols = $('input[name="list_col[]"]');
- for (var i=0; i < cols.length; i++) {
- if (cols[i].value != 'from') {
- found = $.inArray(cols[i].value, rcmail.env.coltypes) != -1;
- }
- else {
- found = ($.inArray('from', rcmail.env.coltypes) != -1
- || $.inArray('to', rcmail.env.coltypes) != -1);
- }
- $(cols[i]).prop('checked', found);
- }
+ // set checkboxes
+ $('input[name="list_col[]"]').each(function() {
+ $(this).prop('checked', $.inArray(this.value, rcmail.env.coltypes) != -1);
+ });
$dialog.dialog({
modal: true,
@@ -466,11 +699,10 @@
var sort = $('input[name="sort_col"]:checked').val(),
ord = $('input[name="sort_ord"]:checked').val(),
- thread = $('input[name="view"]:checked').val(),
cols = $('input[name="list_col[]"]:checked')
.map(function(){ return this.value; }).get();
- rcmail.set_list_options(cols, sort, ord, thread == 'thread' ? 1 : 0);
+ rcmail.set_list_options(cols, sort, ord, rcmail.env.threading);
}
@@ -522,6 +754,35 @@
});
}
+ function push_contactgroup(p)
+ {
+ // lets the contacts list swipe to the left, nice!
+ var table = $('#contacts-table'),
+ scroller = table.parent().css('overflow', 'hidden');
+
+ table.clone()
+ .css({ position:'absolute', top:'0', left:'0', width:table.width()+'px', 'z-index':10 })
+ .appendTo(scroller)
+ .animate({ left: -(table.width()+5) + 'px' }, 300, 'swing', function(){
+ $(this).remove();
+ scroller.css('overflow', 'auto')
+ });
+ }
+
+ function pop_contactgroup(p)
+ {
+ // lets the contacts list swipe to the left, nice!
+ var table = $('#contacts-table'),
+ scroller = table.parent().css('overflow', 'hidden'),
+ clone = table.clone().appendTo(scroller);
+
+ table.css({ position:'absolute', top:'0', left:-(table.width()+5) + 'px', width:table.width()+'px', height:table.height()+'px', 'z-index':10 })
+ .animate({ left:'0' }, 300, 'linear', function(){
+ clone.remove();
+ $(this).css({ position:'relative', left:'0', width:'100%', height:'auto', 'z-index':1 });
+ scroller.css('overflow', 'auto')
+ });
+ }
function show_uploadform()
{
@@ -532,9 +793,9 @@
$dialog.dialog('close');
return;
}
-
+
// add icons to clone file input field
- if (rcmail.env.action = 'compose' && !$dialog.data('extended')) {
+ if (rcmail.env.action == 'compose' && !$dialog.data('extended')) {
$('<a>')
.addClass('iconlink add')
.attr('href', '#add')
@@ -578,11 +839,16 @@
/**
*
*/
- function show_header_row(which)
+ function show_header_row(which, updated)
{
- if (compose_headers[which])
+ var row = $('#compose-' + which);
+ if (row.is(':visible'))
+ return; // nothing to be done here
+
+ if (compose_headers[which] && !updated)
$('#_' + which).val(compose_headers[which]);
- $('#compose-' + which).show();
+
+ row.show();
$('#' + which + '-link').hide();
layout_composeview();
return false;
@@ -610,8 +876,8 @@
*/
function init_tabs(elem, current)
{
- var id = elem.id,
- content = $(elem),
+ var content = $(elem),
+ id = content.get(0).id,
fs = content.children('fieldset');
if (!fs.length)
@@ -619,7 +885,7 @@
if (!id) {
id = 'rcmtabcontainer';
- elem.attr('id', id);
+ content.attr('id', id);
}
// first hide not selected tabs
@@ -661,6 +927,8 @@
// Select/unselect tab
$('#tab'+idx).toggleClass('selected', idx==index);
});
+
+ resize();
}
/**
@@ -670,6 +938,7 @@
{
var frame = $('<iframe>').attr('id', 'aboutframe')
.attr('src', rcmail.url('settings/about'))
+ .attr('frameborder', '0')
.appendTo(document.body);
var h = Math.floor($(window).height() * 0.75);
@@ -694,9 +963,46 @@
}
+/**
+ * Roundcube Scroller class
+ */
+function rcube_scroller(list, top, bottom)
+{
+ var ref = this;
+
+ this.list = $(list);
+ this.top = $(top);
+ this.bottom = $(bottom);
+ this.step_size = 6;
+ this.step_time = 20;
+ this.delay = 500;
+
+ this.top
+ .mouseenter(function() { ref.ts = window.setTimeout(function() { ref.scroll('down'); }, ref.delay); })
+ .mouseout(function() { if (ref.ts) window.clearTimeout(ref.ts); });
+
+ this.bottom
+ .mouseenter(function() { ref.ts = window.setTimeout(function() { ref.scroll('up'); }, ref.delay); })
+ .mouseout(function() { if (ref.ts) window.clearTimeout(ref.ts); });
+
+ this.scroll = function(dir)
+ {
+ var ref = this, size = this.step_size;
+
+ if (!rcmail.drag_active)
+ return;
+
+ if (dir == 'down')
+ size *= -1;
+
+ this.list.get(0).scrollTop += size;
+ this.ts = window.setTimeout(function() { ref.scroll(dir); }, this.step_time);
+ };
+};
+
/**
- * Roundcube splitter GUI class
+ * Roundcube UI splitter class
*
* @constructor
*/
@@ -715,11 +1021,16 @@
this.callback = p.callback;
var me = this;
+ rcube_splitter._instances[this.id] = me;
this.init = function()
{
this.p1 = $(this.p.p1);
this.p2 = $(this.p.p2);
+
+ // check if referenced elements exist, otherwise abort
+ if (!this.p1.length || !this.p2.length)
+ return;
// create and position the handle for this splitter
this.p1pos = this.relative ? this.p1.position() : this.p1.offset();
@@ -740,14 +1051,12 @@
this.handle.css({ left:left+'px', top:'0px' });
}
- this.elm = this.handle.get(0);
-
// listen to window resize on IE
if (bw.ie)
- $(window).resize(function(e){ onResize(e) });
+ $(window).resize(onResize);
// read saved position from cookie
- var cookie = bw.get_cookie(this.id);
+ var cookie = rcmail.get_cookie(this.id);
if (cookie && !isNaN(cookie)) {
this.pos = parseFloat(cookie);
this.resize();
@@ -770,7 +1079,7 @@
this.handle.css('top', Math.round(this.pos - this.halfsize + this.offset)+'px');
if (bw.ie) {
var new_height = parseInt(this.p2.parent().outerHeight(), 10) - parseInt(this.p2.css('top'), 10) - (bw.ie8 ? 2 : 0);
- this.p2.css('height') = (new_height > 0 ? new_height : 0) + 'px';
+ this.p2.css('height', (new_height > 0 ? new_height : 0) + 'px');
}
}
else {
@@ -785,6 +1094,14 @@
this.p2.resize();
this.p1.resize();
+
+ // also resize iframe covers
+ if (this.drag_active) {
+ $('iframe').each(function(i, elem) {
+ var pos = $(this).offset();
+ $('#iframe-splitter-fix-'+i).css({ top: pos.top+'px', left: pos.left+'px', width:elem.offsetWidth+'px', height: elem.offsetHeight+'px' });
+ });
+ }
if (typeof this.render == 'function')
this.render(this);
@@ -807,10 +1124,12 @@
$(document).bind('mousemove.'+this.id, onDrag).bind('mouseup.'+this.id, onDragStop);
// enable dragging above iframes
- $('iframe').each(function() {
- $('<div class="iframe-splitter-fix"></div>')
+ $('iframe').each(function(i, elem) {
+ $('<div>')
+ .attr('id', 'iframe-splitter-fix-'+i)
+ .addClass('iframe-splitter-fix')
.css({ background: '#fff',
- width: this.offsetWidth+'px', height: this.offsetHeight+'px',
+ width: elem.offsetWidth+'px', height: elem.offsetHeight+'px',
position: 'absolute', opacity: '0.001', zIndex: 1000
})
.css($(this).offset())
@@ -866,7 +1185,7 @@
me.drag_active = false;
// remove temp divs
- $('div.iframe-splitter-fix').each(function(){ this.parentNode.removeChild(this); });
+ $('div.iframe-splitter-fix').remove();
me.set_cookie();
@@ -898,9 +1217,16 @@
{
var exp = new Date();
exp.setYear(exp.getFullYear() + 1);
- bw.set_cookie(this.id, this.pos, exp);
+ rcmail.set_cookie(this.id, this.pos, exp);
};
} // end class rcube_splitter
+// static getter for splitter instances
+rcube_splitter._instances = {};
+
+rcube_splitter.get_instance = function(id)
+{
+ return rcube_splitter._instances[id];
+};
--
Gitblit v1.9.1