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

[REF] web_editor: improve code for snippet editor activation

Browse Source 
closes odoo/odoo#28292
This commit is contained in:
qsm-odoo
2018-10-30 13:06:50 +00:00
parent 3219171bab
commit 1058c3cb30
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_editor/static/src/js/editor/snippets.editor.js
+11 -9
View File
@@ -782,7 +782,8 @@ var SnippetsMenu = Widget.extend({
* @param {jQuery|false} $snippet
* The DOM element whose editor need to be enabled. Only disable the
* current one if false is given.
* @returns {Deferred} (might be async when an editor must be created)
* @returns {Deferred<SnippetEditor>}
* (might be async when an editor must be created)
*/
_activateSnippet: function ($snippet) {
if ($snippet) {
@@ -790,25 +791,26 @@ var SnippetsMenu = Widget.extend({
$snippet = globalSelector.closest($snippet);
}
if (this.$activeSnippet && this.$activeSnippet[0] === $snippet[0]) {
return $.when();
return $.when($snippet.data('snippet-editor'));
}
}
var editor = null;
if (this.$activeSnippet) {
if (this.$activeSnippet.data('snippet-editor')) {
this.$activeSnippet.data('snippet-editor').toggleFocus(false);
editor = this.$activeSnippet.data('snippet-editor');
if (editor) {
editor.toggleFocus(false);
}
this.$activeSnippet = false;
}
if ($snippet && $snippet.length) {
var self = this;
return this._createSnippetEditor($snippet).then(function () {
return this._createSnippetEditor($snippet).then(function (editor) {
self.$activeSnippet = $snippet;
if (self.$activeSnippet.data('snippet-editor')) {
self.$activeSnippet.data('snippet-editor').toggleFocus(true);
}
editor.toggleFocus(true);
return editor;
});
}
return $.when();
return $.when(editor);
},
/**
* @private