summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js
diff options
context:
space:
mode:
authorRémi Rahir <rar@odoo.com>2018-04-03 15:52:17 +0200
committerRémi Rahir <rar@odoo.com>2018-04-03 15:52:17 +0200
commitc3d1eda0176b44fd3e43364427f8f00a28615c0d (patch)
tree281c1515621def1c6c72daa35865c3e0daaec348 /addons/web/static/src/js
parent55878df5fff0e6da926e4503b13a51052a4201e0 (diff)
[FIX] web,account,google_calendar: chasing breaking spaces
Before this commit, some breaking spaces were present in the js code. Such spaces are misinterpreted and worked by luck. This has become a problem with exported js bunldes (e.g. the external_lib bundle in im_livechat). This commit replaces breaking spaces by regular spaces.
Diffstat (limited to 'addons/web/static/src/js')
-rw-r--r--addons/web/static/src/js/core/rpc.js14
-rw-r--r--addons/web/static/src/js/views/basic/basic_controller.js4
2 files changed, 9 insertions, 9 deletions
diff --git a/addons/web/static/src/js/core/rpc.js b/addons/web/static/src/js/core/rpc.js
index 53d298c9019..cc56cb74ebb 100644
--- a/addons/web/static/src/js/core/rpc.js
+++ b/addons/web/static/src/js/core/rpc.js
@@ -52,19 +52,19 @@ return {
if (options.method === 'read_group') {
if (!(params.args && params.args[0] !== undefined)) {
- params.kwargs.domain = options.domain || params.domain || params.kwargs.domain || [];
+ params.kwargs.domain = options.domain || params.domain || params.kwargs.domain || [];
}
if (!(params.args && params.args[1] !== undefined)) {
- params.kwargs.fields = options.fields || params.fields || params.kwargs.fields || [];
+ params.kwargs.fields = options.fields || params.fields || params.kwargs.fields || [];
}
if (!(params.args && params.args[2] !== undefined)) {
- params.kwargs.groupby = options.groupBy || params.groupBy || params.kwargs.groupby || [];
+ params.kwargs.groupby = options.groupBy || params.groupBy || params.kwargs.groupby || [];
}
- params.kwargs.offset = options.offset || params.offset || params.kwargs.offset;
- params.kwargs.limit = options.limit || params.limit || params.kwargs.limit;
+ params.kwargs.offset = options.offset || params.offset || params.kwargs.offset;
+ params.kwargs.limit = options.limit || params.limit || params.kwargs.limit;
// In kwargs, we look for "orderby" rather than "orderBy" (note the absence of capital B),
// since the Python argument to the actual function is "orderby".
- var orderBy = options.orderBy || params.orderBy || params.kwargs.orderby;
+ var orderBy = options.orderBy || params.orderBy || params.kwargs.orderby;
params.kwargs.orderby = orderBy ? this._serializeSort(orderBy) : orderBy;
params.kwargs.lazy = 'lazy' in options ? options.lazy : params.lazy;
}
@@ -72,7 +72,7 @@ return {
if (options.method === 'search_read') {
// call the model method
params.kwargs.domain = options.domain || params.domain || params.kwargs.domain;
- params.kwargs.fields = options.fields || params.fields || params.kwargs.fields;
+ params.kwargs.fields = options.fields || params.fields || params.kwargs.fields;
params.kwargs.offset = options.offset || params.offset || params.kwargs.offset;
params.kwargs.limit = options.limit || params.limit || params.kwargs.limit;
// In kwargs, we look for "order" rather than "orderBy" since the Python
diff --git a/addons/web/static/src/js/views/basic/basic_controller.js b/addons/web/static/src/js/views/basic/basic_controller.js
index 328daf956ee..93b8d1ce82d 100644
--- a/addons/web/static/src/js/views/basic/basic_controller.js
+++ b/addons/web/static/src/js/views/basic/basic_controller.js
@@ -306,7 +306,7 @@ var BasicController = AbstractController.extend(FieldManagerMixin, {
*
* @private
*/
- _disableButtons: function () {
+ _disableButtons: function () {
if (this.$buttons) {
this.$buttons.find('button').attr('disabled', true);
}
@@ -352,7 +352,7 @@ var BasicController = AbstractController.extend(FieldManagerMixin, {
*
* @private
*/
- _enableButtons: function () {
+ _enableButtons: function () {
if (this.$buttons) {
this.$buttons.find('button').removeAttr('disabled');
}