[Merge]Merge with trunk

bzr revid: vja@tinyerp.com-20130501054129-2ie8kj73yosxbfo8

7 files changed, 0 insertions, 132 deletions

diff --git a/addons/web/doc/module/static/src/js/first_module.js b/addons/web/doc/module/static/src/js/first_module.js
deleted file mode 100644
index 74580d1c0ca..00000000000
--- a/addons/web/doc/module/static/src/js/first_module.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// static/src/js/first_module.js
-console.log("Debug statement: file loaded");
diff --git a/addons/web/doc/module/static/src/js/first_module.js.1.diff b/addons/web/doc/module/static/src/js/first_module.js.1.diff
deleted file mode 100644
index 53c153e1971..00000000000
--- a/addons/web/doc/module/static/src/js/first_module.js.1.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- web_example/static/src/js/first_module.js
-+++ web_example/static/src/js/first_module.js
-@@ -1,2 +1,4 @@
- // static/src/js/first_module.js
--console.log("Debug statement: file loaded");
-+openerp.web_example = function (instance) {
-+    console.log("Module loaded");
-+};
diff --git a/addons/web/doc/module/static/src/js/first_module.js.2.diff b/addons/web/doc/module/static/src/js/first_module.js.2.diff
deleted file mode 100644
index 88a80f50fff..00000000000
--- a/addons/web/doc/module/static/src/js/first_module.js.2.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- web_example/static/src/js/first_module.js
-+++ web_example/static/src/js/first_module.js
-@@ -1,4 +1,7 @@
- // static/src/js/first_module.js
- openerp.web_example = function (instance) {
--    console.log("Module loaded");
-+    instance.web.client_actions.add('example.action', 'instance.web_example.action');
-+    instance.web_example.action = function (parent, action) {
-+        console.log("Executed the action", action);
-+    };
- };
diff --git a/addons/web/doc/module/static/src/js/first_module.js.3.diff b/addons/web/doc/module/static/src/js/first_module.js.3.diff
deleted file mode 100644
index 295e90b6840..00000000000
--- a/addons/web/doc/module/static/src/js/first_module.js.3.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- web_example/static/src/js/first_module.js
-+++ web_example/static/src/js/first_module.js
-@@ -1,7 +1,11 @@
- // static/src/js/first_module.js
- openerp.web_example = function (instance) {
--    instance.web.client_actions.add('example.action', 'instance.web_example.action');
--    instance.web_example.action = function (parent, action) {
--        console.log("Executed the action", action);
--    };
-+    instance.web.client_actions.add('example.action', 'instance.web_example.Action');
-+    instance.web_example.Action = instance.web.Widget.extend({
-+        className: 'oe_web_example',
-+        start: function () {
-+            this.$el.text("Hello, world!");
-+            return this._super();
-+        }
-+    });
- };
diff --git a/addons/web/doc/module/static/src/js/first_module.js.4.diff b/addons/web/doc/module/static/src/js/first_module.js.4.diff
deleted file mode 100644
index 78a192147e6..00000000000
--- a/addons/web/doc/module/static/src/js/first_module.js.4.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- web_example/static/src/js/first_module.js
-+++ web_example/static/src/js/first_module.js
-@@ -1,11 +1,7 @@
- // static/src/js/first_module.js
- openerp.web_example = function (instance) {
-     instance.web.client_actions.add('example.action', 'instance.web_example.Action');
-     instance.web_example.Action = instance.web.Widget.extend({
-+        template: 'web_example.action'
--        className: 'oe_web_example',
--        start: function () {
--            this.$el.text("Hello, world!");
--            return this._super();
--        }
-     });
- };
diff --git a/addons/web/doc/module/static/src/js/first_module.js.5.diff b/addons/web/doc/module/static/src/js/first_module.js.5.diff
deleted file mode 100644
index f345ea319ef..00000000000
--- a/addons/web/doc/module/static/src/js/first_module.js.5.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- web_example/static/src/js/first_module.js
-+++ web_example/static/src/js/first_module.js
-@@ -1,7 +1,19 @@
- // static/src/js/first_module.js
- openerp.web_example = function (instance) {
-     instance.web.client_actions.add('example.action', 'instance.web_example.Action');
-     instance.web_example.Action = instance.web.Widget.extend({
--        template: 'web_example.action'
-+        template: 'web_example.action',
-+        events: {
-+            'click .oe_web_example_start button': 'watch_start',
-+            'click .oe_web_example_stop button': 'watch_stop'
-+        },
-+        watch_start: function () {
-+            this.$el.addClass('oe_web_example_started')
-+                    .removeClass('oe_web_example_stopped');
-+        },
-+        watch_stop: function () {
-+            this.$el.removeClass('oe_web_example_started')
-+                    .addClass('oe_web_example_stopped');
-+        },
-     });
- };
diff --git a/addons/web/doc/module/static/src/js/first_module.js.6.diff b/addons/web/doc/module/static/src/js/first_module.js.6.diff
deleted file mode 100644
index 7dd17af0e18..00000000000
--- a/addons/web/doc/module/static/src/js/first_module.js.6.diff
+++ /dev/null
@@ -1,55 +0,0 @@
---- web_example/static/src/js/first_module.js
-+++ web_example/static/src/js/first_module.js
-@@ -1,19 +1,52 @@
- // static/src/js/first_module.js
- openerp.web_example = function (instance) {
-     instance.web.client_actions.add('example.action', 'instance.web_example.Action');
-     instance.web_example.Action = instance.web.Widget.extend({
-         template: 'web_example.action',
-         events: {
-             'click .oe_web_example_start button': 'watch_start',
-             'click .oe_web_example_stop button': 'watch_stop'
-         },
-+        init: function () {
-+            this._super.apply(this, arguments);
-+            this._start = null;
-+            this._watch = null;
-+        },
-+        update_counter: function () {
-+            var h, m, s;
-+            // Subtracting javascript dates returns the difference in milliseconds
-+            var diff = new Date() - this._start;
-+            s = diff / 1000;
-+            m = Math.floor(s / 60);
-+            s -= 60*m;
-+            h = Math.floor(m / 60);
-+            m -= 60*h;
-+            this.$('.oe_web_example_timer').text(
-+                _.str.sprintf("%02d:%02d:%02d", h, m, s));
-+        },
-         watch_start: function () {
-             this.$el.addClass('oe_web_example_started')
-                     .removeClass('oe_web_example_stopped');
-+            this._start = new Date();
-+            // Update the UI to the current time
-+            this.update_counter();
-+            // Update the counter at 30 FPS (33ms/frame)
-+            this._watch = setInterval(
-+                this.proxy('update_counter'),
-+                33);
-         },
-         watch_stop: function () {
-+            clearInterval(this._watch);
-+            this.update_counter();
-+            this._start = this._watch = null;
-             this.$el.removeClass('oe_web_example_started')
-                     .addClass('oe_web_example_stopped');
-         },
-+        destroy: function () {
-+            if (this._watch) {
-+                clearInterval(this._watch);
-+            }
-+            this._super();
-+        }
-     });
- };