diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-12-10 13:54:23 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-12-10 13:54:23 +0100 |
| commit | 1ca5e68b1f3ddb440b104c6c47ea35e8d26a1eed (patch) | |
| tree | 4070b56d1253290fa69f4fbc43ad4862c883080e /addons/web/doc/module/static/src/js/first_module.js.4.diff | |
| parent | a5ca416f055871fb2765567c2cf2f06445c1d2ca (diff) | |
| parent | 70f8f99b35c93a880cf15a1f21b7f88aef5a8d36 (diff) | |
[MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121130093732-i8y10ayjqiaq5t7p
bzr revid: tde@openerp.com-20121204142854-pauouyapnw7z8zwj
bzr revid: tde@openerp.com-20121205101544-k4ui6thr0ibzw0vx
bzr revid: tde@openerp.com-20121210125423-81wbh4af9sxdqjki
Diffstat (limited to 'addons/web/doc/module/static/src/js/first_module.js.4.diff')
| -rw-r--r-- | addons/web/doc/module/static/src/js/first_module.js.4.diff | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/addons/web/doc/module/static/src/js/first_module.js.4.diff b/addons/web/doc/module/static/src/js/first_module.js.4.diff new file mode 100644 index 00000000000..78a192147e6 --- /dev/null +++ b/addons/web/doc/module/static/src/js/first_module.js.4.diff @@ -0,0 +1,15 @@ +--- web_example/static/src/js/first_module.js ++++ web_example/static/src/js/first_module.js +@@ -1,11 +1,7 @@ + // static/src/js/first_module.js + openerp.web_example = function (instance) { + instance.web.client_actions.add('example.action', 'instance.web_example.Action'); + instance.web_example.Action = instance.web.Widget.extend({ ++ template: 'web_example.action' +- className: 'oe_web_example', +- start: function () { +- this.$el.text("Hello, world!"); +- return this._super(); +- } + }); + }; |