Changeset 5465 in subversion

Timestamp:

Nov 22, 2011 8:32:44 AM (18 months ago)

Author:

alec

Message:

• Fix action when toggling prefer_html option state

Location:

trunk/roundcubemail/program

Files:

• js/app.js (modified) (1 diff)
• steps/settings/func.inc (modified) (2 diffs)

trunk/roundcubemail/program/js/app.js

@@ -5588 +5588 @@
   this.toggle_prefer_html = function(checkbox)
   {
-    $('#rcmfd_addrbook_show_images').prop('disabled', !checkbox.checked);
+    $('#rcmfd_show_images').prop('disabled', !checkbox.checked).val(0);
   };
 

trunk/roundcubemail/program/steps/settings/func.inc

@@ -438 +438 @@
     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);
@@ -445 +446 @@
       $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),
       );
     }