Request 2119 (accepted)

roundcubemail-plugin-contextmenu.spec Changed

debian.changelog Changed

debian.control Changed

roundcubemail-plugin-contextmenu-2.1.1.tar.gz/.gitignore Deleted

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

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

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

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

@@ -1,12 +1,27 @@
 /**
  * ContextMenu plugin script
+ *
+ * @licstart  The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
+ * Copyright (C) 2009-2014 Philip Weir
+ *
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * @licend  The above is the entire license notice
+ * for the JavaScript code in this file.
  */
 
+rcube_webmail.prototype.context_menu_skip_commands = new Array('mail-checkmail', 'mail-compose', 'addressbook-add', 'addressbook-import', 'addressbook-advanced-search', 'addressbook-search-create');
+rcube_webmail.prototype.context_menu_overload_commands = new Array('move', 'copy');
 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?\'([^\']*)\'/;
+rcube_webmail.prototype.context_menu_command_pattern = /rcmail\.command\(\'([^\']+)\',\s?\'((?:\\\'|[^\'])*)\'/;
 
 function rcm_listmenu_init(row, props, events) {
 	if (!events)
@@ -23,7 +38,7 @@
 	}, events));
 
 	var list_object = props.list_object ? props.list_object : rcmail.message_list;
-	$("#" + row).bind("contextmenu", function(e) {
+	$("#" + row).on("contextmenu", function(e) {
 		if (uid = list_object.get_row_uid(this)) {
 			rcm_show_menu(e, this, uid, menu);
 		}
@@ -35,39 +50,80 @@
 		events = {};
 
 	var menu = rcm_callbackmenu_init($.extend({'menu_name': 'folderlist', 'list_object': null}, props), $.extend({
+		'beforeactivate': function(p) {
+			if (rcmail.env.contextmenu_messagecount_request) {
+				rcmail.env.contextmenu_messagecount_request.abort();
+			}
+			rcmail.env.contextmenu_messagecount_request = null;
+		},
 		'activate': function(p) {
-			if ($.inArray(p.command, Array('expunge', 'purge')) >= 0) {
-				if (rcmail.env.context_menu_source_id == rcmail.env.mailbox && rcm_check_button_state(p.btn, true)) {
+			if ($.inArray(p.command, Array('expunge', 'purge', 'mark-all-read')) >= 0) {
+				// disable the commands by default
+				$(p.el).addClass('disabled').removeClass('active');
+
+				// if menu is opened on current folder (or special mark-all-read command) then enable the commands same as in UI
+				if ((rcmail.env.context_menu_source_id == rcmail.env.mailbox || p.command == 'mark-all-read') && rcm_check_button_state(p.btn, true)) {
 					$(p.el).addClass('active').removeClass('disabled');
 				}
-				else {
-					$(p.el).addClass('disabled').removeClass('active');
+				// if menu is opened on difference folder then get message count for the folder
+				else if (rcmail.env.context_menu_source_id != rcmail.env.mailbox && !rcmail.env.contextmenu_messagecount_request) {
+					// folder check called async to prevent slowdown on menu load
+					rcmail.env.contextmenu_messagecount_request = $.ajax({
+						type: 'POST', url: rcmail.url('plugin.contextmenu.messagecount'), data: {'_mbox': rcmail.env.context_menu_source_id}, dataType: 'json', async: true,
+						success: function(data) {
+							if (data.messagecount > 0 && $('#rcm_folderlist').is(':visible')) {
+								// override the environment to check if commands should be abled
+								var temp_exists = rcmail.env.exists;
+								var temp_mailbox = rcmail.env.mailbox;
+								rcmail.env.exists = data.messagecount;
+								rcmail.env.mailbox = rcmail.env.context_menu_source_id;
+
+								$('#rcm_folderlist').find('a.cmd_expunge').addClass('active').removeClass('disabled');
+								if (rcmail.purge_mailbox_test()) {
+									$('#rcm_folderlist').find('a.cmd_purge').addClass('active').removeClass('disabled');
+								}
+
+								rcmail.env.exists = temp_exists;
+								rcmail.env.mailbox = temp_mailbox;
+							}
+						}
+					});
 				}
 			}
+		},
+		'beforecommand': function(p) {
+			if (rcmail.env.context_menu_source_id != rcmail.env.mailbox && $.inArray(p.command, Array('expunge', 'purge')) >= 0) {
+				var result = rcmail[p.command + '_mailbox'](rcmail.env.context_menu_source_id);
 
-			if (p.command == 'plugin.contextmenu.readfolder') {
-				if ($(p.source).children('a:first').has('span.unreadcount').length > 0) {
-					$(p.el).addClass('active').removeClass('disabled');
-				}
-				else {
-					$(p.el).addClass('disabled').removeClass('active');
+				// update the unread count and trash icon
+				if (p.command == 'purge' && result !== false) {
+					rcmail.set_unread_count(rcmail.env.context_menu_source_id, 0, false);
+
+					if (rcmail.env.context_menu_source_id == rcmail.env.trash_mailbox)
+						rcmail.set_trash_count(0);
 				}
+
+				return {'abort': true, 'result': true};
+			}
+			else if (rcmail.env.context_menu_source_id != rcmail.env.mailbox && p.command == 'mark-all-read') {
+				rcmail.mark_all_read(rcmail.env.context_menu_source_id);
+				return {'abort': true, 'result': true};
 			}
 		}
 	}, events));
 
-	$(el).bind("click",function(e) {
+	$(el).click(function(e) {
 		// hide menu when changing folder
 		menu.hide(e);
 	})
-	.bind("contextmenu", function(e) {
+	.on("contextmenu", function(e) {
 		var source = $(this).children('a');
 
 		// remove focus (and keyboard nav highlighting) from A
 		source.blur();
 
-		if (source.attr('onclick') && source.attr('onclick').match(rcmail.context_menu_command_pattern)) {
-			rcm_show_menu(e, this, RegExp.$2, menu);
+		if (source.attr('rel') && source.attr('onclick') && source.attr('onclick').match(rcmail.context_menu_command_pattern)) {
+			rcm_show_menu(e, this, source.attr('rel'), menu);
 		}
 	});
 }
@@ -112,14 +168,6 @@
 				}
 			}
 		},
-		'beforecommand': function(p) {
-			if (!$(p.el).hasClass('active'))
-				return;
-
-			var ids = rcmail.env.context_menu_source_id.split(':', 2);
-			cur_source = ids[0];
-			rcmail.env.source = cur_source;
-		},
 		'command': function(p) {
 			if (!$(p.el).hasClass('active'))
 				return;
@@ -140,45 +188,23 @@
 			rcmail.enable_command(p.command, true);
 
 			switch (p.command) {
-				case 'group-rename':
-					result = rcmail.command(p.command, p.args, p.el);
-
-					// callback requires target is selected
-					rcmail.enable_command('listgroup', true);
-					rcmail.env.source = prev_source
-					rcmail.env.group = prev_group;
-					prev_source = cur_source;
-					prev_group = cur_id;
-					rcmail.command('listgroup', {'source': prev_source, 'id': prev_group}, p.el, p.evt);
-					rcmail.enable_command('listgroup', false);
-					break;
-				case 'group-delete':
-					result = rcmail.command(p.command, p.args, p.el);
-					break;
 				case 'search-delete':
 					var result = false;
 
 					if ($(p.ref.selected_object).children('a').attr('rel')) {
 						var prev_search_id = rcmail.env.search_id;
 						var prev_search_request = rcmail.env.search_request;
-						var prev_command = rcmail.commands[p.command];
 						rcmail.env.search_request = true;
 						rcmail.env.search_id = $(p.ref.selected_object).children('a').attr('rel').replace('S', '');
 
-						rcmail.enable_command(p.command, true);
 						result = rcmail.command(p.command, p.args, p.el, p.evt);
-						rcmail.enable_command(p.command, prev_command);
 
 						rcmail.env.search_request = prev_search_request;
 						rcmail.env.search_id = prev_search_id;
 					}
 					break;
 				default:
-					// enable the required command
-					var prev_command = rcmail.commands[p.command];
-					rcmail.enable_command(p.command, true);
-					var result = rcmail.command(p.command, p.args, p.el, p.evt);
-					rcmail.enable_command(p.command, prev_command);
+					result = rcmail.command(p.command, p.args, p.el, p.evt);
 					break;
 			}
 
@@ -187,21 +213,14 @@
 			rcmail.env.group = prev_group;
 
 			return result;
-		},
-		'aftercommand': function(p) {
-			var ids = rcmail.env.context_menu_source_id.split(':', 2);
-			cur_source = ids[0];
-
-			if (rcmail.env.source = cur_source)
-				rcmail.command('list', cur_source, p.el);
 		}
 	}, events));
 
-	$(el).bind("click",function(e) {
+	$(el).click(function(e) {
 		// hide menu when changing address book
 		menu.hide(e);
 	})
-	.bind("contextmenu",function(e) {
+	.on("contextmenu",function(e) {
 		var source = $(this).children('a');
 
 		// remove focus (and keyboard nav highlighting) from A
@@ -760,14 +779,15 @@
 			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);
+		container.on('click', 'a.active', function(e) {
+			container.data('callback')(this, container.data('command'), e);
 			return false;
 		});
 
 		rcmail.rcm_addressbook_selector_element = container;
 	}
 
+	container.data('command', command);
 	container.data('callback', callback);
 
 	// customize menu for move or copy
@@ -880,10 +900,10 @@
 				return;
 
 			var body_mouseup = function(e) { $.each(rcmail.env.contextmenus, function() { this.hide(e); }); };
-			$(document.body).bind('click contextmenu', body_mouseup);
+			$(document.body).on('click contextmenu', body_mouseup);
 
 			// Hide menu after clicks in iframes (eg. preview pane)
-			$('iframe').load(function(e) {
+			$('iframe').on('load', function(e) {
 				try { $(this.contentDocument || this.contentWindow).on('mouseup', body_mouseup) }
 				catch (e) { /* catch possible "Permission denied" error in IE */ }
 			})
@@ -904,11 +924,6 @@
 		}
 
 		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.collapseall', function(props, obj) {
 				$("#mailboxlist div.expanded").each(function() { $(this).click(); });
 			}, false);
@@ -933,17 +948,17 @@
 			// 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) {
+					rcm_addressbook_selector(props.originalEvent, props.action, function(obj, cmd, 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);
+							rcmail.command(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);
+							rcmail.command(cmd, rcmail.env.address_sources[$(obj).data('id')], evt);
 						}
 					});
 
@@ -982,6 +997,11 @@
 		});
 
 		rcmail.addEventListener('menu-close', function(p) {
+			// check required args are present, other plugins trigger this event too
+			if (!p.originalEvent) {
+				return;
+			}
+
 			// 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) {

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

@@ -5,8 +5,26 @@
  *
  * Plugin to add a context menu to various parts of the interface
  *
- * @version @package_version@
  * @author Philip Weir
+ *
+ * Copyright (C) 2009-2014 Philip Weir
+ *
+ * This program is a Roundcube (http://www.roundcube.net) plugin.
+ * For more information see README.md.
+ * See MANUAL.md for information about extending this plugin.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Roundcube. If not, see http://www.gnu.org/licenses/.
  */
 class contextmenu extends rcube_plugin
 {
@@ -15,28 +33,26 @@
 	function init()
 	{
 		$rcmail = rcube::get_instance();
+
+		if ($rcmail->output->type == 'html') {
+			$this->include_script('contextmenu.js');
+			$this->include_stylesheet($this->local_skin_path() . '/contextmenu.css');
+			$this->include_script($this->local_skin_path() . '/functions.js');
+			$this->api->output->set_env('contextmenu', true);
+		}
+
 		if ($rcmail->task == 'mail') {
-			$this->register_action('plugin.contextmenu.readfolder', array($this, 'readfolder'));
+			$this->register_action('plugin.contextmenu.messagecount', array($this, 'messagecount'));
 
 			// on the mailbox screen only add some additional options for the folder menu
 			if ($rcmail->action == '') {
 				$this->addition_folder_options();
 			}
 		}
-
-		if ($rcmail->task == 'addressbook' && $rcmail->action == '') {
+		elseif ($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') {
-			$rcmail->output->add_script("rcmail.context_menu_skip_commands = new Array('mail-checkmail', 'mail-compose', 'addressbook-add', 'addressbook-import', 'addressbook-advanced-search', 'addressbook-search-create');");
-			$rcmail->output->add_script("rcmail.context_menu_overload_commands = new Array('move', 'copy');");
-			$this->include_script('contextmenu.js');
-			$this->include_stylesheet($this->local_skin_path() . '/contextmenu.css');
-			$this->include_script($this->local_skin_path() . '/functions.js');
-			$this->api->output->set_env('contextmenu', true);
-		}
 	}
 
 	public function addition_folder_options()
@@ -44,7 +60,6 @@
 		$this->add_texts('localization/');
 
 		$li = '';
-		$li .= html::tag('li', array('role' => 'menuitem'), $this->api->output->button(array('command' => 'plugin.contextmenu.readfolder', 'type' => 'link', 'class' => 'readfolder', 'label' => 'contextmenu.markreadfolder', 'tabindex' => '-1', 'aria-disabled' => 'true')));
 		$li .= html::tag('li', array('role' => 'menuitem'), $this->api->output->button(array('command' => 'plugin.contextmenu.collapseall', 'type' => 'link', 'class' => 'collapseall rcm_active', 'label' => 'contextmenu.collapseall', 'tabindex' => '-1', 'aria-disabled' => 'true')));
 		$li .= html::tag('li', array('role' => 'menuitem'), $this->api->output->button(array('command' => 'plugin.contextmenu.expandall', 'type' => 'link', 'class' => 'expandall rcm_active', 'label' => 'contextmenu.expandall', 'tabindex' => '-1', 'aria-disabled' => 'true')));
 		$li .= html::tag('li', array('role' => 'menuitem'), $this->api->output->button(array('command' => 'plugin.contextmenu.openfolder', 'type' => 'link', 'class' => 'openfolder rcm_active', 'label' => 'openinextwin', 'tabindex' => '-1', 'aria-disabled' => 'true')));
@@ -70,25 +85,15 @@
 		$this->api->output->add_footer(html::div(array('style' => 'display: none;', 'aria-hidden' => 'true'), $out));
 	}
 
-	public function readfolder()
+	public function messagecount()
 	{
 		$storage = rcube::get_instance()->storage;
-		$cbox = rcube_utils::get_input_value('_cur', rcube_utils::INPUT_POST);
 		$mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
-		$oact = rcube_utils::get_input_value('_oact', rcube_utils::INPUT_POST);
-
-		$uids = $storage->search_once($mbox, 'ALL UNSEEN', true);
-
-		if ($uids->is_empty())
-			return false;
-
-		$storage->set_flag($uids->get(), 'SEEN', $mbox);
-
-		if ($cbox == $mbox)
-			$this->api->output->command('toggle_read_status', 'read', $uids->get());
 
-		rcmail_send_unread_count($mbox, true);
-		$this->api->output->send();
+		// send output
+		header("Content-Type: application/json; charset=".RCUBE_CHARSET);
+		echo json_encode(array('messagecount' => $storage->count($mbox, 'EXISTS')));
+		exit;
 	}
 }

roundcubemail-plugin-contextmenu-2.1.1.tar.gz/localization/ca_ES.inc -> roundcubemail-plugin-contextmenu-2.3.tar.gz/localization/ca_ES.inc Changed

roundcubemail-plugin-contextmenu-2.1.1.tar.gz/localization/cs_CZ.inc -> roundcubemail-plugin-contextmenu-2.3.tar.gz/localization/cs_CZ.inc Changed

roundcubemail-plugin-contextmenu-2.1.1.tar.gz/localization/da_DK.inc -> roundcubemail-plugin-contextmenu-2.3.tar.gz/localization/da_DK.inc Changed

roundcubemail-plugin-contextmenu-2.1.1.tar.gz/localization/de_CH.inc -> roundcubemail-plugin-contextmenu-2.3.tar.gz/localization/de_CH.inc Changed

roundcubemail-plugin-contextmenu-2.1.1.tar.gz/localization/de_DE.inc -> roundcubemail-plugin-contextmenu-2.3.tar.gz/localization/de_DE.inc Changed

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

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

roundcubemail-plugin-contextmenu-2.3.tar.gz/localization/es_AR.inc Added

roundcubemail-plugin-contextmenu-2.1.1.tar.gz/localization/es_ES.inc -> roundcubemail-plugin-contextmenu-2.3.tar.gz/localization/es_ES.inc Changed

roundcubemail-plugin-contextmenu-2.1.1.tar.gz/localization/fr_FR.inc -> roundcubemail-plugin-contextmenu-2.3.tar.gz/localization/fr_FR.inc Changed

roundcubemail-plugin-contextmenu-2.1.1.tar.gz/localization/gl_ES.inc -> roundcubemail-plugin-contextmenu-2.3.tar.gz/localization/gl_ES.inc Changed

roundcubemail-plugin-contextmenu-2.1.1.tar.gz/localization/hu_HU.inc -> roundcubemail-plugin-contextmenu-2.3.tar.gz/localization/hu_HU.inc Changed

roundcubemail-plugin-contextmenu-2.1.1.tar.gz/localization/it_IT.inc -> roundcubemail-plugin-contextmenu-2.3.tar.gz/localization/it_IT.inc Changed

roundcubemail-plugin-contextmenu-2.1.1.tar.gz/localization/ja_JP.inc -> roundcubemail-plugin-contextmenu-2.3.tar.gz/localization/ja_JP.inc Changed

roundcubemail-plugin-contextmenu-2.1.1.tar.gz/localization/nl_NL.inc -> roundcubemail-plugin-contextmenu-2.3.tar.gz/localization/nl_NL.inc Changed

roundcubemail-plugin-contextmenu-2.1.1.tar.gz/localization/pl_PL.inc -> roundcubemail-plugin-contextmenu-2.3.tar.gz/localization/pl_PL.inc Changed

roundcubemail-plugin-contextmenu-2.1.1.tar.gz/localization/pt_BR.inc -> roundcubemail-plugin-contextmenu-2.3.tar.gz/localization/pt_BR.inc Changed

roundcubemail-plugin-contextmenu-2.1.1.tar.gz/localization/pt_PT.inc -> roundcubemail-plugin-contextmenu-2.3.tar.gz/localization/pt_PT.inc Changed

roundcubemail-plugin-contextmenu-2.1.1.tar.gz/localization/ro_RO.inc -> roundcubemail-plugin-contextmenu-2.3.tar.gz/localization/ro_RO.inc Changed

roundcubemail-plugin-contextmenu-2.1.1.tar.gz/localization/ru_RU.inc -> roundcubemail-plugin-contextmenu-2.3.tar.gz/localization/ru_RU.inc Changed

roundcubemail-plugin-contextmenu-2.1.1.tar.gz/localization/sv_SE.inc -> roundcubemail-plugin-contextmenu-2.3.tar.gz/localization/sv_SE.inc Changed

roundcubemail-plugin-contextmenu-2.1.1.tar.gz/localization/tr_TR.inc -> roundcubemail-plugin-contextmenu-2.3.tar.gz/localization/tr_TR.inc Changed

roundcubemail-plugin-contextmenu-2.1.1.tar.gz/localization/uk_UA.inc -> roundcubemail-plugin-contextmenu-2.3.tar.gz/localization/uk_UA.inc Changed

roundcubemail-plugin-contextmenu-2.1.1.tar.gz/localization/zh_TW.inc -> roundcubemail-plugin-contextmenu-2.3.tar.gz/localization/zh_TW.inc Changed

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

@@ -132,7 +132,7 @@
   background: url(images/messageactions.png) no-repeat 5px 1px;
 }
 
-div.contextmenu ul.iconized li a.readfolder span.icon
+div.contextmenu ul.iconized li a.cmd_mark-all-read span.icon
 {
   background-position: 7px -85px;
 }
@@ -191,6 +191,11 @@
   background-position: 8px -236px;
 }
 
+div.contextmenu ul.iconized li a.vcard span.icon
+{
+  background-position: 7px -546px;
+}
+
 div.contextmenu ul.iconized li a.cmd_group-create span.icon,
 div.contextmenu ul.iconized li a.assigngroup span.icon
 {
@@ -217,42 +222,42 @@
   background-position: 7px -186px;
 }
 
-#rcm_messagemenu ul.iconized li a span.icon
+#rcm_messagemenumenu ul.iconized li a span.icon
 {
   background: url(images/messageactions.png) no-repeat 5px 20px;
 }
 
-#rcm_messagemenu ul.iconized li a.printlink span.icon
+#rcm_messagemenumenu ul.iconized li a.printlink span.icon
 {
   background-position: 5px 1px;
 }
 
-#rcm_messagemenu ul.iconized li a.downloadlink span.icon
+#rcm_messagemenumenu ul.iconized li a.downloadlink span.icon
 {
   background-position: 5px -17px;
 }
 
-#rcm_messagemenu ul.iconized li a.editlink span.icon
+#rcm_messagemenumenu ul.iconized li a.editlink span.icon
 {
   background-position: 5px -70px;
 }
 
-#rcm_messagemenu ul.iconized li a.movelink span.icon
+#rcm_messagemenumenu ul.iconized li a.movelink span.icon
 {
   background-position: 5px -161px;
 }
 
-#rcm_messagemenu ul.iconized li a.copylink span.icon
+#rcm_messagemenumenu ul.iconized li a.copylink span.icon
 {
   background-position: 5px -143px;
 }
 
-#rcm_messagemenu ul.iconized li a.sourcelink span.icon
+#rcm_messagemenumenu ul.iconized li a.sourcelink span.icon
 {
   background-position: 5px -35px;
 }
 
-#rcm_messagemenu ul.iconized li a.openlink span.icon
+#rcm_messagemenumenu ul.iconized li a.openlink span.icon
 {
   background-position: 5px -52px;
 }

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

@@ -1,11 +1,30 @@
 /**
  * ContextMenu plugin script
+ *
+ * @licstart  The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
+ * Copyright (C) 2014 Philip Weir
+ *
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * @licend  The above is the entire license notice
+ * for the JavaScript code in this file.
  */
 
 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 add_menu_text(p) {
+	if ($(p.item).children('a').hasClass('vcard')) {
+		$(p.item).children('a').children('span').text($('#abookactions a.vcard').attr('title'));
+	}
+}
+
 function reorder_contact_menu(p) {
 	// put export link last
 	var ul = p.ref.container.find('ul:first');
@@ -24,7 +43,7 @@
 			rcmail.add_onload("rcm_foldermenu_init('#mailboxlist li', {'menu_source': ['#rcmFolderMenu', '#mailboxoptionsmenu ul']})");
 		}
 		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}); } );
+			rcmail.addEventListener('insertrow', function(props) { rcm_listmenu_init(props.row.id, {'menu_name': 'composeto', 'menu_source': '#abookactions', 'list_object': rcmail.contact_list}, {'insertitem': function(p) { add_menu_text(p); }}); } );
 		}
 		else if (rcmail.env.task == 'addressbook' && rcmail.env.action == '') {
 			rcmail.addEventListener('contextmenu_init', function(menu) {

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

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

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

@@ -1,5 +1,18 @@
 /**
  * ContextMenu plugin script
+ *
+ * @licstart  The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
+ * Copyright (C) 2014 Philip Weir
+ *
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * @licend  The above is the entire license notice
+ * for the JavaScript code in this file.
  */
 
 rcube_webmail.prototype.context_menu_popup_pattern = /UI\.toggle_popup\(\'([^\']+)\'/;
@@ -17,6 +30,9 @@
 		else if ($(p.item).children('a').hasClass('addbcc')) {
 			$(p.item).children('a').children('span').text($('#compose-contacts div.boxfooter a.addbcc').attr('title'));
 		}
+		else if ($(p.item).children('a').hasClass('vcard')) {
+			$(p.item).children('a').children('span').text($('#compose-contacts div.boxfooter a.vcard').attr('title'));
+		}
 	}
 	else if (menu == 'contactlist') {
 		if ($(p.item).children('a').hasClass('delete')) {

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

roundcubemail-plugin-contextmenu.dsc Changed

Overview

Request 2119 (accepted)

Request History