Dialogs: Fixed 'title' for File dialog

andersevenrud · andersevenrud · commit 1fddd173a3a5 · 2017-04-26T22:10:01.000+02:00
diff --git a/src/client/javascript/dialogs/file.js b/src/client/javascript/dialogs/file.js
@@ -39,7 +39,6 @@
    *
    * @param  {Object}           args                      An object with arguments
    * @param  {String}           args.title                Dialog title
-   * @param  {String}           args.title                Dialog title
    * @param  {String}           [args.type=open]          Dialog type (alternative=save)
    * @param  {Boolean}          [args.multiple=false]     Multiple file selection
    * @param  {OSjs.VFS.File}    [args.file]               Current file
@@ -88,8 +87,8 @@
       }
     }
 
-    var title     = API._(args.type === 'save' ? 'DIALOG_FILE_SAVE' : 'DIALOG_FILE_OPEN');
-    var icon      = args.type === 'open' ? 'actions/document-open.png' : 'actions/documentsave-as.png';
+    var title = args.title || API._(args.type === 'save' ? 'DIALOG_FILE_SAVE' : 'DIALOG_FILE_OPEN');
+    var icon = args.type === 'open' ? 'actions/document-open.png' : 'actions/documentsave-as.png';
 
     DialogWindow.apply(this, ['FileDialog', {
       title: title,

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@`
`39`	`39`	`*`
`40`	`40`	`* @param {Object} args An object with arguments`
`41`	`41`	`* @param {String} args.title Dialog title`
`42`		`- * @param {String} args.title Dialog title`
`43`	`42`	`* @param {String} [args.type=open] Dialog type (alternative=save)`
`44`	`43`	`* @param {Boolean} [args.multiple=false] Multiple file selection`
`45`	`44`	`* @param {OSjs.VFS.File} [args.file] Current file`
`@@ -88,8 +87,8 @@`
`88`	`87`	`}`
`89`	`88`	`}`
`90`	`89`
`91`		`- var title = API._(args.type === 'save' ? 'DIALOG_FILE_SAVE' : 'DIALOG_FILE_OPEN');`
`92`		`- var icon = args.type === 'open' ? 'actions/document-open.png' : 'actions/documentsave-as.png';`
	`90`	`+ var title = args.title \|\| API._(args.type === 'save' ? 'DIALOG_FILE_SAVE' : 'DIALOG_FILE_OPEN');`
	`91`	`+ var icon = args.type === 'open' ? 'actions/document-open.png' : 'actions/documentsave-as.png';`
`93`	`92`
`94`	`93`	`DialogWindow.apply(this, ['FileDialog', {`
`95`	`94`	`title: title,`