diff --git a/src/inputs-ext/wysihtml5/wysihtml5.js b/src/inputs-ext/wysihtml5/wysihtml5.js index 9ec40f1..7e1a64e 100644 --- a/src/inputs-ext/wysihtml5/wysihtml5.js +++ b/src/inputs-ext/wysihtml5/wysihtml5.js @@ -1,12 +1,11 @@ /** -Bootstrap wysihtml5 editor. -To use it you should **manually** include required js and css files. +Bootstrap wysihtml5 editor. Based on [bootstrap-wysihtml5](https://github.com/jhollingworth/bootstrap-wysihtml5). +You should include this input **manually** with dependent js and css files from `inputs-ext` directory. - <link rel="stylesheet" type="text/css" href="/css/bootstrap-wysihtml5.css"></link> - <script src="js/wysihtml5-0.3.0.js"></script> - <script src="js/bootstrap-wysihtml5.js"></script> - -You can download these files from https://github.com/jhollingworth/bootstrap-wysihtml5 + <link href="js/inputs-ext/wysihtml5/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5-0.0.2.css" rel="stylesheet" type="text/css"></link> + <script src="js/inputs-ext/wysihtml5/bootstrap-wysihtml5-0.0.2/wysihtml5-0.3.0.min.js"></script> + <script src="js/inputs-ext/wysihtml5/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5-0.0.2.min.js"></script> + <script src="js/inputs-ext/wysihtml5/wysihtml5.js"></script> @class wysihtml5 @extends abstractinput diff --git a/src/inputs/combodate/combodate.js b/src/inputs/combodate/combodate.js index 9d497c5..dd835de 100644 --- a/src/inputs/combodate/combodate.js +++ b/src/inputs/combodate/combodate.js @@ -1,14 +1,17 @@ /** 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: +Based on [combodate](http://vitalets.github.com/combodate) plugin. To use it you should manually include [momentjs](http://momentjs.com). + + <script src="js/moment.min.js"></script> + +Allows to input: * only date * only time -* datetime +* both date and time Please note, that format is taken from momentjs and **not compatible** with bootstrap-datepicker / jquery UI datepicker. -Internally value stored as momentjs object. +Internally value stored as `momentjs` object. @class combodate @extends abstractinput @@ -20,7 +23,7 @@ Internally value stored as momentjs object. $(function(){ $('#dob').editable({ format: 'YYYY-MM-DD', - viewformat: 'YYYY-MM-DD', + viewformat: 'DD.MM.YYYY', template: 'D / MMMM / YYYY', combodate: { minYear: 2000, @@ -159,16 +162,11 @@ $(function(){ Configuration of combodate. Full list of options: http://vitalets.github.com/combodate/#docs - @property datepicker + @property combodate @type object - @default { - weekStart: 0, - startView: 0, - autoclose: false - } + @default null **/ - combodate: { - } + combodate: null /* (not implemented yet)