[Merge]Merge with trunk

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

1 files changed, 0 insertions, 23 deletions

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');
-+        },
-     });
- };