Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/LiveDevelopment/BrowserScripts/RemoteFunctions.js
Original file line number Diff line number Diff line change
Expand Up @@ -1605,12 +1605,12 @@ function RemoteFunctions(config = {}) {

function _handleEscapeKeyPress() {
enableHoverListeners(); // so that if hover lock is there it will get cleared
dismissUIAndCleanupState();
getAllToolHandlers().forEach(handler => {
if (handler.handleEscapePress) {
handler.handleEscapePress();
}
});
dismissUIAndCleanupState();
}

// Modifier shortcuts forwarded to the Phoenix KeyBindingManager. Clipboard
Expand Down
2 changes: 1 addition & 1 deletion src/LiveDevelopment/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ define(function main(require, exports, module) {
elemHighlights: CONSTANTS.HIGHLIGHT_HOVER, // default value, this will get updated when the extension loads
showRulerLines: false, // default value, this will get updated when the extension loads
showStylesBar: true, // default value, this will get updated when the extension loads
stylesBarPosition: "", // saved bar position ("<cx>:<cy>"); empty = default spot
stylesBarPosition: "", // saved dock side ("top"/"bottom"); empty = default bottom
syncSourceAndPreview: true, // default value, this will get updated when the extension loads
imageGalleryAutoOpen: true, // auto-open gallery on first image click per session
isPaidUser: false, // will be updated when we fetch entitlements
Expand Down
4 changes: 3 additions & 1 deletion src/nls/root/strings.js
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,8 @@ define({
"LIVE_DEV_STYLER_SPACING": "Margin & padding",
"LIVE_DEV_STYLER_LAYOUT": "Layout",
"LIVE_DEV_STYLER_TEXT_STYLE": "Text style",
"LIVE_DEV_STYLER_DOCK_TOP": "Dock to top",
"LIVE_DEV_STYLER_DOCK_BOTTOM": "Dock to bottom",
"LIVE_DEV_STYLER_RESET": "Reset changes",
"LIVE_DEV_STYLER_NOTHING_TO_RESET": "No changes to reset",
"LIVE_DEV_STYLER_OVERRIDDEN": "This change is overridden by a more specific rule",
Expand Down Expand Up @@ -390,7 +392,7 @@ define({
"LIVE_DEV_STYLER_STATE_NORMAL": "Normal",
"LIVE_DEV_STYLER_STATE_BANNER": "Editing the {0} state — changes apply only to {0}",
"LIVE_DEV_STYLER_STATE_EXIT": "Exit",
"LIVE_DEV_STYLER_STATE_NO_BASE": "Add a class or id to this element first so the state has somewhere to live",
"LIVE_DEV_STYLER_STATE_NO_BASE": "States can't be applied to inline styles",
"LIVE_DEV_STYLER_STATE_HOVER": "Hover",
"LIVE_DEV_STYLER_STATE_FOCUS": "Focus",
"LIVE_DEV_STYLER_STATE_ACTIVE": "Active",
Expand Down
Loading