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

Commit bebb6cf

Browse files
jasonsanjosejasonsanjose
committed
Merge branch 'master' into dk/less-refactoring
Conflicts: src/file/FileUtils.js
2 parents 1c8a15d + 30c2751 commit bebb6cf

File tree

34 files changed

+7889
-196
lines changed

34 files changed

+7889
-196
lines changed

‎.gitignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Thumbs.db
2-
node_modules
3-
npm-debug.log
2+
/node_modules
3+
/npm-debug.log
44
src/brackets.css
55
src/brackets.min.css
66

‎Gruntfile.js‎

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,26 @@
1-
/*global module, require*/
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*/
224
module.exports = function (grunt) {
325
'use strict';
426

@@ -10,6 +32,7 @@ module.exports = function (grunt) {
1032
'!src/thirdparty/**',
1133
'!src/widgets/bootstrap-*.js',
1234
'!src/extensions/**/unittest-files/**/*.js',
35+
'!src/extensions/**/thirdparty/**/*.js',
1336
'!src/extensions/dev/**',
1437
'!src/extensions/disabled/**',
1538
'!src/**/*-min.js',
@@ -82,31 +105,21 @@ module.exports = function (grunt) {
82105
});
83106

84107
// load dependencies
108+
grunt.loadTasks('tasks');
85109
grunt.loadNpmTasks('grunt-contrib-jasmine');
86110
grunt.loadNpmTasks('grunt-contrib-jshint');
87111
grunt.loadNpmTasks('grunt-contrib-watch');
88112

89113
// task: install
90114
grunt.registerTask('install', ['write-config']);
91115

92-
// task: write-config
93-
// merge package.json and src/brackets.config.json into src/config.json
94-
grunt.registerTask('write-config', function () {
95-
var packageJSON = grunt.file.readJSON("package.json"),
96-
appConfigJSON = grunt.file.readJSON("src/brackets.config.json");
97-
98-
Object.keys(packageJSON).forEach(function (key) {
99-
if (appConfigJSON[key] === undefined) {
100-
appConfigJSON[key] = packageJSON[key];
101-
}
102-
});
103-
104-
grunt.file.write("src/config.json", JSON.stringify(appConfigJSON, null, " "));
105-
});
106-
107116
// task: test
108117
grunt.registerTask('test', ['jshint', 'jasmine']);
109118

119+
// task: set-sprint
120+
// Update sprint number in package.json and rewrite src/config.json
121+
grunt.registerTask('set-sprint', ['update-sprint-number', 'write-config']);
122+
110123
// Default task.
111124
grunt.registerTask('default', ['test']);
112125
};

‎package.json‎

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,26 @@
11
{
2-
"name" : "Brackets",
3-
"version" : "0.20.0-0",
4-
"homepage" : "http://brackets.io",
5-
"issues" :
6-
{
7-
"url" : "http://github.com/adobe/brackets/issues"
2+
"name": "Brackets",
3+
"version": "0.21.0-0",
4+
"homepage": "http://brackets.io",
5+
"issues": {
6+
"url": "http://github.com/adobe/brackets/issues"
87
},
9-
"repository" :
10-
{
11-
"type" : "git",
12-
"url" : "https://github.com/adobe/brackets.git",
13-
"branch" : "",
14-
"SHA" : ""
8+
"repository": {
9+
"type": "git",
10+
"url": "https://github.com/adobe/brackets.git",
11+
"branch": "",
12+
"SHA": ""
1513
},
16-
"devDependencies" :
17-
{
18-
"grunt" : ">=0.4.0rc5",
19-
"grunt-cli" : ">=0.1.6",
20-
"grunt-contrib-jshint" : ">=0.1.1rc6",
21-
"grunt-contrib-watch" : ">=0.2.0rc5",
22-
"grunt-contrib-jasmine" : ">=0.3.0rc7",
23-
"grunt-template-jasmine-requirejs" : ">=0.1.0"
14+
"devDependencies": {
15+
"grunt": "~0.4.0",
16+
"grunt-cli": "~0.1.0",
17+
"grunt-contrib-jshint": "~0.2.0",
18+
"grunt-contrib-watch": "~0.2.0",
19+
"grunt-contrib-jasmine": "~0.3.0",
20+
"grunt-template-jasmine-requirejs": "~0.1.0"
2421
},
25-
"scripts" :
26-
{
27-
"postinstall" : "grunt install",
28-
"test" : "grunt test"
22+
"scripts": {
23+
"postinstall": "grunt install",
24+
"test": "grunt test"
2925
}
30-
}
26+
}

‎src/base-config/keyboard.json‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -221,24 +221,6 @@
221221
"displayKey": "Alt-↓"
222222
}
223223
],
224-
"debug.showDeveloperTools": [
225-
{
226-
"key": "F12"
227-
},
228-
{
229-
"key": "Cmd-Opt-I",
230-
"platform": "mac"
231-
}
232-
],
233-
"debug.refreshWindow": [
234-
{
235-
"key": "F5"
236-
},
237-
{
238-
"key": "Cmd-R",
239-
"platform": "mac"
240-
}
241-
],
242224
"file.rename": [
243225
"F2"
244226
]

‎src/brackets.config.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"app_title" : "Brackets",
55
"app_name_about" : "Brackets",
66
"about_icon" : "styles/images/brackets_icon.svg",
7-
"show_debug_menu" : true,
87
"enable_jslint" : true,
98
"update_info_url" : "http://dev.brackets.io/updates/stable/",
109
"how_to_use_url" : "https://github.com/adobe/brackets/wiki/How-to-Use-Brackets",

‎src/brackets.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ define(function (require, exports, module) {
9898
require("document/ChangedDocumentTracker");
9999
require("editor/EditorCommandHandlers");
100100
require("view/ViewCommandHandlers");
101-
require("debug/DebugCommandHandlers");
102101
require("help/HelpCommandHandlers");
103102
require("search/FindInFiles");
104103
require("search/FindReplace");

‎src/command/Commands.js‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -95,17 +95,6 @@ define(function (require, exports, module) {
9595
exports.QUICK_EDIT_NEXT_MATCH = "navigate.nextMatch";
9696
exports.QUICK_EDIT_PREV_MATCH = "navigate.previousMatch";
9797

98-
// Debug
99-
exports.DEBUG_REFRESH_WINDOW = "debug.refreshWindow"; // string must MATCH string in native code (brackets_extensions)
100-
exports.DEBUG_SHOW_DEVELOPER_TOOLS = "debug.showDeveloperTools";
101-
exports.DEBUG_RUN_UNIT_TESTS = "debug.runUnitTests";
102-
exports.DEBUG_SHOW_PERF_DATA = "debug.showPerfData";
103-
exports.DEBUG_NEW_BRACKETS_WINDOW = "debug.newBracketsWindow";
104-
exports.DEBUG_SWITCH_LANGUAGE = "debug.switchLanguage";
105-
exports.DEBUG_ENABLE_NODE_DEBUGGER = "debug.enableNodeDebugger";
106-
exports.DEBUG_LOG_NODE_STATE = "debug.logNodeState";
107-
exports.DEBUG_RESTART_NODE = "debug.restartNode";
108-
10998
// Help
11099
exports.HELP_CHECK_FOR_UPDATE = "help.checkForUpdate";
111100
exports.HELP_HOW_TO_USE_BRACKETS = "help.howToUseBrackets";

‎src/command/KeyBindingManager.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323

2424

25-
/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50, regexp: true */
25+
/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50, regexp: true, boss: true */
2626
/*global define, $, brackets, window */
2727

2828
/**

‎src/command/Menus.js‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ define(function (require, exports, module) {
4848
EDIT_MENU : "edit-menu",
4949
VIEW_MENU : "view-menu",
5050
NAVIGATE_MENU : "navigate-menu",
51-
DEBUG_MENU : "debug-menu", // Note: not present in some configurations of Brackets (getMenu() will return null)
5251
HELP_MENU : "help-menu"
5352
};
5453

@@ -1074,25 +1073,6 @@ define(function (require, exports, module) {
10741073
menu.addMenuItem(Commands.QUICK_EDIT_PREV_MATCH);
10751074
menu.addMenuItem(Commands.QUICK_EDIT_NEXT_MATCH);
10761075

1077-
/*
1078-
* Debug menu
1079-
*/
1080-
if (brackets.config.show_debug_menu) {
1081-
menu = addMenu(Strings.DEBUG_MENU, AppMenuBar.DEBUG_MENU);
1082-
menu.addMenuItem(Commands.DEBUG_SHOW_DEVELOPER_TOOLS);
1083-
menu.addMenuItem(Commands.DEBUG_REFRESH_WINDOW);
1084-
menu.addMenuItem(Commands.DEBUG_NEW_BRACKETS_WINDOW);
1085-
menu.addMenuDivider();
1086-
menu.addMenuItem(Commands.DEBUG_SWITCH_LANGUAGE);
1087-
menu.addMenuDivider();
1088-
menu.addMenuItem(Commands.DEBUG_RUN_UNIT_TESTS);
1089-
menu.addMenuItem(Commands.DEBUG_SHOW_PERF_DATA);
1090-
menu.addMenuDivider();
1091-
menu.addMenuItem(Commands.DEBUG_ENABLE_NODE_DEBUGGER);
1092-
menu.addMenuItem(Commands.DEBUG_LOG_NODE_STATE);
1093-
menu.addMenuItem(Commands.DEBUG_RESTART_NODE);
1094-
}
1095-
10961076
/*
10971077
* Help menu
10981078
*/

‎src/config.json‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"app_title": "Brackets",
44
"app_name_about": "Brackets",
55
"about_icon": "styles/images/brackets_icon.svg",
6-
"show_debug_menu": true,
76
"enable_jslint": true,
87
"update_info_url": "http://dev.brackets.io/updates/stable/",
98
"how_to_use_url": "https://github.com/adobe/brackets/wiki/How-to-Use-Brackets",
@@ -15,7 +14,7 @@
1514
"twitter_name": "@brackets"
1615
},
1716
"name": "Brackets",
18-
"version": "0.20.0-0",
17+
"version": "0.21.0-0",
1918
"homepage": "http://brackets.io",
2019
"issues": {
2120
"url": "http://github.com/adobe/brackets/issues"
@@ -27,12 +26,12 @@
2726
"SHA": ""
2827
},
2928
"devDependencies": {
30-
"grunt": ">=0.4.0rc5",
31-
"grunt-cli": ">=0.1.6",
32-
"grunt-contrib-jshint": ">=0.1.1rc6",
33-
"grunt-contrib-watch": ">=0.2.0rc5",
34-
"grunt-contrib-jasmine": ">=0.3.0rc7",
35-
"grunt-template-jasmine-requirejs": ">=0.1.0"
29+
"grunt": "~0.4.0",
30+
"grunt-cli": "~0.1.0",
31+
"grunt-contrib-jshint": "~0.2.0",
32+
"grunt-contrib-watch": "~0.2.0",
33+
"grunt-contrib-jasmine": "~0.3.0",
34+
"grunt-template-jasmine-requirejs": "~0.1.0"
3635
},
3736
"scripts": {
3837
"postinstall": "grunt install",

0 commit comments

Comments
 (0)