diff --git a/muk_web_utils/__manifest__.py b/muk_web_utils/__manifest__.py index 90c32e1..734a716 100644 --- a/muk_web_utils/__manifest__.py +++ b/muk_web_utils/__manifest__.py @@ -20,7 +20,7 @@ { "name": "MuK Web Utils", "summary": """Utility Features""", - "version": "12.0.2.5.2", + "version": "12.0.2.6.0", "category": "Extra Tools", "license": "AGPL-3", "author": "MuK IT", @@ -35,7 +35,6 @@ ], "data": [ "template/assets.xml", - "template/editor.xml", ], "qweb": [ "static/src/xml/*.xml", @@ -49,5 +48,5 @@ }, "application": False, "installable": True, - 'auto_install': True, + 'auto_install': False, } diff --git a/muk_web_utils/doc/changelog.rst b/muk_web_utils/doc/changelog.rst index 3416b59..c61955c 100644 --- a/muk_web_utils/doc/changelog.rst +++ b/muk_web_utils/doc/changelog.rst @@ -1,3 +1,8 @@ +`2.6.0` +------- + +- Moved editor features to separate module + `2.5.0` ------- diff --git a/muk_web_utils/static/src/js/editor/snippets/options.js b/muk_web_utils/static/src/js/editor/snippets/options.js deleted file mode 100644 index 3f4a400..0000000 --- a/muk_web_utils/static/src/js/editor/snippets/options.js +++ /dev/null @@ -1,93 +0,0 @@ -/********************************************************************************** -* -* Copyright (C) 2017 MuK IT GmbH -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU Affero General Public License as -* published by the Free Software Foundation, either version 3 of the -* License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Affero General Public License for more details. -* -* You should have received a copy of the GNU Affero General Public License -* along with this program. If not, see . -* -**********************************************************************************/ - -odoo.define('muk_web_utils.snippet_options', function (require) { -"use strict"; - -var core = require('web.core'); -var colorpicker = require('web.colorpicker'); -var options = require('web_editor.snippets.options'); - -var _t = core._t; -var QWeb = core.qweb; - -options.registry.colorpicker.include({ - events: _.extend({}, options.registry.colorpicker.prototype.events || {}, { - 'click .mk_add_custom_color': '_onCustomColorButtonClick', - }), - start: function () { - var res = this._super.apply(this, arguments); - this._renderPickedColors(); - return res; - }, - onFocus: function () { - this._renderPickedColors(); - }, - _renderPickedColors: function () { - var $editable = window.__EditorMenuBar_$editable; - if (this.$el.find('.colorpicker').length && $editable.length) { - var $snippets = $editable.find('.mk_custom_background'); - var colors = _.map($snippets, function ($el) { - return $el.style.backgroundColor; - }); - this.$el.find('.colorpicker .mk_custom_color').remove(); - this.$el.find('.colorpicker button.selected').removeClass('selected'); - _.each( _.uniq(colors), function (color) { - var classes = ['mk_custom_color']; - if (this.$target.css('background-color') === color) { - classes.push('selected'); - } - var $colorButton = $('