Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions src/components/scene/inspector.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ var pkg = require('../../../package');
var registerComponent = require('../../core/component').registerComponent;

var INSPECTOR_URL = pkg.homepage + 'releases/' + pkg.version + '/aframe-inspector.min.js';
var LOADING_MESSAGE = 'Loading Inspector';

module.exports.Component = registerComponent('inspector', {
schema: {
Expand All @@ -14,10 +15,18 @@ module.exports.Component = registerComponent('inspector', {
init: function () {
this.onKeydown = bind(this.onKeydown, this);
this.onMessage = bind(this.onMessage, this);
this.initOverlay();
window.addEventListener('keydown', this.onKeydown);
window.addEventListener('message', this.onMessage);
},

initOverlay: function () {
var dotsHTML = '<span class="dots"><span>.</span><span>.</span><span>.</span></span>';
this.loadingMessageEl = document.createElement('div');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd give it text-transform: capitalize, increased font size, and monospace font-family.

this.loadingMessageEl.classList.add('a-inspector-loader');
this.loadingMessageEl.innerHTML = LOADING_MESSAGE + dotsHTML;
},

remove: function () {
this.removeEventListeners();
},
Expand All @@ -31,6 +40,14 @@ module.exports.Component = registerComponent('inspector', {
this.injectInspector();
},

showLoader: function () {
document.body.appendChild(this.loadingMessageEl);
},

hideLoader: function () {
this.el.removeChild(this.loadingMessageEl);
},

/**
* postMessage. aframe.io uses this to create a button on examples to open Inspector.
*/
Expand All @@ -44,13 +61,16 @@ module.exports.Component = registerComponent('inspector', {

if (AFRAME.INSPECTOR || AFRAME.inspectorInjected) { return; }

this.showLoader();

// Inject.
script = document.createElement('script');
script.src = this.data.url;
script.setAttribute('data-name', 'aframe-inspector');
script.setAttribute(AFRAME_INJECTED, '');
script.onload = function () {
AFRAME.INSPECTOR.open();
self.hideLoader();
self.removeEventListeners();
};
document.head.appendChild(script);
Expand Down
38 changes: 38 additions & 0 deletions src/style/aframe.css
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,44 @@
position: fixed !important;
}

.a-inspector-loader {
background-color: #ed3160;
position: fixed;
left: 3px;
top: 3px;
padding: 6px 10px;
color: #fff;
text-decoration: none;
font-size: 12px;
font-family: Roboto,sans-serif;
text-align: center;
z-index: 99999;
width: 174px;
}

/* Inspector loader animation */
@keyframes dots-1 { from { opacity: 0; } 25% { opacity: 1; } }
@keyframes dots-2 { from { opacity: 0; } 50% { opacity: 1; } }
@keyframes dots-3 { from { opacity: 0; } 75% { opacity: 1; } }
@-webkit-keyframes dots-1 { from { opacity: 0; } 25% { opacity: 1; } }
@-webkit-keyframes dots-2 { from { opacity: 0; } 50% { opacity: 1; } }
@-webkit-keyframes dots-3 { from { opacity: 0; } 75% { opacity: 1; } }

.a-inspector-loader .dots span {
animation: dots-1 2s infinite steps(1);
-webkit-animation: dots-1 2s infinite steps(1);
}

.a-inspector-loader .dots span:first-child + span {
animation-name: dots-2;
-webkit-animation-name: dots-2;
}

.a-inspector-loader .dots span:first-child + span + span {
animation-name: dots-3;
-webkit-animation-name: dots-3;
}

a-scene {
display: block;
position: relative;
Expand Down