Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for #34 #35

Closed
wants to merge 3 commits into from
+17 −7
Closed

Fix for #34 #35

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69baddf
Include year and month selectors
Dec 28, 2014
ec5f3b8
Include success and feedback details in html template
Dec 28, 2014
3bd382e
Use patched pickadate to resolve build issues with duplicate fa_IR.js…
Sep 20, 2015
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
6 changes: 4 additions & 2 deletions bootstrap-datepicker.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
angular.module("schemaForm").run(["$templateCache", function($templateCache) {$templateCache.put("directives/decorators/bootstrap/datepicker/datepicker.html","<div class=\"form-group\" ng-class=\"{\'has-error\': hasError()}\">\n <label class=\"control-label\" ng-show=\"showTitle()\">{{form.title}}</label>\n\n <input ng-show=\"form.key\"\n style=\"background-color: white\"\n type=\"text\"\n class=\"form-control\"\n schema-validate=\"form\"\n ng-model=\"$$value$$\"\n pick-a-date\n min-date=\"form.minDate\"\n max-date=\"form.maxDate\"\n format=\"form.format\" />\n\n <span class=\"help-block\">{{ (hasError() && errorMessage(schemaError())) || form.description}}</span>\n</div>\n");}]);
angular.module("schemaForm").run(["$templateCache", function($templateCache) {$templateCache.put("directives/decorators/bootstrap/datepicker/datepicker.html","<div class=\"form-group\" ng-class=\"{\'has-error\': hasError(), \'has-success\': hasSuccess(), \'has-feedback\': form.feedback !== false }\">\n <label class=\"control-label\" ng-show=\"showTitle()\">{{form.title}}</label>\n\n <input ng-show=\"form.key\"\n style=\"background-color: white\"\n type=\"text\"\n class=\"form-control\"\n schema-validate=\"form\"\n ng-model=\"$$value$$\"\n pick-a-date\n min-date=\"form.minDate\"\n max-date=\"form.maxDate\"\n format=\"form.format\" />\n\n <span ng-if=\"form.feedback !== false\"\n class=\"form-control-feedback\"\n ng-class=\"evalInScope(form.feedback) || {\'glyphicon\': true, \'glyphicon-ok\': hasSuccess(), \'glyphicon-remove\': hasError() }\"></span>\n\n <div class=\"help-block\"\n ng-show=\"(hasError() && errorMessage(schemaError())) || form.description\"\n ng-bind-html=\"(hasError() && errorMessage(schemaError())) || form.description\"></div>\n</div>\n");}]);
angular.module('schemaForm').directive('pickADate', function () {

//String dates for min and max is not supported
@@ -34,7 +34,9 @@ angular.module('schemaForm').directive('pickADate', function () {
onClose: function () {
element.blur();
},
formatSubmit: null
formatSubmit: null,
selectYears: 100,
selectMonths: true
});

//Defaultformat is for json schema date-time is ISO8601
2 changes: 1 addition & 1 deletion bootstrap-datepicker.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@
"coverage"
],
"dependencies": {
"pickadate": "~3.5.3"
"pickadate": "https://github.com/AddJam/pickadate.js/tarball/2343dce1ff45fdd6a99743608266c39e5a9a16a4"
},
"devDependencies": {
"angular-schema-form": ">= 0.7",
4 changes: 3 additions & 1 deletion src/angular-pickadate.js
View file
Original file line number Diff line number Diff line change
@@ -33,7 +33,9 @@ angular.module('schemaForm').directive('pickADate', function () {
onClose: function () {
element.blur();
},
formatSubmit: null
formatSubmit: null,
selectYears: 100,
selectMonths: true
});

//Defaultformat is for json schema date-time is ISO8601
10 changes: 8 additions & 2 deletions src/datepicker.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="form-group" ng-class="{'has-error': hasError()}">
<div class="form-group" ng-class="{'has-error': hasError(), 'has-success': hasSuccess(), 'has-feedback': form.feedback !== false }">
<label class="control-label" ng-show="showTitle()">{{form.title}}</label>

<input ng-show="form.key"
@@ -12,5 +12,11 @@
max-date="form.maxDate"
format="form.format" />

<span class="help-block">{{ (hasError() && errorMessage(schemaError())) || form.description}}</span>
<span ng-if="form.feedback !== false"
class="form-control-feedback"
ng-class="evalInScope(form.feedback) || {'glyphicon': true, 'glyphicon-ok': hasSuccess(), 'glyphicon-remove': hasError() }"></span>

<div class="help-block"
ng-show="(hasError() && errorMessage(schemaError())) || form.description"
ng-bind-html="(hasError() && errorMessage(schemaError())) || form.description"></div>
</div>