summaryrefslogtreecommitdiff
path: root/plugins/managesieve
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2013-06-15 11:25:27 +0200
committerThomas Bruederli <thomas@roundcube.net>2013-06-15 11:25:27 +0200
commit9a7c575650ef8405403011c5716aa560df81e9c1 (patch)
tree445510c5211be2aeed7fd6ea89b47c26b8f693e3 /plugins/managesieve
parent4f53ab347e6ad026f69105b69ce66e21a7654c78 (diff)
parent5c6e74b176705b595aed3f33c89c9632bb49c587 (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'plugins/managesieve')
-rw-r--r--plugins/managesieve/managesieve.js8
-rw-r--r--plugins/managesieve/managesieve.php2
2 files changed, 6 insertions, 4 deletions
diff --git a/plugins/managesieve/managesieve.js b/plugins/managesieve/managesieve.js
index a1f31bb25..3a87a9f43 100644
--- a/plugins/managesieve/managesieve.js
+++ b/plugins/managesieve/managesieve.js
@@ -603,10 +603,12 @@ function rule_header_select(id)
function rule_op_select(obj, id, header)
{
- var target = document.getElementById('rule_target' + id + '_list'),
- style = obj.value == 'exists' || obj.value == 'notexists' || header == 'size' ? 'none' : 'inline-block';
+ var target = document.getElementById('rule_target' + id + '_list');
- target.style.display = style;
+ if (!header)
+ header = document.getElementById('header' + id).value;
+
+ target.style.display = obj.value == 'exists' || obj.value == 'notexists' || header == 'size' ? 'none' : 'inline-block';
};
function rule_trans_select(id)
diff --git a/plugins/managesieve/managesieve.php b/plugins/managesieve/managesieve.php
index 63ca97a70..0dfe05a6f 100644
--- a/plugins/managesieve/managesieve.php
+++ b/plugins/managesieve/managesieve.php
@@ -1353,7 +1353,7 @@ class managesieve extends rcube_plugin
$select_op = new html_select(array('name' => "_rule_op[]", 'id' => 'rule_op'.$id,
'style' => 'display:' .($rule['test']!='size' ? 'inline' : 'none'),
'class' => 'operator_selector',
- 'onchange' => 'rule_op_select('.$id.')'));
+ 'onchange' => 'rule_op_select(this, '.$id.')'));
$select_op->add(rcube::Q($this->gettext('filtercontains')), 'contains');
$select_op->add(rcube::Q($this->gettext('filternotcontains')), 'notcontains');
$select_op->add(rcube::Q($this->gettext('filteris')), 'is');