Skip to content
This repository was archived by the owner on Sep 2, 2021. It is now read-only.

Commit 0ad2696

Browse files
authored
Merge pull request #592 from adobe/master
Merge master into release for 1.8 release
2 parents 2656b61 + 22645c0 commit 0ad2696

File tree

396 files changed

+17558
-33466
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

396 files changed

+17558
-33466
lines changed

.brackets.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"jslint.options": {
3+
"vars": true,
4+
"plusplus": true,
5+
"node": true,
6+
"browser": false,
7+
"devel": true,
8+
"nomen": true,
9+
"indent": 4,
10+
"maxerr": 50,
11+
"regexp": true,
12+
"es5": true
13+
},
14+
"defaultExtension": "js",
15+
"language": {
16+
"javascript": {
17+
"linting.prefer": ["ESLint", "JSLint"],
18+
"linting.usePreferredOnly": true
19+
}
20+
},
21+
"spaceUnits": 4,
22+
"useTabChar": false
23+
}

.eslintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Third party modules
2+
**/thirdparty/**

.eslintrc.json

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
{
2+
"env": {
3+
"node": true
4+
},
5+
"rules": {
6+
"no-bitwise": 2,
7+
"curly": 2,
8+
"eqeqeq": 2,
9+
"guard-for-in": 2,
10+
"wrap-iife": [2, "outside"],
11+
"no-use-before-define": 2,
12+
"new-cap": 2,
13+
"no-caller": 2,
14+
"no-empty": 2,
15+
"no-new": 2,
16+
"no-invalid-regexp": 2,
17+
"no-control-regex": 2,
18+
"no-regex-spaces": 2,
19+
"no-undef": 2,
20+
"strict": 2,
21+
"no-unused-vars": [2, {"vars": "all", "args": "none"}],
22+
"semi": 2,
23+
24+
"no-iterator": 2,
25+
"no-loop-func": 2,
26+
"no-multi-str": 2,
27+
"no-fallthrough": 2,
28+
"no-proto": 2,
29+
"no-script-url": 2,
30+
"no-shadow": 0,
31+
"no-shadow-restricted-names": 2,
32+
"no-new-func": 2,
33+
"no-new-wrappers": 2,
34+
"no-new-require": 2,
35+
"new-parens": 2,
36+
"no-new-object": 2,
37+
"no-invalid-this": 2,
38+
"indent": [2, 4],
39+
40+
"valid-jsdoc": 0,
41+
"valid-typeof": 2,
42+
43+
"no-trailing-spaces": [2, { "skipBlankLines": true }],
44+
"eol-last": 2
45+
}
46+
}

.gitignore

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,15 @@ xcodebuild/*
66
/npm-debug.log
77
/downloads
88

9-
appshell.xcodeproj
10-
Brackets.vcxproj
11-
appshell.sln
12-
libcef_dll_wrapper.vcxproj
9+
*.xcodeproj
10+
*.VC.db
11+
*.VC.VC.opendb
12+
.vs/
13+
.vscode/
14+
*.vcxproj
15+
*.vcxproj.filters
16+
*.vcxproj.user
17+
*.sln
1318

1419
*.pbxuser
1520
*.perspective
@@ -24,18 +29,17 @@ libcef_dll_wrapper.vcxproj
2429
*.sdf
2530
*.opensdf
2631
*.suo
27-
*.vcxproj.filters
28-
*.vcxproj.user
2932
*.log
3033
*.dmg
3134

32-
Debug
33-
Release
34-
Resources
35-
deps
36-
include
35+
/Debug
36+
/Release
37+
/Resources
38+
/deps
39+
/include
3740
ipch
38-
libcef_dll
41+
/libcef_dll
42+
/out
3943
tools
4044

4145
/installer/mac/staging/
@@ -51,8 +55,7 @@ fr-fr.mst
5155
appshell_extensions_js.o
5256
Makefile
5357
appshell.Makefile
54-
Brackets.target.mk
55-
libcef_dll_wrapper.target.mk
58+
*.target.mk
5659
appshell/gtk
5760
appshell/gtk/*
5861

.jshintrc

Lines changed: 0 additions & 75 deletions
This file was deleted.

Gruntfile.js

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved.
2+
* Copyright (c) 2013 - present Adobe Systems Incorporated. All rights reserved.
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a
55
* copy of this software and associated documentation files (the "Software"),
@@ -20,13 +20,11 @@
2020
* DEALINGS IN THE SOFTWARE.
2121
*
2222
*/
23-
/*jslint regexp:true*/
24-
/*global module, require, process*/
25-
module.exports = function (grunt) {
26-
"use strict";
2723

24+
"use strict";
25+
26+
module.exports = function (grunt) {
2827
var common = require("./tasks/common")(grunt),
29-
resolve = common.resolve,
3028
platform = common.platform(),
3129
staging;
3230

@@ -71,7 +69,7 @@ module.exports = function (grunt) {
7169
},
7270
"node-mac": {
7371
"dest" : "<%= downloads %>",
74-
"src" : "http://nodejs.org/dist/v<%= node.version %>/node-v<%= node.version %>-darwin-x86.tar.gz"
72+
"src" : "http://nodejs.org/dist/v<%= node.version %>/node-v<%= node.version %>-darwin-x64.tar.gz"
7573
},
7674
/* win */
7775
"cef-win": {
@@ -84,8 +82,9 @@ module.exports = function (grunt) {
8482
},
8583
"node-win": {
8684
"dest" : "<%= downloads %>",
87-
"src" : ["http://nodejs.org/dist/v<%= node.version %>/node.exe",
88-
"http://nodejs.org/dist/npm/npm-<%= npm.version %>.zip"]
85+
"src" : process.arch === "x64" ?
86+
"http://nodejs.org/dist/v<%= node.version %>/win-x64/node.exe" :
87+
"http://nodejs.org/dist/v<%= node.version %>/win-x86/node.exe"
8988
}
9089
},
9190
"clean": {
@@ -160,7 +159,10 @@ module.exports = function (grunt) {
160159
"Brackets",
161160
"Brackets-node",
162161
"cef.pak",
163-
"devtools_resources.pak"
162+
"cef_100_percent.pak",
163+
"cef_200_percent.pak",
164+
"devtools_resources.pak",
165+
"icudtl.dat",
164166
],
165167
"dest" : "<%= build.staging %>"
166168
},
@@ -204,10 +206,14 @@ module.exports = function (grunt) {
204206
"dest" : "deps/cef"
205207
}
206208
},
207-
"jshint": {
208-
"all" : ["Gruntfile.js", "tasks/**/*.js"],
209+
"eslint": {
210+
"all" : [
211+
"Gruntfile.js",
212+
"tasks/**/*.js",
213+
"appshell/node-core/*.js"
214+
],
209215
"options": {
210-
"jshintrc" : ".jshintrc"
216+
"quiet" : true
211217
}
212218
},
213219
"build": {
@@ -229,15 +235,12 @@ module.exports = function (grunt) {
229235
"version" : "3.2623.1397"
230236
},
231237
"node": {
232-
"version" : "0.10.24"
233-
},
234-
"npm": {
235-
"version" : "1.2.11"
238+
"version" : "6.3.1"
236239
}
237240
});
238241

239242
grunt.loadTasks("tasks");
240-
grunt.loadNpmTasks("grunt-contrib-jshint");
243+
grunt.loadNpmTasks("grunt-eslint");
241244
grunt.loadNpmTasks("grunt-contrib-copy");
242245
grunt.loadNpmTasks("grunt-contrib-clean");
243246
grunt.loadNpmTasks("grunt-curl");

LICENSE

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
Copyright (c) 2012 - present Adobe Systems Incorporated. All rights reserved.
2-
2+
33
Permission is hereby granted, free of charge, to any person obtaining a
4-
copy of this software and associated documentation files (the "Software"),
5-
to deal in the Software without restriction, including without limitation
6-
the rights to use, copy, modify, merge, publish, distribute, sublicense,
7-
and/or sell copies of the Software, and to permit persons to whom the
4+
copy of this software and associated documentation files (the "Software"),
5+
to deal in the Software without restriction, including without limitation
6+
the rights to use, copy, modify, merge, publish, distribute, sublicense,
7+
and/or sell copies of the Software, and to permit persons to whom the
88
Software is furnished to do so, subject to the following conditions:
9-
9+
1010
The above copyright notice and this permission notice shall be included in
1111
all copies or substantial portions of the Software.
12-
12+
1313
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
14+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1515
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
18-
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
16+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
18+
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
1919
DEALINGS IN THE SOFTWARE.

0 commit comments

Comments
 (0)