Skip to content

Commit

Permalink
alpha14
Browse files Browse the repository at this point in the history
  • Loading branch information
Eonasdan committed Mar 4, 2018
1 parent 27dce70 commit b77700e
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 25 deletions.
3 changes: 3 additions & 0 deletions build/js/tempusdominus-core.js
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,9 @@ var DateTimePicker = function ($, moment) {
return this.actualFormat.indexOf('m') !== -1;
case 's':
return this.actualFormat.indexOf('s') !== -1;
case 'a':
case 'A':
return this.actualFormat.toLowerCase().indexOf('a') !== -1;
default:
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion build/js/tempusdominus-core.min.js

Large diffs are not rendered by default.

9 changes: 0 additions & 9 deletions component.json

This file was deleted.

2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "tempusdominus/core",
"type": "component",
"version": "5.0.0-alpha12",
"version": "5.0.0-alpha14",
"description": "Tempus Dominus core",
"keywords": [
"bootstrap",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"type": "git",
"url": "https://github.com/tempusdominus/core.git"
},
"version": "5.0.0-alpha12",
"version": "5.0.0-alpha14",
"files": [
"build",
"src/js/**/*.js",
Expand Down
13 changes: 0 additions & 13 deletions tasks/bump-version.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,6 @@ module.exports = function (grunt) {
}
});

grunt.config('string-replace.component-json', {
files: {'component.json': 'component.json'},
options: {
replacements: [
{
pattern: /"version": .*/,
replacement: '"version": "' + version + '",'
}
]
}
});

grunt.config('string-replace.composer-json', {
files: {'composer.json': 'composer.json'},
options: {
Expand All @@ -54,7 +42,6 @@ module.exports = function (grunt) {

grunt.task.run([
'string-replace:package-json',
'string-replace:component-json',
'string-replace:composer-json',
'string-replace:js'
]);
Expand Down

0 comments on commit b77700e

Please sign in to comment.