Merge branch 'master' into Issue#1246
This commit is contained in:
commit
3eb83b0560
5 changed files with 16 additions and 11 deletions
|
@ -334,10 +334,10 @@ class PreviewFrame extends React.Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
renderSketch() {
|
renderSketch() {
|
||||||
this.props.clearConsole();
|
|
||||||
const doc = this.iframeElement;
|
const doc = this.iframeElement;
|
||||||
const localFiles = this.injectLocalFiles();
|
const localFiles = this.injectLocalFiles();
|
||||||
if (this.props.isPlaying) {
|
if (this.props.isPlaying) {
|
||||||
|
this.props.clearConsole();
|
||||||
srcDoc.set(doc, localFiles);
|
srcDoc.set(doc, localFiles);
|
||||||
if (this.props.endSketchRefresh) {
|
if (this.props.endSketchRefresh) {
|
||||||
this.props.endSketchRefresh();
|
this.props.endSketchRefresh();
|
||||||
|
|
|
@ -116,7 +116,7 @@ class Toolbar extends React.Component {
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{this.props.project.name}
|
<span>{this.props.project.name}</span>
|
||||||
{
|
{
|
||||||
this.canEditProjectName() &&
|
this.canEditProjectName() &&
|
||||||
<InlineSVG className="toolbar__edit-name-button" src={editProjectNameUrl} alt="Edit Project Name" />
|
<InlineSVG className="toolbar__edit-name-button" src={editProjectNameUrl} alt="Edit Project Name" />
|
||||||
|
|
|
@ -191,6 +191,7 @@ class IDEView extends React.Component {
|
||||||
<Toolbar />
|
<Toolbar />
|
||||||
{this.props.ide.preferencesIsVisible &&
|
{this.props.ide.preferencesIsVisible &&
|
||||||
<Overlay
|
<Overlay
|
||||||
|
title="Settings"
|
||||||
ariaLabel="settings"
|
ariaLabel="settings"
|
||||||
closeOverlay={this.props.closePreferences}
|
closeOverlay={this.props.closePreferences}
|
||||||
>
|
>
|
||||||
|
@ -389,6 +390,7 @@ class IDEView extends React.Component {
|
||||||
}
|
}
|
||||||
{ this.props.location.pathname === '/about' &&
|
{ this.props.location.pathname === '/about' &&
|
||||||
<Overlay
|
<Overlay
|
||||||
|
title="About"
|
||||||
previousPath={this.props.ide.previousPath}
|
previousPath={this.props.ide.previousPath}
|
||||||
ariaLabel="about"
|
ariaLabel="about"
|
||||||
>
|
>
|
||||||
|
@ -397,6 +399,7 @@ class IDEView extends React.Component {
|
||||||
}
|
}
|
||||||
{ this.props.location.pathname === '/feedback' &&
|
{ this.props.location.pathname === '/feedback' &&
|
||||||
<Overlay
|
<Overlay
|
||||||
|
title="Submit Feedback"
|
||||||
previousPath={this.props.ide.previousPath}
|
previousPath={this.props.ide.previousPath}
|
||||||
ariaLabel="submit-feedback"
|
ariaLabel="submit-feedback"
|
||||||
>
|
>
|
||||||
|
@ -405,6 +408,7 @@ class IDEView extends React.Component {
|
||||||
}
|
}
|
||||||
{ this.props.ide.shareModalVisible &&
|
{ this.props.ide.shareModalVisible &&
|
||||||
<Overlay
|
<Overlay
|
||||||
|
title="Share"
|
||||||
ariaLabel="share"
|
ariaLabel="share"
|
||||||
closeOverlay={this.props.closeShareModal}
|
closeOverlay={this.props.closeShareModal}
|
||||||
>
|
>
|
||||||
|
@ -417,6 +421,7 @@ class IDEView extends React.Component {
|
||||||
}
|
}
|
||||||
{ this.props.ide.keyboardShortcutVisible &&
|
{ this.props.ide.keyboardShortcutVisible &&
|
||||||
<Overlay
|
<Overlay
|
||||||
|
title="Keyboard Shortcuts"
|
||||||
ariaLabel="keyboard shortcuts"
|
ariaLabel="keyboard shortcuts"
|
||||||
closeOverlay={this.props.closeKeyboardShortcutModal}
|
closeOverlay={this.props.closeKeyboardShortcutModal}
|
||||||
>
|
>
|
||||||
|
@ -425,6 +430,7 @@ class IDEView extends React.Component {
|
||||||
}
|
}
|
||||||
{ this.props.ide.errorType &&
|
{ this.props.ide.errorType &&
|
||||||
<Overlay
|
<Overlay
|
||||||
|
title="Error"
|
||||||
ariaLabel="error"
|
ariaLabel="error"
|
||||||
closeOverlay={this.props.hideErrorModal}
|
closeOverlay={this.props.hideErrorModal}
|
||||||
>
|
>
|
||||||
|
|
|
@ -74,7 +74,6 @@
|
||||||
}
|
}
|
||||||
margin-left: #{10 / $base-font-size}rem;
|
margin-left: #{10 / $base-font-size}rem;
|
||||||
padding-left: #{10 / $base-font-size}rem;
|
padding-left: #{10 / $base-font-size}rem;
|
||||||
height: 70%;
|
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
@ -90,7 +89,8 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
line-height: #{18 / $base-font-size}rem;
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
|
||||||
.toolbar__project-name-container--editing & {
|
.toolbar__project-name-container--editing & {
|
||||||
display: none;
|
display: none;
|
||||||
|
@ -151,7 +151,6 @@
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
height: #{18 / $base-font-size}rem;
|
height: #{18 / $base-font-size}rem;
|
||||||
margin-left: #{-4 / $base-font-size}rem;
|
|
||||||
& svg {
|
& svg {
|
||||||
width: #{18 / $base-font-size}rem;
|
width: #{18 / $base-font-size}rem;
|
||||||
height: #{18 / $base-font-size}rem;
|
height: #{18 / $base-font-size}rem;
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
This folder contains documents intended for developers of the p5.js Web Editor.
|
This folder contains documents intended for developers of the p5.js Web Editor.
|
||||||
|
|
||||||
## List of Documents
|
## List of Documents
|
||||||
* [Installation](https://github.com/processing/p5.js-web-editor/blob/master/developer_docs/installation.md) - A guide for setting up your development environment
|
* [Installation](installation.md) - A guide for setting up your development environment
|
||||||
* [Development](https://github.com/processing/p5.js-web-editor/blob/master/developer_docs/development.md) - A guide for adding code to the web editor
|
* [Development](development.md) - A guide for adding code to the web editor
|
||||||
* [Preparing a pull-request](https://github.com/processing/p5.js/blob/master/developer_docs/preparing_a_pull_request.md) - Instructions for how to make a pull-request
|
* [Preparing a pull-request](preparing_a_pull_request.md) - Instructions for how to make a pull-request
|
||||||
* [Accessibility Guidelines](https://github.com/processing/p5.js-web-editor/blob/master/developer_docs/accessibility.md) - Guidelines for writing code to create an accessible application
|
* [Accessibility Guidelines](accessibility.md) - Guidelines for writing code to create an accessible application
|
||||||
* [Deployment](https://github.com/processing/p5.js-web-editor/blob/master/developer_docs/deployment.md) - A guide to production deployment, and all platforms that are being used.
|
* [Deployment](deployment.md) - A guide to production deployment, and all platforms that are being used.
|
||||||
|
|
||||||
## Documents to Create
|
## Documents to Create
|
||||||
* Design Principles - reference [p5.js design principles](https://github.com/processing/p5.js/edit/master/developer_docs/design_principles.md)
|
* Design Principles - reference [p5.js design principles](https://github.com/processing/p5.js/edit/master/developer_docs/design_principles.md)
|
||||||
* Issue Labels - reference [p5.js issue labels](https://github.com/processing/p5.js/blob/master/developer_docs/issue_labels.md)
|
* Issue Labels - reference [p5.js issue labels](https://github.com/processing/p5.js/blob/master/developer_docs/issue_labels.md)
|
||||||
* File Structure - An explanation of the file structure of this application.
|
* File Structure - An explanation of the file structure of this application.
|
||||||
|
|
Loading…
Reference in a new issue