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

[fix] editor, fixes frappe/erpnext#3058

Browse source
This commit is contained in:
Rushabh Mehta 2015-04-14 18:19:46 +05:30
parent 2632a09784
commit 8a64ef9ef3
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,11 +30,13 @@ bsEditor = Class.extend({
}
}).on("mouseup keyup mouseout", function() {
var html = me.clean_html();
if(me.editing && html != me.last_html) {
if(me.editing) {
me.toolbar.save_selection();
me.toolbar.update();
me.options.change && me.options.change(html);
me.last_html = html;
if(html != me.last_html) {
me.options.change && me.options.change(html);
me.last_html = html;
}
}
}).data("object", this);
@ -113,11 +115,13 @@ bsEditor = Class.extend({
e.preventDefault();
e.stopPropagation();
me.toolbar.execCommand(command);
return false;
}
}).keyup(hotkey, function (e) {
if (me.editor.attr('contenteditable') && me.editor.is(':visible')) {
e.preventDefault();
e.stopPropagation();
return false;
}
});
});
@ -249,7 +253,7 @@ bsEditorToolbar = Class.extend({
</div>\
<div class="btn-group form-group">\
<a class="btn btn-default btn-small" data-edit="bold" title="' + __("Bold (Ctrl/Cmd+B)") + '">\
B</a>\
<b>B</b></a>\
<a class="btn btn-default btn-small" data-edit="insertunorderedlist" title="' + __("Bullet list") + '">\
<i class="octicon octicon-list-unordered"></i></a>\
<a class="btn btn-default btn-small" data-edit="insertorderedlist" title="' + __("Number list") + '">\
@ -337,7 +341,7 @@ bsEditorToolbar = Class.extend({
var me = this;
// standard button events
this.toolbar.find('a[data-' + me.options.command_role + ']').click(function () {
this.toolbar.find('a[data-' + me.options.command_role + ']').click(function (e) {
me.restore_selection();
me.editor.focus();
me.execCommand($(this).data(me.options.command_role));
@ -345,6 +349,8 @@ bsEditorToolbar = Class.extend({
// close dropdown
if(me.toolbar.find("ul.dropdown-menu:visible").length)
me.toolbar.find('[data-toggle="dropdown"]').dropdown("toggle");
e.stopPropagation();
e.preventDefault();
return false;
});
this.toolbar.find('[data-toggle=dropdown]').click(function() { me.restore_selection() });

10
frappe/public/js/legacy/form.js
View file

@ -496,9 +496,13 @@ _f.Frm.prototype.setnewdoc = function() {
me.opendocs[me.docname] = true;
me.render_form();
if(frappe.route_options) {
$.each(frappe.route_options, function(fieldname, value) {
me.set_value(fieldname, value);
})
$.each(frappe.route_options, function(fieldname, value) {
try {
me.set_value(fieldname, value);
} catch (e) {
// pass - see error log
}
});
frappe.route_options = null;
}