vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #547 from anandpdoshi/hotfix

Browse source 
Set remove_typography to false as default
This commit is contained in:
Nabin Hait 2014-05-20 14:38:23 +05:30
commit c8a8cd6df7
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
frappe/public/js/frappe/ui/editor.js
View file

@ -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();
}