Merge pull request #863 from nextcloud/datepicker-5.0-fixes

Update Datepicker script for nextcloud-vue 0.5.1

4 files changed, 26 insertions, 75 deletions

diff --git a/package-lock.json b/package-lock.json
index c2981a20..7aa9aab0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1545,7 +1545,7 @@
 		},
 		"axios": {
 			"version": "0.18.0",
-			"resolved": "http://registry.npmjs.org/axios/-/axios-0.18.0.tgz",
+			"resolved": "https://registry.npmjs.org/axios/-/axios-0.18.0.tgz",
 			"integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=",
 			"requires": {
 				"follow-redirects": "^1.3.0",
@@ -2003,7 +2003,7 @@
 		},
 		"cdav-library": {
 			"version": "github:nextcloud/cdav-library#c27587a4fdb318d10ef329548d146755964e6672",
-			"from": "github:nextcloud/cdav-library#c27587a4fdb318d10ef329548d146755964e6672",
+			"from": "github:nextcloud/cdav-library",
 			"requires": {
 				"@babel/polyfill": "^7.2.5"
 			}
@@ -2230,12 +2230,6 @@
 			"integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
 			"dev": true
 		},
-		"coalescy": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/coalescy/-/coalescy-1.0.0.tgz",
-			"integrity": "sha1-SwZYRrg2NhrabEtKSr9LwcrDG/E=",
-			"dev": true
-		},
 		"code-point-at": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
@@ -3234,37 +3228,6 @@
 			"integrity": "sha512-COUz8FnXhqFitYj4DTqHzidjIL/t4mumGZto5c7DrBpvWoie+Sn3P4sLEzUGeYhRElWuFEf8K1S1EfvD1vixCQ==",
 			"dev": true
 		},
-		"eslint-friendly-formatter": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/eslint-friendly-formatter/-/eslint-friendly-formatter-4.0.1.tgz",
-			"integrity": "sha1-J9UE3IN/fK3b8gGy6EpO5zC6Pvo=",
-			"dev": true,
-			"requires": {
-				"chalk": "^2.0.1",
-				"coalescy": "1.0.0",
-				"extend": "^3.0.0",
-				"minimist": "^1.2.0",
-				"strip-ansi": "^4.0.0",
-				"text-table": "^0.2.0"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-					"dev": true
-				},
-				"strip-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-					"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^3.0.0"
-					}
-				}
-			}
-		},
 		"eslint-import-resolver-node": {
 			"version": "0.3.2",
 			"resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz",
@@ -3825,7 +3788,7 @@
 		},
 		"fecha": {
 			"version": "2.3.3",
-			"resolved": "http://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz",
+			"resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz",
 			"integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg=="
 		},
 		"figgy-pudding": {
@@ -4060,8 +4023,7 @@
 				"ansi-regex": {
 					"version": "2.1.1",
 					"bundled": true,
-					"dev": true,
-					"optional": true
+					"dev": true
 				},
 				"aproba": {
 					"version": "1.2.0",
@@ -4082,14 +4044,12 @@
 				"balanced-match": {
 					"version": "1.0.0",
 					"bundled": true,
-					"dev": true,
-					"optional": true
+					"dev": true
 				},
 				"brace-expansion": {
 					"version": "1.1.11",
 					"bundled": true,
 					"dev": true,
-					"optional": true,
 					"requires": {
 						"balanced-match": "^1.0.0",
 						"concat-map": "0.0.1"
@@ -4104,20 +4064,17 @@
 				"code-point-at": {
 					"version": "1.1.0",
 					"bundled": true,
-					"dev": true,
-					"optional": true
+					"dev": true
 				},
 				"concat-map": {
 					"version": "0.0.1",
 					"bundled": true,
-					"dev": true,
-					"optional": true
+					"dev": true
 				},
 				"console-control-strings": {
 					"version": "1.1.0",
 					"bundled": true,
-					"dev": true,
-					"optional": true
+					"dev": true
 				},
 				"core-util-is": {
 					"version": "1.0.2",
@@ -4234,8 +4191,7 @@
 				"inherits": {
 					"version": "2.0.3",
 					"bundled": true,
-					"dev": true,
-					"optional": true
+					"dev": true
 				},
 				"ini": {
 					"version": "1.3.5",
@@ -4247,7 +4203,6 @@
 					"version": "1.0.0",
 					"bundled": true,
 					"dev": true,
-					"optional": true,
 					"requires": {
 						"number-is-nan": "^1.0.0"
 					}
@@ -4262,7 +4217,6 @@
 					"version": "3.0.4",
 					"bundled": true,
 					"dev": true,
-					"optional": true,
 					"requires": {
 						"brace-expansion": "^1.1.7"
 					}
@@ -4270,14 +4224,12 @@
 				"minimist": {
 					"version": "0.0.8",
 					"bundled": true,
-					"dev": true,
-					"optional": true
+					"dev": true
 				},
 				"minipass": {
 					"version": "2.2.4",
 					"bundled": true,
 					"dev": true,
-					"optional": true,
 					"requires": {
 						"safe-buffer": "^5.1.1",
 						"yallist": "^3.0.0"
@@ -4296,7 +4248,6 @@
 					"version": "0.5.1",
 					"bundled": true,
 					"dev": true,
-					"optional": true,
 					"requires": {
 						"minimist": "0.0.8"
 					}
@@ -4377,8 +4328,7 @@
 				"number-is-nan": {
 					"version": "1.0.1",
 					"bundled": true,
-					"dev": true,
-					"optional": true
+					"dev": true
 				},
 				"object-assign": {
 					"version": "4.1.1",
@@ -4390,7 +4340,6 @@
 					"version": "1.4.0",
 					"bundled": true,
 					"dev": true,
-					"optional": true,
 					"requires": {
 						"wrappy": "1"
 					}
@@ -4476,8 +4425,7 @@
 				"safe-buffer": {
 					"version": "5.1.1",
 					"bundled": true,
-					"dev": true,
-					"optional": true
+					"dev": true
 				},
 				"safer-buffer": {
 					"version": "2.1.2",
@@ -4513,7 +4461,6 @@
 					"version": "1.0.2",
 					"bundled": true,
 					"dev": true,
-					"optional": true,
 					"requires": {
 						"code-point-at": "^1.0.0",
 						"is-fullwidth-code-point": "^1.0.0",
@@ -4533,7 +4480,6 @@
 					"version": "3.0.1",
 					"bundled": true,
 					"dev": true,
-					"optional": true,
 					"requires": {
 						"ansi-regex": "^2.0.0"
 					}
@@ -4577,14 +4523,12 @@
 				"wrappy": {
 					"version": "1.0.2",
 					"bundled": true,
-					"dev": true,
-					"optional": true
+					"dev": true
 				},
 				"yallist": {
 					"version": "3.0.2",
 					"bundled": true,
-					"dev": true,
-					"optional": true
+					"dev": true
 				}
 			}
 		},
diff --git a/package.json b/package.json
index f88de1eb..09fb0875 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,6 @@
 		"css-loader": "^2.1.0",
 		"eslint": "^5.12.0",
 		"eslint-config-standard": "^12.0.0",
-		"eslint-friendly-formatter": "^4.0.1",
 		"eslint-import-resolver-webpack": "^0.10.1",
 		"eslint-loader": "^2.1.1",
 		"eslint-plugin-import": "^2.14.0",
diff --git a/src/components/Properties/PropertyDateTime.vue b/src/components/Properties/PropertyDateTime.vue
index e8304281..96c72f58 100644
--- a/src/components/Properties/PropertyDateTime.vue
+++ b/src/components/Properties/PropertyDateTime.vue
@@ -130,10 +130,18 @@ let formatDateTime = function(vcardTime, type, locale) {
  * location of the call. So this = DatetimePicker.
  * Therefore we can use any props we pass through datetime-picker
  *
+ * ! TODO: use a DEDICATED function in vue2-datepicker instead of this weird hack
+ *
  * @returns {string}
  */
-DatetimePicker.methods.stringify = function() {
-	return formatDateTime(this.$parent.localValue, this.type, this.$parent.locale)
+if (DatetimePicker && DatetimePicker.methods) {
+	DatetimePicker.methods.stringify = function() {
+		return formatDateTime(this.$parent.localValue, this.type, this.$parent.locale)
+	}
+} else {
+	DatetimePicker.components.DatePicker.methods.stringify = function() {
+		return formatDateTime(this.$parent.$parent.localValue, this.type, this.$parent.$parent.locale)
+	}
 }
 
 export default {
@@ -164,7 +172,7 @@ export default {
 					: 'time',
 
 			// locale and lang data
-			locale: 'en',						// temporary value, see mounted
+			locale: 'en',
 			firstDay: window.firstDay + 1,			// provided by nextcloud
 			lang: {
 				days: window.dayNamesShort,		// provided by nextcloud
diff --git a/webpack.dev.js b/webpack.dev.js
index c44b3220..ee9d6492 100644
--- a/webpack.dev.js
+++ b/webpack.dev.js
@@ -8,5 +8,5 @@ module.exports = merge(common, {
 		noInfo: true,
 		overlay: true
 	},
-	devtool: '#cheap-source-map',
+	devtool: '#cheap-source-map'
 })