diff options
| author | Amit Bhavsar (Open ERP) <amb@tinyerp.com> | 2013-05-28 14:28:53 +0530 |
|---|---|---|
| committer | Amit Bhavsar (Open ERP) <amb@tinyerp.com> | 2013-05-28 14:28:53 +0530 |
| commit | 20210d96f8327961af7815fc5618b63e6bb0dc64 (patch) | |
| tree | 31042b227735e45a5e6dbe5053e12cd6109e08f3 /addons/web/doc/module/static/src/js/first_module.js.2.diff | |
| parent | d11391c5759d4308afde38abccea2e264c39d2d2 (diff) | |
| parent | 978c76c5ea6bf16f7db2f94630ceb4b27caec037 (diff) | |
[MERGE] merge with latest trunk
bzr revid: amb@tinyerp.com-20130528085853-33ak0wen7shv6af2
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, 0 insertions, 11 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 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); -+ }; - }; |