Skip to content

Commit

Permalink
prepare release 1.3.7 of abp-datetime-picker
Browse files Browse the repository at this point in the history
  • Loading branch information
ghiscoding committed Feb 13, 2019
1 parent 7cd0d7a commit b9f0904
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- Bootstrap version 3 -->
<div if.bind="bootstrapVersion == 3" class.bind="parseBool(withDateIcon) ? 'input-group date' : 'date'">
<input type="text" class="form-control datetimepicker"
value.bind="value"
value.two-way="value & updateTrigger:'blur'"
model.bind="model"
blur.trigger="blur()"
placeholder.bind="placeholder"
Expand All @@ -16,7 +16,7 @@
<!-- Bootstrap version 4 -->
<div if.bind="bootstrapVersion == 4" class.bind="parseBool(withDateIcon) ? 'input-group' : 'date'">
<input type="text" class="form-control date datetimepicker"
value.bind="value"
value.two-way="value & updateTrigger:'blur'"
model.bind="model"
blur.trigger="blur()"
placeholder.bind="placeholder"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ define(['exports', 'aurelia-framework', 'moment', 'jquery', './picker-global-opt
this.model = (0, _moment2.default)(value, this._format, true).toDate();
}
if (!this.value) {
this.value = (0, _moment2.default)(value, this._format, true);
this.value = (0, _moment2.default)(value, this._format, true).format(this._format);
}
}
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- Bootstrap version 3 -->
<div if.bind="bootstrapVersion == 3" class.bind="parseBool(withDateIcon) ? 'input-group date' : 'date'">
<input type="text" class="form-control datetimepicker"
value.bind="value"
value.two-way="value & updateTrigger:'blur'"
model.bind="model"
blur.trigger="blur()"
placeholder.bind="placeholder"
Expand All @@ -16,7 +16,7 @@
<!-- Bootstrap version 4 -->
<div if.bind="bootstrapVersion == 4" class.bind="parseBool(withDateIcon) ? 'input-group' : 'date'">
<input type="text" class="form-control date datetimepicker"
value.bind="value"
value.two-way="value & updateTrigger:'blur'"
model.bind="model"
blur.trigger="blur()"
placeholder.bind="placeholder"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ var AbpDatetimePickerCustomElement = exports.AbpDatetimePickerCustomElement = (_
this.model = (0, _moment2.default)(value, this._format, true).toDate();
}
if (!this.value) {
this.value = (0, _moment2.default)(value, this._format, true);
this.value = (0, _moment2.default)(value, this._format, true).format(this._format);
}
}
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- Bootstrap version 3 -->
<div if.bind="bootstrapVersion == 3" class.bind="parseBool(withDateIcon) ? 'input-group date' : 'date'">
<input type="text" class="form-control datetimepicker"
value.bind="value"
value.two-way="value & updateTrigger:'blur'"
model.bind="model"
blur.trigger="blur()"
placeholder.bind="placeholder"
Expand All @@ -16,7 +16,7 @@
<!-- Bootstrap version 4 -->
<div if.bind="bootstrapVersion == 4" class.bind="parseBool(withDateIcon) ? 'input-group' : 'date'">
<input type="text" class="form-control date datetimepicker"
value.bind="value"
value.two-way="value & updateTrigger:'blur'"
model.bind="model"
blur.trigger="blur()"
placeholder.bind="placeholder"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ export let AbpDatetimePickerCustomElement = (_dec = inject(Element), _dec2 = bin
this.model = moment(value, this._format, true).toDate();
}
if (!this.value) {
this.value = moment(value, this._format, true);
this.value = moment(value, this._format, true).format(this._format);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- Bootstrap version 3 -->
<div if.bind="bootstrapVersion == 3" class.bind="parseBool(withDateIcon) ? 'input-group date' : 'date'">
<input type="text" class="form-control datetimepicker"
value.bind="value"
value.two-way="value & updateTrigger:'blur'"
model.bind="model"
blur.trigger="blur()"
placeholder.bind="placeholder"
Expand All @@ -16,7 +16,7 @@
<!-- Bootstrap version 4 -->
<div if.bind="bootstrapVersion == 4" class.bind="parseBool(withDateIcon) ? 'input-group' : 'date'">
<input type="text" class="form-control date datetimepicker"
value.bind="value"
value.two-way="value & updateTrigger:'blur'"
model.bind="model"
blur.trigger="blur()"
placeholder.bind="placeholder"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ System.register(['aurelia-framework', 'moment', 'jquery', 'eonasdan-bootstrap-da
this.model = moment(value, this._format, true).toDate();
}
if (!this.value) {
this.value = moment(value, this._format, true);
this.value = moment(value, this._format, true).format(this._format);
}
}
};
Expand Down
2 changes: 1 addition & 1 deletion aurelia-bootstrap-datetimepicker/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aurelia-bootstrap-datetimepicker",
"version": "1.3.6",
"version": "1.3.7",
"description": "An Aurelia Custom Element for the 3rd party addon [Eonasdan Bootstrap Datepicker]",
"keywords": [
"aurelia",
Expand Down

0 comments on commit b9f0904

Please sign in to comment.