Changeset 8054 for branches/2.5
- Timestamp:
- 03/21/13 16:49:31 (11 years ago)
- Location:
- branches/2.5/prototype/modules/calendar/js
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.5/prototype/modules/calendar/js/helpers.js
r8050 r8054 177 177 */ 178 178 179 function eventDetails( objEvent, decoded, path, isMail, repeat )179 function eventDetails( objEvent, decoded, path, isMail, repeat, buttonClicked) 180 180 { 181 181 … … 197 197 if(path == undefined) 198 198 path = ""; 199 200 199 201 200 if( !decoded ) … … 1095 1094 var oldTime = UI.dialogs.addEvent.find('input.start-time').val(); 1096 1095 $(".start-time").focusout(function(data){ 1097 if($("#calendar").fullCalendar('getView').name == "month" ){1096 if($("#calendar").fullCalendar('getView').name == "month" || buttonClicked) { 1098 1097 setTime( $(this).val() ); 1099 1098 } … … 1104 1103 timeFormat: "hh:mm tt", 1105 1104 onSelect: function( selectedDateTime ){ 1106 if($("#calendar").fullCalendar('getView').name == "month" ){1105 if($("#calendar").fullCalendar('getView').name == "month" || buttonClicked) { 1107 1106 if ( selectedDateTime.indexOf("p.m.") == -1 || !selectedDateTime.indexOf("a.m.") == -1 ) { 1108 1107 var selectedTime = selectedDateTime.split(":"); -
branches/2.5/prototype/modules/calendar/js/init.js
r8021 r8054 149 149 endTime: dateCalendar.decodeRange(startEvent, (!!User.preferences.defaultCalendar ? ( !!Calendar.signatureOf[User.preferences.defaultCalendar].calendar.defaultDuration ? 150 150 (Calendar.signatureOf[User.preferences.defaultCalendar].calendar.defaultDuration) : (User.preferences.defaultDuration)) : (User.preferences.defaultDuration))) 151 }, true );151 }, true, undefined, undefined, undefined, true ); 152 152 }); 153 153
Note: See TracChangeset
for help on using the changeset viewer.