Skip to content

Commit bba1aa9

Browse files
RaymondLimRaymondLim
committed
Merge remote-tracking branch 'origin/master' into improved-color-picker
Conflicts: src/extensions/default/InlineColorEditor/ColorEditor.js src/extensions/default/InlineColorEditor/InlineColorEditor.js
2 parents c0e8cb7 + d6522da commit bba1aa9

File tree

1,298 files changed

+139610
-8246
lines changed

Some content is hidden

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

1,298 files changed

+139610
-8246
lines changed

‎.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Auto detect text files and perform LF normalization
2+
* text=auto

‎.gitignore

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@ Thumbs.db
22
src/brackets.css
33
src/brackets.min.css
44

5+
# ignore jenkins build info
6+
/build.prop
7+
8+
# ignore node_modules created by grunt, but not more deeply-nested node_modules
9+
/node_modules
10+
/npm-debug.log
11+
12+
513
# ignore everything in the dev extension directory EXCEPT the README
614
# (so that the directory is non-empty and can be in git)
715
src/extensions/dev/*
@@ -11,3 +19,10 @@ src/extensions/disabled
1119

1220
#OSX .DS_Store files
1321
.DS_Store
22+
23+
# unit test working directory
24+
test/temp
25+
test/results
26+
27+
# Netbeans
28+
/nbproject

‎.gitmodules

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,15 @@
44
[submodule "src/thirdparty/path-utils"]
55
path = src/thirdparty/path-utils
66
url = https://github.com/jblas/path-utils.git
7-
[submodule "src/thirdparty/jslint"]
8-
path = src/thirdparty/jslint
9-
url = https://github.com/douglascrockford/JSLint.git
107
[submodule "src/thirdparty/smart-auto-complete"]
118
path = src/thirdparty/smart-auto-complete
129
url = https://github.com/laktek/jQuery-Smart-Auto-Complete.git
1310
[submodule "src/thirdparty/mustache"]
1411
path = src/thirdparty/mustache
1512
url = https://github.com/janl/mustache.js.git
13+
[submodule "src/extensions/default/JavaScriptCodeHints/thirdparty/tern"]
14+
path = src/extensions/default/JavaScriptCodeHints/thirdparty/tern
15+
url = https://github.com/marijnh/tern.git
16+
[submodule "src/extensions/default/JavaScriptCodeHints/thirdparty/acorn"]
17+
path = src/extensions/default/JavaScriptCodeHints/thirdparty/acorn
18+
url = https://github.com/marijnh/acorn.git

‎.jshintrc

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
{
2+
"bitwise" : true,
3+
"curly" : true,
4+
"eqeqeq" : true,
5+
"forin" : true,
6+
"immed" : true,
7+
"latedef" : true,
8+
"newcap" : true,
9+
"noarg" : true,
10+
"noempty" : true,
11+
"nonew" : true,
12+
"plusplus" : true,
13+
"regexp" : true,
14+
"undef" : true,
15+
"strict" : true,
16+
"trailing" : false,
17+
18+
"asi" : false,
19+
"boss" : false,
20+
"debug" : false,
21+
"eqnull" : false,
22+
"es5" : false,
23+
"esnext" : false,
24+
"evil" : false,
25+
"expr" : false,
26+
"funcscope" : false,
27+
"globalstrict" : false,
28+
"iterator" : false,
29+
"lastsemic" : false,
30+
"laxbreak" : false,
31+
"laxcomma" : false,
32+
"loopfunc" : false,
33+
"multistr" : false,
34+
"onecase" : false,
35+
"proto" : false,
36+
"regexdash" : false,
37+
"scripturl" : false,
38+
"smarttabs" : false,
39+
"shadow" : false,
40+
"sub" : false,
41+
"supernew" : false,
42+
"validthis" : false,
43+
44+
"browser" : true,
45+
"couch" : false,
46+
"devel" : false,
47+
"dojo" : false,
48+
"jquery" : false,
49+
"mootools" : false,
50+
"node" : false,
51+
"nonstandard" : false,
52+
"prototypejs" : false,
53+
"rhino" : false,
54+
"wsh" : false,
55+
56+
"nomen" : false,
57+
"onevar" : false,
58+
"passfail" : false,
59+
"white" : false,
60+
61+
"maxerr" : 100,
62+
"predef" : [
63+
],
64+
"indent" : 4,
65+
"globals" : [
66+
"require",
67+
"define",
68+
"brackets",
69+
"$",
70+
"PathUtils",
71+
"window",
72+
"navigator",
73+
"Mustache"
74+
]
75+
}

‎.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
language: node_js
2+
node_js:
3+
- 0.8
4+
before_script:
5+
- npm install -g grunt-cli

‎CONTRIBUTING.md

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
###Curious to start contributing to Brackets?
2+
3+
4+
With this file we want to provide some general guidance how to contribute to Brackets - your [feedback](https://groups.google.com/forum/?fromgroups=#!topic/brackets-dev/yEsaied7Fq8) is very welcome.
5+
6+
Issues starting Brackets the first time? Please review the [Troubleshooting Page](https://github.com/adobe/brackets/wiki/Troubleshooting).
7+
8+
## Starter Bugs
9+
10+
If you need some inspiration for a **starter bug**, we have some for you either as [GitHub Issue](https://github.com/adobe/brackets/issues?labels=starter+bug&page=1&state=open) or on the [Trello Board](https://trello.com/board/brackets/4f90a6d98f77505d7940ce88) (there, choose on the right hand sidebar "Filter Cards" and then click on "Starter Feature").
11+
12+
## Getting Started
13+
14+
**Before you start coding**, post to the [brackets-dev Google group](http://groups.google.com/group/brackets-dev) or the [#brackets IRC channel on freenode](http://freenode.net) about what you're thinking of working on, so you can get early feedback.
15+
If you wouldn't chat about your idea that's cool too, but we may have to reject your pull request. This also provides you with an opportunity to find out what others including the core team are working on.
16+
17+
18+
Brackets is developed using Agile development methodologies, features are tracked as user stories on the [public Brackets backlog](http://bit.ly/BracketsBacklog). You may _vote_ on existing stories or find stories to work on with others.
19+
20+
1. Please sign the [Brackets Contributor License Agreement](http://dev.brackets.io/brackets-contributor-license-agreement.html). You must agree to and submit this before you can contribute to Brackets.
21+
22+
1. Please collaborate with others in providing and receiving guidance; the Brackets team made it a priority
23+
to look at pull requests daily, however depending on the feature priority, the complexity of a contribution,
24+
and available bandwidth we may not be able to work on it right away.
25+
26+
27+
## Making Changes
28+
If you use Brackets to edit Brackets, you can quickly reload the app itself by choosing Debug > Reload Brackets from the in-app menu.
29+
When coding, make sure to follow our [coding conventions](https://github.com/adobe/brackets/wiki/Brackets%20Coding%20Conventions).
30+
31+
32+
Before submitting any pull request, please make sure to:
33+
34+
1. read the following wiki page on GitHub: https://github.com/adobe/brackets/wiki/How-to-Hack-on-Brackets.
35+
1. merge from adobe/brackets master
36+
1. re-test your code after the merge
37+
1. run the unit tests with Debug > Run Tests -- everything should pass
38+
1. if your change is nontrivial or might have affected the UI, run through the [Brackets smoke tests](Brackets-Smoke-Tests) and possibly the [Brackets server smoke tests](Brackets-Server-Smoke-Tests).
39+
1. review the [Pull Request Checklist](https://github.com/adobe/brackets/wiki/Pull-Request-Checklist) for additional guidance.
40+
41+
## Reviewing Code, Committing
42+
43+
In general code reviews can be performed by anyone who knows his/her limits, is familiar with the feature area and the architecture,
44+
where the code, being reviewed, is added or altered.
45+
To submit changes one needs commit rights - those are limited to ensure sustainable high quality. Committers are tasked with taking
46+
a leading role in the project by making code contributions, assisting others with their contributions in the form
47+
of reviewing and merging pull requests, and providing feedback and suggestions on the direction of the project.
48+
49+
Please refer to the [Committer Policy](https://github.com/adobe/brackets/wiki/Brackets-Committer-Policy) for more information.
50+
If you want to perform reviews, but don't have commit rights yet, we encourage you to do so. Please add a note that you start reviewing.
51+
After you have finished your review ping us at IRC or leave a comment that your review has been completed. A committer will submit the pull request based on
52+
priority. If a pull request already shows an assignee, please check with him/her first.
53+
54+
##Additional Resources
55+
56+
* [the Brackets github issue tracker](https://github.com/adobe/brackets/issues)
57+
* [Brackets wiki](https://github.com/adobe/brackets/wiki/Resources)
58+
* [Contribute Page](http://brackets.io/contribute/)

‎Gruntfile.js

Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
1+
/*
2+
* Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved.
3+
*
4+
* Permission is hereby granted, free of charge, to any person obtaining a
5+
* copy of this software and associated documentation files (the "Software"),
6+
* to deal in the Software without restriction, including without limitation
7+
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
8+
* and/or sell copies of the Software, and to permit persons to whom the
9+
* Software is furnished to do so, subject to the following conditions:
10+
*
11+
* The above copyright notice and this permission notice shall be included in
12+
* all copies or substantial portions of the Software.
13+
*
14+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
19+
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20+
* DEALINGS IN THE SOFTWARE.
21+
*
22+
*/
23+
/*global module, require*/
24+
module.exports = function (grunt) {
25+
'use strict';
26+
27+
var common = require("./tasks/lib/common")(grunt);
28+
29+
// Project configuration.
30+
grunt.initConfig({
31+
pkg : grunt.file.readJSON("package.json"),
32+
meta : {
33+
src : [
34+
'src/**/*.js',
35+
'!src/thirdparty/**',
36+
'!src/widgets/bootstrap-*.js',
37+
'!src/extensions/**/unittest-files/**/*.js',
38+
'!src/extensions/**/thirdparty/**/*.js',
39+
'!src/extensions/dev/**',
40+
'!src/extensions/disabled/**',
41+
'!**/node_modules/**/*.js',
42+
'!src/**/*-min.js',
43+
'!src/**/*.min.js'
44+
],
45+
test : [
46+
'test/**/*.js',
47+
'!test/perf/*-files/**/*.js',
48+
'!test/spec/*-files/**/*.js',
49+
'!test/smokes/**',
50+
'!test/temp/**',
51+
'!test/thirdparty/**',
52+
'!test/**/node_modules/**/*.js'
53+
],
54+
grunt: [
55+
'Gruntfile.js',
56+
'tasks/**/*.js'
57+
],
58+
/* specs that can run in phantom.js */
59+
specs : [
60+
'test/spec/CommandManager-test.js',
61+
//'test/spec/LanguageManager-test.js',
62+
//'test/spec/PreferencesManager-test.js',
63+
'test/spec/ViewUtils-test.js'
64+
]
65+
},
66+
watch: {
67+
all : {
68+
files: ['**/*', '!**/node_modules/**'],
69+
tasks: ['jshint']
70+
},
71+
grunt : {
72+
files: ['<%= meta.grunt %>', 'tasks/**/*'],
73+
tasks: ['jshint:grunt']
74+
},
75+
src : {
76+
files: ['<%= meta.src %>', 'src/**/*'],
77+
tasks: ['jshint:src']
78+
},
79+
test : {
80+
files: ['<%= meta.test %>', 'test/**/*'],
81+
tasks: ['jshint:test']
82+
}
83+
},
84+
/* FIXME (jasonsanjose): how to handle extension tests */
85+
jasmine : {
86+
src : 'undefined.js', /* trick the default runner to run without importing src files */
87+
options : {
88+
junit : {
89+
path: 'test/results',
90+
consolidate: true
91+
},
92+
specs : '<%= meta.specs %>',
93+
/* Keep in sync with test/SpecRunner.html dependencies */
94+
vendor : [
95+
'src/thirdparty/jquery-1.7.js',
96+
'src/thirdparty/CodeMirror2/lib/codemirror.js',
97+
'src/thirdparty/CodeMirror2/lib/util/dialog.js',
98+
'src/thirdparty/CodeMirror2/lib/util/searchcursor.js',
99+
'src/thirdparty/CodeMirror2/addon/edit/closetag.js',
100+
'src/thirdparty/CodeMirror2/addon/selection/active-line.js',
101+
'src/thirdparty/mustache/mustache.js',
102+
'src/thirdparty/path-utils/path-utils.min',
103+
'src/thirdparty/less-1.3.0.min.js'
104+
],
105+
helpers : [
106+
'test/spec/PhantomHelper.js'
107+
],
108+
template : require('grunt-template-jasmine-requirejs'),
109+
templateOptions: {
110+
requireConfig : {
111+
baseUrl: 'src',
112+
paths: {
113+
'test' : '../test',
114+
'perf' : '../test/perf',
115+
'spec' : '../test/spec',
116+
'text' : 'thirdparty/text',
117+
'i18n' : 'thirdparty/i18n'
118+
}
119+
}
120+
}
121+
}
122+
},
123+
jshint: {
124+
all: [
125+
'<%= meta.grunt %>',
126+
'<%= meta.src %>',
127+
'<%= meta.test %>'
128+
],
129+
grunt: '<%= meta.grunt %>',
130+
src: '<%= meta.src %>',
131+
test: '<%= meta.test %>',
132+
/* use strict options to mimic JSLINT until we migrate to JSHINT in Brackets */
133+
options: {
134+
jshintrc: '.jshintrc'
135+
}
136+
},
137+
shell: {
138+
repo: grunt.option("shell-repo") || "../brackets-shell",
139+
mac: "<%= shell.repo %>/installer/mac/staging/<%= pkg.name %>.app",
140+
win: "<%= shell.repo %>/installer/win/staging/<%= pkg.name %>.exe"
141+
}
142+
});
143+
144+
// load dependencies
145+
grunt.loadTasks('tasks');
146+
grunt.loadNpmTasks('grunt-contrib-jasmine');
147+
grunt.loadNpmTasks('grunt-contrib-jshint');
148+
grunt.loadNpmTasks('grunt-contrib-watch');
149+
150+
// task: install
151+
grunt.registerTask('install', ['write-config']);
152+
153+
// task: test
154+
//grunt.registerTask('test', ['jshint', 'jasmine']);
155+
grunt.registerTask('test', ['jshint']);
156+
157+
// task: set-sprint
158+
// Update sprint number in package.json and rewrite src/config.json
159+
grunt.registerTask('set-sprint', ['update-sprint-number', 'write-config']);
160+
161+
// Default task.
162+
grunt.registerTask('default', ['test']);
163+
};

0 commit comments

Comments
 (0)