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

[FIX] website: snippet: display image editor button in snippet. Don't remove overlay (editor is used to clean snippets for save view)

Browse Source 
bzr revid: chm@openerp.com-20140305132422-sfmlq8giol53rqjm
This commit is contained in:
chm@openerp.com
2014-03-05 14:24:22 +01:00
parent 3a576a47b9
commit 8df09c6c6a
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/static/src/js/website.editor.js
+1 -1
View File
@@ -54,7 +54,7 @@
* is editable but its attributes should not be considered editable
*/
function is_editable_node(element) {
return !(element.data('oe-model') === 'ir.ui.view'
return (element.data('oe-model') !== 'ir.ui.view'
|| element.data('cke-realelement')
|| (is_editing_host(element) && element.getAttribute('attributeEditable') !== 'true')
|| element.isReadOnly());
addons/website/static/src/js/website.snippets.editor.js
+1 -8
View File
@@ -267,12 +267,6 @@
}
if (this.$active_snipped_id) {
this.snippet_blur(this.$active_snipped_id);
var $overlay = this.$active_snipped_id.data("overlay");
if ($overlay) {
$overlay.remove();
this.$active_snipped_id.removeData("overlay");
}
this.$active_snipped_id.removeData("snippet-editor");
this.$active_snipped_id = false;
}
if ($snippet && $snippet.length) {
@@ -432,7 +426,6 @@
$target.data("overlay").remove();
$target.removeData("overlay");
}
self.create_overlay($target);
$target.find("[data-snippet-id]").each(function () {
var $snippet = $(this);
$snippet.removeData("snippet-editor");
@@ -440,10 +433,10 @@
$snippet.data("overlay").remove();
$snippet.removeData("overlay");
}
self.create_overlay($snippet);
});
// end
self.create_overlay($target);
self.make_active($target);
},0);
} else {