summaryrefslogtreecommitdiff
path: root/addons/web_graph/static
diff options
context:
space:
mode:
authorJiten (OpenERP) <jra@tinyerp.com>2012-11-19 11:11:38 +0530
committerJiten (OpenERP) <jra@tinyerp.com>2012-11-19 11:11:38 +0530
commit4346af9c96ddc0e88d2d55d47ee0c4e21865aa2d (patch)
tree24feb522a8d01a5babe5a5a6fde7cc1c77b7de25 /addons/web_graph/static
parent3646b669516f78aa0a1be69ca8a241468cc9d98b (diff)
parent37209eb5e76a7b373a0f302e1f62be32fd2f37d2 (diff)
[MERGE] Merged trunk.
bzr revid: jra@tinyerp.com-20121119054138-lkrx5jo1tgbr71ek
Diffstat (limited to 'addons/web_graph/static')
-rw-r--r--addons/web_graph/static/lib/flotr2/lib/bean.js4
1 files changed, 1 insertions, 3 deletions
diff --git a/addons/web_graph/static/lib/flotr2/lib/bean.js b/addons/web_graph/static/lib/flotr2/lib/bean.js
index 6e6e3ef4eb5..1a854771006 100644
--- a/addons/web_graph/static/lib/flotr2/lib/bean.js
+++ b/addons/web_graph/static/lib/flotr2/lib/bean.js
@@ -9,9 +9,7 @@
*/
/*global module:true, define:true*/
!function (name, context, definition) {
- if (typeof module !== 'undefined') module.exports = definition(name, context);
- else if (typeof define === 'function' && typeof define.amd === 'object') define(definition);
- else context[name] = definition(name, context);
+ context[name] = definition(name, context);
}('bean', this, function (name, context) {
var win = window
, old = context[name]