Kolab Groupware OBS

Changes of Revision 2

roundcubemail-plugin-contextmenu.spec Changed

debian.changelog Changed

roundcubemail-plugin-contextmenu-2.1.tar.gz/CHANGELOG -> roundcubemail-plugin-contextmenu-2.1.1.tar.gz/CHANGELOG Changed

roundcubemail-plugin-contextmenu-2.1.tar.gz/MANUAL.md -> roundcubemail-plugin-contextmenu-2.1.1.tar.gz/MANUAL.md Changed

@@ -87,7 +87,7 @@
 * `label` (string) required - text for the menu element
 * `command` (string) required - the Roundcube command to execute on click
 * `props` (string) optional - arguments to pass to the Roundcube command
-* `class` (string) optional - class(es) to apply to the menu element
+* `classes` (string) optional - classes to apply to the menu element
 
 ## Working with an existing Contextmenu
 
@@ -97,7 +97,7 @@
   // identify the folder list context menu
   if (menu.menu_name == 'folderlist') {
     // add a shortcut to the folder management screen to the end of the menu
-    menu.menu_source.push({label: 'Manage folders', command: 'folders', props: '', class: 'managefolders'});
+    menu.menu_source.push({label: 'Manage folders', command: 'folders', props: '', classes: 'managefolders'});
 
     // make sure this new shortcut is always active
     menu.addEventListener('activate', function(p) {
@@ -126,6 +126,8 @@
 
 To make sure an element in the Contextmenu is always active give it the class `rcm_active`.
 
+The environmental variable `rcmail.env.context_menu_source_id` contains the ID of the specific element that the Contextmenu was triggered on, this is the `source_id` passed to `rcm_show_menu`
+
 ## Events
 
 The following events are triggered by Contextmenu:

roundcubemail-plugin-contextmenu-2.1.tar.gz/README.md -> roundcubemail-plugin-contextmenu-2.1.1.tar.gz/README.md Changed

roundcubemail-plugin-contextmenu-2.1.tar.gz/composer.json -> roundcubemail-plugin-contextmenu-2.1.1.tar.gz/composer.json Changed

roundcubemail-plugin-contextmenu-2.1.tar.gz/contextmenu.js -> roundcubemail-plugin-contextmenu-2.1.1.tar.gz/contextmenu.js Changed

@@ -2,9 +2,9 @@
  * ContextMenu plugin script
  */
 
-rcube_webmail.prototype.context_menu_hide_bound = false;
 rcube_webmail.prototype.context_menu_commands = new Array();
 rcube_webmail.prototype.context_menu_popup_menus = new Array();
+rcube_webmail.prototype.context_menu_popup_commands = {};
 
 rcube_webmail.prototype.context_menu_command_pattern = /rcmail\.command\(\'([^\']+)\',\s?\'([^\']*)\'/;
 
@@ -17,6 +17,7 @@
 			rcmail.env.contextmenu_selection = p.ref.list_selection(true);
 		},
 		'afteractivate': function(p) {
+			p.ref.menu_selection = p.ref.list_object.get_selection();
 			p.ref.list_selection(false, rcmail.env.contextmenu_selection);
 		}
 	}, events));
@@ -280,13 +281,28 @@
 
 	// hide any other open menus
 	for (var i = 0; i < rcmail.menu_stack.length; i++) {
-		rcmail.hide_menu(rcmail.menu_stack[i]);
+		rcmail.hide_menu(rcmail.menu_stack[i], e);
 	}
 
 	rcmail.env.context_menu_source_id = id;
 	menu.show(obj, e);
 }
 
+function rcm_hide_menu(e, sub_only) {
+	$.each($(sub_only ? '.rcmsubmenu' : 'div.contextmenu'), function() {
+		if ($(this).is(':visible')) {
+			$(this).hide();
+			rcmail.triggerEvent('menu-close', { name: $(this).attr('id'), props:{ menu: $(this).attr('id') }, originalEvent: e });
+		}
+	});
+
+	// close popup menus opened by the contextmenu
+	for (var i = rcmail.context_menu_popup_menus.length - 1; i >= 0; i--) {
+		rcmail.hide_menu(rcmail.context_menu_popup_menus[i], e);
+		rcmail.context_menu_popup_menus.pop();
+	}
+}
+
 function rcube_context_menu(p) {
 	this.menu_name = null;
 	this.menu_source = null;
@@ -315,25 +331,23 @@
 		if (!this.container) {
 			rcmail.triggerEvent('contextmenu_init', this);
 
-			var rows = [],
-			ul = $('<ul class="toolbarmenu iconized" role="menu">'),
-			li = document.createElement('li'),
-			link = document.createElement('a'),
-			span = document.createElement('span');
+			this.container = $('<div id="rcm_'+ this.menu_name +'" style="display: none;"></div>');
+			this.container.addClass('contextmenu popupmenu');
+			this.container.addClass(this.is_submenu ? 'rcmsubmenu' : 'rcmmainmenu');
 
-			this.container = $('<div id="rcm_'+ this.menu_name +'" class="contextmenu popupmenu" style="display: none;"></div>');
+			var rows = [], ul = $('<ul role="menu">'),
+			li = $('<li>'),	link = $('<a>'), span = $('<span>');
 
-			li.setAttribute('role', 'menuitem');
-			link.href = '#';
-			link.className = 'icon active';
-			link.setAttribute('role', 'button');
-			link.setAttribute('tabindex', '-1');
-			link.setAttribute('aria-disabled', 'true');
-			span.className = this.is_submenu ? 'icon' : 'icon cmicon';
+			ul.addClass('toolbarmenu iconized');
+			li.attr('role', 'menuitem');
 
-			if (this.is_submenu) {
-				this.container.addClass('rcmsubmenu');
-			}
+			link.attr('href', '#');
+			link.addClass('icon active');
+			link.attr('role', 'button');
+			link.attr('tabindex', '-1');
+			link.attr('aria-disabled', 'true');
+
+			span.addClass('icon');
 
 			// loop over possible menu elements and build settings object
 			sources = typeof this.menu_source == 'string' ? [this.menu_source] : this.menu_source;
@@ -381,7 +395,7 @@
 						elem = $('<a>').attr('href', '#')
 								.attr('id', 'rcmjs')
 								.attr('onclick', "return rcmail.command('"+ this.command +"','"+ this.props +"',this,event)")
-								.addClass(this.class)
+								.addClass(this.classes)
 								.html(this.label);
 					}
 					else {
@@ -403,38 +417,59 @@
 						return;
 					}
 
-					var a = link.cloneNode(false), row = li.cloneNode(false);
+					var a = link.clone(), row = li.clone();
 
 					// add command name element
-					tmp = span.cloneNode(false);
-					$(tmp).text($.trim(elem.text()).length > 0 ? $.trim(elem.text()) : elem.attr('title'));
-					$(tmp).addClass(elem.children('span').attr('class') ? elem.children('span').attr('class') : '');
-					a.appendChild(tmp);
-					$(a).addClass(elem.attr('class') ? elem.attr('class') : '');
-					$(a).removeClass('button').removeClass('disabled');
-					$(a).addClass('rcm_elem_' + elem.attr('id'));
+					tmp = span.clone();
+					tmp.text($.trim(elem.text()).length > 0 ? $.trim(elem.text()) : elem.attr('title'));
+					tmp.addClass(elem.children('span').attr('class'));
+					a.append(tmp);
+					a.addClass(elem.attr('class'));
+					a.removeClass('button').removeClass('disabled');
+					a.addClass('rcm_elem_' + elem.attr('id'));
 
 					if (elem.attr('onclick').match(rcmail.context_menu_popup_pattern)) {
-						$(a).data('command', RegExp.$1);
-						$(row).addClass('submenu');
-						a.onclick = function(e) { ref.submenu(a, e); return false; }
+						a.data('command', RegExp.$1);
+						a.append($('<span>').addClass('right-arrow'));
+						row.addClass('submenu');
+						a.click(function(e) {
+							if (!$(this).hasClass('active'))
+								return;
+
+							ref.submenu(a, e);
+							return false;
+						});
 
 						if (ref.mouseover_timeout > -1) {
-							a.onmouseover = function(e) {
-								ref.timers['submenu_show'] = window.setTimeout(function() {
+							a.mouseover(function(e) {
+								if (!$(this).hasClass('active'))
+									return;
+
+								ref.timers['submenu_show'] = window.setTimeout(function(a, e) {
 									ref.submenu(a, e);
-								}, ref.mouseover_timeout);
-							}
+								}, ref.mouseover_timeout, a, e);
+							});
 
-							a.onmouseout = function(e) { $(this).blur(); clearTimeout(ref.timers['submenu_show']);	}
+							a.mouseout(function(e) {
+								if (!$(this).hasClass('active'))
+									return;
+
+								$(this).blur(); clearTimeout(ref.timers['submenu_show']);
+							});
 						}
 					}
 					else {
-						$(a).data('command', command);
+						a.addClass('cmd_' + command);
+						a.data('command', command);
 						if (elem.attr('target'))
-							$(a).attr('target', elem.attr('target'));
+							a.attr('target', elem.attr('target'));
+
+						a.click(function(e) {
+							if ($(this).parents('.rcmsubmenu').length == 0) {
+								rcm_hide_menu(e, true);
+								clearTimeout(ref.timers['submenu_hide']);
+							}
 
-						a.onclick = function(e) {
 							var cur_popups = rcmail.menu_stack.length;
 							var result;
 
@@ -450,28 +485,33 @@
 								ref.parent_menu.triggerEvent('aftercommand', {ref: ref, el: this, command: command, args: args});
 
 							if (rcmail.menu_stack.length > cur_popups) {
-								rcmail.context_menu_popup_menus.push(rcmail.menu_stack[rcmail.menu_stack.length - 1]);
+								var popup_name = rcmail.menu_stack[rcmail.menu_stack.length - 1];
+								rcmail.context_menu_popup_menus.push(popup_name);
+
+								// make sure enabled commands match context menu message selection
+								$.each(rcmail.context_menu_popup_commands[popup_name], function(cmd, state) {
+									rcmail.enable_command(cmd, state);
+								});
 							}
 
 							// ensure menu is always hidden after action (for Safari)
 							ref.hide(e);
 
 							return result;
-						}
+						});
 
 						if (ref.mouseover_timeout > -1 && !ref.is_submenu) {
-							a.onmouseover = function(e) {
-								ref.timers['submenu_hide'] = window.setTimeout(function() {
-									$('div.rcmsubmenu').hide();
-									$('#folder-selector').hide();
-								}, ref.mouseover_timeout);
-							}
+							a.mouseover(function(e) {
+								ref.timers['submenu_hide'] = window.setTimeout(function(e) {
+									rcm_hide_menu(e, true);
+								}, ref.mouseover_timeout, e);
+							});
 
-							a.onmouseout = function(e) { clearTimeout(ref.timers['submenu_hide']); }
+							a.mouseout(function(e) { clearTimeout(ref.timers['submenu_hide']); });
 						}
 					}
 
-					row.appendChild(a);
+					row.append(a);
 					ref.parent_menu.triggerEvent('insertitem', {item: row});
 					rows.push(row);
 				});
@@ -480,24 +520,6 @@
 			ul.append(rows).appendTo(this.container);
 			this.parent_menu.triggerEvent('init', {ref: this});
 			this.container.appendTo($('body'));
-
-			if (!rcmail.context_menu_hide_bound) {
-				// Hide bindings
-				$(document.body).bind('click contextmenu', function(e) {
-					ref.hide(e);
-				});
-
-				// Hide menu after clicks in iframes (eg. preview pane)
-				$('iframe').load(function() {
-					// this == iframe
-					var doc = this.contentDocument ? this.contentDocument : this.contentWindow ? this.contentWindow.document : null;
-					doc.onclick = function() { $(document.body).trigger('click'); };
-				});
-
-				$('iframe').contents().mouseup( function() { $(document.body).trigger('click'); } );
-
-				rcmail.context_menu_hide_bound = true;
-			}
 		}
 	};
 
@@ -561,6 +583,7 @@
 		if (!callback || callback.show !== false) {
 			this.selected_object = obj;
 			this.container.show();
+			rcmail.triggerEvent('menu-open', { name: this.container.attr('id'), props:{ menu: this.container.attr('id') }, originalEvent: e });
 		}
 	};
 
@@ -571,15 +594,7 @@
 		if ($('div.contextmenu').is(':visible') && (rcmail.context_menu_popup_menus.length == 0 || $(target).parents('div.contextmenu').length == 0)) {
 			this.selected_object = null;
 			$('.' + this.source_class).removeClass(this.source_class);
-			$('div.contextmenu').hide();
-
-			// close popup menus opened by the contextmenu
-			for (var i = rcmail.context_menu_popup_menus.length - 1; i >= 0; i--) {
-				//@TODO - fix for rc issue #1490027
-				//rcmail.hide_menu(rcmail.context_menu_popup_menus[i]);
-				$('#' + rcmail.context_menu_popup_menus[i]).hide();
-				rcmail.context_menu_popup_menus.pop();
-			}
+			rcm_hide_menu(e);
 
 			for (var i in rcmail.context_menu_commands) {
 				if (!rcmail.context_menu_commands[i]) {
@@ -602,12 +617,12 @@
 				e.stopPropagation();
 		}
 
-		$('.rcmsubmenu').hide();
-		$('#folder-selector').hide();
+		rcm_hide_menu(e, true);
 
 		var id = rcmail.gui_containers[$(link).data('command')] ? rcmail.gui_containers[$(link).data('command')].attr('id') : $(link).data('command');
 		if (!this.submenus[id]) {
-			this.submenus[id] = new rcube_context_menu({'menu_name': id, 'menu_source': '#' + id + ' ul', 'parent_menu': this, 'parent_object': link, 'is_submenu': true, 'list_object': this.list_object});
+			var elem = !$('#' + id).is('ul') ? '#' + id + ' ul' : '#' + id; // check if the container returned is a ul else there should be one directly beneath it
+			this.submenus[id] = new rcube_context_menu({'menu_name': id, 'menu_source': elem, 'parent_menu': this, 'parent_object': link, 'is_submenu': true, 'list_object': this.list_object});
 			this.submenus[id].init();
 		}
 
@@ -640,6 +655,11 @@
 	};
 
 	this.list_selection = function(show, prev_sel) {
+		// make the system think no preview pane exists while we do some fake message selects
+		// to enable/disable relevent commands for current selection
+		var prev_contentframe = rcmail.env.contentframe;
+		rcmail.env.contentframe = null;
+
 		if (show) {
 			if (this.list_object.selection.length == 0 || !this.list_object.in_selection(rcmail.env.context_menu_source_id)) {
 				prev_sel = this.list_object.get_selection();
@@ -650,6 +670,11 @@
 
 				this.list_object.triggerEvent('select');
 			}
+			else {
+				// trigger a select event to update active commands
+				// use case: select multiple message, open contextmenu; open contextmenu on a message not in selection; open contextmenu on selection
+				this.list_object.triggerEvent('select');
+			}
 		}
 		else if (prev_sel) {
 			for (var i in prev_sel)
@@ -659,6 +684,8 @@
 			this.list_object.triggerEvent('select');
 		}
 
+		rcmail.env.contentframe = prev_contentframe;
+
 		return prev_sel;
 	};
 
@@ -667,26 +694,18 @@
 	this.triggerEvent = rcube_event_engine.prototype.triggerEvent;
 };
 
-function rcm_override_mailbox_command(props, before) {
+function rcm_override_mailbox_command(menu, props, before) {
 	if ($('div.contextmenu').is(':visible') && $.inArray(props.action, rcmail.context_menu_overload_commands) >= 0) {
 		if (before) {
-			rcmail.env.context_menu_prev_sel = null;
-			if (rcmail.message_list.selection.length == 0 || !rcmail.message_list.in_selection(rcmail.env.context_menu_source_id)) {
-				rcmail.env.context_menu_prev_sel = rcmail.message_list.get_selection();
-				rcmail.message_list.highlight_row(rcmail.env.context_menu_source_id, true);
-
-				for (var i in rcmail.env.context_menu_prev_sel)
-					rcmail.message_list.highlight_row(rcmail.env.context_menu_prev_sel[i], true);
+			rcmail.env.context_menu_prev_display_next = rcmail.env.display_next;
+			if (!(menu.list_object.selection.length == 1 && menu.list_object.in_selection(rcmail.env.context_menu_source_id)))
+				rcmail.env.display_next = false;
 
-				rcmail.message_list.triggerEvent('select');
-			}
+			rcmail.env.context_menu_prev_sel = menu.list_selection(true);
 		}
 		else if (rcmail.env.context_menu_prev_sel) {
-			for (var i in rcmail.env.context_menu_prev_sel)
-				rcmail.message_list.highlight_row(rcmail.env.context_menu_prev_sel[i], true);
-
-			rcmail.message_list.highlight_row(rcmail.env.context_menu_source_id, true);
-			rcmail.message_list.triggerEvent('select');
+			menu.list_selection(false, rcmail.env.context_menu_prev_sel);
+			rcmail.env.display_next = rcmail.env.context_menu_prev_display_next;
 		}
 	}
 }
@@ -707,7 +726,7 @@
 	return found;
 }
 
-function rcm_addressbook_selector(event, type, callback) {
+function rcm_addressbook_selector(event, command, callback) {
 	var container = rcmail.rcm_addressbook_selector_element;
 
 	if (!container) {
@@ -741,7 +760,7 @@
 			container.css('max-height', $('li', container)[0].offsetHeight * 10 + 9);
 
 		// register delegate event handler for folder item clicks
-		container.on('click', 'a.active', function(e){
+		container.on('click', 'a.active', {cmd: command}, function(e) {
 			container.data('callback')(this, e);
 			return false;
 		});
@@ -759,7 +778,8 @@
 	if (source == '' && rcmail.env.selection_sources.length == 1)
 		source = rcmail.env.selection_sources[0];
 
-	if (type == 'move' && source) {
+	// hide currently open address book from menu
+	if (source) {
 		$.each(container.find('a'), function() {
 			if (($(this).data('source') && $(this).data('source') == source) || $(this).data('id') == source)
 				$(this).parent('li').hide();
@@ -770,6 +790,64 @@
 	rcmail.show_menu('addressbook-selector', true, event);
 }
 
+function rcm_group_selector(event, command, callback) {
+	var container = rcmail.rcm_addressgroup_selector_element;
+
+	if (!container) {
+		var rows = [],
+			ul = $('<ul class="toolbarmenu">');
+
+		container = $('<div id="addressgroup-selector" class="popupmenu"></div>');
+
+		// loop over address books
+		$.each(rcmail.env.address_sources, function() {
+			if (this.id === rcmail.env.source) {
+				var ref = this;
+				$.each(rcmail.env.contactgroups, function() {
+					rows.push(rcm_addressbook_selector_item(this, ref.id));
+				});
+			}
+		});
+
+		ul.append(rows).appendTo(container);
+
+		// remove indent added by rcm_addressbook_selector_item()
+		$(ul).find('a').removeAttr('style');
+
+		// temporarily show element to calculate its size
+		container.css({left: '-1000px', top: '-1000px'})
+			.appendTo($('body')).show();
+
+		// set max-height if the list is long
+		if (rows.length > 10)
+			container.css('max-height', $('li', container)[0].offsetHeight * 10 + 9);
+
+		// register delegate event handler for folder item clicks
+		container.on('click', 'a.active', {cmd: command}, function(e) {
+			container.data('callback')(this, e);
+			return false;
+		});
+
+		rcmail.rcm_addressgroup_selector_element = container;
+	}
+
+	container.data('callback', callback);
+
+	// customize menu for move or copy
+	container.find('li').show();
+
+	// hide currently open group from menu
+	if (rcmail.env.group) {
+		$.each(container.find('a'), function() {
+			if ($(this).data('id') == rcmail.env.group)
+				$(this).parent('li').hide();
+		});
+	}
+
+	// position menu on the screen
+	rcmail.show_menu('addressgroup-selector', true, event);
+}
+
 function rcm_addressbook_selector_item(obj, abook_id) {
 	if (abook_id && abook_id === obj.source || !abook_id) {
 		var a = $('<a>').attr('href', '#').addClass('icon'),
@@ -794,63 +872,136 @@
 
 $(document).ready(function() {
 	if (window.rcmail) {
-		rcmail.env.contextmenus = new Array();
+		rcmail.env.contextmenus = {};
 
-		rcmail.register_command('plugin.contextmenu.readfolder', function(props, obj) {
-			var lock = rcmail.set_busy(true, 'loading');
-			rcmail.http_post('plugin.contextmenu.readfolder', {'_mbox': rcmail.env.context_menu_source_id, '_cur': rcmail.env.mailbox}, lock);
-		}, false);
+		rcmail.addEventListener('init', function() {
+			// no need to reattach events inside iframe
+			if (rcmail.is_framed())
+				return;
 
-		rcmail.register_command('plugin.contextmenu.collapseall', function(props, obj) {
-			$("#mailboxlist div.expanded").each(function() { $(this).click(); });
-		}, false);
+			var body_mouseup = function(e) { $.each(rcmail.env.contextmenus, function() { this.hide(e); }); };
+			$(document.body).bind('click contextmenu', body_mouseup);
 
-		rcmail.register_command('plugin.contextmenu.expandall', function(props, obj) {
-			$("#mailboxlist div.collapsed").each(function() { $(this).click(); });
-		}, false);
+			// Hide menu after clicks in iframes (eg. preview pane)
+			$('iframe').load(function(e) {
+				try { $(this.contentDocument || this.contentWindow).on('mouseup', body_mouseup) }
+				catch (e) { /* catch possible "Permission denied" error in IE */ }
+			})
+			.contents().on('mouseup', body_mouseup);
+		});
 
-		rcmail.register_command('plugin.contextmenu.openfolder', function(props, obj) {
-			var button_id = rcmail.buttons['plugin.contextmenu.openfolder'][0].id;
+		if ((rcmail.env.task == 'mail' || rcmail.env.task == 'addressbook') && rcmail.env.action == '') {
+			// special handeling for move/copy functions (folder/address book selector)
+			rcmail.addEventListener('actionbefore', function(props) {
+				var menu = rcmail.env.task == 'addressbook' ? rcmail.env.contextmenus['contactlist'] : rcmail.env.contextmenus['messagelist'];
+				rcm_override_mailbox_command(menu, props, true);
+			});
 
-			rcube_find_object(button_id).href = '?_task=mail&_mbox='+urlencode(rcmail.env.context_menu_source_id);
-			rcmail.sourcewin = window.open(rcube_find_object(button_id).href);
-			if (rcmail.sourcewin)
-				window.setTimeout(function() { rcmail.sourcewin.focus(); }, 20);
+			rcmail.addEventListener('actionafter', function(props) {
+				var menu = rcmail.env.task == 'addressbook' ? rcmail.env.contextmenus['contactlist'] : rcmail.env.contextmenus['messagelist'];
+				rcm_override_mailbox_command(menu, props, false);
+			});
+		}
 
-			rcube_find_object(button_id).href = '#';
-		}, false);
+		if (rcmail.env.task == 'mail' && rcmail.env.action == '') {
+			rcmail.register_command('plugin.contextmenu.readfolder', function(props, obj) {
+				var lock = rcmail.set_busy(true, 'loading');
+				rcmail.http_post('plugin.contextmenu.readfolder', {'_mbox': rcmail.env.context_menu_source_id, '_cur': rcmail.env.mailbox}, lock);
+			}, false);
 
-		rcmail.register_command('plugin.contextmenu.copy_contact', function(command, obj, event) {
-			return rcm_addressbook_selector(event, command, function(obj, evt) {
-				var menu = rcmail.env.contextmenus['contactlist'];
-				var prev_display_next = rcmail.env.display_next;
+			rcmail.register_command('plugin.contextmenu.collapseall', function(props, obj) {
+				$("#mailboxlist div.expanded").each(function() { $(this).click(); });
+			}, false);
 
-				if (!(menu.list_object.selection.length == 1 && menu.list_object.in_selection(rcmail.env.context_menu_source_id)))
-					rcmail.env.display_next = false;
+			rcmail.register_command('plugin.contextmenu.expandall', function(props, obj) {
+				$("#mailboxlist div.collapsed").each(function() { $(this).click(); });
+			}, false);
 
-				var prev_sel = menu.list_selection(true);
+			rcmail.register_command('plugin.contextmenu.openfolder', function(props, obj) {
+				var button_id = rcmail.buttons['plugin.contextmenu.openfolder'][0].id;
 
-				// search result may contain contacts from many sources, but if there is only one...
-				var source = rcmail.env.source;
-				if (source == '' && rcmail.env.selection_sources.length == 1)
-					source = rcmail.env.selection_sources[0];
+				rcube_find_object(button_id).href = '?_task=mail&_mbox='+urlencode(rcmail.env.context_menu_source_id);
+				rcmail.sourcewin = window.open(rcube_find_object(button_id).href);
+				if (rcmail.sourcewin)
+					window.setTimeout(function() { rcmail.sourcewin.focus(); }, 20);
 
-				if (command == 'copy' && $(obj).data('source') && $(obj).data('source') == source) {
-					rcmail.group_member_change('add', rcmail.contact_list.get_selection().join(','), $(obj).data('source'), $(obj).data('id'));
-				}
-				else if ($(obj).data('source')) {
-					rcmail.command(command, rcmail.env.contactgroups['G' + $(obj).data('source') + $(obj).data('id')], evt);
-				}
-				else {
-					rcmail.command(command, rcmail.env.address_sources[$(obj).data('id')], evt);
-				}
+				rcube_find_object(button_id).href = '#';
+			}, false);
+		}
 
-				menu.list_selection(false, prev_sel);
-				rcmail.env.display_next = prev_display_next;
+		if (rcmail.env.task == 'addressbook' && rcmail.env.action == '') {
+			// address book selector
+			rcmail.addEventListener('actionbefore', function(props) {
+				if ((props.action == 'move' || props.action == 'copy') && props.props == '') {
+					rcm_addressbook_selector(props.originalEvent, props.action, function(obj, evt) {
+						// search result may contain contacts from many sources, but if there is only one...
+						var source = rcmail.env.source;
+						if (source == '' && rcmail.env.selection_sources.length == 1)
+							source = rcmail.env.selection_sources[0];
+
+						if ($(obj).data('source')) {
+							rcmail.command(evt.data.cmd, rcmail.env.contactgroups['G' + $(obj).data('source') + $(obj).data('id')], evt);
+						}
+						else {
+							rcmail.command(evt.data.cmd, rcmail.env.address_sources[$(obj).data('id')], evt);
+						}
+					});
+
+					return false;
+				}
 			});
-		}, false);
-		rcmail.addEventListener('group_insert', function() { $("#addressbook-selector").remove(); rcmail.rcm_addressbook_selector_element = undefined; } );
-		rcmail.addEventListener('group_update', function() { $("#addressbook-selector").remove(); rcmail.rcm_addressbook_selector_element = undefined; } );
-		rcmail.addEventListener('group_delete', function() { $("#addressbook-selector").remove(); rcmail.rcm_addressbook_selector_element = undefined; } );
+
+			// address book group selector
+			rcmail.register_command('plugin.contextmenu.assigngroup', function(props, obj, event) {
+				rcm_group_selector(event, props, function(obj, evt) {
+					// search result may contain contacts from many sources, but if there is only one...
+					rcm_override_mailbox_command(rcmail.env.contextmenus['contactlist'], { action: 'copy' } , true);
+					rcmail.group_member_change('add', rcmail.contact_list.get_selection().join(','), rcmail.env.source, $(obj).data('id'));
+					rcm_override_mailbox_command(rcmail.env.contextmenus['contactlist'], { action: 'copy' } , false);
+				});
+			}, false);
+
+			// reset address book selector when groups change
+			rcmail.addEventListener('group_insert', function() { $("#addressbook-selector").remove(); $("#addressgroup-selector").remove(); rcmail.rcm_addressbook_selector_element = undefined; rcmail.rcm_addressgroup_selector_element  = undefined; } );
+			rcmail.addEventListener('group_update', function() { $("#addressbook-selector").remove(); $("#addressgroup-selector").remove(); rcmail.rcm_addressbook_selector_element = undefined; rcmail.rcm_addressgroup_selector_element  = undefined; } );
+			rcmail.addEventListener('group_delete', function() { $("#addressbook-selector").remove(); $("#addressgroup-selector").remove(); rcmail.rcm_addressbook_selector_element = undefined; rcmail.rcm_addressgroup_selector_element  = undefined; } );
+		}
+
+		// special event listeners for intreacting with plugins which open popup menus (eg: zipdownload)
+		rcmail.addEventListener('menu-open', function(p) {
+			// check for popupmenus that arent part of contextmenu
+			if ($('div.contextmenu').is(':visible') && p.name.indexOf('rcm_') != 0) {
+				rcmail.context_menu_popup_commands[p.name] = {};
+				$('#' + p.name).find('a').each(function() {
+					if ($(this).attr('onclick') && $(this).attr('onclick').match(rcmail.context_menu_command_pattern)) {
+						var cmd = RegExp.$1;
+						rcmail.context_menu_popup_commands[p.name][cmd] = rcmail.commands[cmd];
+					}
+				});
+			}
+		});
+
+		rcmail.addEventListener('menu-close', function(p) {
+			// check for popupmenus that arent part of contextmenu
+			var e = p.originalEvent.currentTarget ? p.originalEvent.currentTarget : p.originalEvent.srcElement;
+			if ($('div.contextmenu').is(':visible') && p.name.indexOf('rcm_') != 0 && $(e).attr('class').indexOf('rcm_elem_') == -1) {
+				rcm_hide_menu(p.originalEvent);
+			}
+		});
+
+		rcmail.addEventListener('get_single_uid', function() {
+			if ($('#rcm_messagelist').is(':visible') && rcmail.env.contextmenus['messagelist'].menu_selection.length == 1) {
+				return rcmail.env.contextmenus['messagelist'].menu_selection[0];
+			}
+		});
+
+		rcmail.addEventListener('get_single_cid', function() {
+			if ($('#rcm_contactlist').is(':visible') && rcmail.env.contextmenus['contactlist'].menu_selection.length == 1) {
+				return rcmail.env.contextmenus['contactlist'].menu_selection[0];
+			}
+			else if ($('#rcm_composeto').is(':visible') && rcmail.env.contextmenus['composeto'].menu_selection.length == 1) {
+				return rcmail.env.contextmenus['composeto'].menu_selection[0];
+			}
+		});
 	}
 });
\ No newline at end of file

roundcubemail-plugin-contextmenu-2.1.tar.gz/contextmenu.php -> roundcubemail-plugin-contextmenu-2.1.1.tar.gz/contextmenu.php Changed

@@ -24,8 +24,9 @@
 			}
 		}
 
-		if ($rcmail->task == 'addressbook') {
-			$rcmail->output->add_label('moveto', 'copyto');
+		if ($rcmail->task == 'addressbook' && $rcmail->action == '') {
+			// give other plugins a change to add address books before checking if they exist for the menu
+			$this->add_hook('render_page', array($this, 'addition_addressbook_options'));
 		}
 
 		if ($rcmail->output->type == 'html') {
@@ -52,6 +53,23 @@
 		$this->api->output->add_footer(html::div(array('style' => 'display: none;', 'aria-hidden' => 'true'), $out));
 	}
 
+	public function addition_addressbook_options()
+	{
+		$this->add_texts('localization/');
+
+		$li = '';
+		$li .= html::tag('li', array('role' => 'menuitem'), $this->api->output->button(array('command' => 'plugin.contextmenu.assigngroup', 'type' => 'link', 'class' => 'assigngroup disabled', 'classact' => 'assigngroup active', 'label' => 'contextmenu.assigngroup', 'tabindex' => '-1', 'aria-disabled' => 'true')));
+
+		if (count(rcube::get_instance()->get_address_sources(true)) > 1) {
+			// only show the move option if there are sources to move between
+			$li .= html::tag('li', array('role' => 'menuitem'), $this->api->output->button(array('command' => 'move', 'type' => 'link', 'class' => 'movecontact disabled', 'classact' => 'movecontact active', 'label' => 'moveto', 'tabindex' => '-1', 'aria-disabled' => 'true')));
+			$li .= html::tag('li', array('role' => 'menuitem'), $this->api->output->button(array('command' => 'copy', 'type' => 'link', 'class' => 'copycontact disabled', 'classact' => 'copycontact active', 'label' => 'copyto', 'tabindex' => '-1', 'aria-disabled' => 'true')));
+		}
+
+		$out = html::tag('ul', array('id' => 'rcmAddressBookMenu', 'role' => 'menu'), $li);
+		$this->api->output->add_footer(html::div(array('style' => 'display: none;', 'aria-hidden' => 'true'), $out));
+	}
+
 	public function readfolder()
 	{
 		$storage = rcube::get_instance()->storage;

roundcubemail-plugin-contextmenu-2.1.tar.gz/localization/en_GB.inc -> roundcubemail-plugin-contextmenu-2.1.1.tar.gz/localization/en_GB.inc Changed

roundcubemail-plugin-contextmenu-2.1.tar.gz/localization/en_US.inc -> roundcubemail-plugin-contextmenu-2.1.1.tar.gz/localization/en_US.inc Changed

roundcubemail-plugin-contextmenu-2.1.tar.gz/skins/classic/contextmenu.css -> roundcubemail-plugin-contextmenu-2.1.1.tar.gz/skins/classic/contextmenu.css Changed

@@ -20,109 +20,253 @@
   color: #fff;
 }
 
-div.contextmenu a {
+div.contextmenu a
+{
+  position: relative;
   outline: 0;
   padding: 0 !important;
 }
 
-div.contextmenu ul li a span {
+div.contextmenu ul.iconized li a span
+{
   display: block;
   padding: 1px 12px 3px 28px;
 }
 
-div.contextmenu ul li a span.icon
+div.contextmenu ul.iconized li a span.icon
 {
   background: url(images/contexticons.png) no-repeat 0 20px;
 }
 
-div.contextmenu ul li.submenu a span.icon
+div.contextmenu ul.iconized li.submenu a span.icon
 {
-  background-position: right 0;
   padding-right: 15px;
 }
 
-div.contextmenu ul li a.reply span.icon
+div.contextmenu ul.iconized li.submenu a span.right-arrow
+{
+  position: absolute;
+  top: 0;
+  right: 0;
+  height: 15px;
+  width: 15px;
+  background: url(images/contexticons.png) no-repeat right 1px;
+}
+
+div.contextmenu ul.iconized li a.reply span.icon
 {
   background-position: 7px -119px;
 }
 
-div.contextmenu ul li a.delete span.icon
+div.contextmenu ul.iconized li a.replyAll span.icon
+{
+  background-position: 7px -392px;
+}
+
+div.contextmenu ul.iconized li a.replyalllink span.icon
+{
+  background-position: 7px -392px;
+}
+
+div.contextmenu ul.iconized li a.replylistlink span.icon
+{
+  background-position: 7px -377px;
+}
+
+div.contextmenu ul.iconized li a.forward span.icon
+{
+  background-position: 7px -102px;
+}
+
+div.contextmenu ul.iconized li a.forwardlink span.icon
+{
+  background-position: 7px -102px;
+}
+
+div.contextmenu ul.iconized li a.forwardattachmentlink span.icon
+{
+  background-position: 7px -361px;
+}
+
+div.contextmenu ul.iconized li a.delete span.icon
 {
   background-position: 7px -187px;
 }
 
-div.contextmenu ul li a.readlink span.icon
+div.contextmenu ul.iconized li a.markmessage span.icon
+{
+  background-position: 7px -457px;
+}
+
+div.contextmenu ul.iconized li a.readlink span.icon
 {
   background-position: 7px -85px;
 }
 
-div.contextmenu ul li a.unreadlink span.icon
+div.contextmenu ul.iconized li a.unreadlink span.icon
 {
   background-position: 7px -136px;
 }
-div.contextmenu ul li a.flaggedlink span.icon
+div.contextmenu ul.iconized li a.flaggedlink span.icon
 {
   background-position: 7px -170px;
 }
 
-div.contextmenu ul li a.unflaggedlink span.icon
+div.contextmenu ul.iconized li a.unflaggedlink span.icon
 {
   background-position: 7px -153px;
 }
 
-div.contextmenu ul li a.compose span.icon
+div.contextmenu ul.iconized li a.messagemenu span.icon
+{
+  background-position: 7px -475px;
+}
+
+div.contextmenu ul.iconized li a.compose span.icon
 {
   background-position: 8px -237px;
 }
 
-#rcm_messagemenu ul li a span.icon
+div.contextmenu ul.iconized li a.print span.icon
+{
+  background: url(images/messageactions.png) no-repeat 5px 1px;
+}
+
+div.contextmenu ul.iconized li a.readfolder span.icon
+{
+  background-position: 7px -85px;
+}
+
+div.contextmenu ul.iconized li a.collapseall span.icon
+{
+  background-position: 7px -203px;
+}
+div.contextmenu ul.iconized li a.expandall span.icon
+{
+  background-position: 7px -219px;
+}
+
+div.contextmenu ul.iconized li a.cmd_expunge span.icon
+{
+  background-position: 7px -254px;
+}
+
+div.contextmenu ul.iconized li a.cmd_purge span.icon
+{
+  background-position: 7px -271px;
+}
+
+div.contextmenu ul.iconized li a.openfolder span.icon
+{
+  background: url(images/messageactions.png) no-repeat 6px -52px;
+}
+
+div.contextmenu ul.iconized li a.movecontact span.icon
+{
+  background: url(images/messageactions.png) no-repeat 5px -161px;
+}
+
+div.contextmenu ul.iconized li a.copycontact span.icon
+{
+  background: url(images/messageactions.png) no-repeat 5px -143px;
+}
+
+div.contextmenu ul.iconized li a.export span.icon
+{
+  background-position: 7px -510px;
+}
+
+div.contextmenu ul.iconized li a.exportalllink span.icon
+{
+  background-position: 7px -527px;
+}
+
+div.contextmenu ul.iconized li a.exportsellink span.icon
+{
+  background-position: 7px -510px;
+}
+
+div.contextmenu ul.iconized li a.cmd_add-recipient span.icon
+{
+  background-position: 8px -236px;
+}
+
+div.contextmenu ul.iconized li a.cmd_group-create span.icon,
+div.contextmenu ul.iconized li a.assigngroup span.icon
+{
+  background-position: 7px -441px;
+}
+
+div.contextmenu ul.iconized li a.cmd_group-remove-selected span.icon
+{
+  background-position: 7px -492px;
+}
+
+div.contextmenu ul.iconized li a.cmd_group-rename span.icon
+{
+  background-position: 7px -426px;
+}
+
+div.contextmenu ul.iconized li a.cmd_group-delete span.icon
+{
+  background-position: 7px -186px;
+}
+
+div.contextmenu ul.iconized li a.cmd_search-delete span.icon
+{
+  background-position: 7px -186px;
+}
+
+#rcm_messagemenu ul.iconized li a span.icon
 {
   background: url(images/messageactions.png) no-repeat 5px 20px;
 }
 
-#rcm_messagemenu ul li a.printlink span.icon
+#rcm_messagemenu ul.iconized li a.printlink span.icon
 {
   background-position: 5px 1px;
 }
 
-#rcm_messagemenu ul li a.downloadlink span.icon
+#rcm_messagemenu ul.iconized li a.downloadlink span.icon
 {
   background-position: 5px -17px;
 }
 
-#rcm_messagemenu ul li a.editlink span.icon
+#rcm_messagemenu ul.iconized li a.editlink span.icon
 {
   background-position: 5px -70px;
 }
 
-#rcm_messagemenu ul li a.movelink span.icon
+#rcm_messagemenu ul.iconized li a.movelink span.icon
 {
   background-position: 5px -161px;
 }
 
-#rcm_messagemenu ul li a.copylink span.icon
+#rcm_messagemenu ul.iconized li a.copylink span.icon
 {
   background-position: 5px -143px;
 }
 
-#rcm_messagemenu ul li a.sourcelink span.icon
+#rcm_messagemenu ul.iconized li a.sourcelink span.icon
 {
   background-position: 5px -35px;
 }
 
-#rcm_messagemenu ul li a.openlink span.icon
+#rcm_messagemenu ul.iconized li a.openlink span.icon
 {
   background-position: 5px -52px;
 }
 
 /*** address book selector ***/
 
-#addressbook-selector li a
+#addressbook-selector li a,
+#addressgroup-selector li a
 {
   padding: 0;
 }
 
-#addressbook-selector li a span
+#addressbook-selector li a span,
+#addressgroup-selector li a span
 {
   background: url(images/contexticons.png) no-repeat 0 20px;
   display: block;
@@ -134,7 +278,8 @@
   text-overflow: ellipsis;
 }
 
-#addressbook-selector li a.active:hover span
+#addressbook-selector li a.active:hover span,
+#addressgroup-selector li a.active:hover span
 {
   color: white;
 }
@@ -144,7 +289,8 @@
   background-position: 5px -306px;
 }
 
-#addressbook-selector li a.contactgroup span
+#addressbook-selector li a.contactgroup span,
+#addressgroup-selector li a.contactgroup span
 {
   background-position: 5px -343px;
 }
\ No newline at end of file

roundcubemail-plugin-contextmenu-2.1.tar.gz/skins/classic/functions.js -> roundcubemail-plugin-contextmenu-2.1.1.tar.gz/skins/classic/functions.js Changed

@@ -2,24 +2,19 @@
  * ContextMenu plugin script
  */
 
-rcmail.context_menu_skip_commands.push('addressbook-group-remove-selected');
 rcube_webmail.prototype.context_menu_popup_pattern = /rcmail_ui\.show_popup\(\'([^\']+)\'/;
 rcube_webmail.prototype.context_menu_button_active_class = new Array('active', 'button');
 rcube_webmail.prototype.context_menu_button_disabled_class = new Array('disabled', 'buttonPas');
 
 function reorder_contact_menu(p) {
+	// put export link last
 	var ul = p.ref.container.find('ul:first');
 	$(p.ref.container).find('a.export').parent('li').appendTo(ul);
+}
 
-	var available_sources = 0;
-	$.each(rcmail.env.address_sources, function() {
-		if (!this.readonly)
-			available_sources++;
-	});
-
-	if (available_sources < 2) {
-		$(p.ref.container).find('a.movecontact').parent('li').remove();
-	}
+function reorder_abook_menu(p) {
+	// remove the remove from group option from the address book menu
+	p.ref.container.find('a.cmd_group-remove-selected').remove();
 }
 
 $(document).ready(function() {
@@ -27,29 +22,49 @@
 		if (rcmail.env.task == 'mail' && rcmail.env.action == '') {
 			rcmail.addEventListener('insertrow', function(props) { rcm_listmenu_init(props.row.id, {'menu_name': 'messagelist', 'menu_source': '#messagetoolbar'}); } );
 			rcmail.add_onload("rcm_foldermenu_init('#mailboxlist li', {'menu_source': ['#rcmFolderMenu', '#mailboxoptionsmenu ul']})");
-
-			// special handeling for move/copy functions (folder selector)
-			rcmail.addEventListener('actionbefore', function(props) { rcm_override_mailbox_command(props, true); } );
-			rcmail.addEventListener('actionafter', function(props) { rcm_override_mailbox_command(props, false); } );
 		}
-
-		if (rcmail.env.task == 'mail' && rcmail.env.action == 'compose') {
+		else if (rcmail.env.task == 'mail' && rcmail.env.action == 'compose') {
 			rcmail.addEventListener('insertrow', function(props) { rcm_listmenu_init(props.row.id, {'menu_name': 'composeto', 'menu_source': '#abookactions', 'list_object': rcmail.contact_list}); } );
 		}
-
-		if (rcmail.env.task == 'addressbook' && rcmail.env.action == '') {
-			rcmail.addEventListener('insertrow', function(props) { rcm_listmenu_init(props.row.id, {'menu_name': 'contactlist', 'menu_source': ['#abooktoolbar', {label: rcmail.gettext('moveto'), command: 'plugin.contextmenu.copy_contact', props: 'move', class: 'movecontact'}, {label: rcmail.gettext('copyto'), command: 'plugin.contextmenu.copy_contact', props: 'copy', class: 'copycontact'}], 'list_object': rcmail.contact_list}, {
+		else if (rcmail.env.task == 'addressbook' && rcmail.env.action == '') {
+			rcmail.addEventListener('contextmenu_init', function(menu) {
+				if (menu.menu_name == 'contactlist') {
+					// copy the remove from group option in the contact menu
+					if (btn = $('#' + rcmail.buttons['group-remove-selected'][0].id).clone()) {
+						// remove the ID and add override class
+						btn.removeAttr('id').addClass('rcm_active');
+						btn = $('<li>').attr('role', 'menuitem').append(btn);
+						btn.insertAfter($('#rcmAddressBookMenu').find('a.assigngroup').parent('li'));
+					}
+				}
+			});
+			rcmail.addEventListener('insertrow', function(props) { rcm_listmenu_init(props.row.id, {'menu_name': 'contactlist', 'menu_source': ['#abooktoolbar', '#rcmAddressBookMenu'], 'list_object': rcmail.contact_list}, {
 				'init': function(p) { reorder_contact_menu(p); },
 				'afteractivate': function(p) {
 					p.ref.list_selection(false, rcmail.env.contextmenu_selection);
 
-					if (rcmail.env.readonly)
-						p.ref.container.find('a.movecontact').removeClass('active').addClass('disabled');
+					// count the number of groups in the current addressbook
+					if (!rcmail.env.group || rcmail.env.readonly)
+						p.ref.container.find('a.cmd_group-remove-selected').removeClass('active').addClass('disabled');
+
+					// count the number of groups in the current addressbook
+					var groupcount = 0;
+					if (!rcmail.env.readonly && rcmail.env.address_sources[rcmail.env.source] && rcmail.env.address_sources[rcmail.env.source].groups)
+						$.each(rcmail.env.contactgroups, function(){ if (this.source === rcmail.env.source) groupcount++ });
+
+					if (groupcount > 0)
+						p.ref.container.find('a.assigngroup').removeClass('disabled').addClass('active');
+					else
+						p.ref.container.find('a.assigngroup').removeClass('active').addClass('disabled');
+				},
+				'aftercommand': function(p) {
+					if ($(p.el).hasClass('active') && p.command == 'group-remove-selected')
+						rcmail.command('listgroup', {'source': rcmail.env.source, 'id': rcmail.env.group}, p.el);
 				}
 			}); } );
-			rcmail.add_onload("rcm_abookmenu_init('#directorylist li, #savedsearchlist li', {'menu_source': ['#directorylist-footer', '#groupoptionsmenu ul']})");
-			rcmail.addEventListener('group_insert', function(props) { rcm_abookmenu_init(props.li, {'menu_source': ['#directorylist-footer', '#groupoptionsmenu ul']}) } );
-			rcmail.addEventListener('abook_search_insert', function(props) { rcm_abookmenu_init(rcmail.savedsearchlist.get_item('S' + props.id), {'menu_source': ['#directorylist-footer', '#groupoptionsmenu ul']}) } );
+			rcmail.add_onload("rcm_abookmenu_init('#directorylist li, #savedsearchlist li', {'menu_source': ['#directorylist-footer', '#groupoptionsmenu ul']}, {'init': function(p) { reorder_abook_menu(p); }})");
+			rcmail.addEventListener('group_insert', function(props) { rcm_abookmenu_init(props.li, {'menu_source': ['#directorylist-footer', '#groupoptionsmenu ul']}); } );
+			rcmail.addEventListener('abook_search_insert', function(props) { rcm_abookmenu_init(rcmail.savedsearchlist.get_item('S' + props.id), {'menu_source': ['#directorylist-footer', '#groupoptionsmenu ul']}); } );
 		}
 	}
 });
\ No newline at end of file

roundcubemail-plugin-contextmenu-2.1.tar.gz/skins/classic/images/contexticons.png -> roundcubemail-plugin-contextmenu-2.1.1.tar.gz/skins/classic/images/contexticons.png Changed

roundcubemail-plugin-contextmenu-2.1.tar.gz/skins/larry/contextmenu.css -> roundcubemail-plugin-contextmenu-2.1.1.tar.gz/skins/larry/contextmenu.css Changed

@@ -16,49 +16,199 @@
   background-color: #C7E3EF;
 }
 
-div.contextmenu a {
+div.contextmenu a
+{
+  position: relative;
   outline: 0;
   cursor: default;
 }
 
-div.contextmenu ul li a span.cmicon
+div.contextmenu.rcmmainmenu ul.iconized li a span.icon
 {
   background: url(images/contexticons.png) no-repeat 0 20px;
 }
 
-div.contextmenu ul li.submenu a span.cmicon
+div.contextmenu ul li.submenu a span.icon
 {
-  background-position: right -192px;
   padding-right: 18px;
 }
 
-div.contextmenu ul li a.reply span.cmicon
+div.contextmenu ul.iconized li.submenu a span.right-arrow
+{
+  position: absolute;
+  top: 5px;
+  right: 5px;
+  height: 15px;
+  width: 18px;
+  background: url(images/contexticons.png) no-repeat right -194px;
+  opacity: 0.2;
+}
+
+div.contextmenu ul.iconized li.submenu a.active span.right-arrow
+{
+  opacity: 0.99;
+}
+
+div.contextmenu ul.iconized li a.reply span.icon
 {
   background-position: 0 -122px;
 }
 
-div.contextmenu ul li a.delete span.cmicon
+div.contextmenu ul.iconized li a.reply-all span.icon
+{
+  background: url(images/contexticons.png) no-repeat 0 -147px;
+}
+
+div.contextmenu ul.iconized li a.replyalllink span.icon
+{
+  background: url(images/contexticons.png) no-repeat 0 -147px;
+}
+
+div.contextmenu ul.iconized li a.replylistlink span.icon
+{
+  background: url(images/contexticons.png) no-repeat 0 -464px;
+}
+
+div.contextmenu ul.iconized li a.forward span.icon
+{
+  background: url(images/contexticons.png) no-repeat 0 -169px;
+}
+
+div.contextmenu ul.iconized li a.forwardlink span.icon
+{
+  background: url(images/contexticons.png) no-repeat 0 -169px;
+}
+
+div.contextmenu ul.iconized li a.forwardattachmentlink span.icon
+{
+  background: url(images/contexticons.png) no-repeat 0 -445px;
+}
+
+div.contextmenu ul.iconized li a.delete span.icon
 {
   background-position: 0 -96px;
 }
 
-div.contextmenu ul li a.compose span.cmicon
+div.contextmenu ul.iconized li a.markmessage span.icon
+{
+  background-position: 0 -670px;
+}
+
+div.contextmenu ul.iconized li a.more span.icon
+{
+  background-position: 0 -690px;
+}
+
+div.contextmenu ul.iconized li a.compose span.icon
 {
   background-position: 0 -281px;
 }
 
-div.contextmenu ul li a.removegroup span.cmicon
+div.contextmenu ul.iconized li a.print span.icon
+{
+  background-position: 0 -710px;
+}
+
+div.contextmenu ul.iconized li a.removegroup span.icon
 {
   background-position: 0 -347px;
 }
 
+div.contextmenu ul.iconized li a.readfolder span.icon
+{
+  background-position: 0 -26px;
+}
+
+div.contextmenu ul.iconized li a.cmd_expunge span.icon
+{
+  background-position: 0 -523px;
+}
+
+div.contextmenu ul.iconized li a.cmd_purge span.icon
+{
+  background-position: 0 -504px;
+}
+
+div.contextmenu ul.iconized li a.collapseall span.icon
+{
+  background-position: 0 -326px;
+}
+
+div.contextmenu ul.iconized li a.expandall span.icon
+{
+  background-position: 0 -305px;
+}
+
+div.contextmenu ul.iconized li a.openfolder span.icon
+{
+  background-position: 0 -484px;
+}
+
+div.contextmenu ul.iconized li a.addto span.icon,
+div.contextmenu ul.iconized li a.addcc span.icon,
+div.contextmenu ul.iconized li a.addbcc span.icon
+{
+  background-position: 0 -281px;
+}
+
+div.contextmenu ul.iconized li a.movecontact span.icon
+{
+  background-position: 0 -632px;
+}
+
+div.contextmenu ul.iconized li a.copycontact span.icon
+{
+  background-position: 0 -651px;
+}
+
+div.contextmenu ul.iconized li a.export span.icon
+{
+  background: url(images/contexticons.png) no-repeat 0 -543px;
+}
+
+div.contextmenu ul.iconized li a.exportalllink span.icon
+{
+  background: url(images/contexticons.png) no-repeat 0 -568px;
+}
+
+div.contextmenu ul.iconized li a.exportsellink span.icon
+{
+  background: url(images/contexticons.png) no-repeat 0 -543px;
+}
+
+
+div.contextmenu ul.iconized li a.cmd_group-create span.icon,
+div.contextmenu ul.iconized li a.assigngroup span.icon
+{
+  background-position: 0 -613px;
+}
+
+div.contextmenu ul.iconized li a.cmd_group-rename span.icon
+{
+  background-position: 0 -591px;
+}
+
+div.contextmenu ul.iconized li a.cmd_group-delete span.icon
+{
+  background-position: 0 -96px;
+}
+
+div.contextmenu ul.iconized li a.cmd_search-delete span.icon
+{
+  background-position: 0 -96px;
+}
+
 /*** address book selector ***/
 
-#addressbook-selector {
+#addressbook-selector,
+#addressgroup-selector
+{
 	z-index: 1000;
 }
 
-#addressbook-selector li a span {
+#addressbook-selector li a span,
+#addressgroup-selector li a span
+{
   background: url(images/contexticons.png) no-repeat 0 20px;
   display: block;
   height: 17px;
@@ -69,10 +219,13 @@
   text-overflow: ellipsis;
 }
 
-#addressbook-selector li a.addressbook span {
+#addressbook-selector li a.addressbook span
+{
 	background-position: 0 -397px;
 }
 
-#addressbook-selector li a.contactgroup span {
-	background-position: 0 -421px;
+#addressbook-selector li a.contactgroup span,
+#addressgroup-selector li a.contactgroup span
+{
+	background-position: 0 -418px;
 }
\ No newline at end of file

roundcubemail-plugin-contextmenu-2.1.tar.gz/skins/larry/functions.js -> roundcubemail-plugin-contextmenu-2.1.1.tar.gz/skins/larry/functions.js Changed

@@ -29,18 +29,12 @@
 }
 
 function reorder_contact_menu(p) {
+	// put export link last
 	var ul = p.ref.container.find('ul:first');
 	$(p.ref.container).find('a.export').parent('li').appendTo(ul);
 
-	var available_sources = 0;
-	$.each(rcmail.env.address_sources, function() {
-		if (!this.readonly)
-			available_sources++;
-	});
-
-	if (available_sources < 2) {
-		$(p.ref.container).find('a.movecontact').parent('li').remove();
-	}
+	// put assign group link before remove
+	$(p.ref.container).find('a.assigngroup').parent('li').insertBefore($(p.ref.container).find('a.removegroup').parent('li'));
 }
 
 $(document).ready(function() {
@@ -48,28 +42,29 @@
 		if (rcmail.env.task == 'mail' && rcmail.env.action == '') {
 			rcmail.addEventListener('insertrow', function(props) { rcm_listmenu_init(props.row.id, {'menu_name': 'messagelist', 'menu_source': '#messagetoolbar'}); } );
 			rcmail.add_onload("rcm_foldermenu_init('#mailboxlist li', {'menu_source': ['#rcmFolderMenu', '#mailboxoptionsmenu']})");
-
-			// special handeling for move/copy functions (folder selector)
-			rcmail.addEventListener('actionbefore', function(props) { rcm_override_mailbox_command(props, true); } );
-			rcmail.addEventListener('actionafter', function(props) { rcm_override_mailbox_command(props, false); } );
 		}
-
-		if (rcmail.env.task == 'mail' && rcmail.env.action == 'compose') {
+		else if (rcmail.env.task == 'mail' && rcmail.env.action == 'compose') {
 			rcmail.addEventListener('insertrow', function(props) { rcm_listmenu_init(props.row.id, {'menu_name': 'composeto', 'menu_source': '#compose-contacts div.boxfooter', 'list_object': rcmail.contact_list}, {'insertitem': function(p) { add_menu_text('composeto', p); }}); } );
 		}
-
-		if (rcmail.env.task == 'addressbook' && rcmail.env.action == '') {
-			rcmail.addEventListener('insertrow', function(props) { rcm_listmenu_init(props.row.id, {'menu_name': 'contactlist', 'menu_source': ['#addressbooktoolbar','#addresslist div.boxfooter a.delete','#addresslist div.boxfooter a.removegroup', {label: rcmail.gettext('moveto'), command: 'plugin.contextmenu.copy_contact', props: 'move', class: 'movecontact'}, {label: rcmail.gettext('copyto'), command: 'plugin.contextmenu.copy_contact', props: 'copy', class: 'copycontact'}], 'list_object': rcmail.contact_list}, {
+		else if (rcmail.env.task == 'addressbook' && rcmail.env.action == '') {
+			rcmail.addEventListener('insertrow', function(props) { rcm_listmenu_init(props.row.id, {'menu_name': 'contactlist', 'menu_source': ['#addressbooktoolbar','#addresslist div.boxfooter a.delete','#addresslist div.boxfooter a.removegroup', '#rcmAddressBookMenu'], 'list_object': rcmail.contact_list}, {
 				'insertitem': function(p) { add_menu_text('contactlist', p); },
 				'init': function(p) { reorder_contact_menu(p); },
 				'afteractivate': function(p) {
 					p.ref.list_selection(false, rcmail.env.contextmenu_selection);
 
+					// count the number of groups in the current addressbook
 					if (!rcmail.env.group || rcmail.env.readonly)
 						p.ref.container.find('a.removegroup').removeClass('active').addClass('disabled');
 
-					if (rcmail.env.readonly)
-						p.ref.container.find('a.movecontact').removeClass('active').addClass('disabled');
+					var groupcount = 0;
+					if (!rcmail.env.readonly && rcmail.env.address_sources[rcmail.env.source] && rcmail.env.address_sources[rcmail.env.source].groups)
+						$.each(rcmail.env.contactgroups, function(){ if (this.source === rcmail.env.source) groupcount++ });
+
+					if (groupcount > 0)
+						p.ref.container.find('a.assigngroup').removeClass('disabled').addClass('active');
+					else
+						p.ref.container.find('a.assigngroup').removeClass('active').addClass('disabled');
 				},
 				'aftercommand': function(p) {
 					if ($(p.el).hasClass('active') && p.command == 'group-remove-selected')
@@ -77,8 +72,8 @@
 				}
 			}); } );
 			rcmail.add_onload("rcm_abookmenu_init('#directorylist li, #savedsearchlist li', {'menu_source': ['#directorylist-footer', '#groupoptionsmenu']}, {'insertitem': function(p) { add_menu_text('abooklist', p); }})");
-			rcmail.addEventListener('group_insert', function(props) { rcm_abookmenu_init(props.li, {'menu_source': ['#directorylist-footer', '#groupoptionsmenu']}) } );
-			rcmail.addEventListener('abook_search_insert', function(props) { rcm_abookmenu_init(rcmail.savedsearchlist.get_item('S' + props.id), {'menu_source': ['#directorylist-footer', '#groupoptionsmenu']}) } );
+			rcmail.addEventListener('group_insert', function(props) { rcm_abookmenu_init(props.li, {'menu_source': ['#directorylist-footer', '#groupoptionsmenu']}); } );
+			rcmail.addEventListener('abook_search_insert', function(props) { rcm_abookmenu_init(rcmail.savedsearchlist.get_item('S' + props.id), {'menu_source': ['#directorylist-footer', '#groupoptionsmenu']}); } );
 		}
 	}
 });
\ No newline at end of file

roundcubemail-plugin-contextmenu-2.1.tar.gz/skins/larry/images/contexticons.png -> roundcubemail-plugin-contextmenu-2.1.1.tar.gz/skins/larry/images/contexticons.png Changed

roundcubemail-plugin-contextmenu.dsc Changed