2 commits - plugins/kolab_notes

[Thomas Brüderli]

 plugins/kolab_notes/notes.js              |    4 ++--
 plugins/kolab_notes/skins/larry/notes.css |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit b9ebb38ad63fa77812f7c00b76096fd36aee26e8
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Mon Aug 11 15:47:16 2014 +0200

    Remove empty paragraphs added by TinyMCE in order to avoid false warnings about changed contents

diff --git a/plugins/kolab_notes/notes.js b/plugins/kolab_notes/notes.js
index f761f54..7179a5a 100644
--- a/plugins/kolab_notes/notes.js
+++ b/plugins/kolab_notes/notes.js
@@ -868,7 +868,7 @@ function rcube_kolab_notes_ui(settings)
                 $('.notetitle', rcmail.gui_objects.noteviewtitle).focus().select();
 
             // read possibly re-formatted content back from editor for later comparison
-            me.selected_note.description = editor.getContent({ format:'html' });
+            me.selected_note.description = editor.getContent({ format:'html' }).replace(/^<p><\/p>/, '');
             is_html = true;
         }
         else {
@@ -1135,7 +1135,7 @@ function rcube_kolab_notes_ui(settings)
             listselect = $('option:selected', rcmail.gui_objects.notebooks);
         var savedata = {
             title: trim($('.notetitle', rcmail.gui_objects.noteviewtitle).val()),
-            description: editor ? editor.getContent({ format:'html' }) : $('#notecontent').val(),
+            description: editor ? editor.getContent({ format:'html' }).replace(/^<p><\/p>/, '') : $('#notecontent').val(),
             list: listselect.length ? listselect.val() : me.selected_note.list || me.selected_list,
             uid: me.selected_note.uid,
             categories: []


commit fcfc997fe190ecc14825e4d17e5668ac9d541723
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Mon Aug 11 15:38:40 2014 +0200

    Set (read-only) notes content box to cover the watermark background image (#3241)

diff --git a/plugins/kolab_notes/skins/larry/notes.css b/plugins/kolab_notes/skins/larry/notes.css
index 5d5d0a5..d5d794a 100644
--- a/plugins/kolab_notes/skins/larry/notes.css
+++ b/plugins/kolab_notes/skins/larry/notes.css
@@ -164,6 +164,7 @@
 	    -ms-box-sizing: border-box;
 	        box-sizing: border-box;
 	border-bottom: 1px solid #dfdfdf;
+	background: #fff;
 }
 
 .notesdialog #noteform,