diff options
| author | Christophe Matthieu <chm@openerp.com> | 2012-12-07 09:10:26 +0100 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2012-12-07 09:10:26 +0100 |
| commit | 94c9801ac707086732cbe1a7913ef139d1cc785b (patch) | |
| tree | 4f06a75730ae688b2afe07fa9350e601d97030e8 /addons/web/doc/module/static/src/js/first_module.js.2.diff | |
| parent | 98e87a51aef5c7457c444334f3f5270cbb947ba3 (diff) | |
| parent | c09b9cb5f9a2a7825571cf803ec760f9e3983b6c (diff) | |
[MERGE] from trunk
bzr revid: chm@openerp.com-20121207081026-3edlt0698csc6gk8
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); ++ }; + }; |