Skip to content

Commit b83d6a4

Browse files
committed
Project: Update findFolder to return null when no folder is found
1 parent d98a977 commit b83d6a4

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

lib/modules/project.js

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,23 @@ aeq.project = aeq.extend({}, {
4343
},
4444

4545
/**
46-
* Find folder by name in target folder, or root
46+
* Find folder by name in target folder.
4747
* @method
4848
* @memberof aeq.project
49-
* @param {string} name Folder name to find
50-
* @param {FolderItem|string} [parentFolder=app.project.root] Folder to search in by name or item, or root if undefined
51-
* @return {FolderItem} ArrayEx of folder items
49+
* @param {string} name Folder name to find.
50+
* @param {FolderItem|string} [parentFolder=app.project.root] Folder to search in by name or item, or root if undefined.
51+
* @return {FolderItem|null} FolderItem with the name. Or `null` if not found.
5252
*/
5353
findFolder: function(name, parentFolder){
5454
var folders = aeq.project.getFolders(parentFolder);
5555

5656
var folder = aeq.filter(folders, function(folder) {
5757
return folder.name == name;
5858
});
59-
60-
return folder[0];
59+
if (folder.length) {
60+
return folder[0];
61+
}
62+
return null;
6163
},
6264

6365
/**
@@ -69,11 +71,13 @@ aeq.project = aeq.extend({}, {
6971
* @return {FolderItem|null} Target folder item, or null
7072
*/
7173
getFolder: function(folder, parentFolder){
72-
if (aeq.isFolderItem(folder))
74+
if (aeq.isFolderItem(folder)) {
7375
return folder;
76+
}
7477

75-
if (aeq.isString(folder))
78+
if (aeq.isString(folder)) {
7679
return aeq.project.findFolder(folder, parentFolder);
80+
}
7781

7882
return null;
7983
},

0 commit comments

Comments
 (0)