diff options
| author | Fabien Meghazi <fme@openerp.com> | 2012-12-12 14:38:00 +0100 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2012-12-12 14:38:00 +0100 |
| commit | 428a8154a34a08b0837a73f614bf89c21d5fd296 (patch) | |
| tree | e3e57d5980d9e996954714114af4e245b48c7b6c /addons/web/doc/module/static/src/js/first_module.js.2.diff | |
| parent | 8954271636f3d1b1f933b26434733fb6813ab884 (diff) | |
| parent | 972dc3d1181b955d7e66d74a290591b970bee6c3 (diff) | |
[MERGE] trunk
bzr revid: fme@openerp.com-20121212133800-k67gy1gctt5dxzwk
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); ++ }; + }; |