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

Commit fbf6d92

Browse files
author
Marcel Gerber
committed
Merge remote-tracking branch 'upstream/master' into brackets-js-dependencies
Conflicts: src/brackets.js
2 parents ad8fd2d + 9ebc91b commit fbf6d92

149 files changed

Lines changed: 18553 additions & 16390 deletions

File tree

Some content is hidden

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

‎Gruntfile.js‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ module.exports = function (grunt) {
2525
'use strict';
2626

2727
// load dependencies
28-
require('load-grunt-tasks')(grunt, {pattern: ['grunt-contrib-*', 'grunt-targethtml', 'grunt-usemin']});
28+
require('load-grunt-tasks')(grunt, {pattern: ['grunt-contrib-*', 'grunt-targethtml', 'grunt-usemin', 'grunt-cleanempty']});
2929
grunt.loadTasks('tasks');
3030

3131
// Project configuration.
@@ -72,6 +72,8 @@ module.exports = function (grunt) {
7272
src: [
7373
'extensibility/node/**',
7474
'!extensibility/node/spec/**',
75+
'!extensibility/node/node_modules/**/{test,tst}/**/*',
76+
'!extensibility/node/node_modules/**/examples/**/*',
7577
'filesystem/impls/appshell/node/**',
7678
'!filesystem/impls/appshell/node/spec/**'
7779
]
@@ -82,15 +84,21 @@ module.exports = function (grunt) {
8284
dest: 'dist/',
8385
cwd: 'src/',
8486
src: [
87+
'extensions/default/**/*',
8588
'!extensions/default/*/unittest-files/**/*',
8689
'!extensions/default/*/unittests.js',
87-
'extensions/default/*/**/*',
90+
'!extensions/default/{*/thirdparty,**/node_modules}/**/test/**/*',
91+
'!extensions/default/{*/thirdparty,**/node_modules}/**/doc/**/*',
92+
'!extensions/default/{*/thirdparty,**/node_modules}/**/examples/**/*',
93+
'!extensions/default/*/thirdparty/**/*.htm{,l}',
8894
'extensions/dev/*',
8995
'extensions/samples/**/*',
9096
'thirdparty/CodeMirror2/addon/{,*/}*',
9197
'thirdparty/CodeMirror2/keymap/{,*/}*',
9298
'thirdparty/CodeMirror2/lib/{,*/}*',
9399
'thirdparty/CodeMirror2/mode/{,*/}*',
100+
'!thirdparty/CodeMirror2/mode/**/*.html',
101+
'!thirdparty/CodeMirror2/**/*test.js',
94102
'thirdparty/CodeMirror2/theme/{,*/}*',
95103
'thirdparty/i18n/*.js',
96104
'thirdparty/text/*.js'
@@ -106,6 +114,13 @@ module.exports = function (grunt) {
106114
]
107115
}
108116
},
117+
cleanempty: {
118+
options: {
119+
force: true,
120+
files: false
121+
},
122+
src: ['dist/**/*'],
123+
},
109124
less: {
110125
dist: {
111126
files: {
@@ -330,6 +345,7 @@ module.exports = function (grunt) {
330345
/*'cssmin',*/
331346
/*'uglify',*/
332347
'copy',
348+
'cleanempty',
333349
'usemin',
334350
'build-config'
335351
]);

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ back and forth between your real source code and the browser view.
1515
* **Do it yourself.** Because Brackets is open source, and built with HTML, CSS
1616
and JavaScript, you can [help build](https://github.com/adobe/brackets/blob/master/CONTRIBUTING.md) the best code editor for the web.
1717

18-
Brackets is at 1.0 and we're not stopping there. We have many feature ideas on our
18+
Brackets may have reached version 1, but we're not stopping there. We have many feature ideas on our
1919
[trello board](http://bit.ly/BracketsTrelloBoard) that we're anxious to add and other
2020
innovative web development workflows that we're planning to build into Brackets.
2121
So take Brackets out for a spin and let us know how we can make it your favorite editor.

‎package.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "Brackets",
3-
"version": "1.3.0-0",
4-
"apiVersion": "1.3.0",
3+
"version": "1.4.0-0",
4+
"apiVersion": "1.4.0",
55
"homepage": "http://brackets.io",
66
"issues": {
77
"url": "http://github.com/adobe/brackets/issues"
@@ -37,7 +37,8 @@
3737
"q": "0.9.2",
3838
"semver": "^4.1.0",
3939
"jshint": "2.1.4",
40-
"xmldoc": "^0.1.2"
40+
"xmldoc": "^0.1.2",
41+
"grunt-cleanempty": "1.0.3"
4142
},
4243
"scripts": {
4344
"postinstall": "grunt install",

‎samples/da/Kom godt i gang/index.html‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<head>
55
<meta charset="utf-8">
6-
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
6+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
77
<title>KOM GODT I GANG MED BRACKETS</title>
88
<meta name="description" content="En interaktiv guide til at komme godt i gang med Brackets.">
99
<link rel="stylesheet" href="main.css">
@@ -165,23 +165,23 @@ <h2>Bliv involveret</h2>
165165
</html>
166166
<!--
167167
168-
[[[[[[[[[[[[[[[ ]]]]]]]]]]]]]]]
169-
[:::::::::::::: ::::::::::::::]
170-
[:::::::::::::: ::::::::::::::]
171-
[::::::[[[[[[[: :]]]]]]]::::::]
172-
[:::::[ ]:::::]
173-
[:::::[ ]:::::]
174-
[:::::[ ]:::::]
175-
[:::::[ ]:::::]
176-
[:::::[ CODE THE WEB ]:::::]
177-
[:::::[ http://brackets.io ]:::::]
178-
[:::::[ ]:::::]
179-
[:::::[ ]:::::]
180-
[:::::[ ]:::::]
181-
[:::::[ ]:::::]
182-
[::::::[[[[[[[: :]]]]]]]::::::]
183-
[:::::::::::::: ::::::::::::::]
184-
[:::::::::::::: ::::::::::::::]
185-
[[[[[[[[[[[[[[[ ]]]]]]]]]]]]]]]
168+
[[[[[[[[[[[[[[[ ]]]]]]]]]]]]]]]
169+
[:::::::::::::: ::::::::::::::]
170+
[:::::::::::::: ::::::::::::::]
171+
[::::::[[[[[[[: :]]]]]]]::::::]
172+
[:::::[ ]:::::]
173+
[:::::[ ]:::::]
174+
[:::::[ ]:::::]
175+
[:::::[ ]:::::]
176+
[:::::[ CODE THE WEB ]:::::]
177+
[:::::[ http://brackets.io ]:::::]
178+
[:::::[ ]:::::]
179+
[:::::[ ]:::::]
180+
[:::::[ ]:::::]
181+
[:::::[ ]:::::]
182+
[::::::[[[[[[[: :]]]]]]]::::::]
183+
[:::::::::::::: ::::::::::::::]
184+
[:::::::::::::: ::::::::::::::]
185+
[[[[[[[[[[[[[[[ ]]]]]]]]]]]]]]]
186186
187187
-->

‎samples/de/Erste Schritte/index.html‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<head>
55
<meta charset="utf-8">
6-
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
6+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
77
<title>ERSTE SCHRITTE MIT BRACKETS</title>
88
<meta name="description" content="Ein interaktiver Wegweiser für die ersten Schritte mit Brackets.">
99
<link rel="stylesheet" href="main.css">
@@ -197,23 +197,23 @@ <h2>Machen Sie mit</h2>
197197
</html>
198198
<!--
199199
200-
[[[[[[[[[[[[[[[ ]]]]]]]]]]]]]]]
201-
[:::::::::::::: ::::::::::::::]
202-
[:::::::::::::: ::::::::::::::]
203-
[::::::[[[[[[[: :]]]]]]]::::::]
204-
[:::::[ ]:::::]
205-
[:::::[ ]:::::]
206-
[:::::[ ]:::::]
207-
[:::::[ ]:::::]
208-
[:::::[ CODE THE WEB ]:::::]
209-
[:::::[ http://brackets.io ]:::::]
210-
[:::::[ ]:::::]
211-
[:::::[ ]:::::]
212-
[:::::[ ]:::::]
213-
[:::::[ ]:::::]
214-
[::::::[[[[[[[: :]]]]]]]::::::]
215-
[:::::::::::::: ::::::::::::::]
216-
[:::::::::::::: ::::::::::::::]
217-
[[[[[[[[[[[[[[[ ]]]]]]]]]]]]]]]
200+
[[[[[[[[[[[[[[[ ]]]]]]]]]]]]]]]
201+
[:::::::::::::: ::::::::::::::]
202+
[:::::::::::::: ::::::::::::::]
203+
[::::::[[[[[[[: :]]]]]]]::::::]
204+
[:::::[ ]:::::]
205+
[:::::[ ]:::::]
206+
[:::::[ ]:::::]
207+
[:::::[ ]:::::]
208+
[:::::[ CODE THE WEB ]:::::]
209+
[:::::[ http://brackets.io ]:::::]
210+
[:::::[ ]:::::]
211+
[:::::[ ]:::::]
212+
[:::::[ ]:::::]
213+
[:::::[ ]:::::]
214+
[::::::[[[[[[[: :]]]]]]]::::::]
215+
[:::::::::::::: ::::::::::::::]
216+
[:::::::::::::: ::::::::::::::]
217+
[[[[[[[[[[[[[[[ ]]]]]]]]]]]]]]]
218218
219219
-->

‎samples/el/Getting Started/index.html‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<head>
55
<meta charset="utf-8">
6-
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
6+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
77
<title>ΞΕΚΙΝΩΝΤΑΣ ΜΕ ΤΟ BRACKETS</title>
88
<meta name="description" content="An interactive getting started guide for Brackets.">
99
<link rel="stylesheet" href="main.css">
@@ -165,23 +165,23 @@ <h2>Συμμετάσχετε</h2>
165165
</html>
166166
<!--
167167
168-
[[[[[[[[[[[[[[[ ]]]]]]]]]]]]]]]
169-
[:::::::::::::: ::::::::::::::]
170-
[:::::::::::::: ::::::::::::::]
171-
[::::::[[[[[[[: :]]]]]]]::::::]
172-
[:::::[ ]:::::]
173-
[:::::[ ]:::::]
174-
[:::::[ ]:::::]
175-
[:::::[ ]:::::]
176-
[:::::[ CODE THE WEB ]:::::]
177-
[:::::[ http://brackets.io ]:::::]
178-
[:::::[ ]:::::]
179-
[:::::[ ]:::::]
180-
[:::::[ ]:::::]
181-
[:::::[ ]:::::]
182-
[::::::[[[[[[[: :]]]]]]]::::::]
183-
[:::::::::::::: ::::::::::::::]
184-
[:::::::::::::: ::::::::::::::]
185-
[[[[[[[[[[[[[[[ ]]]]]]]]]]]]]]]
168+
[[[[[[[[[[[[[[[ ]]]]]]]]]]]]]]]
169+
[:::::::::::::: ::::::::::::::]
170+
[:::::::::::::: ::::::::::::::]
171+
[::::::[[[[[[[: :]]]]]]]::::::]
172+
[:::::[ ]:::::]
173+
[:::::[ ]:::::]
174+
[:::::[ ]:::::]
175+
[:::::[ ]:::::]
176+
[:::::[ CODE THE WEB ]:::::]
177+
[:::::[ http://brackets.io ]:::::]
178+
[:::::[ ]:::::]
179+
[:::::[ ]:::::]
180+
[:::::[ ]:::::]
181+
[:::::[ ]:::::]
182+
[::::::[[[[[[[: :]]]]]]]::::::]
183+
[:::::::::::::: ::::::::::::::]
184+
[:::::::::::::: ::::::::::::::]
185+
[[[[[[[[[[[[[[[ ]]]]]]]]]]]]]]]
186186
187187
-->

‎samples/es/Primeros Pasos/index.html‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<head>
55
<meta charset="utf-8">
6-
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
6+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
77
<title>PRIMEROS PASOS CON BRACKETS</title>
88
<meta name="description" content="Una guía interactiva de primeros pasos para Brackets.">
99
<link rel="stylesheet" href="main.css">
@@ -191,23 +191,23 @@ <h2>Involúcrate</h2>
191191
</html>
192192
<!--
193193
194-
[[[[[[[[[[[[[[[ ]]]]]]]]]]]]]]]
195-
[:::::::::::::: ::::::::::::::]
196-
[:::::::::::::: ::::::::::::::]
197-
[::::::[[[[[[[: :]]]]]]]::::::]
198-
[:::::[ ]:::::]
199-
[:::::[ ]:::::]
200-
[:::::[ ]:::::]
201-
[:::::[ ]:::::]
202-
[:::::[ CODE THE WEB ]:::::]
203-
[:::::[ http://brackets.io ]:::::]
204-
[:::::[ ]:::::]
205-
[:::::[ ]:::::]
206-
[:::::[ ]:::::]
207-
[:::::[ ]:::::]
208-
[::::::[[[[[[[: :]]]]]]]::::::]
209-
[:::::::::::::: ::::::::::::::]
210-
[:::::::::::::: ::::::::::::::]
211-
[[[[[[[[[[[[[[[ ]]]]]]]]]]]]]]]
194+
[[[[[[[[[[[[[[[ ]]]]]]]]]]]]]]]
195+
[:::::::::::::: ::::::::::::::]
196+
[:::::::::::::: ::::::::::::::]
197+
[::::::[[[[[[[: :]]]]]]]::::::]
198+
[:::::[ ]:::::]
199+
[:::::[ ]:::::]
200+
[:::::[ ]:::::]
201+
[:::::[ ]:::::]
202+
[:::::[ CODE THE WEB ]:::::]
203+
[:::::[ http://brackets.io ]:::::]
204+
[:::::[ ]:::::]
205+
[:::::[ ]:::::]
206+
[:::::[ ]:::::]
207+
[:::::[ ]:::::]
208+
[::::::[[[[[[[: :]]]]]]]::::::]
209+
[:::::::::::::: ::::::::::::::]
210+
[:::::::::::::: ::::::::::::::]
211+
[[[[[[[[[[[[[[[ ]]]]]]]]]]]]]]]
212212
213213
-->

‎samples/fa-ir/Getting Started/index.html‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html>
33
<head>
44
<meta charset="utf-8">
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
66
<title>شروع به کار با براکتس</title>
77
<meta name="description" content="تعاملی برای شروع به کار با براکتس.">
88
<link rel="stylesheet" href="main.css">
@@ -131,24 +131,25 @@ <h2>درگیر شدن</h2>
131131
</html>
132132
<!--
133133
134-
[[[[[[[[[[[[[[[ ]]]]]]]]]]]]]]]
135-
[:::::::::::::: ::::::::::::::]
136-
[:::::::::::::: ::::::::::::::]
137-
[::::::[[[[[[[: :]]]]]]]::::::]
138-
[:::::[ ]:::::]
139-
[:::::[ ]:::::]
140-
[:::::[ ]:::::]
141-
[:::::[ ]:::::]
142-
[:::::[ CODE THE WEB ]:::::]
143-
[:::::[ http://brackets.io ]:::::]
144-
[:::::[ ]:::::]
145-
[:::::[ ]:::::]
146-
[:::::[ ]:::::]
147-
[:::::[ ]:::::]
148-
[::::::[[[[[[[: :]]]]]]]::::::]
149-
[:::::::::::::: ::::::::::::::]
150-
[:::::::::::::: ::::::::::::::]
151-
[[[[[[[[[[[[[[[ ]]]]]]]]]]]]]]]
134+
[[[[[[[[[[[[[[[ ]]]]]]]]]]]]]]]
135+
[:::::::::::::: ::::::::::::::]
136+
[:::::::::::::: ::::::::::::::]
137+
[::::::[[[[[[[: :]]]]]]]::::::]
138+
[:::::[ ]:::::]
139+
[:::::[ ]:::::]
140+
[:::::[ ]:::::]
141+
[:::::[ ]:::::]
142+
[:::::[ CODE THE WEB ]:::::]
143+
[:::::[ http://brackets.io ]:::::]
144+
[:::::[ ]:::::]
145+
[:::::[ ]:::::]
146+
[:::::[ ]:::::]
147+
[:::::[ ]:::::]
148+
[::::::[[[[[[[: :]]]]]]]::::::]
149+
[:::::::::::::: ::::::::::::::]
150+
[:::::::::::::: ::::::::::::::]
151+
[[[[[[[[[[[[[[[ ]]]]]]]]]]]]]]]
152152
153153
-->
154+
154155
<!-- Last translated for 558502495dddd25974af9f4487f00a35e47dcfec -->

‎samples/fi/Aloitus/index.html‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<head>
55
<meta charset="utf-8">
6-
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
6+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
77
<title>BRACKETSIN KÄYTÖN ALOITUS</title>
88
<meta name="description" content="Vuorovaikutteinen aloitusopas Bracketsille.">
99
<link rel="stylesheet" href="main.css">
@@ -186,23 +186,23 @@ <h2>Lähde mukaan</h2>
186186
</html>
187187
<!--
188188
189-
[[[[[[[[[[[[[[[ ]]]]]]]]]]]]]]]
190-
[:::::::::::::: ::::::::::::::]
191-
[:::::::::::::: ::::::::::::::]
192-
[::::::[[[[[[[: :]]]]]]]::::::]
193-
[:::::[ ]:::::]
194-
[:::::[ ]:::::]
195-
[:::::[ ]:::::]
196-
[:::::[ ]:::::]
197-
[:::::[ CODE THE WEB ]:::::]
198-
[:::::[ http://brackets.io ]:::::]
199-
[:::::[ ]:::::]
200-
[:::::[ ]:::::]
201-
[:::::[ ]:::::]
202-
[:::::[ ]:::::]
203-
[::::::[[[[[[[: :]]]]]]]::::::]
204-
[:::::::::::::: ::::::::::::::]
205-
[:::::::::::::: ::::::::::::::]
206-
[[[[[[[[[[[[[[[ ]]]]]]]]]]]]]]]
189+
[[[[[[[[[[[[[[[ ]]]]]]]]]]]]]]]
190+
[:::::::::::::: ::::::::::::::]
191+
[:::::::::::::: ::::::::::::::]
192+
[::::::[[[[[[[: :]]]]]]]::::::]
193+
[:::::[ ]:::::]
194+
[:::::[ ]:::::]
195+
[:::::[ ]:::::]
196+
[:::::[ ]:::::]
197+
[:::::[ CODE THE WEB ]:::::]
198+
[:::::[ http://brackets.io ]:::::]
199+
[:::::[ ]:::::]
200+
[:::::[ ]:::::]
201+
[:::::[ ]:::::]
202+
[:::::[ ]:::::]
203+
[::::::[[[[[[[: :]]]]]]]::::::]
204+
[:::::::::::::: ::::::::::::::]
205+
[:::::::::::::: ::::::::::::::]
206+
[[[[[[[[[[[[[[[ ]]]]]]]]]]]]]]]
207207
208208
-->

0 commit comments

Comments
 (0)
⚡