diff options
| author | Christophe Simonis <chs@openerp.com> | 2012-12-10 15:08:47 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2012-12-10 15:08:47 +0100 |
| commit | 8b4f341c949b6eac6a9e2ce80340eadbb10dd89f (patch) | |
| tree | 449ab939d5be2e46476148db4ee0d05698271d0d /addons/web/doc/module/static/src/js/first_module.js.2.diff | |
| parent | da574605c72b0830c0855c78308723b88fc0d948 (diff) | |
| parent | 5d2d4dea2cae780f1b42718170b3aedeb2f0df73 (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.2.diff')
| -rw-r--r-- | addons/web/doc/module/static/src/js/first_module.js.2.diff | 11 |
1 files changed, 11 insertions, 0 deletions
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 new file mode 100644 index 00000000000..88a80f50fff --- /dev/null +++ b/addons/web/doc/module/static/src/js/first_module.js.2.diff @@ -0,0 +1,11 @@ +--- 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); ++ }; + }; |