From e3ed66c60687a3fcc445838f742c9e83499eedc9 Mon Sep 17 00:00:00 2001
From: vitalets <noginsk@rambler.ru>
Date: Fri, 11 Jan 2013 19:43:47 +0400
Subject: [PATCH] comments for docs
---
grunt.js | 8 +++++++-
src/inputs/combodate/combodate.js | 10 +++++-----
src/inputs/date/date.js | 3 ++-
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/grunt.js b/grunt.js
index 3deb5d5..96c8095 100644
--- a/grunt.js
+++ b/grunt.js
@@ -212,7 +212,13 @@ module.exports = function(grunt) {
options: {
basePath: 'inputs-ext'
}
- }
+ },
+ ui_datepicker: {
+ files: {
+ //copy jquery ui datepicker
+ '<%= dist %>/jquery-editable/jquery-ui-datepicker/' : 'src/inputs/dateui/jquery-ui-datepicker/**'
+ }
+ }
},
uglify: {}
diff --git a/src/inputs/combodate/combodate.js b/src/inputs/combodate/combodate.js
index d2bc48b..9d497c5 100644
--- a/src/inputs/combodate/combodate.js
+++ b/src/inputs/combodate/combodate.js
@@ -1,19 +1,19 @@
/**
-Combodate input - dropdown date and time picker.
-Based on [combodate](http://vitalets.github.com/combodate) plugin.
-To use it you should manually include [momentjs](http://momentjs.com).
+Combodate input - dropdown date and time picker.
+Based on [combodate](http://vitalets.github.com/combodate) plugin. To use it you should manually include [momentjs](http://momentjs.com).
Allows to enter:
* only date
* only time
* datetime
-Please note, that format is taken from momentjs and not compatible with bootstrap-datepicker / jquery UI datepicker.
-Internally value stored as Moment js object
+Please note, that format is taken from momentjs and **not compatible** with bootstrap-datepicker / jquery UI datepicker.
+Internally value stored as momentjs object.
@class combodate
@extends abstractinput
@final
+@since 1.4.0
@example
<a href="#" id="dob" data-type="combodate" data-pk="1" data-url="/post" data-value="1984-05-15" data-original-title="Select date"></a>
<script>
diff --git a/src/inputs/date/date.js b/src/inputs/date/date.js
index ecbe01b..1d233ef 100644
--- a/src/inputs/date/date.js
+++ b/src/inputs/date/date.js
@@ -2,7 +2,8 @@
Bootstrap-datepicker.
Description and examples: https://github.com/eternicode/bootstrap-datepicker.
For **i18n** you should include js file from here: https://github.com/eternicode/bootstrap-datepicker/tree/master/js/locales
-and set `language` option.
+and set `language` option.
+Since 1.4.0 date has different appearance in **popup** and **inline** modes.
@class date
@extends abstractinput