summaryrefslogtreecommitdiff
path: root/addons/web/static
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2020-05-14 22:44:28 +0000
committerqsm-odoo <qsm@odoo.com>2020-05-14 22:44:28 +0000
commit57ec9049e2d1fe6043b2a4b6660cc83b480a4cef (patch)
tree648db52d815d7aa51e2a613f61bd5271dc206871 /addons/web/static
parent5863411437e836b18174952dc74ab5b42ef507ce (diff)
[MOV] web: rename colorpicker_dialog.xml file
The ColorpickerDialog will become a widget, this commit is only about renaming the related XML file. Part of https://github.com/odoo/odoo/pull/46088 task-2195313
Diffstat (limited to 'addons/web/static')
-rw-r--r--addons/web/static/src/js/widgets/colorpicker.js2
-rw-r--r--addons/web/static/src/xml/colorpicker.xml (renamed from addons/web/static/src/xml/colorpicker_dialog.xml)0
-rw-r--r--addons/web/static/tests/fields/basic_fields_tests.js2
3 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/widgets/colorpicker.js b/addons/web/static/src/js/widgets/colorpicker.js
index f7238cceb2a..1d43d21cfbd 100644
--- a/addons/web/static/src/js/widgets/colorpicker.js
+++ b/addons/web/static/src/js/widgets/colorpicker.js
@@ -9,7 +9,7 @@ var _t = core._t;
var ColorpickerDialog = Dialog.extend({
xmlDependencies: (Dialog.prototype.xmlDependencies || [])
- .concat(['/web/static/src/xml/colorpicker_dialog.xml']),
+ .concat(['/web/static/src/xml/colorpicker.xml']),
template: 'ColorpickerDialog',
events: _.extend({}, Dialog.prototype.events || {}, {
'mousedown .o_color_pick_area': '_onMouseDownPicker',
diff --git a/addons/web/static/src/xml/colorpicker_dialog.xml b/addons/web/static/src/xml/colorpicker.xml
index dab882595db..dab882595db 100644
--- a/addons/web/static/src/xml/colorpicker_dialog.xml
+++ b/addons/web/static/src/xml/colorpicker.xml
diff --git a/addons/web/static/tests/fields/basic_fields_tests.js b/addons/web/static/tests/fields/basic_fields_tests.js
index 3d98ea984e7..ec4b1b3f552 100644
--- a/addons/web/static/tests/fields/basic_fields_tests.js
+++ b/addons/web/static/tests/fields/basic_fields_tests.js
@@ -7259,7 +7259,7 @@ QUnit.module('basic_fields', {
QUnit.module('FieldColor', {
before: function () {
- return ajax.loadXML('/web/static/src/xml/colorpicker_dialog.xml', core.qweb);
+ return ajax.loadXML('/web/static/src/xml/colorpicker.xml', core.qweb);
},
});