Changeset:
db90cfd72f8f
https://sourceforge.net/p/mrbs/hg-code/ci/db90cfd72f8fd5a542030f532ccc91d462ad87dd
Author:
Campbell Morrison <[email protected]>
Date:
Sat Dec 19 16:05:15 2015 +0000
Log message:
Fixed bug whereby the conflict checker wasn't firing when the repeat end date
changed
diffstat:
web/js/edit_entry.js.php | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diffs (28 lines):
diff -r a9ff93ffd0dd -r db90cfd72f8f web/js/edit_entry.js.php
--- a/web/js/edit_entry.js.php Sat Dec 19 15:42:54 2015 +0000
+++ b/web/js/edit_entry.js.php Sat Dec 19 16:05:15 2015 +0000
@@ -1290,7 +1290,7 @@
checkConflicts();
});
formFields.not(':checkbox')
- .change(function() {
+ .change(function() {
checkConflicts();
});
@@ -1358,7 +1358,15 @@
<?php
} // if (function_exists('json_encode'))
+ // Actions to take when the repeat end datepicker is updated (it doesn't fire
+ // a change event so won't be caught by the general handler above)
+ ?>
+ $('#rep_end_datepicker').bind('datePickerUpdated', function() {
+ checkConflicts();
+ });
+
+ <?php
// Actions to take when the start and end datepickers are closed
?>
$('#start_datepicker, #end_datepicker').bind('datePickerUpdated', function()
{
------------------------------------------------------------------------------
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
