[MOV] web: extract mobile-specific code to enterprise
Task ID: 2092550
This commit is contained in:
Romeo Fragomeli
committed by
Pierre Paridans
Pierre Paridans
parent
70ea6739ed
commit
8dfbc7d421
@@ -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
|
||||
@@ -443,13 +439,6 @@ var CalendarController = AbstractController.extend({
|
||||
self.quickCreating = false;
|
||||
});
|
||||
},
|
||||
/**
|
||||
* 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
|
||||
|
||||
@@ -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();
|
||||
@@ -324,32 +317,6 @@ return AbstractRenderer.extend({
|
||||
// Private
|
||||
//--------------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* @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
|
||||
@@ -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',
|
||||
|
||||
@@ -91,9 +91,7 @@
|
||||
|
||||
<t t-name="CalendarView.buttons">
|
||||
<div class="o_calendar_buttons">
|
||||
<t t-if="!isMobile">
|
||||
<t t-call="CalendarView.navigation_buttons" />
|
||||
</t>
|
||||
<t t-call="CalendarView.navigation_buttons" />
|
||||
<t t-call="CalendarView.scale_buttons" />
|
||||
</div>
|
||||
</t>
|
||||
@@ -112,15 +110,6 @@
|
||||
</div>
|
||||
</t>
|
||||
|
||||
<t t-name="CalendarView.TodayButtonMobile">
|
||||
<button class="btn btn-sm btn-link">
|
||||
<span class="fa-stack o_calendar_button_today">
|
||||
<i class="fa fa-calendar-o fa-stack-2x" role="img" aria-label="Today" title="Today"/>
|
||||
<strong class="o_calendar_text fa-stack-1x"><t t-esc="moment().date()"/></strong>
|
||||
</span>
|
||||
</button>
|
||||
</t>
|
||||
|
||||
<main t-name="CalendarView.quick_create" class="o_calendar_quick_create">
|
||||
<div class="form-group">
|
||||
<label for='name' class='col-form-label o_form_label'>Summary:</label>
|
||||
|
||||
Reference in New Issue
Block a user