Skip to content
This repository has been archived by the owner on Jan 11, 2023. It is now read-only.

Commit

Permalink
9-27 update (#4193)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jasonLaster
jasonLaster authored Sep 29, 2017
1 parent 8bbb8c9 commit 9fe3c95
Show file tree
Hide file tree
Showing 5 changed files with 189 additions and 101 deletions.
55 changes: 53 additions & 2 deletions assets/module-manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19993,7 +19993,22 @@
"../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../devtools-source-map/node_modules/devtools-utils/src/privileged-network-request.js": 1166,
"../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../devtools-source-map/node_modules/devtools-utils/src/worker-utils.js": 1168,
"../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../../src/utils/function.js": 1169,
"../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../../src/utils/parser/sources.js": 1171
"../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../../src/utils/parser/sources.js": 1171,
"../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../devtools-source-map/src/utils/index.js": 1172,
"../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../../src/reducers/debuggee.js": 1175,
"../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../../src/reducers/source-tree.js": 1176,
"../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../../src/utils/expressions.js": 1177,
"../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../../src/actions/source-tree.js": 1178,
"../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../../src/actions/debuggee.js": 1179,
"../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../../src/actions/toolbox.js": 1180,
"../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../../src/components/ShortcutsModal.js": 1181,
"../../extract-text-webpack-plugin/dist/loader.js??ref--5-0!../node_modules/style-loader/index.js!../../css-loader/index.js??ref--5-2!../../../src/components/ShortcutsModal.css": 1182,
"../../svg-inline-loader/index.js!../../../assets/images/shortcut.svg": 1183,
"../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../../src/components/ProjectSearch/textSearch/utils/highlight.js": 1184,
"../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../../src/components/SecondaryPanes/UtilsBar.js": 1185,
"../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../../src/utils/parser/getScopes.js": 1186,
"../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../devtools-map-bindings/src/parser.js": 1187,
"../../css-loader/index.js?{\"importLoaders\":1}!../../../src/components/ShortcutsModal.css": 1188
},
"usedIds": {
"0": 0,
Expand Down Expand Up @@ -21168,8 +21183,23 @@
"1169": 1169,
"1170": 1170,
"1171": 1171,
"1172": 1172,
"1173": 1173,
"1174": 1174
"1174": 1174,
"1175": 1175,
"1176": 1176,
"1177": 1177,
"1178": 1178,
"1179": 1179,
"1180": 1180,
"1181": 1181,
"1182": 1182,
"1183": 1183,
"1184": 1184,
"1185": 1185,
"1186": 1186,
"1187": 1187,
"1188": 1188
}
},
"chunks": {
Expand Down Expand Up @@ -24338,5 +24368,26 @@
}
}
}
],
"extract-text-webpack-plugin ../../extract-text-webpack-plugin/dist ../../css-loader/index.js??ref--5-2!../../../src/components/ShortcutsModal.css": [
{
"modules": {
"byIdentifier": {
"../../css-loader/index.js?{\"importLoaders\":1}!../../../src/components/ShortcutsModal.css": 0,
"../../css-loader/lib/css-base.js": 1
},
"usedIds": {
"0": 0,
"1": 1
}
},
"chunks": {
"byName": {},
"byBlocks": {},
"usedIds": {
"1": 1
}
}
}
]
}
22 changes: 22 additions & 0 deletions assets/panel/debugger.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,28 @@ breakpointMenuItem.addCondition2.label=Add condition
breakpointMenuItem.addCondition2.accesskey=A
breakpointMenuItem.editCondition2.label=Edit condition
breakpointMenuItem.editCondition2.accesskey=n
breakpointMenuItem.enableSelf=Enable breakpoint
breakpointMenuItem.enableSelf.accesskey=E
breakpointMenuItem.disableSelf=Disable breakpoint
breakpointMenuItem.disableSelf.accesskey=D
breakpointMenuItem.deleteSelf=Remove breakpoint
breakpointMenuItem.deleteSelf.accesskey=R
breakpointMenuItem.enableOthers=Enable others
breakpointMenuItem.enableOthers.accesskey=o
breakpointMenuItem.disableOthers=Disable others
breakpointMenuItem.disableOthers.accesskey=s
breakpointMenuItem.deleteOthers=Remove others
breakpointMenuItem.deleteOthers.accesskey=h
breakpointMenuItem.enableAll=Enable all breakpoints
breakpointMenuItem.enableAll.accesskey=b
breakpointMenuItem.disableAll=Disable all breakpoints
breakpointMenuItem.disableAll.accesskey=k
breakpointMenuItem.deleteAll=Remove all breakpoints
breakpointMenuItem.deleteAll.accesskey=a
breakpointMenuItem.removeCondition.label=Remove breakpoint condition
breakpointMenuItem.removeCondition.accesskey=c
breakpointMenuItem.editCondition.label=Edit breakpoint condition
breakpointMenuItem.editCondition.accesskey=n

# LOCALIZATION NOTE (breakpoints.header): Breakpoints right sidebar pane header.
breakpoints.header=Breakpoints
Expand Down
9 changes: 4 additions & 5 deletions src/components/Editor/Footer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ class SourceFooter extends PureComponent {
const { selectedSource, toggleBlackBox } = this.props;
const sourceLoaded = selectedSource && isLoaded(selectedSource.toJS());

const blackboxed = selectedSource.get("isBlackBoxed");

if (!isEnabled("blackbox")) {
if (!isEnabled("blackbox") || !sourceLoaded) {
return;
}

const blackboxed = selectedSource.get("isBlackBoxed");

const tooltip = L10N.getStr("sourceFooter.blackbox");
const type = "black-box";

Expand All @@ -92,9 +92,8 @@ class SourceFooter extends PureComponent {

blackBoxSummary() {
const { selectedSource } = this.props;
const blackboxed = selectedSource.get("isBlackBoxed");

if (!blackboxed) {
if (!selectedSource || !selectedSource.get("isBlackBoxed")) {
return;
}

Expand Down
1 change: 1 addition & 0 deletions src/test/mochitest/browser.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,4 @@ skip-if = true # Bug 1393121, 1393299
[browser_dbg-tabs.js]
[browser_dbg-toggling-tools.js]
[browser_dbg-wasm-sourcemaps.js]
skip-if = true
Loading

0 comments on commit 9fe3c95

Please sign in to comment.