diff --git a/README.md b/README.md index 44c799b..c38693a 100644 --- a/README.md +++ b/README.md @@ -53,3 +53,7 @@ Examples +Change Logs +------------ +v.0.1.22 +Add ng-change \ No newline at end of file diff --git a/angularjs-datetime-picker.css b/angularjs-datetime-picker.css index 240be45..df163f5 100644 --- a/angularjs-datetime-picker.css +++ b/angularjs-datetime-picker.css @@ -4,6 +4,7 @@ border: 1px solid #ddd; display: inline-block; background: #fff; + z-index: 99999; } .angularjs-datetime-picker > .adp-month { text-align: center; @@ -33,6 +34,24 @@ .angularjs-datetime-picker > .adp-month > button.adp-next { right: 10px; } +.angularjs-datetime-picker > .adp-days .adp-time { + font-weight: bold; + padding-top: 10px; + border-top: 1px solid #ddd; +} + +.angularjs-datetime-picker > .adp-month > button.adp-close { + top: 10px; +} + +.angularjs-datetime-picker > .adp-month.adp-top { + text-transform: unset; +} +.angularjs-datetime-picker > .adp-month.adp-top a{ + font-weight: normal; + text-decoration: underline; + cursor: pointer; +} .angularjs-datetime-picker > .adp-days { width: 210px; /* 30 x 7 */ margin: 10px; @@ -70,5 +89,5 @@ } .angularjs-datetime-picker input[type=range] { - width: 150px; + width: 100%; } diff --git a/angularjs-datetime-picker.js b/angularjs-datetime-picker.js index e86247d..0529b85 100644 --- a/angularjs-datetime-picker.js +++ b/angularjs-datetime-picker.js @@ -48,6 +48,9 @@ options.day && div.attr('day', parseInt(options.day)); options.hour && div.attr('hour', parseInt(options.hour)); options.minute && div.attr('minute', parseInt(options.minute)); + options.allowClose && div.attr('allow-close', options.allowClose); + options.displaySelectedDate && div.attr('display-selected-date', options.displaySelectedDate); + options.ngChange && div.attr('ng-change', options.ngChange); if (options.dateOnly === '' || options.dateOnly === true) { div.attr('date-only', 'true'); } @@ -77,7 +80,7 @@ datetimePickerEl.style.left= (bcr.left + window.scrollX) + 'px'; } - if (bcr.top < 300 || window.innerHeight - bcr.bottom > 300) { + if (bcr.top < 500 || window.innerHeight - bcr.bottom > 500) { datetimePickerEl.style.top = (bcr.bottom + window.scrollY) + 'px'; } else { datetimePickerEl.style.top = (bcr.top - datePickerElBcr.height + window.scrollY) + 'px'; @@ -100,13 +103,22 @@ } else { removeEl(popupEl); } - } + }; }; DatetimePickerCtrl.$inject = ['$compile', '$document']; angular.module('angularjs-datetime-picker').controller('DatetimePickerCtrl', DatetimePickerCtrl); var tmpl = [ '
' , + ' ', '
', ' ', ' {{months[mv.month].shortName}} {{mv.year}}', @@ -127,10 +139,13 @@ '
{{::day}}
', '
', '
', - ' {{("0"+inputHour).slice(-2)}} : {{("0"+inputMinute).slice(-2)}}
', - ' ', - ' ', + '
{{ displayTime() }}

', + ' ', + ' ', '
', + ' ', '
'].join("\n"); var datetimePickerPopup = function($locale, dateFilter){ @@ -199,21 +214,30 @@ if (scope.dateOnly === true){ element[0].querySelector('#adp-time').style.display = 'none'; } + if (scope.allowClose === true){ + element[0].querySelector('#adp-top').style.display = 'block'; + element[0].querySelector('#adp-bottom').style.display = 'block'; + } + scope.$applyAsync( function() { + ctrl.triggerEl = angular.element(element[0].triggerEl); if (attrs.ngModel) { // need to parse date string var dateStr = ''+ctrl.triggerEl.scope().$eval(attrs.ngModel); if (dateStr) { - if (!dateStr.match(/[0-9]{2}:/)) { // if no time is given, add 00:00:00 at the end - dateStr += " 00:00:00"; + if(!scope.displaySelectedDate) { + if (!dateStr.match(/[0-9]{2}:/)) { // if no time is given, add 00:00:00 at the end + dateStr += " 00:00:00"; + } + dateStr = dateStr.replace(/([0-9]{2}-[0-9]{2})-([0-9]{4})/,'$2-$1'); //mm-dd-yyyy to yyyy-mm-dd + dateStr = dateStr.replace(/([\/-][0-9]{2,4})\ ([0-9]{2}\:[0-9]{2}\:)/,'$1T$2'); //reformat for FF + dateStr = dateStr.replace(/EDT|EST|CDT|CST|MDT|PDT|PST|UT|GMT/g,''); //remove timezone + dateStr = dateStr.replace(/\s*\(\)\s*/,''); //remove timezone + dateStr = dateStr.replace(/[\-\+][0-9]{2}:?[0-9]{2}$/,''); //remove timezone + dateStr += getTimezoneOffset(dateStr); } - dateStr = dateStr.replace(/([0-9]{2}-[0-9]{2})-([0-9]{4})/,'$2-$1'); //mm-dd-yyyy to yyyy-mm-dd - dateStr = dateStr.replace(/([\/-][0-9]{2,4})\ ([0-9]{2}\:[0-9]{2}\:)/,'$1T$2'); //reformat for FF - dateStr = dateStr.replace(/EDT|EST|CDT|CST|MDT|PDT|PST|UT|GMT/g,''); //remove timezone - dateStr = dateStr.replace(/\s*\(\)\s*/,''); //remove timezone - dateStr = dateStr.replace(/[\-\+][0-9]{2}:?[0-9]{2}$/,''); //remove timezone - dateStr += getTimezoneOffset(dateStr); + var d = new Date(dateStr); scope.selectedDate = new Date( d.getFullYear(), @@ -225,20 +249,23 @@ ); } } - if (!scope.selectedDate || isNaN(scope.selectedDate.getTime())) { // no predefined date var today = new Date(); var year = scope.year || today.getFullYear(); var month = scope.month ? (scope.month-1) : today.getMonth(); var day = scope.day || today.getDate(); - var hour = scope.hour || today.getHours(); - var minute = scope.minute || today.getMinutes(); + var hour = scope.hour || scope.hour === 0 ? scope.hour : today.getHours(); + var minute = scope.minute || scope.minute === 0 ? scope.minute : today.getMinutes(); scope.selectedDate = new Date(year, month, day, hour, minute, 0); } scope.inputHour = scope.selectedDate.getHours(); scope.inputMinute = scope.selectedDate.getMinutes(); // Default to current year and month + // var elScope = ctrl.triggerEl.scope(); + // var preSelectedDate = dateFilter(elScope.$eval(attrs.ngModel), dateFormat); + // scope.selectedDate = preSelectedDate ? new Date(preSelectedDate) : scope.selectedDate; + scope.mv = getMonthView(scope.selectedDate.getFullYear(), scope.selectedDate.getMonth()); scope.today = dateFilter(new Date(), 'yyyy-M-d'); if (scope.mv.year == scope.selectedDate.getFullYear() && scope.mv.month == scope.selectedDate.getMonth()) { @@ -248,10 +275,45 @@ } }); + scope.changeCurrentDate = function () { + scope.selectedDate = new Date(); + scope.mv = getMonthView(scope.selectedDate.getFullYear(), scope.selectedDate.getMonth()); + scope.today = dateFilter(scope.selectedDate, 'yyyy-M-d'); + // set field date to today's date and time + scope.selectedDay = scope.selectedDate.getDate(); + if (attrs.ngModel) { + var elScope = ctrl.triggerEl.scope(); + elScope.$eval(attrs.ngModel + '= date', {date: scope.selectedDate}); + } + // if (scope.mv.year == scope.selectedDate.getFullYear() && scope.mv.month == scope.selectedDate.getMonth()) { + // scope.selectedDay = scope.selectedDate.getDate(); + // } else { + // scope.selectedDay = null; + // } + }; + scope.displayTime = function() { + if(scope.inputMinute == null || scope.inputHour == null) + return ""; + return ("0"+scope.inputHour).slice(-2) + ":" + ("0"+scope.inputMinute).slice(-2); + }; + scope.clearSelectedDate = function () { + scope.selectedDate = null; + scope.selectedDay = null; + scope.inputHour = null; + scope.inputMinute = null; + if (attrs.ngModel) { + var elScope = ctrl.triggerEl.scope(); + elScope.$eval(attrs.ngModel + '= date', {date: null}); + } + }; scope.addMonth = function (amount) { scope.mv = getMonthView(scope.mv.year, scope.mv.month + amount); }; + scope.closeDatetimePicker = function() { + ctrl.closeDatetimePicker(); + }; + scope.setDate = function (evt) { var target = angular.element(evt.target)[0]; if (target.className.indexOf('selectable') !== -1) { @@ -269,15 +331,23 @@ ); scope.selectedDay = scope.selectedDate.getDate(); if (attrs.ngModel) { - //console.log('attrs.ngModel',attrs.ngModel); + // convert back to UTC format + scope.selectedDateUTC = new Date( + scope.mv.year, scope.mv.month, day, scope.inputHour, scope.inputMinute, 0 + ); + scope.selectedDateUTC.setMinutes(scope.selectedDateUTC.getMinutes()+scope.selectedDateUTC.getTimezoneOffset()); var elScope = ctrl.triggerEl.scope(), dateValue; if (elScope.$eval(attrs.ngModel) && elScope.$eval(attrs.ngModel).constructor.name === 'Date') { - dateValue = new Date(dateFilter(scope.selectedDate, dateFormat)); + dateValue = new Date(dateFilter(scope.selectedDateUTC, dateFormat)); } else { - dateValue = dateFilter(scope.selectedDate, dateFormat); + dateValue = dateFilter(scope.selectedDateUTC, dateFormat); } elScope.$eval(attrs.ngModel + '= date', {date: dateValue}); } + + if(typeof(scope.ngChange) == 'function') { + scope.ngChange(); + } }; scope.$on('$destroy', ctrl.closeDatetimePicker); @@ -295,7 +365,10 @@ hour: '=', minute: '=', dateOnly: '=', - closeOnSelect: '=' + closeOnSelect: '=', + allowClose: '=', + displaySelectedDate: '=', + ngChange: '&' }, link: linkFunc }; @@ -320,6 +393,8 @@ if( attrs.hasOwnProperty('futureOnly') ){ ctrl.$setValidity('future-only', date < now? false : true); } + + ctrl.$setViewValue(value); }); element[0].addEventListener('click', function() { @@ -334,7 +409,10 @@ minute: attrs.minute, dateOnly: attrs.dateOnly, futureOnly: attrs.futureOnly, - closeOnSelect: attrs.closeOnSelect + closeOnSelect: attrs.closeOnSelect, + displaySelectedDate: attrs.displaySelectedDate, + allowClose: attrs.allowClose, + ngChange: attrs.ngChange }); }); } diff --git a/angularjs-datetime-picker.min.js b/angularjs-datetime-picker.min.js index fe3a6bc..e287125 100644 --- a/angularjs-datetime-picker.min.js +++ b/angularjs-datetime-picker.min.js @@ -1 +1,20 @@ -!function(){"use strict";angular.module("angularjs-datetime-picker",[]);var e=function(e){"string"==typeof e&&(e=new Date(e));var t=new Date(e.getFullYear(),0,1),a=new Date(e.getFullYear(),6,1),n=Math.max(t.getTimezoneOffset(),a.getTimezoneOffset()),l=e.getTimezoneOffset()=0?"-":"+";return r+("0"+i/60).slice(-2)+":"+("0"+i%60).slice(-2)},t=function(e,t,a){var n=a("DatetimePickerCtrl");return{open:function(e){n.openDatetimePicker(e)},close:function(){n.closeDatetimePicker()}}};t.$inject=["$compile","$document","$controller"],angular.module("angularjs-datetime-picker").factory("DatetimePicker",t);var a=function(e,t){var a,n=this,l=function(e){e&&e.remove(),t[0].body.removeEventListener("click",n.closeDatetimePicker)};this.openDatetimePicker=function(n){this.closeDatetimePicker();var l=angular.element("
");n.dateFormat&&l.attr("date-format",n.dateFormat),n.ngModel&&l.attr("ng-model",n.ngModel),n.year&&l.attr("year",parseInt(n.year)),n.month&&l.attr("month",parseInt(n.month)),n.day&&l.attr("day",parseInt(n.day)),n.hour&&l.attr("hour",parseInt(n.hour)),n.minute&&l.attr("minute",parseInt(n.minute)),(""===n.dateOnly||n.dateOnly===!0)&&l.attr("date-only","true"),"false"===n.closeOnSelect&&l.attr("close-on-select","false");var i=n.triggerEl;n.scope=n.scope||angular.element(i).scope(),a=e(l)(n.scope)[0],a.triggerEl=n.triggerEl,t[0].body.appendChild(a);var r=i.getBoundingClientRect();n.scope.$apply();var o=a.getBoundingClientRect();a.style.position="absolute",a.style.left=r.width>o.width?r.left+r.width-o.width+window.scrollX+"px":r.left+window.scrollX+"px",a.style.top=r.top<300||window.innerHeight-r.bottom>300?r.bottom+window.scrollY+"px":r.top-o.height+window.scrollY+"px",t[0].body.addEventListener("click",this.closeDatetimePicker)},this.closeDatetimePicker=function(e){var a=e&&e.target,n=t[0].querySelector("div[datetime-picker-popup]");e&&a?a.hasAttribute("datetime-picker")||n&&n.contains(a)||l(n):l(n)}};a.$inject=["$compile","$document"],angular.module("angularjs-datetime-picker").controller("DatetimePickerCtrl",a);var n=['
','
',' ',' {{months[mv.month].shortName}} {{mv.year}}',' ',"
",'
','
{{::dayOfWeek.firstLetter}}
','
{{::day}}
','
'," {{::day}}","
",'
{{::day}}
',"
",'
',' {{("0"+inputHour).slice(-2)}} : {{("0"+inputMinute).slice(-2)}}
',' ',' ',"
","
"].join("\n"),l=function(t,a){var l,i,r,o,d=function(){l=[],i=[],r=[],o=0;for(var e=1;31>=e;e++)l.push(e);for(var e=0;12>e;e++)i.push({fullName:t.DATETIME_FORMATS.MONTH[e],shortName:t.DATETIME_FORMATS.SHORTMONTH[e]});for(var e=0;7>e;e++){var a=t.DATETIME_FORMATS.DAY[(e+o)%7];r.push({fullName:a,firstLetter:a.substr(0,1)})}o=0},s=function(e,t){t>11?e++:0>t&&e--,t=(t+12)%12;var a=new Date(e,t,1),n=new Date(e,t+1,0),i=new Date(e,t,0),r=n.getDate(),d=i.getDate(),s=a.getDay(),c=(s-o+7)%7||7,u=l.slice(0,42-(c+r));return u.length>7&&(u=u.slice(0,u.length-7)),{year:e,month:t,days:l.slice(0,r),leadingDays:l.slice(-c-(31-d),d),trailingDays:u}},c=function(t,n,l,o){d();var c=l.dateFormat||"short";t.months=i,t.daysOfWeek=r,t.inputHour,t.inputMinute,t.dateOnly===!0&&(n[0].querySelector("#adp-time").style.display="none"),t.$applyAsync(function(){if(o.triggerEl=angular.element(n[0].triggerEl),l.ngModel){var i=""+o.triggerEl.scope().$eval(l.ngModel);if(i){i.match(/[0-9]{2}:/)||(i+=" 00:00:00"),i=i.replace(/([0-9]{2}-[0-9]{2})-([0-9]{4})/,"$2-$1"),i=i.replace(/([\/-][0-9]{2,4})\ ([0-9]{2}\:[0-9]{2}\:)/,"$1T$2"),i=i.replace(/EDT|EST|CDT|CST|MDT|PDT|PST|UT|GMT/g,""),i=i.replace(/\s*\(\)\s*/,""),i=i.replace(/[\-\+][0-9]{2}:?[0-9]{2}$/,""),i+=e(i);var r=new Date(i);t.selectedDate=new Date(r.getFullYear(),r.getMonth(),r.getDate(),r.getHours(),r.getMinutes(),r.getSeconds())}}if(!t.selectedDate||isNaN(t.selectedDate.getTime())){var d=new Date,c=t.year||d.getFullYear(),u=t.month?t.month-1:d.getMonth(),m=t.day||d.getDate(),g=t.hour||d.getHours(),p=t.minute||d.getMinutes();t.selectedDate=new Date(c,u,m,g,p,0)}t.inputHour=t.selectedDate.getHours(),t.inputMinute=t.selectedDate.getMinutes(),t.mv=s(t.selectedDate.getFullYear(),t.selectedDate.getMonth()),t.today=a(new Date,"yyyy-M-d"),t.selectedDay=t.mv.year==t.selectedDate.getFullYear()&&t.mv.month==t.selectedDate.getMonth()?t.selectedDate.getDate():null}),t.addMonth=function(e){t.mv=s(t.mv.year,t.mv.month+e)},t.setDate=function(e){var a=angular.element(e.target)[0];-1!==a.className.indexOf("selectable")&&(t.updateNgModel(parseInt(a.innerHTML)),t.closeOnSelect!==!1&&o.closeDatetimePicker())},t.updateNgModel=function(e){if(e=e?e:t.selectedDate.getDate(),t.selectedDate=new Date(t.mv.year,t.mv.month,e,t.inputHour,t.inputMinute,0),t.selectedDay=t.selectedDate.getDate(),l.ngModel){var n,i=o.triggerEl.scope();n=i.$eval(l.ngModel)&&"Date"===i.$eval(l.ngModel).constructor.name?new Date(a(t.selectedDate,c)):a(t.selectedDate,c),i.$eval(l.ngModel+"= date",{date:n})}},t.$on("$destroy",o.closeDatetimePicker)};return{restrict:"A",template:n,controller:"DatetimePickerCtrl",replace:!0,scope:{year:"=",month:"=",day:"=",hour:"=",minute:"=",dateOnly:"=",closeOnSelect:"="},link:c}};l.$inject=["$locale","dateFilter"],angular.module("angularjs-datetime-picker").directive("datetimePickerPopup",l);var i=function(e,t){return{require:"ngModel",link:function(e,a,n,l){e.$watch(n.ngModel,function(e){if(e&&""!=e){var t=new Date(e);l.$setValidity("date",t?!0:!1);var a=new Date;n.hasOwnProperty("futureOnly")&&l.$setValidity("future-only",a>t?!1:!0)}}),a[0].addEventListener("click",function(){t.open({triggerEl:a[0],dateFormat:n.dateFormat,ngModel:n.ngModel,year:n.year,month:n.month,day:n.day,hour:n.hour,minute:n.minute,dateOnly:n.dateOnly,futureOnly:n.futureOnly,closeOnSelect:n.closeOnSelect})})}}};i.$inject=["$parse","DatetimePicker"],angular.module("angularjs-datetime-picker").directive("datetimePicker",i)}(); \ No newline at end of file +(function(){'use strict';angular.module('angularjs-datetime-picker',[]);var getTimezoneOffset=function(date){(typeof date=='string')&&(date=new Date(date));var jan=new Date(date.getFullYear(),0,1);var jul=new Date(date.getFullYear(),6,1);var stdTimezoneOffset=Math.max(jan.getTimezoneOffset(),jul.getTimezoneOffset());var isDST=date.getTimezoneOffset()=0?'-':'+';return diff+("0"+(offset/60)).slice(-2)+':'+("0"+(offset%60)).slice(-2)};var DatetimePicker=function($compile,$document,$controller){var datetimePickerCtrl=$controller('DatetimePickerCtrl');return{open:function(options){datetimePickerCtrl.openDatetimePicker(options)},close:function(){datetimePickerCtrl.closeDatetimePicker()}}};DatetimePicker.$inject=['$compile','$document','$controller'];angular.module('angularjs-datetime-picker').factory('DatetimePicker',DatetimePicker);var DatetimePickerCtrl=function($compile,$document){var datetimePickerEl;var _this=this;var removeEl=function(el){el&&el.remove();$document[0].body.removeEventListener('click',_this.closeDatetimePicker)};this.openDatetimePicker=function(options){this.closeDatetimePicker();var div=angular.element('
');options.dateFormat&&div.attr('date-format',options.dateFormat);options.ngModel&&div.attr('ng-model',options.ngModel);options.year&&div.attr('year',parseInt(options.year));options.month&&div.attr('month',parseInt(options.month));options.day&&div.attr('day',parseInt(options.day));options.hour&&div.attr('hour',parseInt(options.hour));options.minute&&div.attr('minute',parseInt(options.minute));options.allowClose&&div.attr('allow-close',options.allowClose);options.displaySelectedDate&&div.attr('display-selected-date',options.displaySelectedDate);options.ngChange&&div.attr('ng-change',options.ngChange);if(options.dateOnly===''||options.dateOnly===!0){div.attr('date-only','true')} +if(options.closeOnSelect==='false'){div.attr('close-on-select','false')} +var triggerEl=options.triggerEl;options.scope=options.scope||angular.element(triggerEl).scope();datetimePickerEl=$compile(div)(options.scope)[0];datetimePickerEl.triggerEl=options.triggerEl;$document[0].body.appendChild(datetimePickerEl);var bcr=triggerEl.getBoundingClientRect();options.scope.$apply();var datePickerElBcr=datetimePickerEl.getBoundingClientRect();datetimePickerEl.style.position='absolute';if(bcr.width>datePickerElBcr.width){datetimePickerEl.style.left=(bcr.left+bcr.width-datePickerElBcr.width+window.scrollX)+'px'}else{datetimePickerEl.style.left=(bcr.left+window.scrollX)+'px'} +if(bcr.top<500||window.innerHeight-bcr.bottom>500){datetimePickerEl.style.top=(bcr.bottom+window.scrollY)+'px'}else{datetimePickerEl.style.top=(bcr.top-datePickerElBcr.height+window.scrollY)+'px'} +$document[0].body.addEventListener('click',this.closeDatetimePicker)};this.closeDatetimePicker=function(evt){var target=evt&&evt.target;var popupEl=$document[0].querySelector('div[datetime-picker-popup]');if(evt&&target){if(target.hasAttribute('datetime-picker')){}else if(popupEl&&popupEl.contains(target)){}else{removeEl(popupEl)}}else{removeEl(popupEl)}}};DatetimePickerCtrl.$inject=['$compile','$document'];angular.module('angularjs-datetime-picker').controller('DatetimePickerCtrl',DatetimePickerCtrl);var tmpl=['
',' ','
',' ',' {{months[mv.month].shortName}} {{mv.year}}',' ','
','
','
{{::dayOfWeek.firstLetter}}
','
{{::day}}
','
',' {{::day}}','
','
{{::day}}
','
','
','
{{ displayTime() }}

',' ',' ','
',' ','
'].join("\n");var datetimePickerPopup=function($locale,dateFilter){var days,months,daysOfWeek,firstDayOfWeek;var initVars=function(){days=[],months=[];daysOfWeek=[],firstDayOfWeek=0;for(var i=1;i<=31;i++){days.push(i)} +for(var i=0;i<12;i++){months.push({fullName:$locale.DATETIME_FORMATS.MONTH[i],shortName:$locale.DATETIME_FORMATS.SHORTMONTH[i]})} +for(var i=0;i<7;i++){var day=$locale.DATETIME_FORMATS.DAY[(i+firstDayOfWeek)%7];daysOfWeek.push({fullName:day,firstLetter:day.substr(0,1)})} +firstDayOfWeek=0};var getMonthView=function(year,month){if(month>11){year++}else if(month<0){year--} +month=(month+12)%12;var firstDayOfMonth=new Date(year,month,1),lastDayOfMonth=new Date(year,month+1,0),lastDayOfPreviousMonth=new Date(year,month,0),daysInMonth=lastDayOfMonth.getDate(),daysInLastMonth=lastDayOfPreviousMonth.getDate(),dayOfWeek=firstDayOfMonth.getDay(),leadingDays=(dayOfWeek-firstDayOfWeek+7)%7||7,trailingDays=days.slice(0,6*7-(leadingDays+daysInMonth));if(trailingDays.length>7){trailingDays=trailingDays.slice(0,trailingDays.length-7)} +return{year:year,month:month,days:days.slice(0,daysInMonth),leadingDays:days.slice(-leadingDays-(31-daysInLastMonth),daysInLastMonth),trailingDays:trailingDays}};var linkFunc=function(scope,element,attrs,ctrl){initVars();var dateFormat=attrs.dateFormat||'short';scope.months=months;scope.daysOfWeek=daysOfWeek;scope.inputHour;scope.inputMinute;if(scope.dateOnly===!0){element[0].querySelector('#adp-time').style.display='none'} +if(scope.allowClose===!0){element[0].querySelector('#adp-top').style.display='block';element[0].querySelector('#adp-bottom').style.display='block'} +scope.$applyAsync(function(){ctrl.triggerEl=angular.element(element[0].triggerEl);if(attrs.ngModel){var dateStr=''+ctrl.triggerEl.scope().$eval(attrs.ngModel);if(dateStr){if(!scope.displaySelectedDate){if(!dateStr.match(/[0-9]{2}:/)){dateStr+=" 00:00:00"} +dateStr=dateStr.replace(/([0-9]{2}-[0-9]{2})-([0-9]{4})/,'$2-$1');dateStr=dateStr.replace(/([\/-][0-9]{2,4})\ ([0-9]{2}\:[0-9]{2}\:)/,'$1T$2');dateStr=dateStr.replace(/EDT|EST|CDT|CST|MDT|PDT|PST|UT|GMT/g,'');dateStr=dateStr.replace(/\s*\(\)\s*/,'');dateStr=dateStr.replace(/[\-\+][0-9]{2}:?[0-9]{2}$/,'');dateStr+=getTimezoneOffset(dateStr)} +var d=new Date(dateStr);scope.selectedDate=new Date(d.getFullYear(),d.getMonth(),d.getDate(),d.getHours(),d.getMinutes(),d.getSeconds())}} +if(!scope.selectedDate||isNaN(scope.selectedDate.getTime())){var today=new Date();var year=scope.year||today.getFullYear();var month=scope.month?(scope.month-1):today.getMonth();var day=scope.day||today.getDate();var hour=scope.hour||scope.hour===0?scope.hour:today.getHours();var minute=scope.minute||scope.minute===0?scope.minute:today.getMinutes();scope.selectedDate=new Date(year,month,day,hour,minute,0)} +scope.inputHour=scope.selectedDate.getHours();scope.inputMinute=scope.selectedDate.getMinutes();scope.mv=getMonthView(scope.selectedDate.getFullYear(),scope.selectedDate.getMonth());scope.today=dateFilter(new Date(),'yyyy-M-d');if(scope.mv.year==scope.selectedDate.getFullYear()&&scope.mv.month==scope.selectedDate.getMonth()){scope.selectedDay=scope.selectedDate.getDate()}else{scope.selectedDay=null}});scope.changeCurrentDate=function(){scope.selectedDate=new Date();scope.mv=getMonthView(scope.selectedDate.getFullYear(),scope.selectedDate.getMonth());scope.today=dateFilter(scope.selectedDate,'yyyy-M-d');scope.selectedDay=scope.selectedDate.getDate();if(attrs.ngModel){var elScope=ctrl.triggerEl.scope();elScope.$eval(attrs.ngModel+'= date',{date:scope.selectedDate})}};scope.displayTime=function(){if(scope.inputMinute==null||scope.inputHour==null) +return "";return("0"+scope.inputHour).slice(-2)+":"+("0"+scope.inputMinute).slice(-2)};scope.clearSelectedDate=function(){scope.selectedDate=null;scope.selectedDay=null;scope.inputHour=null;scope.inputMinute=null;if(attrs.ngModel){var elScope=ctrl.triggerEl.scope();elScope.$eval(attrs.ngModel+'= date',{date:null})}};scope.addMonth=function(amount){scope.mv=getMonthView(scope.mv.year,scope.mv.month+amount)};scope.closeDatetimePicker=function(){ctrl.closeDatetimePicker()};scope.setDate=function(evt){var target=angular.element(evt.target)[0];if(target.className.indexOf('selectable')!==-1){scope.updateNgModel(parseInt(target.innerHTML));if(scope.closeOnSelect!==!1){ctrl.closeDatetimePicker()}}};scope.updateNgModel=function(day){day=day?day:scope.selectedDate.getDate();scope.selectedDate=new Date(scope.mv.year,scope.mv.month,day,scope.inputHour,scope.inputMinute,0);scope.selectedDay=scope.selectedDate.getDate();if(attrs.ngModel){scope.selectedDateUTC=new Date(scope.mv.year,scope.mv.month,day,scope.inputHour,scope.inputMinute,0);scope.selectedDateUTC.setMinutes(scope.selectedDateUTC.getMinutes()+scope.selectedDateUTC.getTimezoneOffset());var elScope=ctrl.triggerEl.scope(),dateValue;if(elScope.$eval(attrs.ngModel)&&elScope.$eval(attrs.ngModel).constructor.name==='Date'){dateValue=new Date(dateFilter(scope.selectedDateUTC,dateFormat))}else{dateValue=dateFilter(scope.selectedDateUTC,dateFormat)} +elScope.$eval(attrs.ngModel+'= date',{date:dateValue})}};scope.$on('$destroy',ctrl.closeDatetimePicker)};return{restrict:'A',template:tmpl,controller:'DatetimePickerCtrl',replace:!0,scope:{year:'=',month:'=',day:'=',hour:'=',minute:'=',dateOnly:'=',closeOnSelect:'=',allowClose:'=',displaySelectedDate:'=',ngChange:'=?'},link:linkFunc}};datetimePickerPopup.$inject=['$locale','dateFilter'];angular.module('angularjs-datetime-picker').directive('datetimePickerPopup',datetimePickerPopup);var datetimePicker=function($parse,DatetimePicker){return{require:'ngModel',link:function(scope,element,attrs,ctrl){scope.$watch(attrs.ngModel,function(value){if(!value||value==''){return} +var date=new Date(value);ctrl.$setValidity('date',!date?!1:!0);var now=new Date();if(attrs.hasOwnProperty('futureOnly')){ctrl.$setValidity('future-only',date" diff --git a/package.json b/package.json index 64fac8b..870c20f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "angularjs-datetime-picker", - "version": "0.1.20", + "version": "0.1.23", "description": "Very Lightweight AngularJS DateTime Picker Without Using jQuery, bootStrap, or moment", "main": "angularjs-datetime-picker.js", "scripts": { @@ -29,6 +29,6 @@ "gulp-strip-debug": "^1.0.2", "gulp-uglify": "^1.2.0", "run-sequence": "^1.1.0" - } + }, "homepage": "https://github.com/kineticsocial/angularjs-datetime-picker" }