diff --git a/src/extensions/default/Git/main.js b/src/extensions/default/Git/main.js index 5ec801328a..16ffaaaf64 100644 --- a/src/extensions/default/Git/main.js +++ b/src/extensions/default/Git/main.js @@ -31,8 +31,7 @@ define(function (require, exports, module) { require(modules); // Load CSS - ExtensionUtils.loadStyleSheet(module, "styles/brackets-git.less"); - ExtensionUtils.loadStyleSheet(module, "styles/fonts/octicon.less"); + ExtensionUtils.loadStyleSheet(module, "styles/git-styles.less"); AppInit.appReady(function () { Main.init().then((enabled)=>{ diff --git a/src/extensions/default/Git/src/Branch.js b/src/extensions/default/Git/src/Branch.js index e71bf763d1..789d4a38ac 100644 --- a/src/extensions/default/Git/src/Branch.js +++ b/src/extensions/default/Git/src/Branch.js @@ -458,7 +458,7 @@ define(function (require, exports) { var MAX_LEN = 18; const tooltip = StringUtils.format(Strings.ON_BRANCH, branchName); - const html = ` ${ + const html = ` ${ branchName.length > MAX_LEN ? branchName.substring(0, MAX_LEN) + "\u2026" : branchName }`; $gitBranchName @@ -491,7 +491,7 @@ define(function (require, exports) { // Add branch name to project tree const $html = $(`
- +
`); diff --git a/src/extensions/default/Git/src/Panel.js b/src/extensions/default/Git/src/Panel.js index f3c1e78cb0..758e976a3b 100644 --- a/src/extensions/default/Git/src/Panel.js +++ b/src/extensions/default/Git/src/Panel.js @@ -601,54 +601,60 @@ define(function (require, exports) { let totalFiles = gitStatusResults.length, filesDone = 0; + function showProgress() { + const $progressBar = $dialog.find('.accordion-progress-bar-inner'); + if ($progressBar.length) { + $progressBar[0].style.width = `${filesDone/totalFiles*100}%`; + } + if(filesDone === totalFiles){ + $dialog.find('.accordion-progress-bar').addClass("forced-inVisible"); + } + const progressString = StringUtils.format(Strings.CODE_INSPECTION_DONE_FILES, filesDone, totalFiles); + $dialog.find(".lint-errors").html(progressString); + } + const codeInspectionPromises = gitStatusResults.map(function (fileObj) { const isDeleted = fileObj.status.indexOf(Git.FILE_STATUS.DELETED) !== -1; + if(isDeleted){ + filesDone++; + showProgress(); + return; + } // Do a code inspection for the file, if it was not deleted - if (!isDeleted) { - return new Promise((resolve) => { - // Delay lintFile execution to give the event loop some breathing room - setTimeout(() => { - lintFile(fileObj.file) - .catch(function () { - return [ - { - provider: { name: "See console [F12] for details" }, - result: { - errors: [ - { - pos: { line: 0, ch: 0 }, - message: "CodeInspection failed to execute for this file." - } - ] - } + return new Promise((resolve) => { + // Delay lintFile execution to give the event loop some breathing room + setTimeout(() => { + lintFile(fileObj.file) + .catch(function () { + return [ + { + provider: { name: "See console [F12] for details" }, + result: { + errors: [ + { + pos: { line: 0, ch: 0 }, + message: "CodeInspection failed to execute for this file." + } + ] } - ]; - }) - .then(function (result) { - if (result) { - lintResults.push({ - filename: fileObj.file, - result: result - }); - } - resolve(); - }).finally(()=>{ - filesDone++; - const $progressBar = $dialog.find('.accordion-progress-bar-inner'); - if ($progressBar.length) { - $progressBar[0].style.width = `${filesDone/totalFiles*100}%`; - } - if(filesDone === totalFiles){ - $dialog.find('.accordion-progress-bar').addClass("forced-inVisible"); } - const progressString = StringUtils.format(Strings.CODE_INSPECTION_DONE_FILES, filesDone, totalFiles); - $dialog.find(".lint-errors").html(progressString); - - }); - }, 0); // Delay of 0ms to defer to the next tick of the event loop - }); - } + ]; + }) + .then(function (result) { + if (result) { + lintResults.push({ + filename: fileObj.file, + result: result + }); + } + resolve(); + }).finally(()=>{ + filesDone++; + showProgress(); + }); + }, 0); // Delay of 0ms to defer to the next tick of the event loop + }); }); return Promise.all(_.compact(codeInspectionPromises)).then(function () { diff --git a/src/extensions/default/Git/src/dialogs/templates/push-dialog.html b/src/extensions/default/Git/src/dialogs/templates/push-dialog.html index 67161923d3..52641cf694 100644 --- a/src/extensions/default/Git/src/dialogs/templates/push-dialog.html +++ b/src/extensions/default/Git/src/dialogs/templates/push-dialog.html @@ -1,4 +1,4 @@ -