Skip to content

Commit 91a938f

Browse files
committed
Update filebrowser.js
1 parent f8741a3 commit 91a938f

File tree

1 file changed

+29
-28
lines changed

1 file changed

+29
-28
lines changed

filebrowser.js

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2239,6 +2239,33 @@ function createNewFileInHTML() {
22392239
if (dialogResp === 'return') return;
22402240

22412241

2242+
// validate file name
2243+
2244+
// get file name
2245+
let fileName = fileEl.querySelector('.name').textContent.replaceAll('\n', '');
2246+
2247+
// if file name is empty, use default name
2248+
if (fileName === '') fileName = 'new-file';
2249+
2250+
// if another file in the current directory
2251+
// has the same name, add a differentiating number
2252+
fileWrapper.querySelectorAll('.item.file').forEach(fileElem => {
2253+
2254+
if (fileElem !== fileEl
2255+
&& (fileName === fileElem.querySelector('.name').textContent)) {
2256+
2257+
// split extension from file name
2258+
fileName = splitFileName(fileName);
2259+
2260+
// add a differentiating number
2261+
// and reconstruct file name
2262+
fileName = fileName[0] + '-1' + (fileName[1] !== 'none' ? ('.' + fileName[1]) : '');
2263+
2264+
}
2265+
2266+
});
2267+
2268+
22422269
let commitMessage = 'Create ' + fileName;
22432270

22442271
// if ctrl/cmd/shift-clicked on push button
@@ -2248,7 +2275,7 @@ function createNewFileInHTML() {
22482275
let selBranch = treeLoc[1].split(':')[1];
22492276

22502277
// open push screen
2251-
commitMessage = prompt('Push \''+ fileEl.innerText + (selBranch ? '\' to branch \'' + selBranch + '\'?' : '\'?'),
2278+
commitMessage = prompt('Push \''+ fileName + (selBranch ? '\' to branch \'' + selBranch + '\'?' : '\'?'),
22522279
'Type commit message...');
22532280

22542281
// if canceled push, return
@@ -2282,34 +2309,8 @@ function createNewFileInHTML() {
22822309
const randomNum = Math.floor(Math.random() * 100) + 1;
22832310
const fileContent = '\r\n'.padEnd(randomNum, '\r');
22842311

2285-
2286-
// validate file name
2287-
2288-
// get file name
2289-
let fileName = fileEl.querySelector('.name').textContent.replaceAll('\n', '');
2290-
2291-
// if file name is empty, use default name
2292-
if (fileName === '') fileName = 'new-file';
22932312

2294-
2295-
// if another file in the current directory
2296-
// has the same name, add a differentiating number
2297-
fileWrapper.querySelectorAll('.item.file').forEach(fileElem => {
2298-
2299-
if (fileElem !== fileEl
2300-
&& (fileName === fileElem.querySelector('.name').textContent)) {
2301-
2302-
// split extension from file name
2303-
fileName = splitFileName(fileName);
2304-
2305-
// add a differentiating number
2306-
// and reconstruct file name
2307-
fileName = fileName[0] + '-1' + (fileName[1] !== 'none' ? ('.' + fileName[1]) : '');
2308-
2309-
}
2310-
2311-
});
2312-
2313+
// validate file name
23132314
fileEl.querySelector('.name').textContent = fileName;
23142315

23152316

0 commit comments

Comments
 (0)