mirror of
https://github.com/atom/atom.git
synced 2026-04-28 03:01:47 -04:00
Merge branch 'master' into tj-upgrade-electron
This commit is contained in:
@@ -238,7 +238,7 @@ class AtomApplication
|
||||
@on 'application:open-faq', -> shell.openExternal('https://atom.io/faq')
|
||||
@on 'application:open-terms-of-use', -> shell.openExternal('https://atom.io/terms')
|
||||
@on 'application:report-issue', -> shell.openExternal('https://github.com/atom/atom/blob/master/CONTRIBUTING.md#submitting-issues')
|
||||
@on 'application:search-issues', -> shell.openExternal('https://github.com/issues?q=+is%3Aissue+user%3Aatom')
|
||||
@on 'application:search-issues', -> shell.openExternal('https://github.com/search?q=+is%3Aissue+user%3Aatom')
|
||||
|
||||
@on 'application:install-update', =>
|
||||
@quitting = true
|
||||
|
||||
@@ -29,6 +29,13 @@ class PackageTranspilationRegistry {
|
||||
|
||||
removeTranspilerConfigForPath (packagePath) {
|
||||
delete this.configByPackagePath[packagePath]
|
||||
const packagePathWithSep = packagePath.endsWith(path.sep)
|
||||
? path.join(packagePath) : path.join(packagePath) + path.sep
|
||||
Object.keys(this.specByFilePath).forEach(filePath => {
|
||||
if (path.join(filePath).startsWith(packagePathWithSep)) {
|
||||
delete this.specByFilePath[filePath]
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// Wraps the transpiler in an object with the same interface
|
||||
|
||||
@@ -279,7 +279,7 @@ module.exports = document.registerElement('atom-workspace', {prototype: Workspac
|
||||
function isTab (element) {
|
||||
let el = element
|
||||
while (el != null) {
|
||||
if (el.getAttribute('is') === 'tabs-tab') { return true }
|
||||
if (el.getAttribute && el.getAttribute('is') === 'tabs-tab') return true
|
||||
el = el.parentElement
|
||||
}
|
||||
return false
|
||||
|
||||
Reference in New Issue
Block a user