[IMP] Removed global QWeb. Now instanciate a QWeb2.Engine for each session: instance.web.qweb

bzr revid: fme@openerp.com-20110907093743-k0224c5qjb74hxvb

8 files changed, 10 insertions, 2 deletions

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 9d0f097b6eb..d58dadac210 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -3,6 +3,7 @@
  *---------------------------------------------------------*/
 
 openerp.web.chrome = function(openerp) {
+var QWeb = openerp.web.qweb;
 
 openerp.web.Notification =  openerp.web.Widget.extend({
     init: function(parent, element_id) {
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index d826ff34a43..ae2c4d0d657 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -3,6 +3,7 @@
  *--------------------------------------------------------*/
 
 openerp.web.core = function(openerp) {
+openerp.web.qweb = new QWeb2.Engine();
 /**
  * John Resig Class with factory improvement
  */
@@ -868,7 +869,7 @@ openerp.web.Widget = openerp.web.SessionAware.extend({
      * @param {Object} additional Additional context arguments to pass to the template.
      */
     render: function (additional) {
-        return QWeb.render(this.template, _.extend({widget: this}, additional || {}));
+        return openerp.web.qweb.render(this.template, _.extend({widget: this}, additional || {}));
     },
     /**
      * Method called after rendering. Mostly used to bind actions, perform asynchronous
@@ -946,7 +947,7 @@ openerp.web.Widget = openerp.web.SessionAware.extend({
  */
 openerp.web.OldWidget = openerp.web.Widget.extend({
     render: function (additional) {
-        return QWeb.render(this.template, _.extend(_.extend({}, this), additional || {}));
+        return openerp.web.qweb.render(this.template, _.extend(_.extend({}, this), additional || {}));
     }
 });
 
diff --git a/addons/web/static/src/js/data_export.js b/addons/web/static/src/js/data_export.js
index 15477ffdc41..51ac2cbd568 100644
--- a/addons/web/static/src/js/data_export.js
+++ b/addons/web/static/src/js/data_export.js
@@ -1,4 +1,5 @@
 openerp.web.data_export = function(openerp) {
+var QWeb = openerp.web.qweb;
 openerp.web.DataExport = openerp.web.Dialog.extend({
     template: 'ExportTreeView',
     dialog_title: 'Export Data',
diff --git a/addons/web/static/src/js/form.js b/addons/web/static/src/js/form.js
index 91e19dbe0b0..0b931d7df88 100644
--- a/addons/web/static/src/js/form.js
+++ b/addons/web/static/src/js/form.js
@@ -1,6 +1,7 @@
 openerp.web.form = function (openerp) {
 
 var _t = openerp.web._t;
+var QWeb = openerp.web.qweb;
 
 openerp.web.views.add('form', 'openerp.web.FormView');
 openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView# */{
diff --git a/addons/web/static/src/js/list.js b/addons/web/static/src/js/list.js
index 30c7138936f..6029b30f866 100644
--- a/addons/web/static/src/js/list.js
+++ b/addons/web/static/src/js/list.js
@@ -1,4 +1,5 @@
 openerp.web.list = function (openerp) {
+var QWeb = openerp.web.qweb;
 openerp.web.views.add('list', 'openerp.web.ListView');
 openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView# */ {
     defaults: {
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 23fb1ec5215..272e96b7d01 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1,4 +1,5 @@
 openerp.web.search = function(openerp) {
+var QWeb = openerp.web.qweb;
 
 openerp.web.SearchView = openerp.web.Widget.extend({
     init: function(parent, element_id, dataset, view_id, defaults) {
diff --git a/addons/web/static/src/js/view_tree.js b/addons/web/static/src/js/view_tree.js
index 595288147e1..a71e4010fcf 100644
--- a/addons/web/static/src/js/view_tree.js
+++ b/addons/web/static/src/js/view_tree.js
@@ -3,6 +3,7 @@
  *---------------------------------------------------------*/
 
 openerp.web.view_tree = function(openerp) {
+var QWeb = openerp.web.qweb;
 
 openerp.web.views.add('tree', 'openerp.web.TreeView');
 /**
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index e351d49c6eb..2c616359f01 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -5,6 +5,7 @@
 openerp.web.views = function(openerp) {
 
 var _t = openerp.web._t;
+var QWeb = openerp.web.qweb;
 
 /**
  * Registry for all the client actions key: tag value: widget