diff --git a/Gruntfile.js b/Gruntfile.js index 1682c74..998d20f 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -69,7 +69,7 @@ module.exports = function (grunt) { dist : { files: [ { - dot: true, + dot: false, src: [ '.tmp', '<%= yeoman.dist %>' @@ -128,10 +128,10 @@ module.exports = function (grunt) { expand : true, flatten: true, dot : true, - cwd : '<%= yeoman.app %>', dest : '<%= yeoman.dist %>', src : [ - 'styles/date.css' + 'README.md', + 'bower.json' ] } ] @@ -141,9 +141,9 @@ module.exports = function (grunt) { dist: { options: { base : '<%= yeoman.app %>', - module: 'dateInput' + module: 'datePicker' }, - src : '<%= yeoman.app %>/scripts/*.html', + src : '<%= yeoman.app %>/templates/*.html', dest : '.tmp/templates.js' } }, @@ -185,7 +185,8 @@ module.exports = function (grunt) { 'concat', 'cssmin', 'ngmin', - 'uglify' + 'uglify', + 'copy:dist' ]); grunt.registerTask('default', ['build']); diff --git a/README.md b/README.md index 66940f5..b4f3038 100644 --- a/README.md +++ b/README.md @@ -77,4 +77,3 @@ Live demo : http://run.plnkr.co/erJj712N4bbkGsub/ ```html
``` - diff --git a/app/index.html b/app/index.html index 854719a..3a6be09 100644 --- a/app/index.html +++ b/app/index.html @@ -87,7 +87,7 @@ diff --git a/app/scripts/module.js b/app/scripts/module.js index 8545c92..ecf5233 100644 --- a/app/scripts/module.js +++ b/app/scripts/module.js @@ -1,6 +1,6 @@ (function (angular) { 'use strict'; - var Module = angular.module('dateInput', []); + var Module = angular.module('datePicker', []); Module.directive('datePicker', function () { @@ -357,7 +357,7 @@ }, transclude : true, replace : true, - templateUrl: 'scripts/template.html' + templateUrl: 'templates/datepicker.html' }; }); @@ -392,7 +392,7 @@ picker = $compile('
')(scope); body.append(picker); scope.$digest(); - var pos = angular.extend({}, element.position(), { height: element[0].offsetHeight }); + var pos = angular.extend(element.offset(), { height: element[0].offsetHeight }); picker.css({ top: pos.top + pos.height, left: pos.left, display: 'block', position: 'absolute'}); picker.bind('mousedown', function () { return false; @@ -414,7 +414,7 @@ Module.directive('dateRange', function () { return { - template: '
\n \n \n \n \n \n
\n \n \n
', + templateUrl: 'templates/daterange.html', scope : { start: '=', end : '=' diff --git a/app/styles/date.css b/app/styles/date.css index 52638f7..8044a57 100644 --- a/app/styles/date.css +++ b/app/styles/date.css @@ -20,6 +20,7 @@ } [date-picker] { + z-index: 11000; /* to avoid bootstrap-modal issues */ padding: 4px; margin-top: 1px; -webkit-border-radius: 4px; diff --git a/app/scripts/template.html b/app/templates/datepicker.html similarity index 100% rename from app/scripts/template.html rename to app/templates/datepicker.html diff --git a/app/templates/daterange.html b/app/templates/daterange.html new file mode 100644 index 0000000..55d3906 --- /dev/null +++ b/app/templates/daterange.html @@ -0,0 +1,12 @@ +
+ + + + + +
+
+ 		+
+
+
\ No newline at end of file diff --git a/bower.json b/bower.json index bf31e90..6d4374c 100644 --- a/bower.json +++ b/bower.json @@ -1,10 +1,10 @@ { "name": "angular-datepicker", - "main": ["dist/module.min.js","dist/date.min.css"], + "main": ["module.min.js","date.min.css"], "license": "MIT", "version": "0.0.1", "ignore": [ - "**/.*" + ".gitignore","README.md" ], "dependencies": {}, "devDependencies": { @@ -16,4 +16,4 @@ "angular-scenario": "~1.0.5", "angular-bootstrap": "~0.3.0" } -} +} \ No newline at end of file diff --git a/dist/README.md b/dist/README.md new file mode 100644 index 0000000..b4f3038 --- /dev/null +++ b/dist/README.md @@ -0,0 +1,79 @@ +# AngularJS datepicker directives + +#### Requirements + +- Angular v1.1.4+ +- jQuery or your own implementation of `position()` on top of `jQuery Lite` + + +#### Development version + +Checkout branch `dev`, run `grunt install` and `bower install`. +To build run `gunt build` + +## Examples + +Live demo : http://run.plnkr.co/erJj712N4bbkGsub/ + + +##### defaults + +```html +
+``` + + +##### year view + +```html +
+``` + + +##### month view + +```html +
+``` + + +##### only date view + +```html +
+``` + + +##### hours view + +```html +
+``` + + +##### minutes view + +```html +
+``` + + +##### input as datepicker + +```html + +``` + + +##### input with formatted value + +```html + +``` + + +##### date-range picker + +```html +
+``` diff --git a/dist/bower.json b/dist/bower.json new file mode 100644 index 0000000..6d4374c --- /dev/null +++ b/dist/bower.json @@ -0,0 +1,19 @@ +{ + "name": "angular-datepicker", + "main": ["module.min.js","date.min.css"], + "license": "MIT", + "version": "0.0.1", + "ignore": [ + ".gitignore","README.md" + ], + "dependencies": {}, + "devDependencies": { + "angular-unstable": "latest", + "json3": "~3.2.4", + "es5-shim": "~2.0.8", + "jquery": "~2.0.2", + "angular-mocks": "~1.0.5", + "angular-scenario": "~1.0.5", + "angular-bootstrap": "~0.3.0" + } +} \ No newline at end of file diff --git a/dist/index.css b/dist/index.css index 52638f7..8044a57 100644 --- a/dist/index.css +++ b/dist/index.css @@ -20,6 +20,7 @@ } [date-picker] { + z-index: 11000; /* to avoid bootstrap-modal issues */ padding: 4px; margin-top: 1px; -webkit-border-radius: 4px; diff --git a/dist/index.js b/dist/index.js index 7c08f6e..7afd65d 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1,6 +1,6 @@ (function (angular) { 'use strict'; - var Module = angular.module('dateInput', []); + var Module = angular.module('datePicker', []); Module.directive('datePicker', function () { @@ -357,7 +357,7 @@ }, transclude : true, replace : true, - templateUrl: 'scripts/template.html' + templateUrl: 'templates/datepicker.html' }; }); @@ -392,7 +392,7 @@ picker = $compile('
')(scope); body.append(picker); scope.$digest(); - var pos = angular.extend({}, element.position(), { height: element[0].offsetHeight }); + var pos = angular.extend(element.offset(), { height: element[0].offsetHeight }); picker.css({ top: pos.top + pos.height, left: pos.left, display: 'block', position: 'absolute'}); picker.bind('mousedown', function () { return false; @@ -414,7 +414,7 @@ Module.directive('dateRange', function () { return { - template: '
\n \n \n \n \n \n
\n \n \n
', + templateUrl: 'templates/daterange.html', scope : { start: '=', end : '=' @@ -434,9 +434,9 @@ }; }); })(angular); -angular.module("dateInput").run(["$templateCache", function($templateCache) { +angular.module("datePicker").run(["$templateCache", function($templateCache) { - $templateCache.put("scripts/template.html", + $templateCache.put("templates/datepicker.html", "
\r" + "\n" + "
\r" + @@ -688,4 +688,30 @@ angular.module("dateInput").run(["$templateCache", function($templateCache) { "
" ); + $templateCache.put("templates/daterange.html", + "
\r" + + "\n" + + " \r" + + "\n" + + " \r" + + "\n" + + " \r" + + "\n" + + " \r" + + "\n" + + " \r" + + "\n" + + "
\r" + + "\n" + + "
\r" + + "\n" + + " 		\r" + + "\n" + + "
\r" + + "\n" + + "
\r" + + "\n" + + "
" + ); + }]); diff --git a/dist/index.min.css b/dist/index.min.css index ab649eb..9db5c62 100644 --- a/dist/index.min.css +++ b/dist/index.min.css @@ -6,4 +6,4 @@ * Licensed under the Apache License v2.0 * http://www.apache.org/licenses/LICENSE-2.0 * - */ .before.after:not(.active){background:#2f96b4 linear-gradient(to bottom,#5bc0de,#2f96b4) repeat-x}.next,.prev{font-size:21px}[date-picker] table{table-layout:fixed}[date-picker]{padding:4px;margin-top:1px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;direction:ltr}.datetimepicker-inline{width:220px}[date-picker].datetimepicker-rtl{direction:rtl}[date-picker].datetimepicker-rtl table tr td span{float:right}.datetimepicker-dropdown,.datetimepicker-dropdown-left{top:0;left:0}[class*=" datetimepicker-dropdown"]:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0,0,0,.2);position:absolute}[class*=" datetimepicker-dropdown"]:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute}[class*=" datetimepicker-dropdown-top"]:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-top:7px solid #ccc;border-top-color:rgba(0,0,0,.2);border-bottom:0}[class*=" datetimepicker-dropdown-top"]:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-top:6px solid #fff;border-bottom:0}.datetimepicker-dropdown-bottom-right:before{top:-7px;right:6px}.datetimepicker-dropdown-bottom-right:after{top:-6px;right:7px}.datetimepicker-dropdown-bottom-left:before{top:-7px;left:6px}.datetimepicker-dropdown-bottom-left:after{top:-6px;left:7px}.datetimepicker-dropdown-top-right:before{bottom:-7px;right:6px}.datetimepicker-dropdown-top-right:after{bottom:-6px;right:7px}.datetimepicker-dropdown-top-left:before{bottom:-7px;left:6px}.datetimepicker-dropdown-top-left:after{bottom:-6px;left:7px}[date-picker].minutes div.datetimepicker-minutes{display:block}[date-picker].hours div.datetimepicker-hours{display:block}[date-picker].days div.datetimepicker-days{display:block}[date-picker].months div.datetimepicker-months{display:block}[date-picker].years div.datetimepicker-years{display:block}[date-picker] table{margin:0}[date-picker] td,[date-picker] th{text-align:center;width:20px;height:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;border:0}.table-striped [date-picker] table tr td,.table-striped [date-picker] table tr th{background-color:transparent}[date-picker] table tr td.minute:hover{background:#eee;cursor:pointer}[date-picker] table tr td.hour:hover{background:#eee;cursor:pointer}[date-picker] table tr td.day:hover{background:#eee;cursor:pointer}[date-picker] table tr td.old,[date-picker] table tr td.new{color:#999}[date-picker] table tr td.disabled,[date-picker] table tr td.disabled:hover{background:0;color:#999;cursor:default}[date-picker] table tr td.today,[date-picker] table tr td.today:hover,[date-picker] table tr td.today.disabled,[date-picker] table tr td.today.disabled:hover{background-color:#fde19a;background-image:-moz-linear-gradient(top,#fdd49a,#fdf59a);background-image:-ms-linear-gradient(top,#fdd49a,#fdf59a);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdd49a),to(#fdf59a));background-image:-webkit-linear-gradient(top,#fdd49a,#fdf59a);background-image:-o-linear-gradient(top,#fdd49a,#fdf59a);background-image:linear-gradient(top,#fdd49a,#fdf59a);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fdd49a', endColorstr='#fdf59a', GradientType=0);border-color:#fdf59a #fdf59a #fbed50;border-color:rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}[date-picker] table tr td.today:hover,[date-picker] table tr td.today:hover:hover,[date-picker] table tr td.today.disabled:hover,[date-picker] table tr td.today.disabled:hover:hover,[date-picker] table tr td.today:active,[date-picker] table tr td.today:hover:active,[date-picker] table tr td.today.disabled:active,[date-picker] table tr td.today.disabled:hover:active,[date-picker] table tr td.today.active,[date-picker] table tr td.today:hover.active,[date-picker] table tr td.today.disabled.active,[date-picker] table tr td.today.disabled:hover.active,[date-picker] table tr td.today.disabled,[date-picker] table tr td.today:hover.disabled,[date-picker] table tr td.today.disabled.disabled,[date-picker] table tr td.today.disabled:hover.disabled,[date-picker] table tr td.today[disabled],[date-picker] table tr td.today:hover[disabled],[date-picker] table tr td.today.disabled[disabled],[date-picker] table tr td.today.disabled:hover[disabled]{background-color:#fdf59a}[date-picker] table tr td.today:active,[date-picker] table tr td.today:hover:active,[date-picker] table tr td.today.disabled:active,[date-picker] table tr td.today.disabled:hover:active,[date-picker] table tr td.today.active,[date-picker] table tr td.today:hover.active,[date-picker] table tr td.today.disabled.active,[date-picker] table tr td.today.disabled:hover.active{background-color:#fbf069 \9}[date-picker] table tr td.active,[date-picker] table tr td.active:hover,[date-picker] table tr td.active.disabled,[date-picker] table tr td.active.disabled:hover{background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-ms-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(top,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);border-color:#04c #04c #002a80;border-color:rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,.25)}[date-picker] table tr td.active:hover,[date-picker] table tr td.active:hover:hover,[date-picker] table tr td.active.disabled:hover,[date-picker] table tr td.active.disabled:hover:hover,[date-picker] table tr td.active:active,[date-picker] table tr td.active:hover:active,[date-picker] table tr td.active.disabled:active,[date-picker] table tr td.active.disabled:hover:active,[date-picker] table tr td.active.active,[date-picker] table tr td.active:hover.active,[date-picker] table tr td.active.disabled.active,[date-picker] table tr td.active.disabled:hover.active,[date-picker] table tr td.active.disabled,[date-picker] table tr td.active:hover.disabled,[date-picker] table tr td.active.disabled.disabled,[date-picker] table tr td.active.disabled:hover.disabled,[date-picker] table tr td.active[disabled],[date-picker] table tr td.active:hover[disabled],[date-picker] table tr td.active.disabled[disabled],[date-picker] table tr td.active.disabled:hover[disabled]{background-color:#04c}[date-picker] table tr td.active:active,[date-picker] table tr td.active:hover:active,[date-picker] table tr td.active.disabled:active,[date-picker] table tr td.active.disabled:hover:active,[date-picker] table tr td.active.active,[date-picker] table tr td.active:hover.active,[date-picker] table tr td.active.disabled.active,[date-picker] table tr td.active.disabled:hover.active{background-color:#039 \9}[date-picker] table tr td span{display:block;width:23%;height:54px;line-height:54px;float:left;margin:1%;cursor:pointer;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}[date-picker] .datetimepicker-hours span{height:26px;line-height:26px}[date-picker] .datetimepicker-hours table tr td span.hour_am,[date-picker] .datetimepicker-hours table tr td span.hour_pm{width:14.6%}[date-picker] .datetimepicker-hours fieldset legend,[date-picker] .datetimepicker-minutes fieldset legend{margin-bottom:inherit;line-height:30px}[date-picker] .datetimepicker-minutes span{height:26px;line-height:26px}[date-picker] table tr td span:hover{background:#eee}[date-picker] table tr td span.disabled,[date-picker] table tr td span.disabled:hover{background:0;color:#999;cursor:default}[date-picker] table tr td span.active,[date-picker] table tr td span.active:hover,[date-picker] table tr td span.active.disabled,[date-picker] table tr td span.active.disabled:hover{background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-ms-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(top,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);border-color:#04c #04c #002a80;border-color:rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,.25)}[date-picker] table tr td span.active:hover,[date-picker] table tr td span.active:hover:hover,[date-picker] table tr td span.active.disabled:hover,[date-picker] table tr td span.active.disabled:hover:hover,[date-picker] table tr td span.active:active,[date-picker] table tr td span.active:hover:active,[date-picker] table tr td span.active.disabled:active,[date-picker] table tr td span.active.disabled:hover:active,[date-picker] table tr td span.active.active,[date-picker] table tr td span.active:hover.active,[date-picker] table tr td span.active.disabled.active,[date-picker] table tr td span.active.disabled:hover.active,[date-picker] table tr td span.active.disabled,[date-picker] table tr td span.active:hover.disabled,[date-picker] table tr td span.active.disabled.disabled,[date-picker] table tr td span.active.disabled:hover.disabled,[date-picker] table tr td span.active[disabled],[date-picker] table tr td span.active:hover[disabled],[date-picker] table tr td span.active.disabled[disabled],[date-picker] table tr td span.active.disabled:hover[disabled]{background-color:#04c}[date-picker] table tr td span.active:active,[date-picker] table tr td span.active:hover:active,[date-picker] table tr td span.active.disabled:active,[date-picker] table tr td span.active.disabled:hover:active,[date-picker] table tr td span.active.active,[date-picker] table tr td span.active:hover.active,[date-picker] table tr td span.active.disabled.active,[date-picker] table tr td span.active.disabled:hover.active{background-color:#039 \9}[date-picker] table tr td span.old{color:#999}[date-picker] th.switch{width:145px}[date-picker] thead tr:first-child th,[date-picker] tfoot tr:first-child th{cursor:pointer}[date-picker] thead tr:first-child th:hover,[date-picker] tfoot tr:first-child th:hover{background:#eee}.input-append.date .add-on i,.input-prepend.date .add-on i{cursor:pointer;width:14px;height:14px} \ No newline at end of file + */ .before.after:not(.active){background:#2f96b4 linear-gradient(to bottom,#5bc0de,#2f96b4) repeat-x}.next,.prev{font-size:21px}[date-picker] table{table-layout:fixed}[date-picker]{z-index:11000;padding:4px;margin-top:1px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;direction:ltr}.datetimepicker-inline{width:220px}[date-picker].datetimepicker-rtl{direction:rtl}[date-picker].datetimepicker-rtl table tr td span{float:right}.datetimepicker-dropdown,.datetimepicker-dropdown-left{top:0;left:0}[class*=" datetimepicker-dropdown"]:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0,0,0,.2);position:absolute}[class*=" datetimepicker-dropdown"]:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute}[class*=" datetimepicker-dropdown-top"]:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-top:7px solid #ccc;border-top-color:rgba(0,0,0,.2);border-bottom:0}[class*=" datetimepicker-dropdown-top"]:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-top:6px solid #fff;border-bottom:0}.datetimepicker-dropdown-bottom-right:before{top:-7px;right:6px}.datetimepicker-dropdown-bottom-right:after{top:-6px;right:7px}.datetimepicker-dropdown-bottom-left:before{top:-7px;left:6px}.datetimepicker-dropdown-bottom-left:after{top:-6px;left:7px}.datetimepicker-dropdown-top-right:before{bottom:-7px;right:6px}.datetimepicker-dropdown-top-right:after{bottom:-6px;right:7px}.datetimepicker-dropdown-top-left:before{bottom:-7px;left:6px}.datetimepicker-dropdown-top-left:after{bottom:-6px;left:7px}[date-picker].minutes div.datetimepicker-minutes{display:block}[date-picker].hours div.datetimepicker-hours{display:block}[date-picker].days div.datetimepicker-days{display:block}[date-picker].months div.datetimepicker-months{display:block}[date-picker].years div.datetimepicker-years{display:block}[date-picker] table{margin:0}[date-picker] td,[date-picker] th{text-align:center;width:20px;height:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;border:0}.table-striped [date-picker] table tr td,.table-striped [date-picker] table tr th{background-color:transparent}[date-picker] table tr td.minute:hover{background:#eee;cursor:pointer}[date-picker] table tr td.hour:hover{background:#eee;cursor:pointer}[date-picker] table tr td.day:hover{background:#eee;cursor:pointer}[date-picker] table tr td.old,[date-picker] table tr td.new{color:#999}[date-picker] table tr td.disabled,[date-picker] table tr td.disabled:hover{background:0;color:#999;cursor:default}[date-picker] table tr td.today,[date-picker] table tr td.today:hover,[date-picker] table tr td.today.disabled,[date-picker] table tr td.today.disabled:hover{background-color:#fde19a;background-image:-moz-linear-gradient(top,#fdd49a,#fdf59a);background-image:-ms-linear-gradient(top,#fdd49a,#fdf59a);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdd49a),to(#fdf59a));background-image:-webkit-linear-gradient(top,#fdd49a,#fdf59a);background-image:-o-linear-gradient(top,#fdd49a,#fdf59a);background-image:linear-gradient(top,#fdd49a,#fdf59a);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fdd49a', endColorstr='#fdf59a', GradientType=0);border-color:#fdf59a #fdf59a #fbed50;border-color:rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}[date-picker] table tr td.today:hover,[date-picker] table tr td.today:hover:hover,[date-picker] table tr td.today.disabled:hover,[date-picker] table tr td.today.disabled:hover:hover,[date-picker] table tr td.today:active,[date-picker] table tr td.today:hover:active,[date-picker] table tr td.today.disabled:active,[date-picker] table tr td.today.disabled:hover:active,[date-picker] table tr td.today.active,[date-picker] table tr td.today:hover.active,[date-picker] table tr td.today.disabled.active,[date-picker] table tr td.today.disabled:hover.active,[date-picker] table tr td.today.disabled,[date-picker] table tr td.today:hover.disabled,[date-picker] table tr td.today.disabled.disabled,[date-picker] table tr td.today.disabled:hover.disabled,[date-picker] table tr td.today[disabled],[date-picker] table tr td.today:hover[disabled],[date-picker] table tr td.today.disabled[disabled],[date-picker] table tr td.today.disabled:hover[disabled]{background-color:#fdf59a}[date-picker] table tr td.today:active,[date-picker] table tr td.today:hover:active,[date-picker] table tr td.today.disabled:active,[date-picker] table tr td.today.disabled:hover:active,[date-picker] table tr td.today.active,[date-picker] table tr td.today:hover.active,[date-picker] table tr td.today.disabled.active,[date-picker] table tr td.today.disabled:hover.active{background-color:#fbf069 \9}[date-picker] table tr td.active,[date-picker] table tr td.active:hover,[date-picker] table tr td.active.disabled,[date-picker] table tr td.active.disabled:hover{background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-ms-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(top,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);border-color:#04c #04c #002a80;border-color:rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,.25)}[date-picker] table tr td.active:hover,[date-picker] table tr td.active:hover:hover,[date-picker] table tr td.active.disabled:hover,[date-picker] table tr td.active.disabled:hover:hover,[date-picker] table tr td.active:active,[date-picker] table tr td.active:hover:active,[date-picker] table tr td.active.disabled:active,[date-picker] table tr td.active.disabled:hover:active,[date-picker] table tr td.active.active,[date-picker] table tr td.active:hover.active,[date-picker] table tr td.active.disabled.active,[date-picker] table tr td.active.disabled:hover.active,[date-picker] table tr td.active.disabled,[date-picker] table tr td.active:hover.disabled,[date-picker] table tr td.active.disabled.disabled,[date-picker] table tr td.active.disabled:hover.disabled,[date-picker] table tr td.active[disabled],[date-picker] table tr td.active:hover[disabled],[date-picker] table tr td.active.disabled[disabled],[date-picker] table tr td.active.disabled:hover[disabled]{background-color:#04c}[date-picker] table tr td.active:active,[date-picker] table tr td.active:hover:active,[date-picker] table tr td.active.disabled:active,[date-picker] table tr td.active.disabled:hover:active,[date-picker] table tr td.active.active,[date-picker] table tr td.active:hover.active,[date-picker] table tr td.active.disabled.active,[date-picker] table tr td.active.disabled:hover.active{background-color:#039 \9}[date-picker] table tr td span{display:block;width:23%;height:54px;line-height:54px;float:left;margin:1%;cursor:pointer;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}[date-picker] .datetimepicker-hours span{height:26px;line-height:26px}[date-picker] .datetimepicker-hours table tr td span.hour_am,[date-picker] .datetimepicker-hours table tr td span.hour_pm{width:14.6%}[date-picker] .datetimepicker-hours fieldset legend,[date-picker] .datetimepicker-minutes fieldset legend{margin-bottom:inherit;line-height:30px}[date-picker] .datetimepicker-minutes span{height:26px;line-height:26px}[date-picker] table tr td span:hover{background:#eee}[date-picker] table tr td span.disabled,[date-picker] table tr td span.disabled:hover{background:0;color:#999;cursor:default}[date-picker] table tr td span.active,[date-picker] table tr td span.active:hover,[date-picker] table tr td span.active.disabled,[date-picker] table tr td span.active.disabled:hover{background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-ms-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(top,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);border-color:#04c #04c #002a80;border-color:rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,.25)}[date-picker] table tr td span.active:hover,[date-picker] table tr td span.active:hover:hover,[date-picker] table tr td span.active.disabled:hover,[date-picker] table tr td span.active.disabled:hover:hover,[date-picker] table tr td span.active:active,[date-picker] table tr td span.active:hover:active,[date-picker] table tr td span.active.disabled:active,[date-picker] table tr td span.active.disabled:hover:active,[date-picker] table tr td span.active.active,[date-picker] table tr td span.active:hover.active,[date-picker] table tr td span.active.disabled.active,[date-picker] table tr td span.active.disabled:hover.active,[date-picker] table tr td span.active.disabled,[date-picker] table tr td span.active:hover.disabled,[date-picker] table tr td span.active.disabled.disabled,[date-picker] table tr td span.active.disabled:hover.disabled,[date-picker] table tr td span.active[disabled],[date-picker] table tr td span.active:hover[disabled],[date-picker] table tr td span.active.disabled[disabled],[date-picker] table tr td span.active.disabled:hover[disabled]{background-color:#04c}[date-picker] table tr td span.active:active,[date-picker] table tr td span.active:hover:active,[date-picker] table tr td span.active.disabled:active,[date-picker] table tr td span.active.disabled:hover:active,[date-picker] table tr td span.active.active,[date-picker] table tr td span.active:hover.active,[date-picker] table tr td span.active.disabled.active,[date-picker] table tr td span.active.disabled:hover.active{background-color:#039 \9}[date-picker] table tr td span.old{color:#999}[date-picker] th.switch{width:145px}[date-picker] thead tr:first-child th,[date-picker] tfoot tr:first-child th{cursor:pointer}[date-picker] thead tr:first-child th:hover,[date-picker] tfoot tr:first-child th:hover{background:#eee}.input-append.date .add-on i,.input-prepend.date .add-on i{cursor:pointer;width:14px;height:14px} \ No newline at end of file diff --git a/dist/index.min.js b/dist/index.min.js index e6c2382..a943e3f 100644 --- a/dist/index.min.js +++ b/dist/index.min.js @@ -1 +1 @@ -!function(a){"use strict";var b=a.module("dateInput",[]);b.directive("datePicker",function(){function a(a){return a instanceof Date&&!isNaN(a.getTime())}function b(a){a=new Date(a||new Date),a=new Date(a.getFullYear(),a.getMonth(),a.getDate(),a.getHours());for(var b=[],c=5,d=a.getTime()+36e5;a.getTime()d;d++)c.push(new Date(a)),a.setDate(a.getDate()+1);b.push(c)}return b}function d(a){var b=[];a=new Date(a||new Date),a.setFullYear(a.getFullYear()-a.getFullYear()%10);for(var c=0;12>c;c++)b.push(new Date(a.getFullYear()+(c-1),0,1));return b}function e(a){a=new Date(a||new Date),a=new Date(a.getFullYear(),a.getMonth(),a.getDate()),a.setDate(a.getDate()-(a.getDay()-1));for(var b=[],c=0;7>c;c++)b.push(new Date(a)),a.setDate(a.getDate()+1);return b}function f(a){a=new Date(a||new Date);for(var b=a.getFullYear(),c=[],d=0;12>d;d++)c.push(new Date(b,d,1));return c}function g(a){a=new Date(a||new Date),a.setHours(0),a.setMinutes(0),a.setSeconds(0),a.setMilliseconds(0);for(var b=[],c=0;24>c;c++)b.push(a),a=new Date(a.getTime()+36e5);return b}var h=["month","date","year","month","hours","minutes"];return{scope:{date:"=datePicker",after:"=?",before:"=?"},link:function(i,j,k){function l(a){return-1!==i.views.indexOf(a)}function m(){a(i.date)||(i.date=new Date(2e3,1,1)),i.date=new Date(i.date)}function n(a){m(),i.date.setFullYear(a.getFullYear())}function o(a){n(a),i.date.setMonth(a.getMonth())}function p(a){o(a),i.date.setDate(a.getDate())}function q(a){p(a),i.date.setHours(a.getHours())}function r(a){q(a),i.date.setMinutes(a.getMinutes())}function s(){return i.date instanceof Date}i.views=[];for(var t in k)-1!==h.indexOf(t)&&i.views.push(t);i.views.length||(i.views=["date","month","year","hours","minutes"]),i.view=i.views[0],i.setYear=function(a){n(a),i.$emit("setYear",a)},i.setMonth=function(a){o(a),i.$emit("setMonth",a)},i.setDate=function(a){p(a),i.$emit("setDate",a)},i.setHours=function(a){q(a),i.$emit("setHours",a)},i.setMinutes=function(a){r(a),i.$emit("setMinutes",a)},i.setView=function(a){if(l(a))switch(i.view=a,a){case"minutes":i.minutes=b(i.visibleDate);break;case"hours":i.hours=g(i.visibleDate);break;case"date":i.weeks=c(i.visibleDate);break;case"month":i.months=f(i.visibleDate);break;case"year":i.years=d(i.visibleDate)}},i.nextMonth=function(a){i.visibleDate.setMonth(i.visibleDate.getMonth()+(a||1))},i.prevMonth=function(a){i.nextMonth(-a||-1)},i.nextDay=function(a){i.visibleDate.setDate(i.visibleDate.getDate()+(a||1))},i.prevDay=function(a){i.nextDay(-a||-1)},i.nextHour=function(a){i.visibleDate.setHours(i.visibleDate.getHours()+(a||1))},i.prevHour=function(a){i.nextHour(-a||-1)},i.nextYear=function(a){i.visibleDate.setFullYear(i.visibleDate.getFullYear()+(a||1))},i.prevYear=function(a){i.nextYear(-a||-1)},i.visibleDate=new Date,i.$watch("date",function(a){a&&(i.visibleDate=new Date(a))}),i.isAfter=function(a){return a>=i.after},i.isBefore=function(a){return a<=i.before},i.isSameMinutes=function(a){if(!s())return!1;var b=i.date;return a.getTime()-1e3*a.getSeconds()-a.getMilliseconds()===b.getTime()-1e3*b.getSeconds()-b.getMilliseconds()},i.isSameMonth=function(a){return s()?a.getFullYear()===i.date.getFullYear()&&a.getMonth()===i.date.getMonth():!1},i.isSameYear=function(a){return s()?a.getFullYear()===i.date.getFullYear():!1},i.isSameDate=function(a){return s()?i.date.getDate()===a.getDate()&&i.isSameMonth(a):!1},i.isSameHour=function(a){return s()?i.date.getHours()===a.getHours()&&i.isSameDate(a):!1},i.isOldMonth=function(a){return a.getTime()i.visibleDate.getTime()&&a.getHours()!==i.visibleDate.getHours()},i.isOldHour=function(a){return a.getTime()i.visibleDate.getTime()&&a.getMonth()!==i.visibleDate.getMonth()},i.$on("setDate",i.setView.bind(null,"hours")),i.$on("setMonth",i.setView.bind(null,"date")),i.$on("setHours",i.setView.bind(null,"minutes")),i.$on("setYear",i.setView.bind(null,"month")),i.$watch(function(){return a(i.visibleDate)},function(a){a||(i.visibleDate=new Date)}),i.$watch("[visibleDate.getDate(),visibleDate.getHours()].join()",function(){"hours"===i.view&&(i.hours=g(i.visibleDate))}),i.$watch("[visibleDate.getFullYear(),visibleDate.getMonth(),visibleDate.getDate()].join()",function(){"date"===i.view&&(i.weeks=c(i.visibleDate),i.weekdays=e(i.visibleDate))}),i.$watch("[visibleDate.getFullYear(),visibleDate.getMonth()].join()",function(){"month"===i.view&&(i.months=f(i.visibleDate))}),i.$watch("visibleDate.getYear()",function(){"year"===i.view&&(i.years=d(i.visibleDate))}),i.$watch("visibleDate.getTime()",function(){"minutes"===i.view&&(i.minutes=b(i.visibleDate))})},transclude:!0,replace:!0,templateUrl:"scripts/template.html"}}),b.directive("dateTime",["$compile","$document","$filter",function(b,c,d){var e=c.find("body"),f=d("date");return{require:"ngModel",link:function(c,d,g,h){function i(a){return f(a,j)}var j=g.format||"yyyy-MM-dd HH:mm",k=["date","year","month","hours","minutes","month"],l=[];for(var m in g)-1!==k.indexOf(m)&&l.push(m);h.$formatters=[i];var n=null,o=a.noop;d.bind("focus",function(){if(!n){n=b('
")(c),e.append(n),c.$digest();var f=a.extend({},d.position(),{height:d[0].offsetHeight});n.css({top:f.top+f.height,left:f.left,display:"block",position:"absolute"}),n.bind("mousedown",function(){return!1})}return!1}),d.bind("blur",function(){o(),o=a.noop,n&&n.remove(),n=null})}}}]),b.directive("dateRange",function(){return{template:'
\n \n \n \n \n \n
\n \n \n
',scope:{start:"=",end:"="},link:function(a){a.$watch("start.getTime()",function(b){b&&a.end&&b>a.end.getTime()&&(a.end=new Date(b))}),a.$watch("end.getTime()",function(b){b&&a.start&&b\r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
‹{{visibleDate|date:"yyyy MMMM"}}›
{{ day|date:"EEE"}}
{{ day.getDate() }}\r\n
\r\n
\r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
‹{{years[0].getFullYear()}}-{{years[years.length-1].getFullYear()}}›
\r\n {{year.getFullYear()}}\r\n
\r\n
\r\n\r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
‹{{ visibleDate|date:"yyyy" }}›
\r\n {{month|date:\'MMM\'}}\r\n
\r\n
\r\n\r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
‹{{ visibleDate|date:"dd MMMM yyyy" }}›
\r\n {{hour|date:"HH:mm"}}\r\n
\r\n
\r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
‹{{ visibleDate|date:"dd MMMM yyyy HH:mm" }}\r\n ›
\r\n {{minute|date:"HH:mm"}}\r\n
\r\n
\r\n
')}]); \ No newline at end of file +!function(a){"use strict";var b=a.module("datePicker",[]);b.directive("datePicker",function(){function a(a){return a instanceof Date&&!isNaN(a.getTime())}function b(a){a=new Date(a||new Date),a=new Date(a.getFullYear(),a.getMonth(),a.getDate(),a.getHours());for(var b=[],c=5,d=a.getTime()+36e5;a.getTime()d;d++)c.push(new Date(a)),a.setDate(a.getDate()+1);b.push(c)}return b}function d(a){var b=[];a=new Date(a||new Date),a.setFullYear(a.getFullYear()-a.getFullYear()%10);for(var c=0;12>c;c++)b.push(new Date(a.getFullYear()+(c-1),0,1));return b}function e(a){a=new Date(a||new Date),a=new Date(a.getFullYear(),a.getMonth(),a.getDate()),a.setDate(a.getDate()-(a.getDay()-1));for(var b=[],c=0;7>c;c++)b.push(new Date(a)),a.setDate(a.getDate()+1);return b}function f(a){a=new Date(a||new Date);for(var b=a.getFullYear(),c=[],d=0;12>d;d++)c.push(new Date(b,d,1));return c}function g(a){a=new Date(a||new Date),a.setHours(0),a.setMinutes(0),a.setSeconds(0),a.setMilliseconds(0);for(var b=[],c=0;24>c;c++)b.push(a),a=new Date(a.getTime()+36e5);return b}var h=["month","date","year","month","hours","minutes"];return{scope:{date:"=datePicker",after:"=?",before:"=?"},link:function(i,j,k){function l(a){return-1!==i.views.indexOf(a)}function m(){a(i.date)||(i.date=new Date(2e3,1,1)),i.date=new Date(i.date)}function n(a){m(),i.date.setFullYear(a.getFullYear())}function o(a){n(a),i.date.setMonth(a.getMonth())}function p(a){o(a),i.date.setDate(a.getDate())}function q(a){p(a),i.date.setHours(a.getHours())}function r(a){q(a),i.date.setMinutes(a.getMinutes())}function s(){return i.date instanceof Date}i.views=[];for(var t in k)-1!==h.indexOf(t)&&i.views.push(t);i.views.length||(i.views=["date","month","year","hours","minutes"]),i.view=i.views[0],i.setYear=function(a){n(a),i.$emit("setYear",a)},i.setMonth=function(a){o(a),i.$emit("setMonth",a)},i.setDate=function(a){p(a),i.$emit("setDate",a)},i.setHours=function(a){q(a),i.$emit("setHours",a)},i.setMinutes=function(a){r(a),i.$emit("setMinutes",a)},i.setView=function(a){if(l(a))switch(i.view=a,a){case"minutes":i.minutes=b(i.visibleDate);break;case"hours":i.hours=g(i.visibleDate);break;case"date":i.weeks=c(i.visibleDate);break;case"month":i.months=f(i.visibleDate);break;case"year":i.years=d(i.visibleDate)}},i.nextMonth=function(a){i.visibleDate.setMonth(i.visibleDate.getMonth()+(a||1))},i.prevMonth=function(a){i.nextMonth(-a||-1)},i.nextDay=function(a){i.visibleDate.setDate(i.visibleDate.getDate()+(a||1))},i.prevDay=function(a){i.nextDay(-a||-1)},i.nextHour=function(a){i.visibleDate.setHours(i.visibleDate.getHours()+(a||1))},i.prevHour=function(a){i.nextHour(-a||-1)},i.nextYear=function(a){i.visibleDate.setFullYear(i.visibleDate.getFullYear()+(a||1))},i.prevYear=function(a){i.nextYear(-a||-1)},i.visibleDate=new Date,i.$watch("date",function(a){a&&(i.visibleDate=new Date(a))}),i.isAfter=function(a){return a>=i.after},i.isBefore=function(a){return a<=i.before},i.isSameMinutes=function(a){if(!s())return!1;var b=i.date;return a.getTime()-1e3*a.getSeconds()-a.getMilliseconds()===b.getTime()-1e3*b.getSeconds()-b.getMilliseconds()},i.isSameMonth=function(a){return s()?a.getFullYear()===i.date.getFullYear()&&a.getMonth()===i.date.getMonth():!1},i.isSameYear=function(a){return s()?a.getFullYear()===i.date.getFullYear():!1},i.isSameDate=function(a){return s()?i.date.getDate()===a.getDate()&&i.isSameMonth(a):!1},i.isSameHour=function(a){return s()?i.date.getHours()===a.getHours()&&i.isSameDate(a):!1},i.isOldMonth=function(a){return a.getTime()i.visibleDate.getTime()&&a.getHours()!==i.visibleDate.getHours()},i.isOldHour=function(a){return a.getTime()i.visibleDate.getTime()&&a.getMonth()!==i.visibleDate.getMonth()},i.$on("setDate",i.setView.bind(null,"hours")),i.$on("setMonth",i.setView.bind(null,"date")),i.$on("setHours",i.setView.bind(null,"minutes")),i.$on("setYear",i.setView.bind(null,"month")),i.$watch(function(){return a(i.visibleDate)},function(a){a||(i.visibleDate=new Date)}),i.$watch("[visibleDate.getDate(),visibleDate.getHours()].join()",function(){"hours"===i.view&&(i.hours=g(i.visibleDate))}),i.$watch("[visibleDate.getFullYear(),visibleDate.getMonth(),visibleDate.getDate()].join()",function(){"date"===i.view&&(i.weeks=c(i.visibleDate),i.weekdays=e(i.visibleDate))}),i.$watch("[visibleDate.getFullYear(),visibleDate.getMonth()].join()",function(){"month"===i.view&&(i.months=f(i.visibleDate))}),i.$watch("visibleDate.getYear()",function(){"year"===i.view&&(i.years=d(i.visibleDate))}),i.$watch("visibleDate.getTime()",function(){"minutes"===i.view&&(i.minutes=b(i.visibleDate))})},transclude:!0,replace:!0,templateUrl:"templates/datepicker.html"}}),b.directive("dateTime",["$compile","$document","$filter",function(b,c,d){var e=c.find("body"),f=d("date");return{require:"ngModel",link:function(c,d,g,h){function i(a){return f(a,j)}var j=g.format||"yyyy-MM-dd HH:mm",k=["date","year","month","hours","minutes","month"],l=[];for(var m in g)-1!==k.indexOf(m)&&l.push(m);h.$formatters=[i];var n=null,o=a.noop;d.bind("focus",function(){if(!n){n=b('
")(c),e.append(n),c.$digest();var f=a.extend(d.offset(),{height:d[0].offsetHeight});n.css({top:f.top+f.height,left:f.left,display:"block",position:"absolute"}),n.bind("mousedown",function(){return!1})}return!1}),d.bind("blur",function(){o(),o=a.noop,n&&n.remove(),n=null})}}}]),b.directive("dateRange",function(){return{templateUrl:"templates/daterange.html",scope:{start:"=",end:"="},link:function(a){a.$watch("start.getTime()",function(b){b&&a.end&&b>a.end.getTime()&&(a.end=new Date(b))}),a.$watch("end.getTime()",function(b){b&&a.start&&b\r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
‹{{visibleDate|date:"yyyy MMMM"}}›
{{ day|date:"EEE"}}
{{ day.getDate() }}\r\n
\r\n
\r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
‹{{years[0].getFullYear()}}-{{years[years.length-1].getFullYear()}}›
\r\n {{year.getFullYear()}}\r\n
\r\n
\r\n\r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
‹{{ visibleDate|date:"yyyy" }}›
\r\n {{month|date:\'MMM\'}}\r\n
\r\n
\r\n\r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
‹{{ visibleDate|date:"dd MMMM yyyy" }}›
\r\n {{hour|date:"HH:mm"}}\r\n
\r\n
\r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
‹{{ visibleDate|date:"dd MMMM yyyy HH:mm" }}\r\n ›
\r\n {{minute|date:"HH:mm"}}\r\n
\r\n
\r\n'),a.put("templates/daterange.html",'
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n
\r\n 		\r\n
\r\n
\r\n
')}]); \ No newline at end of file