From e01e7985176867c0fe7dae2853c44aff53a56db7 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 22 Nov 2011 08:32:44 -0500
Subject: [PATCH] - Fix action when toggling prefer_html option state
---
program/steps/settings/func.inc | 5 +++--
program/js/app.js | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index 4b4187d..1be2009 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -5587,7 +5587,7 @@
this.toggle_prefer_html = function(checkbox)
{
- $('#rcmfd_addrbook_show_images').prop('disabled', !checkbox.checked);
+ $('#rcmfd_show_images').prop('disabled', !checkbox.checked).val(0);
};
this.toggle_preview_pane = function(checkbox)
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 6ba5247..28da876 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -437,14 +437,15 @@
if (!isset($no_override['show_images'])) {
$field_id = 'rcmfd_show_images';
- $input_show_images = new html_select(array('name' => '_show_images', 'id' => $field_id));
+ $input_show_images = new html_select(array('name' => '_show_images', 'id' => $field_id,
+ 'disabled' => !$config['prefer_html']));
$input_show_images->add(rcube_label('never'), 0);
$input_show_images->add(rcube_label('fromknownsenders'), 1);
$input_show_images->add(rcube_label('always'), 2);
$blocks['main']['options']['show_images'] = array(
'title' => html::label($field_id, Q(rcube_label('showremoteimages'))),
- 'content' => $input_show_images->show($config['show_images']),
+ 'content' => $input_show_images->show($config['prefer_html'] ? $config['show_images'] : 0),
);
}
--
Gitblit v1.9.1