From 18153efe21d85414bc720d1fbbf2b191d3325f41 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 03 Nov 2009 12:49:15 -0500
Subject: [PATCH] - Fix pasting from Office apps into html editor (#1486271)

---
 CHANGELOG            |    2 ++
 program/js/editor.js |    3 ++-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index a99eb16..8d43e6a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Fix pasting from Office apps into html editor (#1486271)
+- Fix empty <A> tags parsing (#1486272)
 - Don't cut off attachment names when using non-RFC2231 encoding (#1485515)
 - Allow inserting signatures above replied message body (#1484272)
 - Managesieve 2.0: multi-script support
diff --git a/program/js/editor.js b/program/js/editor.js
index eeb16ec..39149a7 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -24,6 +24,7 @@
       theme : 'advanced',
       language : editor_lang,
       content_css : skin_path + '/editor_content.css',
+      plugins: 'paste',
       theme_advanced_toolbar_location : 'top',
       theme_advanced_toolbar_align : 'left',
       theme_advanced_buttons1 : 'bold,italic,underline,strikethrough,justifyleft,justifycenter,justifyright,justifyfull,separator,outdent,indent,charmap,hr,link,unlink,code,forecolor',
@@ -41,7 +42,7 @@
       apply_source_formatting : true,
       theme : 'advanced',
       language : editor_lang,
-      plugins : 'emotions,media,nonbreaking,table,searchreplace,visualchars,directionality' + (spellcheck ? ',spellchecker' : ''),
+      plugins : 'paste,emotions,media,nonbreaking,table,searchreplace,visualchars,directionality' + (spellcheck ? ',spellchecker' : ''),
       theme_advanced_buttons1 : 'bold,italic,underline,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,bullist,numlist,outdent,indent,separator,link,unlink,emotions,charmap,code,forecolor,backcolor,fontselect,fontsizeselect, separator' + (spellcheck ? ',spellchecker' : '') + ',undo,redo,image,media,ltr,rtl',
       theme_advanced_buttons2 : '',
       theme_advanced_buttons3 : '',

--
Gitblit v1.9.1