Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ Make sure you use `charset="utf-8"` in your script tag if your browser (or those
To use the directive, use the following code :

```html
<input type="text" ng-datepicker ng-options="datepickerOptions" ng-model="date">
<input type="text" ng-datepicker ng-datepicker-options="datepickerOptions" ng-model="date">
```

`ng-datepicker` : Indicates you want your input as a date picker.

`ng-options` : Object of the controller scope containing the [options](http://bootstrap-datepicker.readthedocs.org/en/latest/options.html) for your date picker.
`ng-datepicker-options` : Object of the controller scope containing the [options](http://bootstrap-datepicker.readthedocs.org/en/latest/options.html) for your date picker.

`ng-model` : Variable of the controller scope to store the date. The date is currently store as a string, formatted according to the one set in ng-options.

Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-bootstrap-datepicker",
"version": "0.3.1",
"version": "0.3.3",
"description": "Angular Boostrap Datepicker based on https://github.com/eternicode/bootstrap-datepicker",
"main": ["dist/angular-bootstrap-datepicker.js", "dist/angular-bootstrap-datepicker.min.js", "dist/angular-bootstrap-datepicker.css"],
"authors": [
Expand Down
32 changes: 16 additions & 16 deletions dist/angular-bootstrap-datepicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -1487,18 +1487,18 @@
};
}(jQuery));

/**
* Greek translation for bootstrap-datepicker
*/
;(function($){
$.fn.datepicker.dates['el'] = {
days: ["Κυριακή", "Δευτέρα", "Τρίτη", "Τετάρτη", "Πέμπτη", "Παρασκευή", "Σάββατο", "Κυριακή"],
daysShort: ["Κυρ", "Δευ", "Τρι", "Τετ", "Πεμ", "Παρ", "Σαβ", "Κυρ"],
daysMin: ["Κυ", "Δε", "Τρ", "Τε", "Πε", "Πα", "Σα", "Κυ"],
months: ["Ιανουάριος", "Φεβρουάριος", "Μάρτιος", "Απρίλιος", "Μάιος", "Ιούνιος", "Ιούλιος", "Αύγουστος", "Σεπτέμβριος", "Οκτώβριος", "Νοέμβριος", "Δεκέμβριος"],
monthsShort: ["Ιαν", "Φεβ", "Μαρ", "Απρ", "Μάι", "Ιουν", "Ιουλ", "Αυγ", "Σεπ", "Οκτ", "Νοε", "Δεκ"],
today: "Σήμερα"
};
/**
* Greek translation for bootstrap-datepicker
*/
;(function($){
$.fn.datepicker.dates['el'] = {
days: ["Κυριακή", "Δευτέρα", "Τρίτη", "Τετάρτη", "Πέμπτη", "Παρασκευή", "Σάββατο", "Κυριακή"],
daysShort: ["Κυρ", "Δευ", "Τρι", "Τετ", "Πεμ", "Παρ", "Σαβ", "Κυρ"],
daysMin: ["Κυ", "Δε", "Τρ", "Τε", "Πε", "Πα", "Σα", "Κυ"],
months: ["Ιανουάριος", "Φεβρουάριος", "Μάρτιος", "Απρίλιος", "Μάιος", "Ιούνιος", "Ιούλιος", "Αύγουστος", "Σεπτέμβριος", "Οκτώβριος", "Νοέμβριος", "Δεκέμβριος"],
monthsShort: ["Ιαν", "Φεβ", "Μαρ", "Απρ", "Μάι", "Ιουν", "Ιουλ", "Αυγ", "Σεπ", "Οκτ", "Νοε", "Δεκ"],
today: "Σήμερα"
};
}(jQuery));
/**
* Spanish translation for bootstrap-datepicker
Expand Down Expand Up @@ -2095,18 +2095,18 @@ dp.directive('ngDatepicker', function() {
restrict: 'A',
replace: true,
scope: {
ngOptions: '=',
ngDatepickerOptions: '=',
ngModel: '='
},
template: "<div class=\"input-append date\">\n <input type=\"text\"><span class=\"add-on\"><i class=\"icon-th\"></i></span>\n</div>",
link: function(scope, element) {
scope.inputHasFocus = false;
element.datepicker(scope.ngOptions).on('changeDate', function(e) {
element.datepicker(scope.ngDatepickerOptions).on('changeDate', function(e) {
var defaultFormat, defaultLanguage, format, language;
defaultFormat = $.fn.datepicker.defaults.format;
format = scope.ngOptions.format || defaultFormat;
format = scope.ngDatepickerOptions.format || defaultFormat;
defaultLanguage = $.fn.datepicker.defaults.language;
language = scope.ngOptions.language || defaultLanguage;
language = scope.ngDatepickerOptions.language || defaultLanguage;
return scope.$apply(function() {
return scope.ngModel = $.fn.datepicker.DPGlobal.formatDate(e.date, format, language);
});
Expand Down
4 changes: 2 additions & 2 deletions dist/angular-bootstrap-datepicker.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-datepicker",
"version": "0.1.0",
"version": "0.1.1",
"description": "some description",
"main": "angular-datepicker.js",
"directories": {
Expand Down
8 changes: 4 additions & 4 deletions src/angular-bootstrap-datepicker.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dp.directive 'ngDatepicker', ->
restrict: 'A'
replace: true
scope:
ngOptions: '='
ngDatepickerOptions: '='
ngModel: '='
template: """
<div class="input-append date">
Expand All @@ -14,12 +14,12 @@ dp.directive 'ngDatepicker', ->
link: (scope, element)->
scope.inputHasFocus = false

element.datepicker(scope.ngOptions).on('changeDate', (e)->
element.datepicker(scope.ngDatepickerOptions).on('changeDate', (e)->

defaultFormat = $.fn.datepicker.defaults.format
format = scope.ngOptions.format || defaultFormat
format = scope.ngDatepickerOptions.format || defaultFormat
defaultLanguage = $.fn.datepicker.defaults.language
language = scope.ngOptions.language || defaultLanguage
language = scope.ngDatepickerOptions.language || defaultLanguage

scope.$apply -> scope.ngModel = $.fn.datepicker.DPGlobal.formatDate(e.date, format, language)
)
Expand Down