Skip to content

Commit

Permalink
Merge branch 'dev' into eden/readme
Browse files Browse the repository at this point in the history
  • Loading branch information
thelucidcoder committed Sep 8, 2022
2 parents 5f9b163 + ed1804b commit a05f82f
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 9 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "three-devtools",
"name": "three-tools",
"private": true,
"version": "0.4.1",
"description": "BACE three.js developer tools web extension",
Expand All @@ -14,7 +14,7 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/jsantell/three-devtools.git"
"url": "https://github.com/oslabs-beta/BACE"
},
"author": "BACE",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion src/app/ContentBridge.js
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ export default class ContentBridge extends EventTarget {
break;
case 'register':
this.revision = data.revision;
this[$eval](`console.log("three-devtools: debugging three.js r${this.revision}")`);
this[$eval](`console.log("three-tools: debugging three.js r${this.revision}")`);
break;
case 'committed':
this[$db].clear();
Expand Down
2 changes: 1 addition & 1 deletion src/app/elements/AppElement.js
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ export default class AppElement extends LitElement {
<div class="flex" state=${this.isReady ? 'ready' : this.needsReload ? 'needs-reload' : 'waiting'} id="container">
<!-- Reload panes only when needs to reload, but should autoreload normally -->
<devtools-message visible-when='needs-reload'>
<span>BACE Three Devtools requires a page reload.</span>
<span>three-tools requires a page reload.</span>
<devtools-button @click="${() => this.content.reload()}">
<span>Reload</span>
</devtools-button>
Expand Down
2 changes: 1 addition & 1 deletion src/app/injection.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const blue = "rgb(120, 250, 228)";

export default `
console.log('%c▲%cthree-devtools%c',
console.log('%c▲%cthree-tools%c',
'font-size:150%; color:${green}; text-shadow: -10px 0px ${red}, 10px 0px ${blue}; padding: 0 15px 0 10px;',
'font-size: 110%; background-color: #666; color:white; padding: 0 5px;',
'font-size: 110%; background-color: ${blue}; color:#666; padding: 0 5px;');
Expand Down
2 changes: 1 addition & 1 deletion src/extension/background.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const connections = new Map();

/**
* When opening the three-devtools panel, store
* When opening the three-tools panel, store
* a connection to communicate later.
*/
browser.runtime.onConnect.addListener(port => {
Expand Down
1 change: 1 addition & 0 deletions src/extension/contentScript.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ script.text = `
* This script injected by the installed three.js developer
* tools extension.
* https://github.com/threejs/three-devtools
* https://github.com/oslabs-beta/BACE
*/
const $devtoolsReady = Symbol('devtoolsReady');
Expand Down
2 changes: 1 addition & 1 deletion src/extension/devtools.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ async function createPanel() {
// Use `/` to circumvent.
const icon = '/assets/icon_128.png';
const url = '/src/app/index.html';
const panel = await browser.devtools.panels.create(`BACE-three-devtools`, icon, url);
const panel = await browser.devtools.panels.create(`three-tools`, icon, url);
}

0 comments on commit a05f82f

Please sign in to comment.