summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/views/calendar
diff options
context:
space:
mode:
authorRomeo Fragomeli <rfr@odoo.com>2020-01-15 14:59:06 +0000
committerPierre Paridans <app@odoo.com>2020-03-31 15:06:45 +0000
commit8dfbc7d42148440cb6ede8d291735d92981f8da8 (patch)
tree1441d49c1fa1ad0b8a2c4d077bf5612a08f586fe /addons/web/static/src/js/views/calendar
parent70ea6739ede926cc5e87e90ac5718bffe8f35d35 (diff)
[MOV] web: extract mobile-specific code to enterprise
Task ID: 2092550
Diffstat (limited to 'addons/web/static/src/js/views/calendar')
-rw-r--r--addons/web/static/src/js/views/calendar/calendar_controller.js15
-rw-r--r--addons/web/static/src/js/views/calendar/calendar_renderer.js41
2 files changed, 3 insertions, 53 deletions
diff --git a/addons/web/static/src/js/views/calendar/calendar_controller.js b/addons/web/static/src/js/views/calendar/calendar_controller.js
index 39e1db6d4e3..cddd25ee56a 100644
--- a/addons/web/static/src/js/views/calendar/calendar_controller.js
+++ b/addons/web/static/src/js/views/calendar/calendar_controller.js
@@ -10,7 +10,6 @@ odoo.define('web.CalendarController', function (require) {
*/
var AbstractController = require('web.AbstractController');
-var config = require('web.config');
var core = require('web.core');
var Dialog = require('web.Dialog');
var dialogs = require('web.view_dialogs');
@@ -38,7 +37,6 @@ var CalendarController = AbstractController.extend({
viewUpdated: '_onViewUpdated',
}),
events: _.extend({}, AbstractController.prototype.events, {
- today_button_click: '_onTodayButtonClicked',
'click button.o_calendar_button_new': '_onButtonNew',
'click button.o_calendar_button_prev': '_onButtonNavigation',
'click button.o_calendar_button_today': '_onButtonNavigation',
@@ -109,7 +107,7 @@ var CalendarController = AbstractController.extend({
*/
_extractLastPartOfClassName(startClassName, classList) {
var result;
- classList.forEach(function(value){
+ classList.forEach(function (value) {
if (value && value.indexOf(startClassName) === 0) {
result = value.substring(startClassName.length);
}
@@ -134,9 +132,7 @@ var CalendarController = AbstractController.extend({
* @return {{}}
*/
_renderButtonsParameters() {
- return {
- isMobile: config.device.isMobile,
- };
+ return {};
},
/**
* @override
@@ -444,13 +440,6 @@ var CalendarController = AbstractController.extend({
});
},
/**
- * In mobile, we display a special 'Today' button on the bottom right corner
- * of the control panel. Its click events are handled here.
- */
- _onTodayButtonClicked: function () {
- this._move('today');
- },
- /**
* @private
* @param {OdooEvent} event
*/
diff --git a/addons/web/static/src/js/views/calendar/calendar_renderer.js b/addons/web/static/src/js/views/calendar/calendar_renderer.js
index 554a6b3c79d..17ea9da1333 100644
--- a/addons/web/static/src/js/views/calendar/calendar_renderer.js
+++ b/addons/web/static/src/js/views/calendar/calendar_renderer.js
@@ -57,7 +57,6 @@ var SidebarFilter = Widget.extend(FieldManagerMixin, {
this.filters = options.filters;
this.label = options.label;
this.getColor = options.getColor;
- this.isSwipeEnabled = true;
},
/**
* @override
@@ -202,9 +201,6 @@ return AbstractRenderer.extend({
start: function () {
this._initSidebar();
this._initCalendar();
- if (config.device.isMobile) {
- this._bindSwipe();
- }
return this._super();
},
/**
@@ -213,9 +209,6 @@ return AbstractRenderer.extend({
on_attach_callback: function () {
this._super(...arguments);
this._isInDOM = true;
- if (config.device.isMobile) {
- this.$el.height($(window).height() - this.$el.offset().top);
- }
// BUG Test ????
// this.$el.height($(window).height() - this.$el.offset().top);
this.calendar.render();
@@ -325,32 +318,6 @@ return AbstractRenderer.extend({
//--------------------------------------------------------------------------
/**
- * @private
- * Bind handlers to enable swipe navigation
- *
- * @private
- */
- _bindSwipe: function () {
- var self = this;
- var touchStartX;
- var touchEndX;
- this.calendarElement.addEventListener('touchstart', function (event) {
- self.isSwipeEnabled = true;
- touchStartX = event.touches[0].pageX;
- });
- this.calendarElement.addEventListener('touchend', function (event) {
- if (!self.isSwipeEnabled) {
- return;
- }
- touchEndX = event.changedTouches[0].pageX;
- if (touchStartX - touchEndX > 100) {
- self.trigger_up('next');
- } else if (touchStartX - touchEndX < -100) {
- self.trigger_up('prev');
- }
- });
- },
- /**
* Convert the new format of Event from FullCalendar V4 to a Event FullCalendar V3
* @param fc4Event
* @return {Object} FullCalendar V3 Object Event
@@ -431,7 +398,6 @@ return AbstractRenderer.extend({
self.trigger_up('dropRecord', event);
},
eventResize: function (eventResizeInfo) {
- self.isSwipeEnabled = false;
self._unselectEvent();
var event = self._convertEventToFC3Event(eventResizeInfo.event);
self.trigger_up('updateRecord', event);
@@ -456,7 +422,6 @@ return AbstractRenderer.extend({
self.calendar.unselect();
},
eventRender: function (info) {
- self.isSwipeEnabled = false;
var event = info.event;
var element = $(info.el);
var view = info.view;
@@ -491,9 +456,6 @@ return AbstractRenderer.extend({
self.trigger_up('edit_event', {id: event.id});
});
},
- eventPositioned: function (){
- self.isSwipeEnabled = false;
- },
datesRender: function (info) {
// compute mode from view.type which is either 'dayGridMonth', 'timeGridWeek' or 'timeGridDay'
var mode = info.view.type === 'dayGridMonth' ? 'month' : (info.view.type === 'timeGridWeek' ? 'week' : 'day');
@@ -519,7 +481,6 @@ return AbstractRenderer.extend({
self._unselectEvent();
},
eventResizeStart: function (mouseResizeInfo) {
- self.isSwipeEnabled = false;
$(self.calendarElement).find(_.str.sprintf('[data-event-id=%s]', mouseResizeInfo.event.id)).addClass('o_cw_custom_hover');
self._unselectEvent();
},
@@ -538,7 +499,7 @@ return AbstractRenderer.extend({
columnHeaderFormat: 'ddd D'
},
dayGridMonth: {
- columnHeaderFormat: config.device.isMobile ? 'ddd' : 'dddd'
+ columnHeaderFormat: 'dddd'
}
},
height: 'parent',