From b1f1ca0ea1745503924b139594ac715780a64b72 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 13 Feb 2012 12:17:46 +0100
Subject: [PATCH] [FIX] stupid dhtmlxGraph blowing up everything in MSIE8 when
 not in debug mode

bzr revid: xmo@openerp.com-20120213111746-uojye5kfp1zpsb4a
---
 addons/web_graph/__openerp__.py                              | 5 +++--
 .../web_graph/static/lib/dhtmlxGraph/codebase/dhtmlxchart.js | 1 -
 .../static/lib/dhtmlxGraph/codebase/dhtmlxchart_debug.js     | 1 -
 .../lib/dhtmlxGraph/codebase/thirdparty/excanvas/excanvas.js | 3 ---
 .../web_graph/static/lib/dhtmlxGraph/sources/dhtmlxchart.js  | 1 -
 5 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/addons/web_graph/__openerp__.py b/addons/web_graph/__openerp__.py
index 533c0e21974..5a42ea381fe 100644
--- a/addons/web_graph/__openerp__.py
+++ b/addons/web_graph/__openerp__.py
@@ -5,8 +5,9 @@
     "version": "2.0",
     "depends": ['web'],
     "js": [
-           "static/lib/dhtmlxGraph/codebase/dhtmlxchart.js",
-           "static/src/js/graph.js"],
+        "static/lib/dhtmlxGraph/codebase/thirdparty/excanvas/excanvas.js",
+        "static/lib/dhtmlxGraph/codebase/dhtmlxchart.js",
+        "static/src/js/graph.js"],
     "css": ["static/lib/dhtmlxGraph/codebase/dhtmlxchart.css"],
     'qweb' : [
         "static/src/xml/*.xml",
diff --git a/addons/web_graph/static/lib/dhtmlxGraph/codebase/dhtmlxchart.js b/addons/web_graph/static/lib/dhtmlxGraph/codebase/dhtmlxchart.js
index 36ba2dd9f80..73d936e26d0 100755
--- a/addons/web_graph/static/lib/dhtmlxGraph/codebase/dhtmlxchart.js
+++ b/addons/web_graph/static/lib/dhtmlxGraph/codebase/dhtmlxchart.js
@@ -2189,7 +2189,6 @@ dhtmlx.Canvas = {
         });
         a.appendChild(this.l);
         if (!this.l.getContext) if (dhtmlx.r) {
-            dhtmlx.require("thirdparty/excanvas/excanvas.js");
             G_vmlCanvasManager.init_(document);
             G_vmlCanvasManager.initElement(this.l)
         }
diff --git a/addons/web_graph/static/lib/dhtmlxGraph/codebase/dhtmlxchart_debug.js b/addons/web_graph/static/lib/dhtmlxGraph/codebase/dhtmlxchart_debug.js
index af9b4437b31..b536825fe02 100644
--- a/addons/web_graph/static/lib/dhtmlxGraph/codebase/dhtmlxchart_debug.js
+++ b/addons/web_graph/static/lib/dhtmlxGraph/codebase/dhtmlxchart_debug.js
@@ -4021,7 +4021,6 @@ dhtmlx.Canvas = {
 		//use excanvas in IE
 		if (!this._canvas.getContext){
 			if (dhtmlx._isIE){
-				dhtmlx.require("thirdparty/excanvas/excanvas.js");	//sync loading
 				G_vmlCanvasManager.init_(document);
 				G_vmlCanvasManager.initElement(this._canvas);
 			} else	//some other not supported browser
diff --git a/addons/web_graph/static/lib/dhtmlxGraph/codebase/thirdparty/excanvas/excanvas.js b/addons/web_graph/static/lib/dhtmlxGraph/codebase/thirdparty/excanvas/excanvas.js
index 3fe46d3336f..367764b4d6a 100644
--- a/addons/web_graph/static/lib/dhtmlxGraph/codebase/thirdparty/excanvas/excanvas.js
+++ b/addons/web_graph/static/lib/dhtmlxGraph/codebase/thirdparty/excanvas/excanvas.js
@@ -922,6 +922,3 @@ if (!document.createElement('canvas').getContext) {
 })();
 
 } // if
-
-if (dhtmlx && dhtmlx._modules)
-	dhtmlx._modules["thirdparty/excanvas/excanvas.js"] = true;
\ No newline at end of file
diff --git a/addons/web_graph/static/lib/dhtmlxGraph/sources/dhtmlxchart.js b/addons/web_graph/static/lib/dhtmlxGraph/sources/dhtmlxchart.js
index c0c4838a0c0..cbb0f8346bd 100644
--- a/addons/web_graph/static/lib/dhtmlxGraph/sources/dhtmlxchart.js
+++ b/addons/web_graph/static/lib/dhtmlxGraph/sources/dhtmlxchart.js
@@ -3093,7 +3093,6 @@ dhtmlx.Canvas = {
 		//use excanvas in IE
 		if (!this._canvas.getContext){
 			if (dhtmlx._isIE){
-				dhtmlx.require("thirdparty/excanvas/excanvas.js");	//sync loading
 				G_vmlCanvasManager.init_(document);
 				G_vmlCanvasManager.initElement(this._canvas);
 			} else	//some other not supported browser