pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] Transform get_default_options of calendar into a function, to be instancied after date.js

Browse Source 
bzr revid: jke@openerp.com-20140225153926-ltwubk1sxfi3heuv
This commit is contained in:
Kersten Jeremy
2014-02-25 16:39:26 +01:00
parent f94f50c7e8
commit 50c3d34a8e
1 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_calendar/static/src/js/web_calendar.js
+12 -25
View File
@@ -20,17 +20,17 @@ openerp.web_calendar = function(instance) {
return new instance.web.Registry({'tmp' : name}).get_object("tmp");
}
var fc_defaultOptions = {
monthNames: Date.CultureInfo.monthNames,
monthNamesShort: Date.CultureInfo.abbreviatedMonthNames,
dayNames: Date.CultureInfo.dayNames,
dayNamesShort: Date.CultureInfo.abbreviatedDayNames,
weekNumberTitle: _t("W"),
allDayText: _t("all-day"),
firstDay: Date.CultureInfo.firstDayOfWeek,
};
function get_fc_defaultOptions() {
return {
weekNumberTitle: _t("W"),
allDayText: _t("all-day"),
monthNames: Date.CultureInfo.monthNames,
monthNamesShort: Date.CultureInfo.abbreviatedMonthNames,
dayNames: Date.CultureInfo.dayNames,
dayNamesShort: Date.CultureInfo.abbreviatedDayNames,
firstDay: Date.CultureInfo.firstDayOfWeek,
};
}
function is_virtual_id(id) {
return typeof id == "string" && id.indexOf('-') >= 0;
@@ -217,7 +217,7 @@ openerp.web_calendar = function(instance) {
get_fc_init_options: function () {
//Documentation here : http://arshaw.com/fullcalendar/docs/
var self = this;
return $.extend({}, fc_defaultOptions, {
return $.extend({}, get_fc_defaultOptions(), {
defaultView: (this.mode == "month")?"month":
(this.mode == "week"?"agendaWeek":
@@ -263,19 +263,7 @@ openerp.web_calendar = function(instance) {
self.open_quick_create(data_template);
},
drop: function(start_date, all_day) {
if (this.classList.contains("ui-dialog")) {
return; //don't look click event on calendar if popup hover !
}
var data_template = self.get_event_data({
start: start_date,
allDay: all_day,
});
var stored_data = $(this).data('eventDefaults');
data_template = $.extend({}, stored_data, data_template);
self.open_quick_create(data_template);
},
unselectAuto: false,
// Options
@@ -369,7 +357,6 @@ openerp.web_calendar = function(instance) {
}
self.$calendar.fullCalendar(self.get_fc_init_options());
return $.when();
},