summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
Diffstat (limited to 'addons/web/static/src')
-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
2 files changed, 1 insertions, 1 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