diff options
| author | qsm-odoo <qsm@odoo.com> | 2017-02-23 14:19:56 +0100 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2017-04-11 19:44:38 +0200 |
| commit | 2db5ee0f7be9f22d87fbffa72c743b3ab92bcd60 (patch) | |
| tree | 69879cd269e2c5938de702147e47b1302eb88c51 | |
| parent | 3c0190d0a6c0d5ccc130fd9b685681fa9bac1de3 (diff) | |
[IMP] web: some more linting to follow guidelines
| -rw-r--r-- | addons/web/static/src/js/_deprecated/data.js | 44 | ||||
| -rw-r--r-- | addons/web/static/src/js/core/context.js | 6 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/basic/basic_model.js | 16 |
3 files changed, 32 insertions, 34 deletions
diff --git a/addons/web/static/src/js/_deprecated/data.js b/addons/web/static/src/js/_deprecated/data.js index 66469ff1374..791693bce67 100644 --- a/addons/web/static/src/js/_deprecated/data.js +++ b/addons/web/static/src/js/_deprecated/data.js @@ -314,7 +314,7 @@ var DataSet = Class.extend(mixins.PropertiesMixin, { * * @param {String} model the OpenERP model this dataset will manage */ - init: function(parent, model, context) { + init: function (parent, model, context) { mixins.PropertiesMixin.init.call(this); this.model = model; this.context = context || {}; @@ -341,7 +341,7 @@ var DataSet = Class.extend(mixins.PropertiesMixin, { } return this; }, - select_id: function(id) { + select_id: function (id) { var idx = this.get_id_index(id); if (idx === null) { return false; @@ -350,7 +350,7 @@ var DataSet = Class.extend(mixins.PropertiesMixin, { return true; } }, - get_id_index: function(id) { + get_id_index: function (id) { for (var i=0, ii=this.ids.length; i<ii; i++) { // Here we use type coercion because of the mess potentially caused by // OpenERP ids fetched from the DOM as string. (eg: dhtmlxcalendar) @@ -439,7 +439,7 @@ var DataSet = Class.extend(mixins.PropertiesMixin, { * @param {Object} [options.context] context data to add to the request payload, on top of the DataSet's own context * @returns {$.Deferred} */ - default_get: function(fields, options) { + default_get: function (fields, options) { options = options || {}; return this._model.call('default_get', [fields], {context: this.get_context(options.context)}); @@ -453,7 +453,7 @@ var DataSet = Class.extend(mixins.PropertiesMixin, { * on_changes. Only used by the BufferedDataSet to make the o2m work correctly. * @returns {$.Deferred} */ - create: function(data, options) { + create: function (data, options) { var self = this; return this._model.call('create', [data], { context: this.get_context() @@ -486,7 +486,7 @@ var DataSet = Class.extend(mixins.PropertiesMixin, { * * @param {Number|String} ids identifier of the record to delete */ - unlink: function(ids) { + unlink: function (ids) { var self = this; return this._model.call('unlink', [ids], { context: this.get_context() @@ -522,7 +522,7 @@ var DataSet = Class.extend(mixins.PropertiesMixin, { * @param {Array} ids * @returns {$.Deferred} */ - name_get: function(ids) { + name_get: function (ids) { return this._model.call('name_get', [ids], {context: this.get_context()}); }, /** @@ -546,10 +546,10 @@ var DataSet = Class.extend(mixins.PropertiesMixin, { /** * @param name */ - name_create: function(name, context) { + name_create: function (name, context) { return this._model.call('name_create', [name], {context: this.get_context(context)}); }, - get_context: function(request_context) { + get_context: function (request_context) { return this._model.context(request_context); }, /** @@ -589,13 +589,13 @@ var DataSet = Class.extend(mixins.PropertiesMixin, { size: function () { return this.ids.length; }, - alter_ids: function(n_ids) { + alter_ids: function (n_ids) { this.ids = n_ids; }, remove_ids: function (ids) { this.alter_ids(_(this.ids).difference(ids)); }, - add_ids: function(ids, at) { + add_ids: function (ids, at) { var args = [at, 0].concat(_.difference(ids, this.ids)); this.ids.splice.apply(this.ids, args); }, @@ -619,7 +619,7 @@ var DataSet = Class.extend(mixins.PropertiesMixin, { }); var DataSetStatic = DataSet.extend({ - init: function(parent, model, context, ids) { + init: function (parent, model, context, ids) { this._super(parent, model, context); // all local records this.ids = ids || []; @@ -640,7 +640,7 @@ var DataSetStatic = DataSet.extend({ this.index = ids.length - 1; } }, - unlink: function(ids) { + unlink: function (ids) { this.set_ids(_.without.apply(null, [this.ids].concat(ids))); this.trigger('unlink', ids); return $.Deferred().resolve({result: true}); @@ -657,7 +657,7 @@ var DataSetSearch = DataSet.extend({ * @param {Object} context * @param {Array} domain */ - init: function(parent, model, context, domain) { + init: function (parent, model, context, domain) { this._super(parent, model, context); this.domain = domain || []; this._length = null; @@ -708,16 +708,16 @@ var DataSetSearch = DataSet.extend({ this._length -= (before - this.ids.length); } }, - add_ids: function(ids, at) { + add_ids: function (ids, at) { var before = this.ids.length; this._super(ids, at); if(this._length){ this._length += (this.ids.length - before); } }, - unlink: function(ids, callback, error_callback) { + unlink: function (ids, callback, error_callback) { var self = this; - return this._super(ids).done(function() { + return this._super(ids).done(function () { self.remove_ids( ids); self.trigger("dataset_changed", ids, callback, error_callback); }); @@ -736,22 +736,22 @@ var CompoundDomain = Class.extend({ this.__domains = []; this.__eval_context = null; var self = this; - _.each(arguments, function(x) { + _.each(arguments, function (x) { self.add(x); }); }, - add: function(domain) { + add: function (domain) { this.__domains.push(domain); return this; }, - set_eval_context: function(eval_context) { + set_eval_context: function (eval_context) { this.__eval_context = eval_context; return this; }, - get_eval_context: function() { + get_eval_context: function () { return this.__eval_context; }, - eval: function() { + eval: function () { return pyeval.eval('domain', this); }, }); diff --git a/addons/web/static/src/js/core/context.js b/addons/web/static/src/js/core/context.js index c63c9f15bd8..961c67b898a 100644 --- a/addons/web/static/src/js/core/context.js +++ b/addons/web/static/src/js/core/context.js @@ -10,7 +10,7 @@ var Context = Class.extend({ this.__contexts = []; this.__eval_context = null; var self = this; - _.each(arguments, function(x) { + _.each(arguments, function (x) { self.add(x); }); }, @@ -25,11 +25,11 @@ var Context = Class.extend({ get_eval_context: function () { return this.__eval_context; }, - eval: function() { + eval: function () { return pyeval.eval('context', this); }, }); return Context; -});
\ No newline at end of file +}); diff --git a/addons/web/static/src/js/views/basic/basic_model.js b/addons/web/static/src/js/views/basic/basic_model.js index 2f6c3849b86..5cce92af685 100644 --- a/addons/web/static/src/js/views/basic/basic_model.js +++ b/addons/web/static/src/js/views/basic/basic_model.js @@ -123,7 +123,7 @@ var x2ManyCommands = { } }; -var Model = AbstractModel.extend({ +var BasicModel = AbstractModel.extend({ /** * @override */ @@ -149,7 +149,6 @@ var Model = AbstractModel.extend({ // Public //-------------------------------------------------------------------------- - /** * Add a default record to a list object. This method actually make a new * record with the makeDefaultRecord method, then add it to the list object. @@ -173,7 +172,7 @@ var Model = AbstractModel.extend({ parentID: list.id, relationField: list.relationField, }; - return this.makeDefaultRecord(list.model, params).then(function(id) { + return this.makeDefaultRecord(list.model, params).then(function (id) { list.count++; if (position === 'top') { list.data.unshift(id); @@ -874,10 +873,10 @@ var Model = AbstractModel.extend({ * @param {string} parentID id of the parent resource to reload * @returns {Deferred -> string} resolves to the parent id */ - toggleActive: function(recordIDs, value, parentID) { + toggleActive: function (recordIDs, value, parentID) { var self = this; var parent = this.localData[parentID]; - var resIDs = _.map(recordIDs, function(recordID) { + var resIDs = _.map(recordIDs, function (recordID) { return self.localData[recordID].res_id; }); return this @@ -997,6 +996,7 @@ var Model = AbstractModel.extend({ var field = record.fields[name]; if (!field) { return; } // ignore changes of unknown fields + var rec; if (field.type === 'many2one' ) { // in some case, the value returned by the onchange can // be false (no value), so we need to avoid creating a @@ -1008,7 +1008,7 @@ var Model = AbstractModel.extend({ var data = _.isArray(val) ? {id: val[0], display_name: val[1]} : {id: val}; - var rec = self._makeDataPoint({ + rec = self._makeDataPoint({ context: context, data: data, modelName: field.relation, @@ -1019,7 +1019,6 @@ var Model = AbstractModel.extend({ record._changes = record._changes || {}; var listId = record._changes[name] || record.data[name]; var list = self.localData[listId]; - var rec; _.each(val, function (command) { if (command[0] === 0 || command[0] === 1) { // CREATE or UPDATE @@ -2032,7 +2031,6 @@ var Model = AbstractModel.extend({ }, }); -return Model; - +return BasicModel; }); |
