From 5d66a4bcf3ad5d584255184776f1f04451c929fc Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 19 Apr 2012 03:42:19 -0400
Subject: [PATCH] - Improved ttl values handling
---
skins/larry/ui.js | 400 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 330 insertions(+), 70 deletions(-)
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index 7033ebf..cf7ff55 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -24,6 +24,7 @@
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 }
@@ -54,14 +55,18 @@
}
/**
- *
+ * Initialize UI
+ * Called on document.ready
*/
function init()
{
+ rcmail.addEventListener('message', message_displayed);
+
+ /*** 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,17 +74,23 @@
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();
+ $("#all-headers").resizable({ handles: 's', minHeight: 50 });
+ $('#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();
+
+ // 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').parent().click(function(){
$('#composeoptionstoggle').toggleClass('enabled');
@@ -89,37 +100,54 @@
}).css('cursor', 'pointer');
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 });
+
+ 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();
+
+ 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') {
- var tab = '#settingstabpreferences';
- if (rcmail.env.action)
- tab = '#settingstab' + (rcmail.env.action.indexOf('identity')>0 ? 'identities' : rcmail.env.action.replace(/\./g, ''));
+ rcmail.addEventListener('init', function(){
+ var tab = '#settingstabpreferences';
+ if (rcmail.env.action)
+ tab = '#settingstab' + (rcmail.env.action.indexOf('identity')>0 ? 'identities' : rcmail.env.action.replace(/\./g, ''));
- $(tab).addClass('selected')
- .children().first().removeAttr('onclick').click(function() { return false; });
+ $(tab).addClass('selected')
+ .children().first().removeAttr('onclick').click(function() { return false; });
+ });
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();
}
}
+ /*** addressbook task ***/
else if (rcmail.env.task == 'addressbook') {
rcmail.addEventListener('afterupload-photo', show_uploadform);
@@ -127,40 +155,87 @@
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');
+ }
}
// 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 title = $('option', this).first().text();
+ if ($('option:selected', this).val() != '')
+ title = $('option:selected', this).text();
+
+ var select = $(this)
+ .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);
+
+ select.parent().css('position', 'relative');
});
-
- $(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
+ var doc = this.contentDocument ? this.contentDocument : this.contentWindow ? this.contentWindow.document : null;
+ $(doc).mouseup(body_mouseup);
+ })
+ .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();
+ });
+ }
+
+ /**
+ * 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;
+ 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);
+ }
+ }
}
/**
@@ -175,6 +250,39 @@
layout_composeview();
}
}
+
+ /**
+ * Triggered when a new user message is displayed
+ */
+ function message_displayed(p)
+ {
+ // show a popup dialog on errors
+ if (p.type == 'error') {
+ if (!me.messagedialog) {
+ me.messagedialog = $('<div>').addClass('popupdialog');
+ }
+
+ var pos = $(p.object).offset();
+ me.messagedialog.dialog('close');
+ me.messagedialog.html(p.message)
+ .dialog({
+ resizable: false,
+ closeOnEscape: true,
+ dialogClass: 'popupmessage ' + p.type,
+ title: env.errortitle,
+ close: function() {
+ me.messagedialog.dialog('destroy').hide();
+ },
+ position: ['center', pos.top - 160],
+ hide: { effect:'drop', direction:'down' },
+ width: 420,
+ minHeight: 90
+ }).show();
+
+ window.setTimeout(function(){ me.messagedialog.dialog('close'); }, Math.max(2000, p.timeout / 2));
+ }
+ }
+
/**
* Adjust UI objects of the mail view screen
@@ -193,6 +301,7 @@
function render_mailboxlist(splitter)
{
+ // TODO: implement smart shortening of long folder names
}
@@ -206,22 +315,33 @@
function layout_composeview()
{
var body = $('#composebody'),
+ form = $('#compose-content'),
bottom = $('#composeview-bottom'),
w, h;
- bottom.css('height', (bottom.parent().height() - bottom.position().top) + 'px');
+ bottom.css('height', (form.height() - bottom.position().top) + 'px');
- 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');
+ $('#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');
}
+
+ 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;
+ $('#quotadisplay').css('background-position', '0 -'+y+'px');
}
@@ -288,7 +408,7 @@
$('select').css('visibility', show?'hidden':'inherit');
$('select', obj).css('visibility', 'inherit');
}
-
+
return show;
}
@@ -355,6 +475,23 @@
/**
+ * 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')
+ }
+
+
+ /**
*
*/
function switch_view_mode(mode)
@@ -397,6 +534,42 @@
$('#s_mod_' + n).prop('checked', true);
}
}
+ }
+
+
+ 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="#">').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');
+ });
}
@@ -521,6 +694,17 @@
$dialog.dialog('close');
return;
}
+
+ // add icons to clone file input field
+ if (rcmail.env.action == 'compose' && !$dialog.data('extended')) {
+ $('<a>')
+ .addClass('iconlink add')
+ .attr('href', '#add')
+ .html('Add')
+ .appendTo($('input[type="file"]', $dialog).parent())
+ .click(add_uploadfile);
+ $dialog.data('extended', true);
+ }
$dialog.dialog({
modal: true,
@@ -532,22 +716,40 @@
catch(e){ } // ignore errors
$dialog.dialog('destroy').hide();
+ $('div.addline', $dialog).remove();
},
width: 480
}).show();
if (!document.all)
- $('input[type=file]', $dialog).click();
+ $('input[type=file]', $dialog).first().click();
}
+
+ function add_uploadfile(e)
+ {
+ var div = $(this).parent();
+ var clone = div.clone().addClass('addline').insertAfter(div);
+ clone.children('.iconlink').click(add_uploadfile);
+ clone.children('input').val('');
+
+ if (!document.all)
+ $('input[type=file]', clone).click();
+ }
+
/**
*
*/
- 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;
@@ -575,8 +777,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)
@@ -584,7 +786,7 @@
if (!id) {
id = 'rcmtabcontainer';
- elem.attr('id', id);
+ content.attr('id', id);
}
// first hide not selected tabs
@@ -635,6 +837,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);
@@ -659,9 +862,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
*/
@@ -680,11 +920,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();
@@ -705,11 +950,9 @@
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);
@@ -735,7 +978,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 {
@@ -750,6 +993,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);
@@ -772,10 +1023,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())
@@ -831,7 +1084,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();
@@ -869,3 +1122,10 @@
} // 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