Skip to content

Commit a1d032f

Browse files
committed
Merge pull request #3 from Modulr/dev
Update v1.0.2
2 parents 3bdadf0 + 72c00bf commit a1d032f

File tree

6 files changed

+16
-28
lines changed

6 files changed

+16
-28
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Angular Bootstrap Datepicker is an Angularjs component that can replacement for
88
##Features
99

1010
- Uses the native Angularjs scope for data binding
11+
- Fast and lightweight
1112
- Formats support
1213

1314

@@ -62,7 +63,7 @@ angular.module('MyApp', ['mdr.datepicker'])
6263
> Complete Directive (All attributes)
6364
6465
```html
65-
<mdr-datepicker model="input" date="output" format="d/M/yyyy" placeholder="dd/M/yyyy" disabled="true" required></mdr-datepicker>
66+
<mdr-datepicker model="input" date="output" format="d/M/yyyy" placeholder="dd/M/yyyy" disabled="true" required="true"></mdr-datepicker>
6667
```
6768

6869
####API
@@ -76,6 +77,7 @@ date | `date` | *Get date (Output).*
7677
format | `string` | *It is date format.*
7778
placeholder | `string` | *Text into placeholder.*
7879
disabled | `boolean` | *If required disable the component is marked as true.*
80+
required | `boolean` | *If is required the component is marked as true.*
7981

8082
##How to contribute
8183

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "mdr-angular-datepicker",
3-
"version": "1.0.1",
3+
"version": "1.0.2",
44
"description": "Bootstrap Datepicker for angular",
55
"main": "dist/mdr-datepicker.js",
66
"authors": [

dist/mdr-datepicker.js

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@
1010
* @param format {string}
1111
* @param placeholder {string}
1212
* @param disabled {boolean}
13-
* @param required {attribute}
14-
* <mdr-datepicker model="" date="" format="" placeholder="" disabled="" required></mdr-datepicker>
13+
* @param required {boolean}
1514
*/
1615
return {
1716
restrict: 'E',
17+
controller: 'mdrDatepickerCtrl',
1818
scope: {
1919
model: '=',
2020
date: '=',
2121
format: '@',
2222
placeholder: '@',
23-
disabled: '='
23+
disabled: '=',
24+
required: '='
2425
},
25-
controller: 'mdrDatepickerCtrl',
26-
template: '<input type="text" class="form-control datepicker" id="datepickerId_{{$id}}" placeholder="{{placeholder}}" ng-model="model" ng-disabled="disabled">'
26+
template: '<input type="text" class="form-control datepicker" id="datepickerId_{{$id}}" placeholder="{{placeholder}}" ng-model="model" ng-disabled="disabled" ng-required="required">'
2727
};
2828
}])
2929
.controller('mdrDatepickerCtrl', ['$scope', '$element', '$attrs', '$filter', function($scope, $element, $attrs, $filter){
@@ -35,7 +35,6 @@
3535
if(newValue !== undefined){
3636
if(newValue !== '0000-00-00'){
3737
var date = $filter('date')(newValue, $scope.format);
38-
console.log(date);
3938
$("#datepickerId_" + $scope.$id).datepicker('update', date);
4039
}else{
4140
$("#datepickerId_" + $scope.$id).datepicker('update', '');
@@ -53,12 +52,6 @@
5352
todayHighlight: true,
5453
//language:"es"
5554
});
56-
setTimeout(function() {
57-
// Si la directiva contiene el attr required se agrega el attr required al datepicker
58-
if($attrs.required){
59-
$("#datepickerId_" + $scope.$id).attr('required','required');
60-
}
61-
},0);
6255
}
6356

6457
}]);

dist/mdr-datepicker.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "mdr-angular-datepicker",
3-
"version": "1.0.1",
3+
"version": "1.0.2",
44
"description": "Bootstrap Datepicker for angular",
55
"main": "index.js",
66
"scripts": {

src/mdr-datepicker.js

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@
1010
* @param format {string}
1111
* @param placeholder {string}
1212
* @param disabled {boolean}
13-
* @param required {attribute}
14-
* <mdr-datepicker model="" date="" format="" placeholder="" disabled="" required></mdr-datepicker>
13+
* @param required {boolean}
1514
*/
1615
return {
1716
restrict: 'E',
17+
controller: 'mdrDatepickerCtrl',
1818
scope: {
1919
model: '=',
2020
date: '=',
2121
format: '@',
2222
placeholder: '@',
23-
disabled: '='
23+
disabled: '=',
24+
required: '='
2425
},
25-
controller: 'mdrDatepickerCtrl',
26-
template: '<input type="text" class="form-control datepicker" id="datepickerId_{{$id}}" placeholder="{{placeholder}}" ng-model="model" ng-disabled="disabled">'
26+
template: '<input type="text" class="form-control datepicker" id="datepickerId_{{$id}}" placeholder="{{placeholder}}" ng-model="model" ng-disabled="disabled" ng-required="required">'
2727
};
2828
}])
2929
.controller('mdrDatepickerCtrl', ['$scope', '$element', '$attrs', '$filter', function($scope, $element, $attrs, $filter){
@@ -35,7 +35,6 @@
3535
if(newValue !== undefined){
3636
if(newValue !== '0000-00-00'){
3737
var date = $filter('date')(newValue, $scope.format);
38-
console.log(date);
3938
$("#datepickerId_" + $scope.$id).datepicker('update', date);
4039
}else{
4140
$("#datepickerId_" + $scope.$id).datepicker('update', '');
@@ -53,12 +52,6 @@
5352
todayHighlight: true,
5453
//language:"es"
5554
});
56-
setTimeout(function() {
57-
// Si la directiva contiene el attr required se agrega el attr required al datepicker
58-
if($attrs.required){
59-
$("#datepickerId_" + $scope.$id).attr('required','required');
60-
}
61-
},0);
6255
}
6356

6457
}]);

0 commit comments

Comments
 (0)