Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

Issue #4453: Parameter "{0}" appears in the invalid filename title. #4491

Merged
merged 2 commits into from
Jul 17, 2013
Merged

Issue #4453: Parameter "{0}" appears in the invalid filename title. #4491

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
137aef5
Replace the title's {0} with 'File' or 'Directory' in the illegal cha…
TomMalbran Jul 17, 2013
4d3d6ce
Type fixed on the return description
TomMalbran Jul 17, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/project/ProjectManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1098,18 +1098,20 @@ define(function (require, exports, module) {

/**
* @private
*
* Check a filename for illegal characters. If any are found, show an error
* dialog and return false. If no illegal characters are found, return true.
* @param {string} filename
* @param {boolean} isFolder
* @return {boolean} Returns true if no illegal characters are found
*/
function _checkForValidFilename(filename) {
function _checkForValidFilename(filename, isFolder) {
// Validate file name
// Checks for valid Windows filenames:
// See http://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx
if ((filename.search(/[\/?*:;\{\}<>\\|]+/) !== -1) || filename.match(_illegalFilenamesRegEx)) {
Dialogs.showModalDialog(
DefaultDialogs.DIALOG_ID_ERROR,
Strings.INVALID_FILENAME_TITLE,
StringUtils.format(Strings.INVALID_FILENAME_TITLE, isFolder ? Strings.DIRECTORY : Strings.FILE),
Strings.INVALID_FILENAME_MESSAGE
);
return false;
Expand Down Expand Up @@ -1194,7 +1196,7 @@ define(function (require, exports, module) {

if (!escapeKeyPressed) {
// Validate file name
if (!_checkForValidFilename(data.rslt.name)) {
if (!_checkForValidFilename(data.rslt.name, isFolder)) {
errorCleanup();
return;
}
Expand Down Expand Up @@ -1418,7 +1420,7 @@ define(function (require, exports, module) {
_projectTree.jstree("sort", selected.parent());
};

if (!changed || !_checkForValidFilename(data.rslt.new_name)) {
if (!changed || !_checkForValidFilename(data.rslt.new_name, isFolder)) {
// No change or invalid filename. Reset the old name and bail.
_resetOldFilename();
return;
Expand Down