Skip to content

Commit

Permalink
Merge pull request #71 from leonhartX/fix-appscript-color-conflict
Browse files Browse the repository at this point in the history
change filename selector
  • Loading branch information
leonhartX authored Apr 5, 2018
2 parents 54a9c0d + 48f3095 commit 38772b0
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "3.3.5",
"version": "3.3.6",
"manifest_version": 2,
"default_locale": "en",
"name": "__MSG_appName__",
Expand Down
6 changes: 3 additions & 3 deletions src/gas-hub.js
Original file line number Diff line number Diff line change
Expand Up @@ -288,11 +288,11 @@ function prepareCode() {
return Promise.all([gas.getGasCode(), scm.getCode()])
.then((data) => {
const re = new RegExp(`\\${context.config.filetype}$`);
const files = $('.item').toArray().reduce((hash, e) => {
if (context.config.manifestEnabled && e.innerText.trim() === 'appsscript.json') {
const files = $('.item > .gwt-Label').toArray().reduce((hash, e) => {
if (context.config.manifestEnabled && e.title === 'appsscript.json') {
hash['appsscript'] = 'appsscript.json';
}
const match = e.innerText.trim().match(/(.*?)\.(gs|html)$/);
const match = e.title.match(/(.*?)\.(gs|html)$/);
if (!match || !match[1] || !match[2]) return hash;
hash[match[1]] = match[0];
return hash;
Expand Down
2 changes: 1 addition & 1 deletion src/scm/bitbucket.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class Bitbucket {
const files = changed.filter(f => code.gas[f]).map(f => {
return { name: f.replace(/\.gs$/, context.config.filetype), content: code.gas[f] }
});
const deleteFiles = changed.filter(f => !code.gas[f]);
const deleteFiles = changed.filter(f => !code.gas[f]).forEach((f, i) => changed[i] = f.replace(/\.gs$/, context.config.filetype));
const comment = $('#commit-comment').val();

this.commitFiles(context.repo.fullName, context.branch, null, files, deleteFiles, comment)
Expand Down
1 change: 1 addition & 0 deletions src/scm/github.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ class Github {
return {file: file.replace(/\.gs$/, context.config.filetype), blob: response};
})
});
changed.filter(f => !code.gas[f]).forEach((f, i) => changed[i] = f.replace(/\.gs$/, context.config.filetype));
if (changed.length === 0) {
showAlert('Nothing to do', LEVEL_WARN);
return;
Expand Down

0 comments on commit 38772b0

Please sign in to comment.