Merge branch 'develop'

webnotes · May 21, 2014 · eb02134 · eb02134
2 parents 3eb8e22 + 9577f72
commit eb02134
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/config.json b/config.json
@@ -1,6 +1,6 @@
 {
  "base_template": "lib/website/templates/base.html", 
- "framework_version": "3.13.6", 
+ "framework_version": "3.13.7", 
  "modules": {
   "Calendar": {
    "color": "#2980b9", 

diff --git a/public/js/wn/ui/editor.js b/public/js/wn/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,
 	},
 
@@ -130,8 +130,10 @@ bsEditor = Class.extend({
 		// remove custom typography (use CSS!)
 		if(this.options.remove_typography) {
 			var tmp = $("<div></div>").html(html);
-			// remove style attributes
-			tmp.find("*").removeAttr("style");
+			// remove style and font attribute
+			tmp.find("*")
+				.removeAttr("style")
+				.removeAttr("font");
 			html = tmp.html();
 		}