Title: SF.net SVN: mrbs:[2445] mrbs/branches/flexible_day_end/web/js/edit_entry.js.php
- Revision
- 2445
- Author
- cimorrison
- Date
- 2012-09-27 16:37:57 +0000 (Thu, 27 Sep 2012)
Log Message
Made edit_entry recognise all day bookings
Modified Paths
Diff
Modified: mrbs/branches/flexible_day_end/web/js/edit_entry.js.php (2444 => 2445)
--- mrbs/branches/flexible_day_end/web/js/edit_entry.js.php 2012-09-27 15:57:47 UTC (rev 2444)
+++ mrbs/branches/flexible_day_end/web/js/edit_entry.js.php 2012-09-27 16:37:57 UTC (rev 2445)
@@ -1021,19 +1021,20 @@
// If this is an All Day booking then check the All Day box and disable the
// start and end time boxes
?>
- startSelect = form["start_seconds" + currentArea];
- endSelect = form["end_seconds" + currentArea];
- allDay = form["all_day" + currentArea];
- if (allDay &&
- !allDay.disabled &&
- (parseInt(startSelect.options[startSelect.selectedIndex].value, 10) == startOptions[currentArea][0]['value']) &&
- (parseInt(endSelect.options[endSelect.selectedIndex].value, 10) == endOptions[currentArea][nEndOptions[currentArea] - 1]['value']))
+ startSelect = $(form).find('select[name="start_seconds"]:visible');
+ endSelect = $(form).find('select[name="end_seconds"]:visible');
+ allDay = $(form).find('input[name="all_day"]:visible');
+ if ((allDay.is(':disabled') === false) &&
+ (startSelect.val() == startSelect.data('first')) &&
+ (endSelect.val() == endSelect.data('last')))
{
- allDay.checked = true;
- startSelect.disabled = true;
- endSelect.disabled = true;
- old_start = startSelect.options[startSelect.selectedIndex].value;
- old_end = endSelect.options[endSelect.selectedIndex].value;
+ allDay.attr('checked', 'checked');
+ startSelect.attr('disabled', 'disabled');
+ endSelect.attr('disabled', 'disabled');
+ onAllDayClick.oldStart = startSelect.val();
+ onAllDayClick.oldEnd = endSelect.val();
+ onAllDayClick.oldStartDatepicker = $(form).find('#start_datepicker').datepicker('getDate');
+ onAllDayClick.oldEndDatepicker = $(form).find('#end_datepicker').datepicker('getDate');
}
}
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://ad.doubleclick.net/clk;258768047;13503038;j?
http://info.appdynamics.com/FreeJavaPerformanceDownload.html
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
