diff options
| author | Christophe Matthieu <chm@openerp.com> | 2013-04-30 10:34:44 +0200 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2013-04-30 10:34:44 +0200 |
| commit | d47824c79291b4904c5b3087b7bdf16fd84c0a50 (patch) | |
| tree | ec141eb2df81e07e89e0f5985c1aaf83eea97088 /addons/web/doc/module/static/src/js/first_module.js.2.diff | |
| parent | b8a5ec1dc9cfbac79fd8a540c01a7c0749c522f9 (diff) | |
| parent | 511efd43a90b6bbc30bac9764358fc81b42fb13a (diff) | |
[MERGE] from trunk
bzr revid: chm@openerp.com-20130430083444-r300f3a2s5kgbj9k
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); -+ }; - }; |