Merge branch 'master' of https://github.com/ng2-ui/ng2-datetime-picker

Author: allenhwkim

src/datetime-picker.component.ts

@@ -174,6 +174,7 @@ declare var moment: any;
 }
 .ngui-datetime-picker .days {
   width: 210px; /* 30 x 7 days */
+  box-sizing: content-box;
 }
 .ngui-datetime-picker .close-button {
   position: absolute;
@@ -182,6 +183,7 @@ declare var moment: any;
   right: 0;
   z-index: 1;
   padding: 0 5px;
+  box-sizing: content-box;
 }
 .ngui-datetime-picker .close-button:before {
   content: 'X';
@@ -209,6 +211,7 @@ declare var moment: any;
   cursor: pointer;
   width: 25px;
   text-align: center;
+  box-sizing: content-box;
 }
 .ngui-datetime-picker > .month > .prev_next:hover {
   background-color: #333;
@@ -232,18 +235,19 @@ declare var moment: any;
   text-align: right;
   width: 21px;
   vertical-align: top;
+  box-sizing: content-box;
 }
 
 .ngui-datetime-picker  .days {
   display: inline-block;
   width: 210px; /* 30 x 7 */
   text-align: center;
   padding: 0 10px;
+  box-sizing: content-box;
 }
 .ngui-datetime-picker .days .day-of-week,
 .ngui-datetime-picker .days .day {
   box-sizing: border-box;
-  -moz-box-sizing: border-box;
   border: 1px solid transparent;
   width: 30px;
   line-height: 28px;
@@ -319,6 +323,7 @@ declare var moment: any;
   display: inline-block;
   width: 45px;
   vertical-align: top;
+  box-sizing: content-box;
 }
 .closing-layer {
   display: block;

src/datetime-picker.directive.ts

@@ -46,6 +46,7 @@ export class NguiDatetimePickerDirective implements OnInit, OnChanges {
   @Input('max-hour')          maxHour: Date | number;
   @Input('disabled-dates')    disabledDates: Date[];
   @Input('show-close-layer')  showCloseLayer: boolean;
+  @Input('show-today-shortcut') showTodayShortcut: boolean = false;
   @Input('show-week-numbers') showWeekNumbers: boolean;
   @Input() formControlName: string;
   @Input('is-draggable')      isDraggable: boolean = true;
@@ -280,6 +281,7 @@ export class NguiDatetimePickerDirective implements OnInit, OnChanges {
     component.disabledDates  = this.disabledDates;
     component.showCloseButton = this.closeOnSelect === false;
     component.showCloseLayer = this.showCloseLayer;
+    component.showTodayShortcut = this.showTodayShortcut;
     component.showWeekNumbers = this.showWeekNumbers;
 
     this.styleDatetimePicker();

src/datetime.ts

@@ -77,7 +77,7 @@ export class NguiDatetime {
       ret = d.getFullYear() + '-' + pad0(d.getMonth() + 1) + '-' + pad0(d.getDate());
       ret += dateOnly ? '' : ' ' + pad0(d.getHours()) + ':' + pad0(d.getMinutes());
       return ret;
-    } else if (d && moment) {
+    } else if (d && typeof moment !== 'undefined') {
       return moment(d).format(format);
     } else {
       return '';