From 2b36d3e8f68a1f7f9caa908e6d06877a22ce59a8 Mon Sep 17 00:00:00 2001 From: Jason Laster Date: Mon, 5 Jun 2017 21:17:22 -0400 Subject: [PATCH 1/5] Release a new version of the debugger frontend --- assets/module-manifest.json | 679 +++++++++++++++++++++++++++- package.json | 2 +- src/components/Editor/Editor.css | 3 + src/components/Editor/SearchBar.css | 2 - src/components/Editor/Tabs.js | 3 +- src/components/Outline.js | 2 +- 6 files changed, 684 insertions(+), 7 deletions(-) diff --git a/assets/module-manifest.json b/assets/module-manifest.json index 616c8e19e6..c6e7cbab23 100644 --- a/assets/module-manifest.json +++ b/assets/module-manifest.json @@ -7336,6 +7336,622 @@ "byBlocks": {} } }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/shared/Dropdown.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!components/LandingPage.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!components/Tabs.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!components/Sidebar.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!components/shared/menu.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!components/Root.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/variables.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/App.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/shared/menu.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/shared/reps.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../devtools-splitter/src/SplitBox.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/ProjectSearch/ProjectSearch.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/shared/Svg.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/shared/Autocomplete.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/shared/Button/Close.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/shared/SearchInput.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/shared/ResultList.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/shared/ManagedTree.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/ProjectSearch/TextSearch.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/Sources.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/Outline.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/shared/previewFunction.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/Editor/ConditionalPanel.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/shared/Button/PaneToggle.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/Editor/Footer.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/Editor/SearchBar.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/shared/ObjectInspector.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/shared/BracketArrow.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/shared/Popover.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/Editor/Preview.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/Editor/Editor.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/Editor/Highlight.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/SecondaryPanes/WhyPaused.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/SecondaryPanes/Breakpoints.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/SecondaryPanes/Expressions.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/SecondaryPanes/Frames/Group.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/SecondaryPanes/Frames/Frames.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/SecondaryPanes/EventListeners.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/shared/Accordion.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/SecondaryPanes/CommandBar.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/SecondaryPanes/Scopes.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/SecondaryPanes/SecondaryPanes.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/WelcomeBox.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, + { + "nextFreeModuleId": 2, + "modules": { + "byIdentifier": { + "../../css-loader/index.js!../../../src/components/Editor/Tabs.css": 0, + "../../css-loader/lib/css-base.js": 1 + } + }, + "nextFreeChunkId": 1, + "chunks": { + "byName": {}, + "byBlocks": {} + } + }, { "nextFreeModuleId": 2, "modules": { @@ -7351,7 +7967,7 @@ } } ], - "nextFreeModuleId": 1056, + "nextFreeModuleId": 1115, "modules": { "byIdentifier": { "../../../multi debugger": 0, @@ -8413,7 +9029,66 @@ "../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../../src/utils/parser/utils/helpers.js": 1052, "../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../../src/utils/parser/utils/getFunctionName.js": 1053, "../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../../src/utils/parser/resolveToken.js": 1054, - "../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../../src/utils/parser/utils/closest.js": 1055 + "../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../../src/utils/parser/utils/closest.js": 1055, + "../../chalk/node_modules/ansi-styles/index.js": 1056, + "../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../../src/utils/breakpoint/index.js": 1057, + "../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../../src/reducers/ast.js": 1058, + "../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../../src/actions/ast.js": 1059, + "../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../../src/components/ProjectSearch/ProjectSearch.js": 1060, + "../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../../src/utils/project-search.js": 1061, + "../../extract-text-webpack-plugin/loader.js?{\"0\":\"p\",\"1\":\"o\",\"2\":\"s\",\"3\":\"t\",\"4\":\"c\",\"5\":\"s\",\"6\":\"s\",\"7\":\"-\",\"8\":\"l\",\"9\":\"o\",\"10\":\"a\",\"11\":\"d\",\"12\":\"e\",\"13\":\"r\",\"omit\":1,\"extract\":true,\"remove\":true}!../../style-loader/index.js!../../css-loader/index.js!../../../src/components/ProjectSearch/ProjectSearch.css": 1062, + "../../css-loader/index.js!../../../src/components/ProjectSearch/ProjectSearch.css": 1063, + "../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../../src/components/ProjectSearch/TextSearch.js": 1064, + "../../extract-text-webpack-plugin/loader.js?{\"0\":\"p\",\"1\":\"o\",\"2\":\"s\",\"3\":\"t\",\"4\":\"c\",\"5\":\"s\",\"6\":\"s\",\"7\":\"-\",\"8\":\"l\",\"9\":\"o\",\"10\":\"a\",\"11\":\"d\",\"12\":\"e\",\"13\":\"r\",\"omit\":1,\"extract\":true,\"remove\":true}!../../style-loader/index.js!../../css-loader/index.js!../../../src/components/ProjectSearch/TextSearch.css": 1065, + "../../css-loader/index.js!../../../src/components/ProjectSearch/TextSearch.css": 1066, + "../../lodash/flatMap.js": 1067, + "../../lodash/map.js": 1068, + "../../lodash/_baseMap.js": 1069, + "../../lodash/_baseEach.js": 1070, + "../../lodash/_createBaseEach.js": 1071, + "../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../../src/utils/parser/getOutOfScopeLocations.js": 1072, + "../../lodash/fp/get.js": 1073, + "../../lodash/fp/convert.js": 1074, + "../../lodash/fp/_baseConvert.js": 1075, + "../../lodash/fp/_mapping.js": 1076, + "../../lodash/fp/placeholder.js": 1077, + "../../lodash/fp/_util.js": 1078, + "../../lodash/ary.js": 1079, + "../../lodash/_createWrap.js": 1080, + "../../lodash/_baseSetData.js": 1081, + "../../lodash/_metaMap.js": 1082, + "../../lodash/_createBind.js": 1083, + "../../lodash/_createCtor.js": 1084, + "../../lodash/_createCurry.js": 1085, + "../../lodash/_createHybrid.js": 1086, + "../../lodash/_composeArgs.js": 1087, + "../../lodash/_composeArgsRight.js": 1088, + "../../lodash/_countHolders.js": 1089, + "../../lodash/_createRecurry.js": 1090, + "../../lodash/_isLaziable.js": 1091, + "../../lodash/_LazyWrapper.js": 1092, + "../../lodash/_baseLodash.js": 1093, + "../../lodash/_getData.js": 1094, + "../../lodash/_getFuncName.js": 1095, + "../../lodash/_realNames.js": 1096, + "../../lodash/wrapperLodash.js": 1097, + "../../lodash/_LodashWrapper.js": 1098, + "../../lodash/_wrapperClone.js": 1099, + "../../lodash/_setData.js": 1100, + "../../lodash/_setWrapToString.js": 1101, + "../../lodash/_getWrapDetails.js": 1102, + "../../lodash/_insertWrapDetails.js": 1103, + "../../lodash/_updateWrapDetails.js": 1104, + "../../lodash/_getHolder.js": 1105, + "../../lodash/_reorder.js": 1106, + "../../lodash/_replaceHolders.js": 1107, + "../../lodash/_createPartial.js": 1108, + "../../lodash/_mergeData.js": 1109, + "../../lodash/curry.js": 1110, + "../../lodash/iteratee.js": 1111, + "../../lodash/rearg.js": 1112, + "../../lodash/_flatRest.js": 1113, + "../../lodash/toPath.js": 1114 } }, "nextFreeChunkId": 5, diff --git a/package.json b/package.json index 663bee3737..652217aef1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "debugger.html", - "version": "0.4.0", + "version": "0.5.0", "license": "MPL-2.0", "repository": { "url": "git://github.com/devtools-html/debugger.html.git", diff --git a/src/components/Editor/Editor.css b/src/components/Editor/Editor.css index d53db79226..70cf52a36c 100644 --- a/src/components/Editor/Editor.css +++ b/src/components/Editor/Editor.css @@ -1,6 +1,9 @@ .editor-wrapper { --debug-line-background: rgba(226, 236, 247, 0.5); --debug-line-border: rgb(145, 188, 219); + --editor-searchbar-height: 27px; + --editor-second-searchbar-height: 27px; + } .theme-dark .editor-wrapper { diff --git a/src/components/Editor/SearchBar.css b/src/components/Editor/SearchBar.css index 8619105d5d..f2f60f5698 100644 --- a/src/components/Editor/SearchBar.css +++ b/src/components/Editor/SearchBar.css @@ -1,8 +1,6 @@ .search-bar { display: flex; flex-direction: column; - --editor-searchbar-height: 27px; - --editor-second-searchbar-height: 27px; } .search-bar .search-field { diff --git a/src/components/Editor/Tabs.js b/src/components/Editor/Tabs.js index 41fda73e17..c1f604a214 100644 --- a/src/components/Editor/Tabs.js +++ b/src/components/Editor/Tabs.js @@ -50,7 +50,8 @@ function getHiddenTabs(sourceTabs: SourcesList, sourceTabEls) { return sourceTabs.filter((tab, index) => { // adding 10px helps account for cases where the tab might be offset by // styling such as selected tabs which don't have a border. - return sourceTabEls[index].getBoundingClientRect().top > tabTopOffset + 10; + const el = sourceTabEls[index]; + return el && el.getBoundingClientRect().top > tabTopOffset + 10; }); } diff --git a/src/components/Outline.js b/src/components/Outline.js index cb54ab465e..6233bf2f72 100644 --- a/src/components/Outline.js +++ b/src/components/Outline.js @@ -46,7 +46,7 @@ class Outline extends Component { return dom.li( { - key: `${name}:${location.start.line}`, + key: `${name}:${location.start.line}:${location.start.column}`, className: "outline-list__element", onClick: () => this.selectItem(location) }, From 0b56fd2c1fceb14bcaa9ad111d73c0ae6752f0c7 Mon Sep 17 00:00:00 2001 From: Jason Laster Date: Tue, 6 Jun 2017 12:43:40 -0400 Subject: [PATCH 2/5] tweaks --- src/components/SecondaryPanes/Expressions.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/components/SecondaryPanes/Expressions.js b/src/components/SecondaryPanes/Expressions.js index f8704f7aee..ddf086a067 100644 --- a/src/components/SecondaryPanes/Expressions.js +++ b/src/components/SecondaryPanes/Expressions.js @@ -36,6 +36,13 @@ function getValue(expression) { }; } + if (value.error) { + return { + path: value.from, + value: value.error + }; + } + if (typeof value.result == "object") { return { path: value.result.actor, @@ -157,6 +164,10 @@ class Expressions extends PureComponent { let { value, path } = getValue(expression); + if (!value) { + debugger; + } + if (value.class == "Error") { value = { unavailable: true }; } From e2254f29c1e0e47fbf644d84acd4d815b1e79924 Mon Sep 17 00:00:00 2001 From: Jason Laster Date: Tue, 6 Jun 2017 16:57:44 -0400 Subject: [PATCH 3/5] comment --- src/test/mochitest/head.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/mochitest/head.js b/src/test/mochitest/head.js index 37daa22efb..ce0ee4180a 100644 --- a/src/test/mochitest/head.js +++ b/src/test/mochitest/head.js @@ -32,7 +32,7 @@ * @parent mochitest */ -// shared-head.js handles +// shared-head.js handles imports, constants, and utility functions Services.scriptloader.loadSubScript( "chrome://mochitests/content/browser/devtools/client/framework/test/shared-head.js", this From da83f45f6ac30460f2fa711b48cbcea1f3d96b52 Mon Sep 17 00:00:00 2001 From: Jason Laster Date: Wed, 7 Jun 2017 11:45:10 -0400 Subject: [PATCH 4/5] drop class --- src/components/Editor/Editor.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/components/Editor/Editor.css b/src/components/Editor/Editor.css index 70cf52a36c..3253fa50ff 100644 --- a/src/components/Editor/Editor.css +++ b/src/components/Editor/Editor.css @@ -23,10 +23,6 @@ --theme-conditional-breakpoint-color: #ccd1d5; } -.theme-firebug { - --theme-conditional-breakpoint-color: #ccd1d5; -} - .out-of-scope .CodeMirror-line, .out-of-scope .CodeMirror-linenumber { opacity: 0.8; From 843108b8a2d7721be189eefa957471598640edbf Mon Sep 17 00:00:00 2001 From: Jason Laster Date: Wed, 7 Jun 2017 18:21:12 -0400 Subject: [PATCH 5/5] tweaks --- src/components/Editor/Tabs.js | 12 ++++++++---- src/components/SecondaryPanes/Expressions.js | 4 ---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/Editor/Tabs.js b/src/components/Editor/Tabs.js index c1f604a214..97a2e6e30e 100644 --- a/src/components/Editor/Tabs.js +++ b/src/components/Editor/Tabs.js @@ -46,12 +46,16 @@ function getHiddenTabs(sourceTabs: SourcesList, sourceTabEls) { return Math.min(...topOffsets); } - const tabTopOffset = getTopOffset(); - return sourceTabs.filter((tab, index) => { + function hasTopOffset(el) { // adding 10px helps account for cases where the tab might be offset by // styling such as selected tabs which don't have a border. - const el = sourceTabEls[index]; - return el && el.getBoundingClientRect().top > tabTopOffset + 10; + const tabTopOffset = getTopOffset(); + return el.getBoundingClientRect().top > tabTopOffset + 10; + } + + return sourceTabs.filter((tab, index) => { + const element = sourceTabEls[index]; + return element && hasTopOffset(element); }); } diff --git a/src/components/SecondaryPanes/Expressions.js b/src/components/SecondaryPanes/Expressions.js index ddf086a067..39e09fddde 100644 --- a/src/components/SecondaryPanes/Expressions.js +++ b/src/components/SecondaryPanes/Expressions.js @@ -164,10 +164,6 @@ class Expressions extends PureComponent { let { value, path } = getValue(expression); - if (!value) { - debugger; - } - if (value.class == "Error") { value = { unavailable: true }; }