fix testing for undefined

Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>

Author: rummatee

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) {

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) {

core/js/oc-dialogs.js

@@ -218,6 +218,7 @@ var OCdialogs = {
 		if (path == undefined) {
 			path = '';
 		}
+		path = path || '';
 
 		$.when(this._getFilePickerTemplate()).then(function($tmpl) {
 			self.filepicker.loading = false;
@@ -236,14 +237,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;