rrule_form 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6523de7ea2c3a6d6f7e19a709ea8361e297bdbc7eab8951790b989ccf188edc7
-  data.tar.gz: 3f9a0bc9fc50b3c932a1d27b7fce569a0b3ea577d5c79bff27209a4c32abb2b3
+  metadata.gz: cf30ec8c9745d204e257047c7e846ea570d79fccb5f18ac43f32cdb9675c7b8a
+  data.tar.gz: 8ba35beec8be23eb8b1fca990076f28ad97692d1bff0b24ac9de6306f2ce584d
 SHA512:
-  metadata.gz: 2ef34b0a3d70816a34ad74a9ac23ea431adb5f3fe157853d3a1268888366516aeaa4a4048805a474167c5ac30430f966b6d5a46adc1ef5a189adc5da50874e97
-  data.tar.gz: efd1bb4423270e964732eba5a0775f851dad46959b706594974f89d53f326e00cbb559f04288a0543c42854031301df722ea3bcde65f300bf3b6c908c880f81d
+  metadata.gz: ab82d07a8d374f00e4242e37556ce106d2c0115c9b61419499fad3c58bb2611c6a4b1b66cfc6944ecb51fe23ec1e7e9528af5a718a0f0a21b5f45d40e7ee2b62
+  data.tar.gz: 03e76a17ccc26ebb0443895fd396360bf942e37b2d1fef8d653341262b165ff0ce81d8bcffe58445c680f779d9f9ac85bc7a1ce6e128d87dd1d737dd69ab7b38

data/app/views/rrule/_rrule_form.html.erb

@@ -3,14 +3,14 @@
   <div class="modal-dialog" role="document">
     <div class="modal-content">
       <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+        <a href="#" type="button" class="close" data-dismiss="modal" aria-label="Close">
           <span aria-hidden="true">&times;</span>
-        </button>
+        </a>
         <h3 class="modal-title">Set Recurrence Rule</h3>
       </div>
       <div class="modal-body">
         <form name="rrule[<%= selector.gsub(/[^\w\s]/, '_') %>]" id="rrule-<%= selector.gsub(/[^\w\s]/, '_') %>" class='rrule-form' action='javascript:void(0);'>
-           <p>Start Date: <input type="text" class="datepicker" id="start-date-rrule" /></p>
+           <p>Start Date: <input type="text" class="datepicker" id="start-date-rrule"  autocomplete="off"/></p>
            <input type="hidden" name="start-date-formatted" id="start-date-hidden" value="" />
            <!-- <p> End Date: <input type="text" class="datepicker" id="start-date" /></p> -->
            <p>Recurring Event?
@@ -123,7 +123,7 @@
                     <input autocomplete="off" type="number" name="count" min="1" max="50" value="1" step="1"/> Time(s)</label>
                  </p>
                  <p><label for="until-select"><input type="radio" name="end-select" value="until" id="until-select" /> Specific Date (aka until)
-                   <input type="text" name="until" id="end-date-rrule" disabled="yes" />
+                   <input type="text" name="until" id="end-date-rrule" disabled="yes" autocomplete="off" />
                     <input type="hidden" name="end-date-formatted" id="end-date-hidden" value="" /></label>
                  </p>
               </div>

data/lib/rrule_form/version.rb

@@ -1,3 +1,3 @@
 module RruleForm
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/vendor/assets/javascripts/rrule-gui.js

@@ -85,13 +85,13 @@ RruleForm = {
                     dateFormat: 'yy-mm-dd',
                     onSelect: function(value) {
 
-                        dateSelected = new Date(value + ' 00:00:00');
-                        dtstartString = dateSelected.getFullYear() + ('0' + (dateSelected.getMonth() + 1)).slice(-2) + ('0' + dateSelected.getDate()).slice(-2);
+                        var dateSelected = new Date(value + ' 00:00:00');
+                        var dtstartString = dateSelected.getFullYear() + ('0' + (dateSelected.getMonth() + 1)).slice(-2) + ('0' + dateSelected.getDate()).slice(-2);
                         $('#start-date-hidden').val(dtstartString + 'T040000z');
                         recurringRule.dtstart = dtstartString + 'T040000z';
 
                         // Set minimum selected date on end-datepicker
-                        minEndDate = dateSelected.getFullYear() + '-' + ('0' + (dateSelected.getMonth() + 1)).slice(-2) + '-' + ('0' + dateSelected.getDate()).slice(-2);
+                        var minEndDate = dateSelected.getFullYear() + '-' + ('0' + (dateSelected.getMonth() + 1)).slice(-2) + '-' + ('0' + dateSelected.getDate()).slice(-2);
                         $('#end-date-rrule').datepicker('option', 'minDate', minEndDate);
                         // Reset the selected enddate
                         $('#end-date-hidden').val(dtstartString + 'T040000z');
@@ -106,8 +106,8 @@ RruleForm = {
                     selectOtherMonths: true,
                     dateFormat: 'yy-mm-dd',
                     onSelect: function(value) {
-                        dateSelected = new Date(value + ' 00:00:00');
-                        untilString = dateSelected.getFullYear() + ('0' + (dateSelected.getMonth() + 1)).slice(-2) + ('0' + dateSelected.getDate()).slice(-2);
+                        var dateSelected = new Date(value + ' 00:00:00');
+                        var untilString = dateSelected.getFullYear() + ('0' + (dateSelected.getMonth() + 1)).slice(-2) + ('0' + dateSelected.getDate()).slice(-2);
                         $('#end-date-hidden').val(untilString + 'T040000z');
                         // Remove the count variable
                         recurringRule.count = '';
@@ -118,9 +118,9 @@ RruleForm = {
 
                 if (recur.UNTIL) {
                     // Setup end date picker
-                    endYear = recur.UNTIL.substring(0, 4);
-                    endMonth = recur.UNTIL.substring(4, 6);
-                    endDay = recur.UNTIL.substring(6, 8);
+                    var endYear = recur.UNTIL.substring(0, 4);
+                    var endMonth = recur.UNTIL.substring(4, 6);
+                    var endDay = recur.UNTIL.substring(6, 8);
 
                     $('#end-date-rrule').val(endYear + '-' + endMonth + '-' + endDay);
                     $('#end-date-hidden').val(endYear + endMonth + endDay + 'T040000z');
@@ -162,7 +162,7 @@ RruleForm = {
                         if (typeof recur.BYDAY !== 'undefined') {
 
                             // Split up the individual bymonthdays
-                            bydays = recur.BYDAY.split(',');
+                            var bydays = recur.BYDAY.split(',');
 
                             // Loop through the BYDAYs
                             for (v = 0; v < bydays.length; v++) {
@@ -194,7 +194,7 @@ RruleForm = {
                         if (typeof recur.BYMONTHDAY !== 'undefined') {
 
                             // Split up the individual bymonthdays
-                            bymonthdays = recur.BYMONTHDAY.split(',');
+                            var bymonthdays = recur.BYMONTHDAY.split(',');
 
                             // Loop through the BYMONTHDAYs
                             for (v = 0; v < bymonthdays.length; v++) {
@@ -329,7 +329,7 @@ RruleForm = {
     resetOptions: function() {
 
         // Format the date (http://stackoverflow.com/questions/3605214/javascript-add-leading-zeroes-to-date)
-        today = new Date();
+        var today = new Date();
         MyDateString = today.getFullYear() + ('0' + (today.getMonth() + 1)).slice(-2) + ('0' + today.getDate()).slice(-2);
 
         // Reset all the selected rules
@@ -405,11 +405,11 @@ RruleForm = {
             $('#start-date-rrule').datepicker({
                 showOtherMonths: true,
                 selectOtherMonths: true,
-                dateFormat: 'dd/mm/yy',
+                dateFormat: 'yy-mm-dd',
                 onSelect: function(value) {
 
-                    dateSelected = new Date(value.replace(/-/g, "/") + ' 00:00:00'); // REGEX used to please SAFARI browser!
-                    dtstartString = dateSelected.getFullYear() + ('0' + (dateSelected.getMonth() + 1)).slice(-2) + ('0' + dateSelected.getDate()).slice(-2);
+                    var dateSelected = new Date(value.replace(/-/g, "/") + ' 00:00:00'); // REGEX used to please SAFARI browser!
+                    var dtstartString = dateSelected.getFullYear() + ('0' + (dateSelected.getMonth() + 1)).slice(-2) + ('0' + dateSelected.getDate()).slice(-2);
                     $('#start-date-hidden').val(dtstartString + 'T040000z');
                     recurringRule.dtstart = dtstartString + 'T040000z';
 
@@ -428,11 +428,12 @@ RruleForm = {
             $('#end-date-rrule').datepicker({
                 showOtherMonths: true,
                 selectOtherMonths: true,
-                dateFormat: 'dd/mm/yy',
+                dateFormat: 'yy-mm-dd',
                 onSelect: function(value) {
                     //dateSelected = Date.parseExact(value, "yyyy-MM-dd");
-                    dateSelected = new Date(value.replace(/-/g, "/") + ' 00:00:00'); // REGEX used to please SAFARI browser!
-                    untilString = dateSelected.getFullYear() + ('0' + (dateSelected.getMonth() + 1)).slice(-2) + ('0' + dateSelected.getDate()).slice(-2);
+                    var dateSelected = new Date(value + ' 00:00:00'); // REGEX used to please SAFARI browser!
+                    console.log(dateSelected, value);
+                    var untilString = dateSelected.getFullYear() + ('0' + (dateSelected.getMonth() + 1)).slice(-2) + ('0' + dateSelected.getDate()).slice(-2);
                     $('#end-date-hidden').val(untilString + 'T040000z');
                     // Remove the count variable
                     recurringRule.count = '';
@@ -841,6 +842,7 @@ RruleForm = {
             if (callback === '') {
                 $(selector).val(RruleForm.rruleGenerate()).trigger('change');
             } else {
+                $(selector).val(RruleForm.rruleGenerate()).trigger('change');
                 eval(callback + '("'+RruleForm.rruleGenerate() +'")');
             }
             $('.modal.in').modal('hide');

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rrule_form
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - ravi-ture