From f130d1c374bafb63107333817de57ba672334060 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 8 Aug 2011 11:57:50 +0200
Subject: [PATCH] [IMP] rename openerp.base.Class.mix to
 openerp.base.Class.include, // to Ruby's name for the same behavior

bzr revid: xmo@openerp.com-20110808095750-yhg1ixaump4rq09x
---
 addons/base/static/src/js/core.js | 2 +-
 addons/base/static/test/class.js  | 8 ++++----
 doc/source/addons.rst             | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/base/static/src/js/core.js b/addons/base/static/src/js/core.js
index a96ff7d1b65..80dba3cd10c 100644
--- a/addons/base/static/src/js/core.js
+++ b/addons/base/static/src/js/core.js
@@ -56,7 +56,7 @@ openerp.base.core = function(openerp) {
             }
             return this;
         }
-        Class.mix = function (properties) {
+        Class.include = function (properties) {
             for (var name in properties) {
                 if (typeof properties[name] !== 'function'
                         || !fnTest.test(properties[name])) {
diff --git a/addons/base/static/test/class.js b/addons/base/static/test/class.js
index f188d3920e5..9ee6cedbcf1 100644
--- a/addons/base/static/test/class.js
+++ b/addons/base/static/test/class.js
@@ -67,7 +67,7 @@ $(document).ready(function () {
             },
             bar: 3
         });
-        C0.mix({
+        C0.include({
             foo: function () {
                 return 5;
             },
@@ -94,7 +94,7 @@ $(document).ready(function () {
         strictEqual(new C1().foo(), 2);
         strictEqual(new C1().bar(), 1);
 
-        C1.mix({
+        C1.include({
             foo: function () { return 2 + this._super(); },
             bar: function () { return 1 + this._super(); }
         });
@@ -110,7 +110,7 @@ $(document).ready(function () {
         strictEqual(instance.foo(), 1);
         strictEqual(instance.bar(), 1);
 
-        C0.mix({
+        C0.include({
             foo: function () { return 2; },
             bar: function () { return 2 + this._super(); }
         });
@@ -128,7 +128,7 @@ $(document).ready(function () {
         });
         var instance = new C1();
         strictEqual(instance.foo(), 2);
-        C0.mix({
+        C0.include({
             foo: function () { return 2; },
             bar: function () { return 2 + this._super(); }
         });
diff --git a/doc/source/addons.rst b/doc/source/addons.rst
index a99737221ce..4f371192760 100644
--- a/doc/source/addons.rst
+++ b/doc/source/addons.rst
@@ -88,7 +88,7 @@ initializing the addon.
     /** @namespace */
     openerp.example = function (openerp) {
         // basic initialization code (e.g. templates loading)
-        openerp.example.SomeClass = Class.extend(
+        openerp.example.SomeClass = openerp.base.Class.extend(
             /** @lends openerp.example.SomeClass# */{
             /**
              * Description for SomeClass's constructor here