Skip to content

Commit bfdc18b

Browse files
committed
refactor: move noDistractions default extensions to integrated extension
1 parent 272f554 commit bfdc18b

File tree

6 files changed

+28
-37
lines changed

6 files changed

+28
-37
lines changed

src/extensions/default/DefaultExtensions.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"LightTheme",
55
"CloseOthers",
66
"CodeFolding",
7-
"NoDistractions",
87
"CSSAtRuleCodeHints",
98
"CSSCodeHints",
109
"CSSPseudoSelectorHints",
@@ -20,7 +19,6 @@
2019
"JSHint",
2120
"MDNDocs",
2221
"NavigationAndHistory",
23-
"NoDistractions",
2422
"Phoenix",
2523
"Phoenix-prettier",
2624
"PrefsCodeHints",

src/extensions/default/NoDistractions/package.json

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

src/extensions/default/NoDistractions/requirejs-config.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/extensions/default/NoDistractions/unittests.js

Whitespace-only changes.

src/extensions/default/NoDistractions/main.js renamed to src/extensionsIntegrated/NoDistractions/main.js

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -24,32 +24,33 @@
2424
define(function (require, exports, module) {
2525

2626

27-
var Menus = brackets.getModule("command/Menus"),
28-
CommandManager = brackets.getModule("command/CommandManager"),
29-
Commands = brackets.getModule("command/Commands"),
30-
Strings = brackets.getModule("strings"),
31-
PreferencesManager = brackets.getModule("preferences/PreferencesManager"),
32-
ViewUtils = brackets.getModule("utils/ViewUtils"),
33-
KeyBindingManager = brackets.getModule("command/KeyBindingManager"),
34-
Metrics = brackets.getModule("utils/Metrics"),
35-
WorkspaceManager = brackets.getModule("view/WorkspaceManager");
27+
const AppInit = require("utils/AppInit"),
28+
Menus = require("command/Menus"),
29+
CommandManager = require("command/CommandManager"),
30+
Commands = require("command/Commands"),
31+
Strings = require("strings"),
32+
PreferencesManager = require("preferences/PreferencesManager"),
33+
ViewUtils = require("utils/ViewUtils"),
34+
KeyBindingManager = require("command/KeyBindingManager"),
35+
Metrics = require("utils/Metrics"),
36+
WorkspaceManager = require("view/WorkspaceManager");
3637

3738
// Constants
38-
var PREFS_PURE_CODE = "noDistractions",
39+
const PREFS_PURE_CODE = "noDistractions",
3940
CMD_TOGGLE_PURE_CODE = "view.togglePureCode",
4041
CMD_TOGGLE_FULLSCREEN = "view.toggleFullscreen",
4142
CMD_TOGGLE_PANELS = "view.togglePanels";
4243

4344
//key binding keys
44-
var togglePureCodeKey = "Ctrl-Shift-2",
45+
const togglePureCodeKey = "Ctrl-Shift-2",
4546
togglePureCodeKeyMac = "Cmd-Shift-2",
4647
togglePanelsKey = "Ctrl-Shift-1",
4748
togglePanelsKeyMac = "Cmd-Shift-1",
4849
togglePanelsKey_EN = "Ctrl-Shift-`",
4950
togglePanelsKeyMac_EN = "Cmd-Shift-`";
5051

5152
//locals
52-
var _previouslyOpenPanelIDs = [],
53+
let _previouslyOpenPanelIDs = [],
5354
panelsToggled = false,
5455
layoutUpdated = false;
5556

@@ -139,25 +140,12 @@ define(function (require, exports, module) {
139140
description: Strings.DESCRIPTION_PURE_CODING_SURFACE
140141
});
141142

142-
PreferencesManager.on("change", PREFS_PURE_CODE, function () {
143-
if (PreferencesManager.get(PREFS_PURE_CODE)) {
144-
ViewUtils.hideMainToolBar();
145-
CommandManager.execute(Commands.HIDE_SIDEBAR);
146-
_hidePanelsIfRequired();
147-
} else {
148-
ViewUtils.showMainToolBar();
149-
CommandManager.execute(Commands.SHOW_SIDEBAR);
150-
_showPanelsIfRequired();
151-
}
152-
_updateCheckedState();
153-
});
154-
155143
WorkspaceManager.on(WorkspaceManager.EVENT_WORKSPACE_PANEL_SHOWN, _updateLayout);
156144

157145
/**
158146
* Register the Commands , add the Menu Items and key bindings
159147
*/
160-
function initializeCommands() {
148+
AppInit.appReady(function () {
161149
CommandManager.register(Strings.CMD_TOGGLE_PURE_CODE, CMD_TOGGLE_PURE_CODE, _togglePureCode);
162150
CommandManager.register(Strings.CMD_TOGGLE_FULLSCREEN, CMD_TOGGLE_FULLSCREEN, _toggleFullScreen);
163151
CommandManager.register(Strings.CMD_TOGGLE_PANELS, CMD_TOGGLE_PANELS, _togglePanels);
@@ -172,8 +160,19 @@ define(function (require, exports, module) {
172160
//from IQE team than non-English keyboards does not have the ` char. So added one more shortcut ctrl+shift+1 which will be preferred
173161
KeyBindingManager.addBinding(CMD_TOGGLE_PANELS, [ {key: togglePanelsKey}, {key: togglePanelsKeyMac, platform: "mac"} ]);
174162
KeyBindingManager.addBinding(CMD_TOGGLE_PANELS, [ {key: togglePanelsKey_EN}, {key: togglePanelsKeyMac_EN, platform: "mac"} ]);
175-
}
176163

177-
initializeCommands();
164+
PreferencesManager.on("change", PREFS_PURE_CODE, function () {
165+
if (PreferencesManager.get(PREFS_PURE_CODE)) {
166+
ViewUtils.hideMainToolBar();
167+
CommandManager.execute(Commands.HIDE_SIDEBAR);
168+
_hidePanelsIfRequired();
169+
} else {
170+
ViewUtils.showMainToolBar();
171+
CommandManager.execute(Commands.SHOW_SIDEBAR);
172+
_showPanelsIfRequired();
173+
}
174+
_updateCheckedState();
175+
});
176+
});
178177

179178
});

src/extensionsIntegrated/loader.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,5 @@
3232
*/
3333
define(function (require, exports, module) {
3434
require("./InAppNotifications/main");
35+
require("./NoDistractions/main");
3536
});

0 commit comments

Comments
 (0)