maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix electron URLs

Browse source
This commit is contained in:
Martin Aeschlimann 2016-04-28 15:44:49 +02:00
parent 9610e70997
commit 5f6a60128d
5 changed files with 13 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
OSSREADME.json
View file

@ -2,7 +2,7 @@
[{
"name": "atom-brightray",
"repositoryURL": "https://github.com/atom/brightray",
"repositoryURL": "https://github.com/electron/brightray",
"license": "MIT",
"isProd": true
},
@ -46,7 +46,7 @@
"name": "libchromiumcontent",
"version": "49.0.2623.75",
"license": "MIT",
"repositoryURL": "https://github.com/atom/libchromiumcontent",
"repositoryURL": "https://github.com/electron/libchromiumcontent",
"isProd": true
},
{
@ -59,7 +59,7 @@
"name": "electron",
"version": "0.37.6",
"license": "MIT",
"repositoryURL": "https://github.com/atom/electron",
"repositoryURL": "https://github.com/electron/electron",
"isProd": true
},
{
@ -67,7 +67,7 @@
"version": "5.5.6",
"repositoryURL": "https://github.com/jrsoftware/issrc",
"isProd": true
},
}
// ----------------------------------------------------------
@ -75,64 +75,8 @@
// defining licenses for dependencies where licensing cannot
// be inferred by tooling:
{
// Reason: LICENSE file missing in repo
// SOURCE: https://github.com/isaacs/core-util-is/blob/master/lib/util.js
"name":"core-util-is",
"isLicense": true,
"licenseDetail": [
"Copyright Joyent, Inc. and other Node contributors.",
"",
"Permission is hereby granted, free of charge, to any person obtaining a",
"copy of this software and associated documentation files (the",
"\"Software\"), to deal in the Software without restriction, including",
"without limitation the rights to use, copy, modify, merge, publish,",
"distribute, sublicense, and/or sell copies of the Software, and to permit",
"persons to whom the Software is furnished to do so, subject to the",
"following conditions:",
"",
"The above copyright notice and this permission notice shall be included",
"in all copies or substantial portions of the Software.",
"",
"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS",
"OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF",
"MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN",
"NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,",
"DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR",
"OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE",
"USE OR OTHER DEALINGS IN THE SOFTWARE."
]
},
{
// Reason: windows-mutex is not public yet
// TODO: Remove once windows-mutex visibility is made public
"name": "windows-mutex",
"isLicense": true,
"licenseDetail": [
"The MIT License (MIT)",
"",
"Copyright (c) Microsoft Corporation",
"",
"Permission is hereby granted, free of charge, to any person obtaining a copy",
"of this software and associated documentation files (the \"Software\"), to deal",
"in the Software without restriction, including without limitation the rights",
"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
"copies of the Software, and to permit persons to whom the Software is",
"furnished to do so, subject to the following conditions:",
"",
"The above copyright notice and this permission notice shall be included in all",
"copies or substantial portions of the Software.",
"",
"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
"SOFTWARE."
]
},
{
/*{
// Reason: LICENSE file missing in repo
"name": "winreg",
"isLicense": true,
@ -163,31 +107,5 @@
"OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN",
"IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
]
},
{
// Reason: LICENSE file doesn't have Copyright statement
"name": "readdirp",
"isLicense": true,
"licenseDetail": [
"This software is released under the MIT license:",
"",
"Copyright (c) Thorsten Lorenz",
"",
"Permission is hereby granted, free of charge, to any person obtaining a copy of",
"this software and associated documentation files (the \"Software\"), to deal in",
"the Software without restriction, including without limitation the rights to",
"use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of",
"the Software, and to permit persons to whom the Software is furnished to do so,",
"subject to the following conditions:",
"",
"The above copyright notice and this permission notice shall be included in all",
"copies or substantial portions of the Software.",
"",
"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS",
"FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR",
"COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER",
"IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN",
"CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
]
}]
}*/
]

4
src/vs/base/common/keyCodes.ts
View file

@ -555,7 +555,7 @@ export class Keybinding {
/**
* This prints the binding in a format suitable for electron's accelerators.
* See https://github.com/atom/electron/blob/master/docs/api/accelerator.md
* See https://github.com/electron/electron/blob/master/docs/api/accelerator.md
*/
private static _toElectronAccelerator(value:number, Platform:ISimplifiedPlatform): string {
if (BinaryKeybindings.hasChord(value)) {
@ -744,7 +744,7 @@ export class Keybinding {
/**
* This prints the binding in a format suitable for electron's accelerators.
* See https://github.com/atom/electron/blob/master/docs/api/accelerator.md
* See https://github.com/electron/electron/blob/master/docs/api/accelerator.md
*/
public _toElectronAccelerator(Platform:ISimplifiedPlatform = defaultPlatform): string {
return Keybinding._toElectronAccelerator(this.value, Platform);

2
src/vs/workbench/electron-browser/window.ts
View file

@ -166,7 +166,7 @@ export class ElectronWindow {
return dialog.showSaveDialog(this.win, options, callback);
}
return dialog.showSaveDialog(this.win, options); // https://github.com/atom/electron/issues/4936
return dialog.showSaveDialog(this.win, options); // https://github.com/electron/electron/issues/4936
}
public setFullScreen(fullscreen: boolean): void {

2
src/vs/workbench/electron-main/menus.ts
View file

@ -122,7 +122,7 @@ export class VSCodeMenu {
// Due to limitations in Electron, it is not possible to update menu items dynamically. The suggested
// workaround from Electron is to set the application menu again.
// See also https://github.com/atom/electron/issues/846
// See also https://github.com/electron/electron/issues/846
//
// Run delayed to prevent updating menu while it is open
if (!this.isQuitting) {

2
src/vs/workbench/parts/files/electron-browser/textFileServices.ts
View file

@ -403,7 +403,7 @@ export class TextFileService extends AbstractTextFileService {
// Filters are working flaky in Electron and there are bugs. On Windows they are working
// somewhat but we see issues:
// - https://github.com/atom/electron/issues/3556
// - https://github.com/electron/electron/issues/3556
// - https://github.com/Microsoft/vscode/issues/451
// - Bug on Windows: When "All Files" is picked, the path gets an extra ".*"
// Until these issues are resolved, we disable the dialog file extension filtering.