diff options
| author | Xavier Morel <xmo@openerp.com> | 2013-02-11 08:52:00 +0100 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2013-02-11 08:52:00 +0100 |
| commit | 06954ded48b0b9e9736eaf7325e89454d8be22c3 (patch) | |
| tree | a38b67ddba97130a2162b5e64532d5da001b9f1d /addons/web/doc/module/static | |
| parent | eff170870451284a7317a9a0554e6e2060c9071d (diff) | |
[IMP] replace ad-hoc patch display by patchqueue
bzr revid: xmo@openerp.com-20130211075200-lwd79pktewqf0wkk
Diffstat (limited to 'addons/web/doc/module/static')
11 files changed, 0 insertions, 237 deletions
diff --git a/addons/web/doc/module/static/src/css/web_example.css b/addons/web/doc/module/static/src/css/web_example.css deleted file mode 100644 index b861af8d517..00000000000 --- a/addons/web/doc/module/static/src/css/web_example.css +++ /dev/null @@ -1,6 +0,0 @@ -.openerp .oe_web_example { - color: white; - background-color: black; - height: 100%; - font-size: 400%; -} diff --git a/addons/web/doc/module/static/src/css/web_example.css.1.diff b/addons/web/doc/module/static/src/css/web_example.css.1.diff deleted file mode 100644 index 442211a252b..00000000000 --- a/addons/web/doc/module/static/src/css/web_example.css.1.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- web_example/static/src/css/web_example.css -+++ web_example/static/src/css/web_example.css -@@ -1,6 +1,13 @@ - .openerp .oe_web_example { - color: white; - background-color: black; - height: 100%; -- font-size: 400%; - } -+.openerp .oe_web_example h4 { -+ margin: 0; -+ font-size: 200%; -+} -+.openerp .oe_web_example.oe_web_example_started .oe_web_example_start button, -+.openerp .oe_web_example.oe_web_example_stopped .oe_web_example_stop button { -+ display: none -+} diff --git a/addons/web/doc/module/static/src/js/first_module.js b/addons/web/doc/module/static/src/js/first_module.js deleted file mode 100644 index 74580d1c0ca..00000000000 --- a/addons/web/doc/module/static/src/js/first_module.js +++ /dev/null @@ -1,2 +0,0 @@ -// static/src/js/first_module.js -console.log("Debug statement: file loaded"); diff --git a/addons/web/doc/module/static/src/js/first_module.js.1.diff b/addons/web/doc/module/static/src/js/first_module.js.1.diff deleted file mode 100644 index 53c153e1971..00000000000 --- a/addons/web/doc/module/static/src/js/first_module.js.1.diff +++ /dev/null @@ -1,8 +0,0 @@ ---- web_example/static/src/js/first_module.js -+++ web_example/static/src/js/first_module.js -@@ -1,2 +1,4 @@ - // static/src/js/first_module.js --console.log("Debug statement: file loaded"); -+openerp.web_example = function (instance) { -+ console.log("Module loaded"); -+}; 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); -+ }; - }; diff --git a/addons/web/doc/module/static/src/js/first_module.js.3.diff b/addons/web/doc/module/static/src/js/first_module.js.3.diff deleted file mode 100644 index 295e90b6840..00000000000 --- a/addons/web/doc/module/static/src/js/first_module.js.3.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- web_example/static/src/js/first_module.js -+++ web_example/static/src/js/first_module.js -@@ -1,7 +1,11 @@ - // 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 = function (parent, action) { -- console.log("Executed the action", action); -- }; -+ instance.web.client_actions.add('example.action', 'instance.web_example.Action'); -+ instance.web_example.Action = instance.web.Widget.extend({ -+ className: 'oe_web_example', -+ start: function () { -+ this.$el.text("Hello, world!"); -+ return this._super(); -+ } -+ }); - }; 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 deleted file mode 100644 index 78a192147e6..00000000000 --- a/addons/web/doc/module/static/src/js/first_module.js.4.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- 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(); -- } - }); - }; diff --git a/addons/web/doc/module/static/src/js/first_module.js.5.diff b/addons/web/doc/module/static/src/js/first_module.js.5.diff deleted file mode 100644 index f345ea319ef..00000000000 --- a/addons/web/doc/module/static/src/js/first_module.js.5.diff +++ /dev/null @@ -1,23 +0,0 @@ ---- web_example/static/src/js/first_module.js -+++ web_example/static/src/js/first_module.js -@@ -1,7 +1,19 @@ - // 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' -+ template: 'web_example.action', -+ events: { -+ 'click .oe_web_example_start button': 'watch_start', -+ 'click .oe_web_example_stop button': 'watch_stop' -+ }, -+ watch_start: function () { -+ this.$el.addClass('oe_web_example_started') -+ .removeClass('oe_web_example_stopped'); -+ }, -+ watch_stop: function () { -+ this.$el.removeClass('oe_web_example_started') -+ .addClass('oe_web_example_stopped'); -+ }, - }); - }; diff --git a/addons/web/doc/module/static/src/js/first_module.js.6.diff b/addons/web/doc/module/static/src/js/first_module.js.6.diff deleted file mode 100644 index 7dd17af0e18..00000000000 --- a/addons/web/doc/module/static/src/js/first_module.js.6.diff +++ /dev/null @@ -1,55 +0,0 @@ ---- web_example/static/src/js/first_module.js -+++ web_example/static/src/js/first_module.js -@@ -1,19 +1,52 @@ - // 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', - events: { - 'click .oe_web_example_start button': 'watch_start', - 'click .oe_web_example_stop button': 'watch_stop' - }, -+ init: function () { -+ this._super.apply(this, arguments); -+ this._start = null; -+ this._watch = null; -+ }, -+ update_counter: function () { -+ var h, m, s; -+ // Subtracting javascript dates returns the difference in milliseconds -+ var diff = new Date() - this._start; -+ s = diff / 1000; -+ m = Math.floor(s / 60); -+ s -= 60*m; -+ h = Math.floor(m / 60); -+ m -= 60*h; -+ this.$('.oe_web_example_timer').text( -+ _.str.sprintf("%02d:%02d:%02d", h, m, s)); -+ }, - watch_start: function () { - this.$el.addClass('oe_web_example_started') - .removeClass('oe_web_example_stopped'); -+ this._start = new Date(); -+ // Update the UI to the current time -+ this.update_counter(); -+ // Update the counter at 30 FPS (33ms/frame) -+ this._watch = setInterval( -+ this.proxy('update_counter'), -+ 33); - }, - watch_stop: function () { -+ clearInterval(this._watch); -+ this.update_counter(); -+ this._start = this._watch = null; - this.$el.removeClass('oe_web_example_started') - .addClass('oe_web_example_stopped'); - }, -+ destroy: function () { -+ if (this._watch) { -+ clearInterval(this._watch); -+ } -+ this._super(); -+ } - }); - }; diff --git a/addons/web/doc/module/static/src/js/first_module.js.7.diff b/addons/web/doc/module/static/src/js/first_module.js.7.diff deleted file mode 100644 index 1d3430656fc..00000000000 --- a/addons/web/doc/module/static/src/js/first_module.js.7.diff +++ /dev/null @@ -1,71 +0,0 @@ ---- web_example/static/src/js/first_module.js -+++ web_example/static/src/js/first_module.js -@@ -1,52 +1,60 @@ - // 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', - events: { - 'click .oe_web_example_start button': 'watch_start', - 'click .oe_web_example_stop button': 'watch_stop' - }, - init: function () { - this._super.apply(this, arguments); - this._start = null; - this._watch = null; - }, -+ current: function () { -+ // Subtracting javascript dates returns the difference in milliseconds -+ return new Date() - this._start; -+ }, -- update_counter: function () { -+ update_counter: function (time) { - var h, m, s; -- // Subtracting javascript dates returns the difference in milliseconds -- var diff = new Date() - this._start; -- s = diff / 1000; -+ s = time / 1000; - m = Math.floor(s / 60); - s -= 60*m; - h = Math.floor(m / 60); - m -= 60*h; - this.$('.oe_web_example_timer').text( - _.str.sprintf("%02d:%02d:%02d", h, m, s)); - }, - watch_start: function () { - this.$el.addClass('oe_web_example_started') - .removeClass('oe_web_example_stopped'); - this._start = new Date(); - // Update the UI to the current time -- this.update_counter(); -+ this.update_counter(this.current()); - // Update the counter at 30 FPS (33ms/frame) -- this._watch = setInterval( -- this.proxy('update_counter'), -+ this._watch = setInterval(function () { -+ this.update_counter(this.current()); -+ }.bind(this), - 33); - }, - watch_stop: function () { - clearInterval(this._watch); -+ var time = this.current(); -- this.update_counter(); -+ this.update_counter(time); - this._start = this._watch = null; - this.$el.removeClass('oe_web_example_started') - .addClass('oe_web_example_stopped'); -+ new instance.web.Model('web_example.stopwatch').call('create', [{ -+ user_id: instance.session.uid, -+ time: time, -+ }]); - }, - destroy: function () { - if (this._watch) { - clearInterval(this._watch); - } - this._super(); - } - }); - }; diff --git a/addons/web/doc/module/static/src/xml/web_example.xml b/addons/web/doc/module/static/src/xml/web_example.xml deleted file mode 100644 index b5a9918f2f0..00000000000 --- a/addons/web/doc/module/static/src/xml/web_example.xml +++ /dev/null @@ -1,11 +0,0 @@ -<templates> -<div t-name="web_example.action" class="oe_web_example oe_web_example_stopped"> - <h4 class="oe_web_example_timer">00:00:00</h4> - <p class="oe_web_example_start"> - <button type="button">Start</button> - </p> - <p class="oe_web_example_stop"> - <button type="button">Stop</button> - </p> -</div> -</templates> |
