From 07a459f2d49977ac108756d4d03a70ede133b617 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 17 Jan 2012 14:28:43 +0100 Subject: [PATCH 1/5] [FIX] trailing commas bzr revid: xmo@openerp.com-20120117132843-obecwigtts1rf9ja --- addons/web/static/src/js/chrome.js | 6 +++--- addons/web/static/src/js/core.js | 6 +++--- addons/web/static/src/js/data.js | 4 ++-- addons/web/static/src/js/view_editor.js | 12 ++++++------ addons/web/static/src/js/view_form.js | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 588af765978..6dce78a1c5e 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -205,7 +205,7 @@ openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({ buttons: buttons }).open(); dialog.$element.html(QWeb.render('CrashManagerError', {session: openerp.connection, error: error})); - }, + } }); openerp.web.Loading = openerp.web.Widget.extend(/** @lends openerp.web.Loading# */{ @@ -649,7 +649,7 @@ openerp.web.Login = openerp.web.Widget.extend(/** @lends openerp.web.Login# */{ } } }); - }, + } }); openerp.web.Header = openerp.web.Widget.extend(/** @lends openerp.web.Header# */{ @@ -1215,7 +1215,7 @@ openerp.web.EmbeddedClient = openerp.web.Widget.extend({ self.am.do_action(action); }); - }, + } }); diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index b36e576ae47..3005fc80d13 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -491,7 +491,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp. dataType: 'json', contentType: 'application/json', data: JSON.stringify(payload), - processData: false, + processData: false }, url); if (this.synch) ajax.async = false; @@ -502,7 +502,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp. // extracted from payload to set on the url var data = { session_id: this.session_id, - id: payload.id, + id: payload.id }; url.url = this.get_url(url.url); var ajax = _.extend({ @@ -864,7 +864,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp. } finally { this.synch = synch; } - }, + } }); /** diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js index 447b95d17cf..bb53fb2175a 100644 --- a/addons/web/static/src/js/data.js +++ b/addons/web/static/src/js/data.js @@ -829,9 +829,9 @@ openerp.web.Model = openerp.web.CallbackEnabled.extend({ model: this.model_name, method: method, args: args, - kwargs: kwargs, + kwargs: kwargs }); - }, + } }); openerp.web.CompoundContext = openerp.web.Class.extend({ diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index bf920380ff9..6e58886fadd 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -806,7 +806,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ 'widget' : {'name':'widget', 'string': 'widget', 'type': 'selection'}, 'colors' : {'name':'colors', 'string': 'Colors', 'type': 'char'}, 'editable' : {'name':'editable', 'string': 'Editable', 'type': 'selection', 'selection': [["",""],["top","Top"],["bottom", "Bottom"]]}, - 'groups' : {'name':'groups', 'string': 'Groups', 'type': 'seleciton_multi'}, + 'groups' : {'name':'groups', 'string': 'Groups', 'type': 'seleciton_multi'} }; var arch_val = self.get_object_by_id(this.one_object.clicked_tr_id,this.one_object['main_object'], []); this.edit_node_dialog.$element.append('
'); @@ -928,7 +928,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ type: 'ir.actions.act_window', target: "new", flags: { - action_buttons: true, + action_buttons: true } } var action_manager = new openerp.web.ActionManager(self); @@ -982,7 +982,7 @@ openerp.web.ViewEditor.Field = openerp.web.Class.extend({ }, render: function() { return _.str.sprintf("%s", this.name, QWeb.render(this.template, {widget: this})) - }, + } }); openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({ template : "vieweditor_boolean", @@ -1084,7 +1084,7 @@ var _PROPERTIES = { 'action' : ['name', 'string', 'colspan', 'groups'], 'tree' : ['string', 'colors', 'editable', 'link', 'limit', 'min_rows'], 'graph' : ['string', 'type'], - 'calendar' : ['string', 'date_start', 'date_stop', 'date_delay', 'day_length', 'color', 'mode'], + 'calendar' : ['string', 'date_start', 'date_stop', 'date_delay', 'day_length', 'color', 'mode'] }; var _CHILDREN = { 'form': ['notebook', 'group', 'field', 'label', 'button','board', 'newline', 'separator'], @@ -1100,7 +1100,7 @@ var _CHILDREN = { 'label': [], 'button' : [], 'newline': [], - 'separator': [], + 'separator': [] }; var _ICONS = ['','STOCK_ABOUT', 'STOCK_ADD', 'STOCK_APPLY', 'STOCK_BOLD', 'STOCK_CANCEL', 'STOCK_CDROM', 'STOCK_CLEAR', 'STOCK_CLOSE', 'STOCK_COLOR_PICKER', @@ -1134,6 +1134,6 @@ openerp.web.ViewEditor.property_widget = new openerp.web.Registry({ 'seleciton_multi' : 'openerp.web.ViewEditor.FieldSelectMulti', 'selection' : 'openerp.web.ViewEditor.FieldSelect', 'char' : 'openerp.web.ViewEditor.FieldChar', - 'float' : 'openerp.web.ViewEditor.FieldFloat', + 'float' : 'openerp.web.ViewEditor.FieldFloat' }); }; diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index e761173e042..467edcebd8c 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -1279,7 +1279,7 @@ openerp.web.form.Field = openerp.web.form.Widget.extend(/** @lends openerp.web.f this.definition_options = JSON.parse(str); } return this.definition_options; - }, + } }); openerp.web.form.FieldChar = openerp.web.form.Field.extend({ @@ -2422,7 +2422,7 @@ openerp.web.form.One2ManyListView = openerp.web.ListView.extend({ var self = this; var def = $.Deferred().then(callback).then(function() {self.o2m.view.reload();}); return this._super(name, id, _.bind(def.resolve, def)); - }, + } }); openerp.web.form.One2ManyFormView = openerp.web.FormView.extend({ From 439f23d77b268aff1417d9cbf65e540dcf3c3dff Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 17 Jan 2012 14:53:12 +0100 Subject: [PATCH 2/5] [FIX] root css on .openerp, not body.openerp bzr revid: xmo@openerp.com-20120117135312-f9pmqgmy4704vfyh --- addons/web/static/src/css/base.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 84e4da5b711..0994ed41b1a 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,4 +1,5 @@ -body.openerp { +body { padding: 0; margin: 0; } +.openerp { padding: 0; margin: 0; height: 100%; @@ -7,7 +8,8 @@ body.openerp { font-family: Ubuntu, Helvetica, sans-serif; } -body.openerp, .openerp textarea, .openerp input, .openerp select, .openerp option, .openerp button, .openerp .ui-widget { +.openerp, .openerp textarea, .openerp input, .openerp select, .openerp option, +.openerp button, .openerp .ui-widget { font-family: Ubuntu, Helvetica, sans-serif; font-size:85%; } From 7d305cbbee66251870e825cd44a99a57a41f407c Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 17 Jan 2012 14:58:17 +0100 Subject: [PATCH 3/5] [FIX] MSIE does not like calling .html on the page's title, set the string on the document's title directly (as a property) bzr revid: xmo@openerp.com-20120117135817-t3ggfjp71r6io6b4 --- addons/web/static/src/js/chrome.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 6dce78a1c5e..be570e3dd84 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -1092,7 +1092,7 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie self.bind_hashchange(); if (!self.session.openerp_entreprise) { self.$element.find('.oe_footer_powered').append(' - Unsupported/Community Version'); - $('title').html('OpenERP - Unsupported/Community Version'); + document.title = _t("OpenERP - Unsupported/Community Version"); } }); }, From aeebcf3dccbd1adfdb4fd62e29043449ef96c603 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 17 Jan 2012 15:02:13 +0100 Subject: [PATCH 4/5] [FIX] un-nivity call of WebClient, IE8 does not like nobody to mess with its body: bzr revid: xmo@openerp.com-20120117140213-u2n1l4cg1nz1xrea --- addons/web/controllers/main.py | 4 ++-- addons/web/static/src/js/chrome.js | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 7b2ad5b311c..b0a12802db4 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -99,7 +99,7 @@ html_template = """ }); - + """ @@ -207,7 +207,7 @@ class WebClient(openerpweb.Controller): 'js': js, 'css': css, 'modules': simplejson.dumps(self.server_wide_modules(req)), - 'init': 'new s.web.WebClient().replace($("body"));', + 'init': 'new s.web.WebClient().start();', } return r diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index be570e3dd84..8b9a0d4efc6 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -1062,13 +1062,9 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie this._current_state = null; }, - render_element: function() { - this.$element = $(''); - this.$element.attr("id", "oe"); - this.$element.addClass("openerp"); - }, start: function() { var self = this; + this.$element = $(document.body); if (jQuery.param != undefined && jQuery.deparam(jQuery.param.querystring()).kitten != undefined) { this.$element.addClass("kitten-mode-activated"); this.$element.delegate('img.oe-record-edit-link-img', 'hover', function(e) { From c82878388a5a26ec424453eafe4ae71779c62824 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 17 Jan 2012 15:38:06 +0100 Subject: [PATCH 5/5] [FIX] qweb: benchmark on browsers without console.time & console/timeEnd bzr revid: xmo@openerp.com-20120117143806-x5hqclaw6a8hdu98 --- addons/web/static/lib/qweb/qweb-benchmark.html | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/addons/web/static/lib/qweb/qweb-benchmark.html b/addons/web/static/lib/qweb/qweb-benchmark.html index 0cc67e7e54f..4f7fb56ac1f 100644 --- a/addons/web/static/lib/qweb/qweb-benchmark.html +++ b/addons/web/static/lib/qweb/qweb-benchmark.html @@ -5,11 +5,25 @@