pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] website: editor: enable/disable save/undo/redo button when resize snippet

Browse Source
This commit is contained in:
Christophe Matthieu
2016-01-13 16:05:22 +01:00
parent a6badd2559
commit 10efb0621f
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_editor/static/src/js/rte.summernote.js
+1 -1
View File
@@ -764,7 +764,7 @@ eventHandler.attach = function (oLayoutInfo, options) {
.add(oLayoutInfo.handle())
.add(oLayoutInfo.popover())
.add(custom_toolbar)
.on('click keyup', function () {
.on('click content_changed', function () {
$('button[data-event="undo"]', $toolbar).attr('disabled', !oLayoutInfo.editable().data('NoteHistory').hasUndo());
$('button[data-event="redo"]', $toolbar).attr('disabled', !oLayoutInfo.editable().data('NoteHistory').hasRedo());
});
addons/website/static/src/js/website.snippets.editor.js
+4 -2
View File
@@ -326,7 +326,9 @@ options.registry.marginAndResize = options.Class.extend({
$body.removeClass(cursor);
setTimeout(function () {
self.buildingBlock.editor_busy = false;
self.$target.closest(".o_editable").trigger("content_changed");
if (begin !== current) {
self.buildingBlock.parent.rte.historyRecordUndo(self.$target, 'resize_' + XY);
}
},0);
self.$target.removeClass("resize_editor_busy");
};
@@ -336,8 +338,8 @@ options.registry.marginAndResize = options.Class.extend({
this.$overlay.find(".oe_handle.size .auto_size").on('click', function (event){
self.$target.css("height", "");
self.$target.css("overflow", "");
self.buildingBlock.parent.rte.historyRecordUndo(self.$target, 'resize_Y');
self.buildingBlock.cover_target(self.$overlay, self.$target);
self.$target.closest(".o_editable").trigger("content_changed");
return false;
});
},