Merge pull request #1 from ejdraper/master

Ability to passthrough custom datepicker arguments
qertoip · May 11, 2011 · 05318a2 · 05318a2
2 parents 3ad477f + c5f65e7
commit 05318a2
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/src/jquery.jeditable.datepicker.js b/src/jquery.jeditable.datepicker.js
@@ -36,8 +36,8 @@ $.editable.addInputType( 'datepicker', {
 
       // Don't cancel inline editing onblur to allow clicking datepicker
       settings.onblur = 'nothing';
-      
-      input.datepicker( {
+
+      datepicker = {
         onSelect: function() {
           // clicking specific day in the calendar should
           // submit the form and close the input field
@@ -63,6 +63,12 @@ $.editable.addInputType( 'datepicker', {
             // without a delay the form is submitted in all scenarios, which is wrong
           }, 150 );
         }
-      } );
+      };
+
+      if (settings.datepicker) {
+        jQuery.extend(datepicker, settings.datepicker);
+      }
+
+      input.datepicker(datepicker);
     }
 } );
diff --git a/test/javascripts/example.js b/test/javascripts/example.js
@@ -7,8 +7,12 @@ $( document ).ready( function() {
       date.html( value );
     },
     {
-      type: 'datepicker'
+      type: 'datepicker',
+      datepicker: {
+        changeMonth: true,
+        changeYear: true
+      }
     }
   );
 
-} );
+} );
diff --git a/test/javascripts/jquery.jeditable.datepicker.js b/test/javascripts/jquery.jeditable.datepicker.js
@@ -36,8 +36,8 @@ $.editable.addInputType( 'datepicker', {
 
       // Don't cancel inline editing onblur to allow clicking datepicker
       settings.onblur = 'nothing';
-      
-      input.datepicker( {
+
+      datepicker = {
         onSelect: function() {
           // clicking specific day in the calendar should
           // submit the form and close the input field
@@ -63,6 +63,12 @@ $.editable.addInputType( 'datepicker', {
             // without a delay the form is submitted in all scenarios, which is wrong
           }, 150 );
         }
-      } );
+      };
+
+      if (settings.datepicker) {
+        jQuery.extend(datepicker, settings.datepicker);
+      }
+
+      input.datepicker(datepicker);
     }
 } );