Merge branch 'release-2.3' into release-2.2

Author: johndoh

CHANGELOG

@@ -1,6 +1,12 @@
 Roundcube Webmail ContextMenu
 =============================
 
+Version 2.3 (2017-06-14, rc-1.3)
+=================================================
+ * Remove special handling for group-create/rename (requires roundcube rev ec98aa5)
+ * "Flattened" the larry theme: fresher look by removing shadows and gradients
+ * Fix handling of folder names containing special chars
+
 Version 2.2 (2017-01-02, rc-1.3)
 =================================================
  * Use new 'Mark all as read' function from core (requires 1.3)

composer.json

@@ -5,7 +5,7 @@
   "homepage": "http://github.com/JohnDoh/Roundcube-Plugin-Context-Menu/",
   "license": "GPL-3.0",
   "type": "roundcube-plugin",
-  "version": "2.2",
+  "version": "2.3",
   "authors": [
     {
       "name": "Philip Weir",
@@ -25,7 +25,7 @@
   },
   "extra": {
     "roundcube": {
-      "min-version": "1.3-beta"
+      "min-version": "1.3"
     }
   }
 }

contextmenu.js

@@ -21,7 +21,7 @@ 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)
@@ -122,8 +122,8 @@ function rcm_foldermenu_init(el, props, events) {
 		// 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);
 		}
 	});
 }
@@ -188,20 +188,6 @@ function rcm_abookmenu_init(el, props, events) {
 			rcmail.enable_command(p.command, true);
 
 			switch (p.command) {
-				case 'group-create':
-				case 'group-rename':
-					result = rcmail.command(p.command, p.args, p.el);
-
-					// callback requires target is selected
-					var prev_command_list = rcmail.commands['listgroup'];
-					rcmail.enable_command('listgroup', true);
-					rcmail.env.source = prev_source
-					rcmail.env.group = prev_group;
-					rcmail.command('listgroup', {'source': cur_source, 'id': cur_id}, p.el, p.evt);
-					prev_source = cur_source;
-					prev_group = cur_id;
-					rcmail.enable_command('listgroup', prev_command_list);
-					break;
 				case 'search-delete':
 					var result = false;
 

localization/es_AR.inc

@@ -0,0 +1,12 @@
+<?php
+/* Author: Sergio Loyola */
+
+$labels = array();
+$labels['markreadfolder'] = 'Marcar todo como leído';
+$labels['collapseall'] = 'Compactar todas las carpetas';
+$labels['expandall'] = 'Expandir todas las carpetas';
+$labels['assigngroup'] = 'Asignar contactos seleccionados al grupo ...';
+
+$messages = array();
+
+?>

skins/classic/contextmenu.css

@@ -191,6 +191,11 @@ div.contextmenu ul.iconized li a.cmd_add-recipient span.icon
   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
 {

skins/classic/functions.js

@@ -19,6 +19,12 @@ 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');
@@ -37,7 +43,7 @@ $(document).ready(function() {
 			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) {

skins/classic/images/contexticons.png

@@ -151,6 +151,11 @@ div.contextmenu ul.iconized li a.addbcc span.icon
   background-position: 0 -281px;
 }
 
+div.contextmenu ul.iconized li a.vcard span.icon
+{
+  background-position: 0 -738px;
+}
+
 div.contextmenu ul.iconized li a.movecontact span.icon
 {
   background-position: 0 -632px;

skins/larry/contextmenu.css

@@ -30,6 +30,9 @@ function add_menu_text(menu, p) {
 		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')) {