summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorGéry Debongnie <ged@odoo.com>2015-03-10 08:49:58 +0100
committerGéry Debongnie <ged@odoo.com>2015-03-18 09:23:35 +0100
commitda73f624b2a3ff329a6cd7f08104519e4b312a14 (patch)
tree337133b26852d0e09a0ad109f70fdb08ad1d97da /addons
parenta78655e71f4769765874096159cc42cac22022fb (diff)
[REF] website_event: update to the new module system
Diffstat (limited to 'addons')
-rw-r--r--addons/website_event/static/src/js/website.tour.event.js21
-rw-r--r--addons/website_event/static/src/js/website_event.editor.js38
-rw-r--r--addons/website_event/static/src/js/website_event.js10
-rw-r--r--addons/website_event/static/src/js/website_geolocation.js31
-rw-r--r--addons/website_event_sale/static/src/js/website.tour.event_sale.js20
-rw-r--r--addons/website_event_track/static/src/js/website_event_track.js7
6 files changed, 76 insertions, 51 deletions
diff --git a/addons/website_event/static/src/js/website.tour.event.js b/addons/website_event/static/src/js/website.tour.event.js
index 7c3c6cd5370..eb3422628f3 100644
--- a/addons/website_event/static/src/js/website.tour.event.js
+++ b/addons/website_event/static/src/js/website.tour.event.js
@@ -1,10 +1,15 @@
-(function () {
- 'use strict';
+odoo.define('website_event.tour', ['web.core', 'web.Tour', 'website.website'], function (require) {
+'use strict';
- var _t = openerp._t;
- var website = openerp.website;
- website.ready().done(function() {
- openerp.Tour.register({
+var core = require('web.core');
+var Tour = require('web.Tour');
+var website = require('website.website');
+
+
+var _t = core._t;
+
+website.ready().done(function () {
+ Tour.register({
id: 'event',
name: _t("Create an event"),
steps: [
@@ -87,6 +92,6 @@
},
]
});
- });
+});
-}());
+});
diff --git a/addons/website_event/static/src/js/website_event.editor.js b/addons/website_event/static/src/js/website_event.editor.js
index d40c2732871..ee8ae431062 100644
--- a/addons/website_event/static/src/js/website_event.editor.js
+++ b/addons/website_event/static/src/js/website_event.editor.js
@@ -1,20 +1,24 @@
-(function() {
- "use strict";
+odoo.define('website_event.editor', ['web.core', 'website.contentMenu', 'website.website'], function (require) {
+"use strict";
- var website = openerp.website;
- var _t = openerp._t;
+var core = require('web.core');
+var contentMenu = require('website.contentMenu');
+var website = require('website.website');
- website.EditorBarContent.include({
- new_event: function() {
- website.prompt({
- id: "editor_new_event",
- window_title: _t("New Event"),
- input: "Event Name",
- }).then(function (event_name) {
- website.form('/event/add_event', 'POST', {
- event_name: event_name
- });
+var _t = core._t;
+
+contentMenu.EditorBarContent.include({
+ new_event: function() {
+ website.prompt({
+ id: "editor_new_event",
+ window_title: _t("New Event"),
+ input: "Event Name",
+ }).then(function (event_name) {
+ website.form('/event/add_event', 'POST', {
+ event_name: event_name
});
- },
- });
-})();
+ });
+ },
+});
+
+});
diff --git a/addons/website_event/static/src/js/website_event.js b/addons/website_event/static/src/js/website_event.js
index f6a4328def4..afa37dff93d 100644
--- a/addons/website_event/static/src/js/website_event.js
+++ b/addons/website_event/static/src/js/website_event.js
@@ -1,3 +1,7 @@
+odoo.define('website_event.website_event', ['web.ajax'], function (require) {
+
+var ajax = require('web.ajax');
+
$(document).ready(function () {
// Catch registration form event, because of JS for attendee details
@@ -12,12 +16,14 @@ $(document).ready(function () {
$("select").each(function() {
post[$(this)[0].name] = $(this).val();
});
- openerp.jsonRpc($form.attr('action'), 'call', post).then(function (modal) {
+ ajax.jsonRpc($form.attr('action'), 'call', post).then(function (modal) {
var $modal = $(modal);
- $modal.appendTo($form).modal()
+ $modal.appendTo($form).modal();
$modal.on('click', '.js_goto_event', function () {
$modal.modal('hide');
});
});
});
});
+
+});
diff --git a/addons/website_event/static/src/js/website_geolocation.js b/addons/website_event/static/src/js/website_geolocation.js
index fb00edc5e64..c292ca40833 100644
--- a/addons/website_event/static/src/js/website_geolocation.js
+++ b/addons/website_event/static/src/js/website_geolocation.js
@@ -1,16 +1,17 @@
-(function() {
- "use strict";
- var website = openerp.website;
+odoo.define('website_event.geolocation', ['website.snippets.animation'], function (require) {
+"use strict";
- website.snippet.animationRegistry.visitor = website.snippet.Animation.extend({
- selector: ".oe_country_events",
- start: function () {
- var self = this;
- $.post( "/event/get_country_event_list", function( data ) {
- if(data){
- $( ".country_events_list" ).replaceWith( data );
- }
- });
- }
- });
-})(); \ No newline at end of file
+var animation = require('website.snippets.animation');
+
+animation.registry.visitor = animation.Animation.extend({
+ selector: ".oe_country_events",
+ start: function () {
+ $.post( "/event/get_country_event_list", function( data ) {
+ if(data){
+ $( ".country_events_list" ).replaceWith( data );
+ }
+ });
+ }
+});
+
+});
diff --git a/addons/website_event_sale/static/src/js/website.tour.event_sale.js b/addons/website_event_sale/static/src/js/website.tour.event_sale.js
index 0b7a67eb29c..ab14ef41e82 100644
--- a/addons/website_event_sale/static/src/js/website.tour.event_sale.js
+++ b/addons/website_event_sale/static/src/js/website.tour.event_sale.js
@@ -1,8 +1,11 @@
-(function () {
- 'use strict';
- var website = openerp.website;
- website.ready().done(function() {
- openerp.Tour.register({
+odoo.define('website_event_sale.tour', ['web.Tour', 'website.website'], function (require) {
+'use strict';
+
+var Tour = require('web.Tour');
+var website = require('website.website');
+
+website.ready().done(function () {
+ Tour.register({
id: 'event_buy_tickets',
name: "Buy tickets for the Conference on Business Apps",
path: '/event',
@@ -66,7 +69,7 @@
{
title: "Complete the checkout",
element: 'form[action="/shop/confirm_order"] .btn:contains("Confirm")',
- onload: function (tour) {
+ onload: function () {
if ($("input[name='name']").val() === "")
$("input[name='name']").val("website_sale-test-shoptest");
if ($("input[name='email']").val() === "")
@@ -93,5 +96,6 @@
}
]
});
- });
-}());
+});
+
+});
diff --git a/addons/website_event_track/static/src/js/website_event_track.js b/addons/website_event_track/static/src/js/website_event_track.js
index 494d75bb9e0..ccb080270aa 100644
--- a/addons/website_event_track/static/src/js/website_event_track.js
+++ b/addons/website_event_track/static/src/js/website_event_track.js
@@ -1,6 +1,9 @@
+odoo.define('website_event_track.website_event_track', function (require) {
+"use strict";
+
$(document).ready(function() {
- $("#event_track_search").bind('keyup', function(e){
+ $("#event_track_search").bind('keyup', function(){
var change_text = $(this).val();
$('.event_track').removeClass('invisible');
@@ -16,3 +19,5 @@ $(document).ready(function() {
});
});
+
+});