Skip to content
Open
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
5 changes: 3 additions & 2 deletions client/debugger/content/actions/breakpoints.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ function _getOrCreateBreakpoint(state, location, condition) {
return getBreakpoint(state, location) || { location, condition };
}

let fakeBpId = 1;
function addBreakpoint(location, condition) {
return (dispatch, getState) => {
if (_breakpointExists(getState(), location)) {
Expand All @@ -64,7 +65,7 @@ function addBreakpoint(location, condition) {
let { isPending, actualLocation } = response;

// Save the client instance
setBreakpointClient(bpClient.actor, bpClient);
// setBreakpointClient(bpClient.actor, bpClient);

return {
//text: DebuggerView.editor.getText(bp.location.line - 1).trim(),
Expand All @@ -74,7 +75,7 @@ function addBreakpoint(location, condition) {
// the original requested placement for the breakpoint wasn't
// accepted.
actualLocation: isPending ? null : actualLocation,
actor: bpClient.actor
actor: 'bp' + (fakeBpId++)
};
})
});
Expand Down
10 changes: 6 additions & 4 deletions client/debugger/content/components/Sources.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@ const Sources = React.createClass({
if(!source.url) {
return;
}
const location = parseURL(source.url);
const url = source.url.replace(/^file:\/\//, 'http://app');
const location = parseURL(url);
const group = location.host || 'Internal';

if(!groups[location.host]) {
groups[location.host] = [];
if(!groups[group]) {
groups[group] = [];
}
let label;
if(location.pathname !== '/') {
Expand All @@ -27,7 +29,7 @@ const Sources = React.createClass({
else {
label = location.pathname;
}
groups[location.host].push({ source, label });
groups[group].push({ source, label });
});
return groups;
},
Expand Down
8 changes: 4 additions & 4 deletions client/definitions.js
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,10 @@ Tools.jsdebugger = {
};

var defaultTools = [
Tools.options,
Tools.webConsole,
Tools.inspector,
Tools.jsdebugger,
// Tools.options,
// Tools.webConsole,
// Tools.inspector,
Tools.jsdebugger
];

exports.defaultTools = defaultTools;
Expand Down
2 changes: 1 addition & 1 deletion client/framework/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
const Toolbox = require("devtools/client/framework/toolbox");

Toolbox.getWSTarget().then(target => {
const toolbox = new Toolbox.Toolbox(target, "inspector", "bottom");
const toolbox = new Toolbox.Toolbox(target, "jsdebugger", "bottom");
return toolbox.open().then(() => console.log("Open finished"));
});
24 changes: 12 additions & 12 deletions valence/lib/chromium/thread.js
Original file line number Diff line number Diff line change
Expand Up @@ -620,18 +620,18 @@ var ChromiumThreadActor = protocol.ActorClass({
console.log("Resuming");
var wasKicked = false;

if (this.pauseOutstanding) {
this.resuming = true;
// The engine has a pause requested but doesn't actually pause
// until something happens. Evaluate a script to kick it into
// the pause state, and `onPaused` which simply resume from here
yield this.rpc.request("Runtime.evaluate", {
expression: "5"
});
this.resuming = false;
this.pauseOutstanding = false;
wasKicked = true;
}
// if (this.pauseOutstanding) {
// this.resuming = true;
// // The engine has a pause requested but doesn't actually pause
// // until something happens. Evaluate a script to kick it into
// // the pause state, and `onPaused` which simply resume from here
// yield this.rpc.request("Runtime.evaluate", {
// expression: "5"
// });
// this.resuming = false;
// this.pauseOutstanding = false;
// wasKicked = true;
// }

this.state = "running";
yield this.updateExceptionState(this.getDesiredExceptionState());
Expand Down