Skip to content

Commit

Permalink
v4! It lives!
Browse files Browse the repository at this point in the history
Fixes #747, #742, #726, #696, #695, #677
  • Loading branch information
Eonasdan committed Jan 18, 2015
1 parent 758e79b commit 175ba28
Show file tree
Hide file tree
Showing 41 changed files with 1,652 additions and 4,979 deletions.
44 changes: 44 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -146,5 +146,49 @@ module.exports = function (grunt) {
'jshint', 'jscs', 'uglify', 'less'
]);

grunt.registerTask('nuget', 'Create a nuget package', function () {
var target = grunt.option('target') || 'less', done = this.async();
if (target === 'less') {
grunt.util.spawn({
cmd: 'src/nuget/nuget.exe',
args: [
'pack',
'src/nuget/Bootstrap.v3.Datetimepicker.nuspec',
'-OutputDirectory',
'build/nuget',
'-Version',
grunt.config.get('pkg').version
]
}, function (error, result) {
if (error) {
grunt.log.error(error);
} else {
grunt.log.write(result);
}
done();
});
}
else { //--target=css
grunt.util.spawn({
cmd: 'src/nuget/nuget.exe',
args: [
'pack',
'src/nuget/Bootstrap.v3.Datetimepicker.CSS.nuspec',
'-OutputDirectory',
'build/nuget',
'-Version',
grunt.config.get('pkg').version
]
}, function (error, result) {
if (error) {
grunt.log.error(error);
} else {
grunt.log.write(result);
}
done();
});
}
});

grunt.registerTask('test', ['jshint', 'jscs', 'uglify', 'less', 'jasmine']);
};
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) {{{year}}} {{{fullname}}}
Copyright (c) 2015 Jonathan Peterson (@Eonasdan)

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
34 changes: 17 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
# This is the v4beta development branch. ![Travis](https://travis-ci.org/Eonasdan/bootstrap-datetimepicker.svg?branch=v4beta)
# Bootstrap 3 Date/Time Picker
![GitHub version](https://badge.fury.io/gh/Eonasdan%2Fbootstrap-datetimepicker.png)   ![Travis](https://travis-ci.org/Eonasdan/bootstrap-datetimepicker.svg?branch=development)

Please use [this jsfiddle](http://jsfiddle.net/Eonasdan/0Ltv25o8/) to test your configurations.
![DateTimePicker](http://i.imgur.com/nfnvh5g.png)

Expect things to change as we are currently in the process of redesing API and behaviour for the component
## [View the manual and demos](http://eonasdan.github.io/bootstrap-datetimepicker/)

For changelog have a look on [here](https://github.com/Eonasdan/bootstrap-datetimepicker/wiki/Version-4-changelog) and also on the commit history
#v4
v4 is out now! For v4 related bugs and issues see: /Eonasdan/bootstrap-datetimepicker/labels/v4.

In this version all the component interaction is made through the [Public API](https://github.com/Eonasdan/bootstrap-datetimepicker/wiki/Version-4-Public-API)
v3 is going into an archive state. Please be sure to check the documents. v4 has breaking changes and is a major rewrite.

## Want to help us?

That would be great!

**We are currently in need for beta testers** to find issues that might have slipped.

Also if you have the guts we could use a hand writing test specs.

Have a look first [here](https://github.com/Eonasdan/bootstrap-datetimepicker/wiki/Version-4-Contributors-guide) as a supplement to the code
## Submitting Issues
If you have issues, please check the following first:
* Have you read the docs?
* Do you have the latest version of momentjs?
* Do you have the latest version of jQuery?
* Please test and/or fork [this jsfiddle](http://jsfiddle.net/Eonasdan/0Ltv25o8/) with an example of your issue before you post an issue here.

Also note that all PR's related to v4 should be made to ```v4beta``` branch and should pass the validations. Have a look at [here](https://github.com/Eonasdan/bootstrap-datetimepicker/blob/v4beta/CONTRIBUTING.md) to get started. Remember to ```checkout v4beta```.
## Where do you use this?
I'd love to know if your public site is using this plugin and list your logo on the documentation site. Please email me `eonasdan at outlook dot com`. Do not submit issue/feature request to this email, they will be ignored.

## Submitting Issues
## [Installation instructions](https://github.com/Eonasdan/bootstrap-datetimepicker/wiki/Installation)

Please test with the latest source code on this branch not the minified versions as they are outdated. Start your issue title with a ```v4:``` so it can be easily identified by the colaborators.
## [Change Log](https://github.com/Eonasdan/bootstrap-datetimepicker/wiki/Version-4-changelog)
8 changes: 5 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
{
"name": "eonasdan-bootstrap-datetimepicker",
"version": "4.0.0-beta",
"version": "4.0.0",
"main": [
"build/css/bootstrap-datetimepicker.min.css",
"build/js/bootstrap-datetimepicker.min.js"
"build/js/bootstrap-datetimepicker.min.js",
"src/less/_bootstrap-datetimepicker.less",
"src/less/bootstrap-datetimepicker-build.less",
"src/js/bootstrap-datetimepicker.js"
],
"dependencies": {
"jquery": ">=1.8.3",
"bootstrap": "~3.0",
"moment": ">=2.8.0"
},
"homepage": "https://github.com/Eonasdan/bootstrap-datetimepicker",
Expand Down
122 changes: 121 additions & 1 deletion build/css/bootstrap-datetimepicker.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Datetimepicker for Bootstrap v3
* Datetimepicker for Bootstrap 3
//! version : 4.0.0-beta
* https://github.com/Eonasdan/bootstrap-datetimepicker/
*/
Expand Down Expand Up @@ -87,9 +87,97 @@
.bootstrap-datetimepicker-widget button[data-action] {
padding: 6px;
}
.bootstrap-datetimepicker-widget .btn[data-action="incrementHours"]::after {
position: absolute;
width: 1px;
height: 1px;
margin: -1px;
padding: 0;
overflow: hidden;
clip: rect(0, 0, 0, 0);
border: 0;
content: "Increment Hours";
}
.bootstrap-datetimepicker-widget .btn[data-action="incrementMinutes"]::after {
position: absolute;
width: 1px;
height: 1px;
margin: -1px;
padding: 0;
overflow: hidden;
clip: rect(0, 0, 0, 0);
border: 0;
content: "Increment Minutes";
}
.bootstrap-datetimepicker-widget .btn[data-action="decrementHours"]::after {
position: absolute;
width: 1px;
height: 1px;
margin: -1px;
padding: 0;
overflow: hidden;
clip: rect(0, 0, 0, 0);
border: 0;
content: "Decrement Hours";
}
.bootstrap-datetimepicker-widget .btn[data-action="decrementMinutes"]::after {
position: absolute;
width: 1px;
height: 1px;
margin: -1px;
padding: 0;
overflow: hidden;
clip: rect(0, 0, 0, 0);
border: 0;
content: "Decrement Minutes";
}
.bootstrap-datetimepicker-widget .btn[data-action="showHours"]::after {
position: absolute;
width: 1px;
height: 1px;
margin: -1px;
padding: 0;
overflow: hidden;
clip: rect(0, 0, 0, 0);
border: 0;
content: "Show Hours";
}
.bootstrap-datetimepicker-widget .btn[data-action="showMinutes"]::after {
position: absolute;
width: 1px;
height: 1px;
margin: -1px;
padding: 0;
overflow: hidden;
clip: rect(0, 0, 0, 0);
border: 0;
content: "Show Minutes";
}
.bootstrap-datetimepicker-widget .btn[data-action="togglePeriod"]::after {
position: absolute;
width: 1px;
height: 1px;
margin: -1px;
padding: 0;
overflow: hidden;
clip: rect(0, 0, 0, 0);
border: 0;
content: "Toggle AM/PM";
}
.bootstrap-datetimepicker-widget .picker-switch {
text-align: center;
}
.bootstrap-datetimepicker-widget .picker-switch::after {
position: absolute;
width: 1px;
height: 1px;
margin: -1px;
padding: 0;
overflow: hidden;
clip: rect(0, 0, 0, 0);
border: 0;
content: "Toggle Date and Time Screens";
}
.bootstrap-datetimepicker-widget .picker-switch td {
padding: 0;
margin: 0;
Expand Down Expand Up @@ -125,6 +213,28 @@
color: #777777;
cursor: not-allowed;
}
.bootstrap-datetimepicker-widget th.prev::after {
position: absolute;
width: 1px;
height: 1px;
margin: -1px;
padding: 0;
overflow: hidden;
clip: rect(0, 0, 0, 0);
border: 0;
content: "Previous Month";
}
.bootstrap-datetimepicker-widget th.next::after {
position: absolute;
width: 1px;
height: 1px;
margin: -1px;
padding: 0;
overflow: hidden;
clip: rect(0, 0, 0, 0);
border: 0;
content: "Next Month";
}
.bootstrap-datetimepicker-widget thead tr:first-child th {
cursor: pointer;
}
Expand Down Expand Up @@ -219,3 +329,13 @@
.input-group.date .input-group-addon {
cursor: pointer;
}
.sr-only {
position: absolute;
width: 1px;
height: 1px;
margin: -1px;
padding: 0;
overflow: hidden;
clip: rect(0, 0, 0, 0);
border: 0;
}
Loading

0 comments on commit 175ba28

Please sign in to comment.