Skip to content

Commit 981e10f

Browse files
zd5043039119zd5043039119
committed
增加支持lang的配置,并修复多个dp事件绑定到元素
1 parent c5bf7bf commit 981e10f

10 files changed

+22
-12
lines changed

‎bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"GruntFile.js",
2222
"package.json"
2323
],
24-
"version": "0.0.8",
24+
"version": "0.0.9",
2525
"dependencies": {
2626
"angular": "^1.4.0"
2727
},

‎dist/beanext-ui-datepicker.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ angular.module('bui.datepicker', []).directive('buiDatepicker', [function () {
1818
require: '?ngModel',
1919
scope: {
2020
minDateFunc: '&?',
21-
maxDateFunc: '&?'
21+
maxDateFunc: '&?',
22+
lang: '=?'
2223
},
2324
link: function (scope, element, attr, ngModel) {
2425
ngModel = ngModel || {
@@ -80,6 +81,9 @@ angular.module('bui.datepicker', []).directive('buiDatepicker', [function () {
8081
if (attr.maxDateFunc) {
8182
options.maxDate = scope.maxDateFunc();
8283
}
84+
if(scope.lang){
85+
options.lang = scope.lang;
86+
}
8387
window.WdatePicker(options);
8488
});
8589
}

‎dist/beanext-ui-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.

‎dist/datepicker/WdatePicker.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.

‎example/demo.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
</head>
99
<body ng-app="uiDatepickerApp" ng-controller="uiDatepickerCtrl">
1010
<input type="text" bui-datepicker>
11-
12-
13-
<script src="scripts/lib/angular/angular.min.js"></script>
11+
<script src="scripts/lib/angular.min.js"></script>
1412
<script src="scripts/beanext-ui-datepicker.min.js"></script>
1513
<script src="scripts/lib/datepicker/WdatePicker.js"></script>
1614
<script src="scripts/demo.js"></script>

‎example/scripts/beanext-ui-datepicker.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ angular.module('bui.datepicker', []).directive('buiDatepicker', [function () {
1818
require: '?ngModel',
1919
scope: {
2020
minDateFunc: '&?',
21-
maxDateFunc: '&?'
21+
maxDateFunc: '&?',
22+
lang: '=?'
2223
},
2324
link: function (scope, element, attr, ngModel) {
2425
ngModel = ngModel || {
@@ -80,6 +81,9 @@ angular.module('bui.datepicker', []).directive('buiDatepicker', [function () {
8081
if (attr.maxDateFunc) {
8182
options.maxDate = scope.maxDateFunc();
8283
}
84+
if(scope.lang){
85+
options.lang = scope.lang;
86+
}
8387
window.WdatePicker(options);
8488
});
8589
}

‎example/scripts/beanext-ui-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.

‎example/scripts/lib/datepicker/WdatePicker.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.

‎lib/WdatePicker.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.

‎src/beanext-ui-datepicker.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ angular.module('bui.datepicker', []).directive('buiDatepicker', [function () {
1818
require: '?ngModel',
1919
scope: {
2020
minDateFunc: '&?',
21-
maxDateFunc: '&?'
21+
maxDateFunc: '&?',
22+
lang: '=?'
2223
},
2324
link: function (scope, element, attr, ngModel) {
2425
ngModel = ngModel || {
@@ -80,6 +81,9 @@ angular.module('bui.datepicker', []).directive('buiDatepicker', [function () {
8081
if (attr.maxDateFunc) {
8182
options.maxDate = scope.maxDateFunc();
8283
}
84+
if(scope.lang){
85+
options.lang = scope.lang;
86+
}
8387
window.WdatePicker(options);
8488
});
8589
}

0 commit comments

Comments
 (0)