summaryrefslogtreecommitdiff
path: root/addons/web/doc/module/static/src/js/first_module.js.4.diff
diff options
context:
space:
mode:
authorChristophe Simonis <chs@openerp.com>2012-12-10 15:08:47 +0100
committerChristophe Simonis <chs@openerp.com>2012-12-10 15:08:47 +0100
commit8b4f341c949b6eac6a9e2ce80340eadbb10dd89f (patch)
tree449ab939d5be2e46476148db4ee0d05698271d0d /addons/web/doc/module/static/src/js/first_module.js.4.diff
parentda574605c72b0830c0855c78308723b88fc0d948 (diff)
parent5d2d4dea2cae780f1b42718170b3aedeb2f0df73 (diff)
merge upstream
bzr revid: chs@openerp.com-20121205150654-c7ps8cygsx1zk1ua bzr revid: chs@openerp.com-20121207104954-xz35sdqgya18pgus bzr revid: chs@openerp.com-20121210140847-yoobt0twf9kg9yau
Diffstat (limited to 'addons/web/doc/module/static/src/js/first_module.js.4.diff')
-rw-r--r--addons/web/doc/module/static/src/js/first_module.js.4.diff15
1 files changed, 15 insertions, 0 deletions
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
new file mode 100644
index 00000000000..78a192147e6
--- /dev/null
+++ b/addons/web/doc/module/static/src/js/first_module.js.4.diff
@@ -0,0 +1,15 @@
+--- 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();
+- }
+ });
+ };