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

Commit

Permalink
Merge pull request #3098 from jasonLaster/6-5
Browse files Browse the repository at this point in the history
Release a new version of the debugger
  • Loading branch information
jasonLaster authored Jun 7, 2017
2 parents cdccd0a + 843108b commit 1278f11
Show file tree
Hide file tree
Showing 8 changed files with 698 additions and 14 deletions.
679 changes: 677 additions & 2 deletions assets/module-manifest.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
7 changes: 3 additions & 4 deletions src/components/Editor/Editor.css
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -20,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;
Expand Down
2 changes: 0 additions & 2 deletions src/components/Editor/SearchBar.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
.search-bar {
display: flex;
flex-direction: column;
--editor-searchbar-height: 27px;
--editor-second-searchbar-height: 27px;
}

.search-bar .search-field {
Expand Down
11 changes: 8 additions & 3 deletions src/components/Editor/Tabs.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +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.
return sourceTabEls[index].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);
});
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/Outline.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
},
Expand Down
7 changes: 7 additions & 0 deletions src/components/SecondaryPanes/Expressions.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/test/mochitest/head.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1278f11

Please sign in to comment.