details: https://code.openbravo.com/erp/devel/pi/rev/dad3958c49c8
changeset: 21089:dad3958c49c8
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Thu Sep 05 19:56:53 2013 +0200
summary: Fixed issue 24706: Now OBCalendar doesn't override isc.Calendar
properties
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/calendar/ob-calendar.js
| 27 ++---
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-calendar-styles.js
| 48 ++++++---
2 files changed, 39 insertions(+), 36 deletions(-)
diffs (127 lines):
diff -r 1f55c40cadb9 -r dad3958c49c8
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/calendar/ob-calendar.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/calendar/ob-calendar.js
Thu Sep 05 18:35:18 2013 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/calendar/ob-calendar.js
Thu Sep 05 19:56:53 2013 +0200
@@ -26,7 +26,7 @@
show: function () {
this.Super('show', arguments);
- var calendar = this.calendar,
+ var calendar = this.creator,
currentStart = this.currentStart,
currentEnd = this.currentEnd,
event = this.event;
@@ -61,20 +61,6 @@
multiCalendar = this.multiCalendar;
this.eventWindowStyle = OB.Styles.OBCalendar.eventWindowStyle;
- this.datePickerButtonDefaults.src =
OB.Styles.OBCalendar.datePickerButton.src;
- this.datePickerButtonDefaults.width =
OB.Styles.OBCalendar.datePickerButton.width;
- this.datePickerButtonDefaults.height =
OB.Styles.OBCalendar.datePickerButton.height;
- this.previousButtonDefaults.src = OB.Styles.OBCalendar.previousButton.src;
- this.previousButtonDefaults.width =
OB.Styles.OBCalendar.previousButton.width;
- this.previousButtonDefaults.height =
OB.Styles.OBCalendar.previousButton.height;
- this.nextButtonDefaults.src = OB.Styles.OBCalendar.nextButton.src;
- this.nextButtonDefaults.width = OB.Styles.OBCalendar.nextButton.width;
- this.nextButtonDefaults.height = OB.Styles.OBCalendar.nextButton.height;
- this.controlsBarDefaults.layoutTopMargin =
OB.Styles.OBCalendar.controlsTopMarging;
-
- this.mainViewDefaults._constructor = isc.OBCalendarTabSet;
- this.eventDialogDefaults._constructor = isc.OBCalendar_EventDialogBridge;
- this.eventDialogDefaults.calendar = this;
if (!this.eventIdField) {
this.eventIdField = 'eventId';
@@ -241,8 +227,6 @@
this.datePickerButton.hide();
}
- this.workdayBaseStyle = OB.Styles.OBCalendar.workdayBaseStyle;
- this.selectedCellStyle = OB.Styles.OBCalendar.selectedCellStyle;
if (this.showDayView !== false) {
this.dayView.baseStyle = OB.Styles.OBCalendar.dayView_baseStyle;
}
@@ -569,4 +553,13 @@
return this.Super('addEvent', [startDate, endDate, name, description,
otherFields, ignoreDataChanged]);
}
+});
+
+
+isc.OBCalendar.changeDefaults('mainViewDefaults', {
+ _constructor: isc.OBCalendarTabSet
+});
+
+isc.OBCalendar.changeDefaults('eventDialogDefaults', {
+ _constructor: isc.OBCalendar_EventDialogBridge
});
\ No newline at end of file
diff -r 1f55c40cadb9 -r dad3958c49c8
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-calendar-styles.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-calendar-styles.js
Thu Sep 05 18:35:18 2013 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-calendar-styles.js
Thu Sep 05 19:56:53 2013 +0200
@@ -56,35 +56,45 @@
pickerButtonSrc: OB.Styles.skinsPath +
'Default/org.openbravo.client.application/images/tab/tabBarButtonMain_OverflowIconPicker.png'
});
+
+isc.OBCalendar.addProperties({
+ workdayBaseStyle: 'OBCalendarGridCellWorkday',
+ selectedCellStyle: 'OBCalendarGridCellSelected'
+});
+
OB.Styles.OBCalendar = {
- controlsTopMarging: 6,
eventWindowStyle: 'OBEventWindow',
- datePickerButton: {
- src: OB.Styles.skinsPath +
'Default/org.openbravo.client.application/images/form/date_control.png',
- width: 21,
- height: 21
- },
addEventButton: {
src: OB.Styles.skinsPath +
'Default/org.openbravo.client.application/images/form/add_icon.png',
// It doesn't exist yet
width: 21,
height: 21
},
- previousButton: {
- src: OB.Styles.skinsPath +
'Default/org.openbravo.client.application/images/statusbar/iconButton-previous.png',
- width: 20,
- height: 20
- },
- nextButton: {
- src: OB.Styles.skinsPath +
'Default/org.openbravo.client.application/images/statusbar/iconButton-next.png',
- width: 20,
- height: 20
- },
- workdayBaseStyle: 'OBCalendarGridCellWorkday',
- selectedCellStyle: 'OBCalendarGridCellSelected',
dayView_baseStyle: 'OBCalendarGridCell',
weekView_baseStyle: 'OBCalendarGridCell',
weekView_headerBaseStyle: 'OBCalendarGridHeaderCell',
monthView_baseStyle: 'OBCalendarGridCell',
monthView_headerBaseStyle: 'OBCalendarGridHeaderCell'
-};
\ No newline at end of file
+};
+
+isc.OBCalendar.changeDefaults('datePickerButtonDefaults', {
+ src: OB.Styles.skinsPath +
'Default/org.openbravo.client.application/images/form/date_control.png',
+ width: 21,
+ height: 21
+});
+
+isc.OBCalendar.changeDefaults('previousButtonDefaults', {
+ src: OB.Styles.skinsPath +
'Default/org.openbravo.client.application/images/statusbar/iconButton-previous.png',
+ width: 20,
+ height: 20
+});
+
+isc.OBCalendar.changeDefaults('nextButtonDefaults', {
+ src: OB.Styles.skinsPath +
'Default/org.openbravo.client.application/images/statusbar/iconButton-next.png',
+ width: 20,
+ height: 20
+});
+
+isc.OBCalendar.changeDefaults('controlsBarDefaults', {
+ layoutTopMargin: 6
+});
\ No newline at end of file
------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58041391&iu=/4140/ostg.clktrk
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
