From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop
---
plugins/acl/acl.js | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/plugins/acl/acl.js b/plugins/acl/acl.js
index aa9e06d..d693478 100644
--- a/plugins/acl/acl.js
+++ b/plugins/acl/acl.js
@@ -28,6 +28,9 @@
rcmail.enable_command('acl-create', 'acl-save', 'acl-cancel', 'acl-mode-switch', true);
rcmail.enable_command('acl-delete', 'acl-edit', false);
+
+ if (rcmail.env.acl_advanced)
+ $('#acl-switch').addClass('selected');
});
}
@@ -129,6 +132,8 @@
// ACL table initialization
rcube_webmail.prototype.acl_list_init = function()
{
+ $('#acl-switch')[this.env.acl_advanced ? 'addClass' : 'removeClass']('selected');
+
this.acl_list = new rcube_list_widget(this.gui_objects.acltable,
{multiselect:true, draggable:false, keyboard:true, toggleselect:true});
this.acl_list.addEventListener('select', function(o) { rcmail.acl_list_select(o); });
@@ -297,7 +302,7 @@
li_elements.map(function() {
val = this.value;
td = $('td.'+this.id, row);
- if (td && td.hasClass('enabled'))
+ if (td.length && td.hasClass('enabled'))
this.checked = true;
});
--
Gitblit v1.9.1