From f654b59c41ad1b23b4bc0ec420187bce5f1d22eb Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Tue, 20 May 2014 13:59:49 +0530
Subject: [PATCH] Set remove_typography to false as default

---
 frappe/public/js/frappe/ui/editor.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/ui/editor.js b/frappe/public/js/frappe/ui/editor.js
index 4cdeaeb3d7..f4d934ca4d 100644
--- a/frappe/public/js/frappe/ui/editor.js
+++ b/frappe/public/js/frappe/ui/editor.js
@@ -8,7 +8,7 @@
 
 bsEditor = Class.extend({
 	init: function(options) {
-		this.options = $.extend(options || {}, this.default_options);
+		this.options = $.extend({}, this.default_options, options || {});
 		this.edit_mode = true;
 		if(this.options.editor) {
 			this.setup_editor(this.options.editor);
@@ -100,7 +100,7 @@ bsEditor = Class.extend({
 		active_toolbar_class: 'btn-info',
 		selection_marker: 'edit-focus-marker',
 		selection_color: 'darkgrey',
-		remove_typography: true,
+		remove_typography: false,
 		max_file_size: 1,
 	},
 
@@ -131,7 +131,9 @@ bsEditor = Class.extend({
 		if(this.options.remove_typography) {
 			var tmp = $("<div></div>").html(html);
 			// remove style attributes
-			tmp.find("*").removeAttr("style");
+			tmp.find("*")
+				.removeAttr("style")
+				.removeAttr("font");
 			html = tmp.html();
 		}