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

Commit c9cfba6

Browse files
ficristoficristo
committed
Merge pull request #1 from adobe/master
merge master
2 parents f9cd4f7 + 11b663e commit c9cfba6

File tree

269 files changed

+27755
-18190
lines changed

Some content is hidden

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

269 files changed

+27755
-18190
lines changed

‎.brackets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
}
1616
},
1717
"path": {
18-
"src/thirdparty/CodeMirror2/**/*.js": {
18+
"src/thirdparty/CodeMirror/**/*.js": {
1919
"spaceUnits": 2,
2020
"linting.enabled": false
2121
},

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ Thumbs.db
2020

2121
/src/extensions/disabled
2222

23+
# ignore .disabled file for default extensions
24+
/src/extensions/default/*/.disabled
25+
2326
#OSX .DS_Store files
2427
.DS_Store
2528

@@ -34,3 +37,4 @@ Thumbs.db
3437

3538
# Files that can be automatically downloaded that we don't want to ship with our builds
3639
/src/extensibility/node/node_modules/request/tests/
40+

‎.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
[submodule "src/thirdparty/CodeMirror2"]
2-
path = src/thirdparty/CodeMirror2
1+
[submodule "src/thirdparty/CodeMirror"]
2+
path = src/thirdparty/CodeMirror
33
url = https://github.com/adobe/CodeMirror2.git
44
[submodule "src/thirdparty/path-utils"]
55
path = src/thirdparty/path-utils

‎.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
language: node_js
2+
sudo: false # use container-based Travis infrastructure
23
node_js:
34
- "0.10"
45
before_script:

‎Gruntfile.js

Lines changed: 31 additions & 14 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,8 +72,11 @@ 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/**',
76-
'!filesystem/impls/appshell/node/spec/**'
78+
'!filesystem/impls/appshell/node/spec/**',
79+
'search/node/**'
7780
]
7881
},
7982
/* extensions and CodeMirror modes */
@@ -82,16 +85,22 @@ module.exports = function (grunt) {
8285
dest: 'dist/',
8386
cwd: 'src/',
8487
src: [
88+
'extensions/default/**/*',
8589
'!extensions/default/*/unittest-files/**/*',
8690
'!extensions/default/*/unittests.js',
87-
'extensions/default/*/**/*',
91+
'!extensions/default/{*/thirdparty,**/node_modules}/**/test/**/*',
92+
'!extensions/default/{*/thirdparty,**/node_modules}/**/doc/**/*',
93+
'!extensions/default/{*/thirdparty,**/node_modules}/**/examples/**/*',
94+
'!extensions/default/*/thirdparty/**/*.htm{,l}',
8895
'extensions/dev/*',
8996
'extensions/samples/**/*',
90-
'thirdparty/CodeMirror2/addon/{,*/}*',
91-
'thirdparty/CodeMirror2/keymap/{,*/}*',
92-
'thirdparty/CodeMirror2/lib/{,*/}*',
93-
'thirdparty/CodeMirror2/mode/{,*/}*',
94-
'thirdparty/CodeMirror2/theme/{,*/}*',
97+
'thirdparty/CodeMirror/addon/{,*/}*',
98+
'thirdparty/CodeMirror/keymap/{,*/}*',
99+
'thirdparty/CodeMirror/lib/{,*/}*',
100+
'thirdparty/CodeMirror/mode/{,*/}*',
101+
'!thirdparty/CodeMirror/mode/**/*.html',
102+
'!thirdparty/CodeMirror/**/*test.js',
103+
'thirdparty/CodeMirror/theme/{,*/}*',
95104
'thirdparty/i18n/*.js',
96105
'thirdparty/text/*.js'
97106
]
@@ -106,6 +115,13 @@ module.exports = function (grunt) {
106115
]
107116
}
108117
},
118+
cleanempty: {
119+
options: {
120+
force: true,
121+
files: false
122+
},
123+
src: ['dist/**/*'],
124+
},
109125
less: {
110126
dist: {
111127
files: {
@@ -252,12 +268,12 @@ module.exports = function (grunt) {
252268
/* Keep in sync with test/SpecRunner.html dependencies */
253269
vendor : [
254270
'test/polyfills.js', /* For reference to why this polyfill is needed see Issue #7951. The need for this should go away once the version of phantomjs gets upgraded to 2.0 */
255-
'src/thirdparty/jquery-2.1.1.min.js',
256-
'src/thirdparty/CodeMirror2/lib/codemirror.js',
257-
'src/thirdparty/CodeMirror2/lib/util/dialog.js',
258-
'src/thirdparty/CodeMirror2/lib/util/searchcursor.js',
259-
'src/thirdparty/CodeMirror2/addon/edit/closetag.js',
260-
'src/thirdparty/CodeMirror2/addon/selection/active-line.js',
271+
'src/thirdparty/jquery-2.1.3.min.js',
272+
'src/thirdparty/CodeMirror/lib/codemirror.js',
273+
'src/thirdparty/CodeMirror/lib/util/dialog.js',
274+
'src/thirdparty/CodeMirror/lib/util/searchcursor.js',
275+
'src/thirdparty/CodeMirror/addon/edit/closetag.js',
276+
'src/thirdparty/CodeMirror/addon/selection/active-line.js',
261277
'src/thirdparty/mustache/mustache.js',
262278
'src/thirdparty/path-utils/path-utils.min',
263279
'src/thirdparty/less-1.7.5.min.js'
@@ -330,6 +346,7 @@ module.exports = function (grunt) {
330346
/*'cssmin',*/
331347
/*'uglify',*/
332348
'copy',
349+
'cleanempty',
333350
'usemin',
334351
'build-config'
335352
]);

‎README.md

Lines changed: 5 additions & 2 deletions
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.
@@ -107,10 +107,13 @@ Not sure you needed the exclamation point there, but we like your enthusiasm.
107107
(starting from "Development") list the features that we're currently working on.
108108
"Ready" shows what we'll be working on next.
109109
* Watch our [GitHub activity stream](https://github.com/adobe/brackets/pulse).
110+
* Watch our [Waffle Kanban board](https://waffle.io/adobe/brackets): Work items in [![Stories in Ready](https://badge.waffle.io/adobe/brackets.svg?label=ready&title=Ready)](http://waffle.io/adobe/brackets) are next. The entire development process is outlined in the [Developer Guide](https://github.com/adobe/brackets/wiki/Brackets-Developers-Guide).
110111

111112
#### Contact info
112113

114+
* **Slack:** [Brackets on Slack](https://brackets.slack.com) (You can join by [requesting an invite](https://brackets-slack.herokuapp.com/))
115+
* **Developers mailing list:** http://groups.google.com/group/brackets-dev
113116
* **Twitter:** [@brackets](https://twitter.com/brackets)
114117
* **Blog:** http://blog.brackets.io/
115118
* **IRC:** [#brackets on freenode](http://webchat.freenode.net/?channels=brackets)
116-
* **Developers mailing list:** http://groups.google.com/group/brackets-dev
119+

‎package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "Brackets",
3-
"version": "1.2.0-0",
4-
"apiVersion": "1.2.0",
3+
"version": "1.5.0-0",
4+
"apiVersion": "1.5.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",
@@ -49,4 +50,4 @@
4950
"url": "https://github.com/adobe/brackets/blob/master/LICENSE"
5051
}
5152
]
52-
}
53+
}

0 commit comments

Comments
 (0)