":"")}})(window.jQuery);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
index e651b87b05..908200e1d0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
@@ -1,5 +1,5 @@
-angular.module("umbraco").controller("Umbraco.PropertyEditors.DatepickerController",
- function ($scope, notificationsService, assetsService, angularHelper) {
+angular.module("umbraco").controller("Umbraco.Editors.DatepickerController",
+ function ($scope, notificationsService, assetsService) {
//setup the default config
var config = {
@@ -7,27 +7,44 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.DatepickerControll
pickTime: true,
format: "yyyy-MM-dd HH:mm:ss"
};
-
//map the user config
angular.extend(config, $scope.model.config);
//map back to the model
$scope.model.config = config;
+ $scope.model.viewvalue = $scope.model.value;
- if($scope.model.value){
- $scope.model.datetime = moment($scope.model.value).toDate();
+ function applyDate(e){
+ // when a date is changed, update the model
+ if (e.localDate) {
+ if ($scope.model.config.format == "yyyy-MM-dd HH:mm:ss") {
+ $scope.$apply(function(){
+ $scope.model.value = e.localDate.toIsoDateTimeString();
+ });
+ }else{
+ $scope.model.value = e.localDate.toIsoDateString();
+ }
+ }
}
-
+
+ assetsService.loadJs(
+ 'views/propertyeditors/datepicker/bootstrap-datetimepicker.min.js'
+ ).then(
+ function () {
+ //The Datepicker js and css files are available and all components are ready to use.
+
+ // Get the id of the datepicker button that was clicked
+ var pickerId = $scope.model.alias;
+ // Open the datepicker and add a changeDate eventlistener
+
+ $("#" + pickerId)
+ .datetimepicker($scope.model.config)
+ .on("changeDate", applyDate)
+ .on("hide", applyDate);
+
+ });
+
+
assetsService.loadCss(
- 'views/propertyeditors/datepicker/bootstrap-datetimepicker.min.css'
+ 'views/propertyeditors/datepicker/bootstrap-datetimepicker.min.css'
);
-
- $scope.$on("formSubmitting", function (ev, args) {
-
- //hack to set the hours right
- //since an hour is subtracted on the server?
- var t = angular.copy($scope.model.datetime);
- t.setHours(t.getHours()+1);
- $scope.model.value = t;
- });
-
});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
index c89f3ab557..90e32d588a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
@@ -1,18 +1,11 @@
-