From 1424e53b96e79ad212b67d74eb5d372c14e8b1b3 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 11 Sep 2012 09:08:50 -0400
Subject: [PATCH] Init splitter in Preferences also when env.action is empty
---
skins/larry/ui.js | 137 +++++++++++++++++++++++----------------------
1 files changed, 70 insertions(+), 67 deletions(-)
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index 7f14c5e..fe449fd 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -76,7 +76,8 @@
if (rcmail.env.action == 'show' || rcmail.env.action == 'preview') {
layout_messageview();
- $("#all-headers").resizable({ handles: 's', minHeight: 50 });
+ 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') {
@@ -109,7 +110,7 @@
$('#mailthreadmode').addClass(rcmail.env.threading ? 'selected' : '').click(function(e){ switch_view_mode('thread'); return false });
mailviewsplit = new rcube_splitter({ id:'mailviewsplitter', p1:'#mailview-top', p2:'#mailview-bottom',
- orientation:'h', relative:true, start:310, min:150, size:0, offset:-22 });
+ orientation:'h', relative:true, start:310, min:150, size:12, offset:4 });
if (previewframe)
mailviewsplit.init();
@@ -120,7 +121,7 @@
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 ***/
@@ -136,7 +137,7 @@
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');
@@ -144,7 +145,11 @@
}
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 ***/
@@ -155,27 +160,9 @@
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');
- }
- }
- /*** login page ***/
- else if (rcmail.env.task == 'login') {
- if (bw.ie && bw.vendver < 8) {
- var popup = $('<div>')
- .addClass('readtext')
- .html("Roundcube will not work well with the crappy browser ya' using. Get yourself a new internet browsing software and don't come back without!<p>Sincerly,<br/>the Roundcube Dev Team</p>")
- .appendTo(document.body)
- .dialog({
- dialogClass: 'alert',
- closeOnEscape: true,
- title: "No way, are you serious?",
- close: function() {
- popup.dialog('destroy').remove();
- },
- width: 450
- });
}
}
@@ -189,23 +176,32 @@
return;
}
- var title = $('option', this).first().text();
+ 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 select = $(this)
- .change(function(){
+ 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);
});
- $('<a class="menuselector dropdownselector"><span class="handle">' + title + '</span></a>')
- .css('position', 'absolute')
- .offset(select.position())
- .insertAfter(select)
- .children().width(select.outerWidth() - 40);
+ var parent = select.parent();
+ if (parent.css('position') != 'absolute')
+ parent.css('position', 'relative');
- select.parent().css('position', 'relative');
+ // re-set original select width to fix click action and options width in some browsers
+ select.width(overlay.width());
});
$(document.body)
@@ -226,12 +222,9 @@
})
.contents().mouseup(body_mouseup);
- $(window).resize(function(e) {
- // check target due to bugs in jquery
- // http://bugs.jqueryui.com/ticket/7514
- // http://bugs.jquery.com/ticket/9841
- if (e.target == window) resize();
- });
+ // don't use $(window).resize() due to some unwanted side-effects
+ window.onresize = resize;
+ resize();
}
/**
@@ -241,6 +234,8 @@
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];
@@ -267,6 +262,20 @@
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');
+ }
+ })
+
}
/**
@@ -275,12 +284,13 @@
function message_displayed(p)
{
// show a popup dialog on errors
- if (p.type == 'error') {
+ if (p.type == 'error' && rcmail.env.task != 'login') {
if (!me.messagedialog) {
me.messagedialog = $('<div>').addClass('popupdialog');
}
var pos = $(p.object).offset();
+ pos.top -= (rcmail.env.task == 'login' ? 20 : 160);
me.messagedialog.dialog('close');
me.messagedialog.html(p.message)
.dialog({
@@ -291,7 +301,7 @@
close: function() {
me.messagedialog.dialog('destroy').hide();
},
- position: ['center', pos.top - 160],
+ position: ['center', pos.top],
hide: { effect:'drop', direction:'down' },
width: 420,
minHeight: 90
@@ -309,7 +319,7 @@
{
$('#messagecontent').css('top', ($('#messageheader').outerHeight() + 10) + 'px');
$('#message-objects div a').addClass('button');
-
+
if (!$('#attachment-list li').length) {
$('div.rightcol').hide();
$('div.leftcol').css('margin-right', '0');
@@ -325,8 +335,7 @@
function resize_leftcol(splitter)
{
- if (splitter)
- $('#quicksearchbar input').css('width', (splitter.pos - 70) + 'px');
+ // STUB
}
@@ -343,13 +352,9 @@
h = body.parent().height() - 16;
body.width(w).height(h);
- if (window.tinyMCE && tinyMCE.get('composebody')) {
- $('#composebody_tbl').width((w+8)+'px').height('').css('margin-top', '1px');
- $('#composebody_ifr').width((w+8)+'px').height((h-40)+'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');
var abooks = $('#directorylist');
$('#compose-contacts .scroller').css('top', abooks.position().top + abooks.outerHeight());
@@ -358,7 +363,13 @@
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');
}
@@ -459,7 +470,7 @@
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';
@@ -478,7 +489,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)
@@ -567,7 +578,7 @@
for (i in rcmail.env.spell_langs) {
li = $('<li>');
- link = $('<a href="#">').text(rcmail.env.spell_langs[i])
+ link = $('<a href="#"></a>').text(rcmail.env.spell_langs[i])
.addClass('active').data('lang', i)
.click(function() {
rcmail.spellcheck_lang_set($(this).data('lang'));
@@ -611,18 +622,10 @@
$('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,
--
Gitblit v1.9.1