Skip to content
This repository was archived by the owner on Jun 26, 2020. It is now read-only.

Commit 4c17157

Browse files
committed
firefox uses new panel, has slightly better styling
1 parent 62a1e2c commit 4c17157

File tree

4 files changed

+43
-214
lines changed

4 files changed

+43
-214
lines changed

shells/firefox/data/panel.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
right: 0;
2222
bottom: 0;
2323
background-color: white;
24+
font-family: sans-serif;
25+
}
26+
#container h1 {
27+
margin: 20px auto;
2428
}
2529
#logs {
2630
position: fixed;

shells/firefox/main/ReactPanel.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,20 @@ const ReactPanel = Class({
3939
const panelSide = channel.port2;
4040

4141
addonSide.onmessage = function (evt) {
42-
// console.log('from panel', evt.data);
4342
worker.port.emit('message', evt.data);
4443
};
4544
worker.port.on('message', function (data) {
46-
// console.log('to panel', data);
4745
addonSide.postMessage(data);
4846
});
4947
worker.port.on('hasReact', function (hasReact) {
48+
addonSide.postMessage({hasReact});
49+
/*
5050
addonSide.postMessage({
5151
type: 'event',
5252
evt: 'hasReact',
5353
data: hasReact,
5454
});
55+
*/
5556
});
5657
worker.on('error', function (error) {
5758
console.log('More Error!!', error);

shells/firefox/panel/Panel.js

Lines changed: 0 additions & 208 deletions
This file was deleted.

shells/firefox/panel/run.js

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,53 @@
1010
*/
1111
'use strict';
1212

13-
var Panel = require('./Panel');
13+
var globalHook = require('../../../backend/GlobalHook');
14+
globalHook(window);
15+
16+
var Panel = require('../../../frontend/Panel');
1417
var React = require('react');
1518

1619
var node = document.getElementById('container');
1720
node.innerHTML = '<h1>Connecting to devtools</h1>';
18-
var port;
21+
var port = {};
1922

2023
function reload() {
2124
React.unmountComponentAtNode(node);
2225
node.innerHTML = '';
23-
React.render(<Panel port={port} reload={reload} />, node);
26+
React.render(<Panel alreadyFoundReact={true} {...config} />, node);
2427
}
2528

2629
window.addEventListener('message', function (evt) {
2730
port = evt.ports[0];
28-
React.render(<Panel port={port} reload={reload} />, node);
31+
port.onmessage = evt => {
32+
if (evt.data.hasReact === true) {
33+
React.render(<Panel alreadyFoundReact={true} {...config} />, node);
34+
} else {
35+
node.innerHTML = '<h1>No react found on page...</h1>';
36+
}
37+
}
2938
});
3039

40+
var config = {
41+
reload,
42+
// checkForReact,
43+
inject(done) {
44+
var disconnected = false;
45+
46+
var wall = {
47+
listen(fn) {
48+
port.onmessage = evt => {
49+
fn(evt.data);
50+
};
51+
},
52+
send(data) {
53+
if (disconnected) {
54+
return;
55+
}
56+
port.postMessage(data);
57+
},
58+
};
59+
done(wall);
60+
},
61+
};
62+

0 commit comments

Comments
 (0)