rrule_form 0.1.1 → 0.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/views/rrule/_rrule_form.html.erb +4 -4
- data/lib/rrule_form/version.rb +1 -1
- data/vendor/assets/javascripts/rrule-gui.js +19 -17
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: cf30ec8c9745d204e257047c7e846ea570d79fccb5f18ac43f32cdb9675c7b8a
|
|
4
|
+
data.tar.gz: 8ba35beec8be23eb8b1fca990076f28ad97692d1bff0b24ac9de6306f2ce584d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ab82d07a8d374f00e4242e37556ce106d2c0115c9b61419499fad3c58bb2611c6a4b1b66cfc6944ecb51fe23ec1e7e9528af5a718a0f0a21b5f45d40e7ee2b62
|
|
7
|
+
data.tar.gz: 03e76a17ccc26ebb0443895fd396360bf942e37b2d1fef8d653341262b165ff0ce81d8bcffe58445c680f779d9f9ac85bc7a1ce6e128d87dd1d737dd69ab7b38
|
|
@@ -3,14 +3,14 @@
|
|
|
3
3
|
<div class="modal-dialog" role="document">
|
|
4
4
|
<div class="modal-content">
|
|
5
5
|
<div class="modal-header">
|
|
6
|
-
<
|
|
6
|
+
<a href="#" type="button" class="close" data-dismiss="modal" aria-label="Close">
|
|
7
7
|
<span aria-hidden="true">×</span>
|
|
8
|
-
</
|
|
8
|
+
</a>
|
|
9
9
|
<h3 class="modal-title">Set Recurrence Rule</h3>
|
|
10
10
|
</div>
|
|
11
11
|
<div class="modal-body">
|
|
12
12
|
<form name="rrule[<%= selector.gsub(/[^\w\s]/, '_') %>]" id="rrule-<%= selector.gsub(/[^\w\s]/, '_') %>" class='rrule-form' action='javascript:void(0);'>
|
|
13
|
-
<p>Start Date: <input type="text" class="datepicker" id="start-date-rrule"
|
|
13
|
+
<p>Start Date: <input type="text" class="datepicker" id="start-date-rrule" autocomplete="off"/></p>
|
|
14
14
|
<input type="hidden" name="start-date-formatted" id="start-date-hidden" value="" />
|
|
15
15
|
<!-- <p> End Date: <input type="text" class="datepicker" id="start-date" /></p> -->
|
|
16
16
|
<p>Recurring Event?
|
|
@@ -123,7 +123,7 @@
|
|
|
123
123
|
<input autocomplete="off" type="number" name="count" min="1" max="50" value="1" step="1"/> Time(s)</label>
|
|
124
124
|
</p>
|
|
125
125
|
<p><label for="until-select"><input type="radio" name="end-select" value="until" id="until-select" /> Specific Date (aka until)
|
|
126
|
-
<input type="text" name="until" id="end-date-rrule" disabled="yes" />
|
|
126
|
+
<input type="text" name="until" id="end-date-rrule" disabled="yes" autocomplete="off" />
|
|
127
127
|
<input type="hidden" name="end-date-formatted" id="end-date-hidden" value="" /></label>
|
|
128
128
|
</p>
|
|
129
129
|
</div>
|
data/lib/rrule_form/version.rb
CHANGED
|
@@ -85,13 +85,13 @@ RruleForm = {
|
|
|
85
85
|
dateFormat: 'yy-mm-dd',
|
|
86
86
|
onSelect: function(value) {
|
|
87
87
|
|
|
88
|
-
dateSelected = new Date(value + ' 00:00:00');
|
|
89
|
-
dtstartString = dateSelected.getFullYear() + ('0' + (dateSelected.getMonth() + 1)).slice(-2) + ('0' + dateSelected.getDate()).slice(-2);
|
|
88
|
+
var dateSelected = new Date(value + ' 00:00:00');
|
|
89
|
+
var dtstartString = dateSelected.getFullYear() + ('0' + (dateSelected.getMonth() + 1)).slice(-2) + ('0' + dateSelected.getDate()).slice(-2);
|
|
90
90
|
$('#start-date-hidden').val(dtstartString + 'T040000z');
|
|
91
91
|
recurringRule.dtstart = dtstartString + 'T040000z';
|
|
92
92
|
|
|
93
93
|
// Set minimum selected date on end-datepicker
|
|
94
|
-
minEndDate = dateSelected.getFullYear() + '-' + ('0' + (dateSelected.getMonth() + 1)).slice(-2) + '-' + ('0' + dateSelected.getDate()).slice(-2);
|
|
94
|
+
var minEndDate = dateSelected.getFullYear() + '-' + ('0' + (dateSelected.getMonth() + 1)).slice(-2) + '-' + ('0' + dateSelected.getDate()).slice(-2);
|
|
95
95
|
$('#end-date-rrule').datepicker('option', 'minDate', minEndDate);
|
|
96
96
|
// Reset the selected enddate
|
|
97
97
|
$('#end-date-hidden').val(dtstartString + 'T040000z');
|
|
@@ -106,8 +106,8 @@ RruleForm = {
|
|
|
106
106
|
selectOtherMonths: true,
|
|
107
107
|
dateFormat: 'yy-mm-dd',
|
|
108
108
|
onSelect: function(value) {
|
|
109
|
-
dateSelected = new Date(value + ' 00:00:00');
|
|
110
|
-
untilString = dateSelected.getFullYear() + ('0' + (dateSelected.getMonth() + 1)).slice(-2) + ('0' + dateSelected.getDate()).slice(-2);
|
|
109
|
+
var dateSelected = new Date(value + ' 00:00:00');
|
|
110
|
+
var untilString = dateSelected.getFullYear() + ('0' + (dateSelected.getMonth() + 1)).slice(-2) + ('0' + dateSelected.getDate()).slice(-2);
|
|
111
111
|
$('#end-date-hidden').val(untilString + 'T040000z');
|
|
112
112
|
// Remove the count variable
|
|
113
113
|
recurringRule.count = '';
|
|
@@ -118,9 +118,9 @@ RruleForm = {
|
|
|
118
118
|
|
|
119
119
|
if (recur.UNTIL) {
|
|
120
120
|
// Setup end date picker
|
|
121
|
-
endYear = recur.UNTIL.substring(0, 4);
|
|
122
|
-
endMonth = recur.UNTIL.substring(4, 6);
|
|
123
|
-
endDay = recur.UNTIL.substring(6, 8);
|
|
121
|
+
var endYear = recur.UNTIL.substring(0, 4);
|
|
122
|
+
var endMonth = recur.UNTIL.substring(4, 6);
|
|
123
|
+
var endDay = recur.UNTIL.substring(6, 8);
|
|
124
124
|
|
|
125
125
|
$('#end-date-rrule').val(endYear + '-' + endMonth + '-' + endDay);
|
|
126
126
|
$('#end-date-hidden').val(endYear + endMonth + endDay + 'T040000z');
|
|
@@ -162,7 +162,7 @@ RruleForm = {
|
|
|
162
162
|
if (typeof recur.BYDAY !== 'undefined') {
|
|
163
163
|
|
|
164
164
|
// Split up the individual bymonthdays
|
|
165
|
-
bydays = recur.BYDAY.split(',');
|
|
165
|
+
var bydays = recur.BYDAY.split(',');
|
|
166
166
|
|
|
167
167
|
// Loop through the BYDAYs
|
|
168
168
|
for (v = 0; v < bydays.length; v++) {
|
|
@@ -194,7 +194,7 @@ RruleForm = {
|
|
|
194
194
|
if (typeof recur.BYMONTHDAY !== 'undefined') {
|
|
195
195
|
|
|
196
196
|
// Split up the individual bymonthdays
|
|
197
|
-
bymonthdays = recur.BYMONTHDAY.split(',');
|
|
197
|
+
var bymonthdays = recur.BYMONTHDAY.split(',');
|
|
198
198
|
|
|
199
199
|
// Loop through the BYMONTHDAYs
|
|
200
200
|
for (v = 0; v < bymonthdays.length; v++) {
|
|
@@ -329,7 +329,7 @@ RruleForm = {
|
|
|
329
329
|
resetOptions: function() {
|
|
330
330
|
|
|
331
331
|
// Format the date (http://stackoverflow.com/questions/3605214/javascript-add-leading-zeroes-to-date)
|
|
332
|
-
today = new Date();
|
|
332
|
+
var today = new Date();
|
|
333
333
|
MyDateString = today.getFullYear() + ('0' + (today.getMonth() + 1)).slice(-2) + ('0' + today.getDate()).slice(-2);
|
|
334
334
|
|
|
335
335
|
// Reset all the selected rules
|
|
@@ -405,11 +405,11 @@ RruleForm = {
|
|
|
405
405
|
$('#start-date-rrule').datepicker({
|
|
406
406
|
showOtherMonths: true,
|
|
407
407
|
selectOtherMonths: true,
|
|
408
|
-
dateFormat: 'dd
|
|
408
|
+
dateFormat: 'yy-mm-dd',
|
|
409
409
|
onSelect: function(value) {
|
|
410
410
|
|
|
411
|
-
dateSelected = new Date(value.replace(/-/g, "/") + ' 00:00:00'); // REGEX used to please SAFARI browser!
|
|
412
|
-
dtstartString = dateSelected.getFullYear() + ('0' + (dateSelected.getMonth() + 1)).slice(-2) + ('0' + dateSelected.getDate()).slice(-2);
|
|
411
|
+
var dateSelected = new Date(value.replace(/-/g, "/") + ' 00:00:00'); // REGEX used to please SAFARI browser!
|
|
412
|
+
var dtstartString = dateSelected.getFullYear() + ('0' + (dateSelected.getMonth() + 1)).slice(-2) + ('0' + dateSelected.getDate()).slice(-2);
|
|
413
413
|
$('#start-date-hidden').val(dtstartString + 'T040000z');
|
|
414
414
|
recurringRule.dtstart = dtstartString + 'T040000z';
|
|
415
415
|
|
|
@@ -428,11 +428,12 @@ RruleForm = {
|
|
|
428
428
|
$('#end-date-rrule').datepicker({
|
|
429
429
|
showOtherMonths: true,
|
|
430
430
|
selectOtherMonths: true,
|
|
431
|
-
dateFormat: 'dd
|
|
431
|
+
dateFormat: 'yy-mm-dd',
|
|
432
432
|
onSelect: function(value) {
|
|
433
433
|
//dateSelected = Date.parseExact(value, "yyyy-MM-dd");
|
|
434
|
-
dateSelected = new Date(value
|
|
435
|
-
|
|
434
|
+
var dateSelected = new Date(value + ' 00:00:00'); // REGEX used to please SAFARI browser!
|
|
435
|
+
console.log(dateSelected, value);
|
|
436
|
+
var untilString = dateSelected.getFullYear() + ('0' + (dateSelected.getMonth() + 1)).slice(-2) + ('0' + dateSelected.getDate()).slice(-2);
|
|
436
437
|
$('#end-date-hidden').val(untilString + 'T040000z');
|
|
437
438
|
// Remove the count variable
|
|
438
439
|
recurringRule.count = '';
|
|
@@ -841,6 +842,7 @@ RruleForm = {
|
|
|
841
842
|
if (callback === '') {
|
|
842
843
|
$(selector).val(RruleForm.rruleGenerate()).trigger('change');
|
|
843
844
|
} else {
|
|
845
|
+
$(selector).val(RruleForm.rruleGenerate()).trigger('change');
|
|
844
846
|
eval(callback + '("'+RruleForm.rruleGenerate() +'")');
|
|
845
847
|
}
|
|
846
848
|
$('.modal.in').modal('hide');
|