From 332b4aee9da4ffe6f7f79255ca4ce75b8a283693 Mon Sep 17 00:00:00 2001
From: Florian Schunk <florian.schunk@rwth-aachen.de>
Date: Mon, 7 Jan 2019 22:07:16 +0100
Subject: [PATCH] fix testing for undefined
Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
---
apps/files/js/fileactions.js | 2 +-
apps/files/js/filelist.js | 2 +-
core/js/oc-dialogs.js | 9 +--------
3 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 05efa1f36e9..ef29551c591 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -649,7 +649,7 @@
actions = OC.dialogs.FILEPICKER_TYPE_COPY_MOVE;
}
var dialogDir = context.dir;
- if (context.fileList.dirInfo.dirLastCopiedTo != undefined) {
+ if (typeof context.fileList.dirInfo.dirLastCopiedTo !== 'undefined') {
dialogDir = context.fileList.dirInfo.dirLastCopiedTo;
}
OC.dialogs.filepicker(t('files', 'Choose target folder'), function(targetPath, type) {
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 7f0d1ea1a94..29c5a49131d 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -919,7 +919,7 @@
var actions = this.isSelectedMovable() ? OC.dialogs.FILEPICKER_TYPE_COPY_MOVE : OC.dialogs.FILEPICKER_TYPE_COPY;
var dialogDir = self.getCurrentDirectory();
- if (self.dirInfo.dirLastCopiedTo != undefined) {
+ if (typeof self.dirInfo.dirLastCopiedTo !== 'undefined') {
dialogDir = self.dirInfo.dirLastCopiedTo;
}
OC.dialogs.filepicker(t('files', 'Choose target folder'), function(targetPath, type) {
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 9646eb0cc41..3583019ef08 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -215,9 +215,7 @@ var OCdialogs = {
this.filepicker.filesClient = (OCA.Sharing && OCA.Sharing.PublicApp && OCA.Sharing.PublicApp.fileList)? OCA.Sharing.PublicApp.fileList.filesClient: OC.Files.getClient();
this.filelist = null;
- if (path == undefined) {
- path = '';
- }
+ path = path || '';
$.when(this._getFilePickerTemplate()).then(function($tmpl) {
self.filepicker.loading = false;
@@ -236,14 +234,9 @@ var OCdialogs = {
self.$filePicker = $tmpl.octemplate({
dialog_name: dialogName,
title: title,
-<<<<<<< HEAD
emptytext: emptyText,
newtext: newText
- }).data('path', '').data('multiselect', multiselect).data('mimetype', mimetypeFilter);
-=======
- emptytext: emptyText
}).data('path', path).data('multiselect', multiselect).data('mimetype', mimetypeFilter);
->>>>>>> copy Dialog starts in current directory
if (modal === undefined) {
modal = false;
--
GitLab