diff options
| author | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2012-12-10 10:50:56 +0530 |
|---|---|---|
| committer | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2012-12-10 10:50:56 +0530 |
| commit | b7b3a16dca204865156db4d8a04779e72388d933 (patch) | |
| tree | c014b8dfcae0b26b8f6a22854fe8cd0e706a1bf8 /addons/web/doc/module/static/src/js/first_module.js.2.diff | |
| parent | aec7ff50247918d3903f3c272bf99cf7d84a2f5e (diff) | |
| parent | 7f1d5daf2f7a137a470a4a72779408edf7995910 (diff) | |
[MERGE]TRUNK.
bzr revid: vme@tinyerp.com-20121207131444-qscwkjtqua3nqt9q
bzr revid: vme@tinyerp.com-20121210052056-p0cnnaam9j8l4usv
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); ++ }; + }; |