Merge branch 'MathuraMG-accessibility'
This commit is contained in:
commit
7cacb4bf7c
3 changed files with 49 additions and 39 deletions
|
@ -4,13 +4,17 @@ const exitUrl = require('../../../images/exit.svg');
|
||||||
import { browserHistory } from 'react-router';
|
import { browserHistory } from 'react-router';
|
||||||
|
|
||||||
class About extends React.Component {
|
class About extends React.Component {
|
||||||
|
componentDidMount() {
|
||||||
|
this.refs.about.focus();
|
||||||
|
}
|
||||||
|
|
||||||
closeAboutModal() {
|
closeAboutModal() {
|
||||||
browserHistory.goBack();
|
browserHistory.goBack();
|
||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<div className="about">
|
<section className="about" ref="about" tabIndex="0">
|
||||||
<header className="about__header">
|
<header className="about__header">
|
||||||
<h2>About</h2>
|
<h2>About</h2>
|
||||||
<button className="about__exit-button" onClick={this.closeAboutModal}>
|
<button className="about__exit-button" onClick={this.closeAboutModal}>
|
||||||
|
@ -33,7 +37,7 @@ class About extends React.Component {
|
||||||
> report a bug.</a>
|
> report a bug.</a>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</section>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -148,6 +148,7 @@ class Editor extends React.Component {
|
||||||
>
|
>
|
||||||
<button
|
<button
|
||||||
className="editor__options-button"
|
className="editor__options-button"
|
||||||
|
aria-label="editor options"
|
||||||
tabIndex="0"
|
tabIndex="0"
|
||||||
onClick={(e) => {
|
onClick={(e) => {
|
||||||
e.target.focus();
|
e.target.focus();
|
||||||
|
@ -157,7 +158,7 @@ class Editor extends React.Component {
|
||||||
>
|
>
|
||||||
<InlineSVG src={downArrowUrl} />
|
<InlineSVG src={downArrowUrl} />
|
||||||
</button>
|
</button>
|
||||||
<ul className="editor__options">
|
<ul className="editor__options" title="editor options">
|
||||||
<li>
|
<li>
|
||||||
<a onClick={this.tidyCode}>Tidy</a>
|
<a onClick={this.tidyCode}>Tidy</a>
|
||||||
</li>
|
</li>
|
||||||
|
|
|
@ -2,13 +2,17 @@ import React, { PropTypes } from 'react';
|
||||||
import InlineSVG from 'react-inlinesvg';
|
import InlineSVG from 'react-inlinesvg';
|
||||||
const exitUrl = require('../../../images/exit.svg');
|
const exitUrl = require('../../../images/exit.svg');
|
||||||
|
|
||||||
function ShareModal(props) {
|
class ShareModal extends React.Component {
|
||||||
|
componentDidMount() {
|
||||||
|
this.refs.shareModal.focus();
|
||||||
|
}
|
||||||
|
render() {
|
||||||
const hostname = window.location.origin;
|
const hostname = window.location.origin;
|
||||||
return (
|
return (
|
||||||
<section className="share-modal">
|
<section className="share-modal" ref="shareModal" tabIndex="0">
|
||||||
<header className="share-modal__header">
|
<header className="share-modal__header">
|
||||||
<h2>Share Sketch</h2>
|
<h2>Share Sketch</h2>
|
||||||
<button className="about__exit-button" onClick={props.closeShareModal}>
|
<button className="about__exit-button" onClick={this.props.closeShareModal}>
|
||||||
<InlineSVG src={exitUrl} alt="Close Share Overlay" />
|
<InlineSVG src={exitUrl} alt="Close Share Overlay" />
|
||||||
</button>
|
</button>
|
||||||
</header>
|
</header>
|
||||||
|
@ -17,7 +21,7 @@ function ShareModal(props) {
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
className="share-modal__input"
|
className="share-modal__input"
|
||||||
value={`<iframe src="${hostname}/embed/${props.projectId}"></iframe>`}
|
value={`<iframe src="${hostname}/embed/${this.props.projectId}"></iframe>`}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className="share-modal__section">
|
<div className="share-modal__section">
|
||||||
|
@ -25,7 +29,7 @@ function ShareModal(props) {
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
className="share-modal__input"
|
className="share-modal__input"
|
||||||
value={`${hostname}/full/${props.projectId}`}
|
value={`${hostname}/full/${this.props.projectId}`}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className="share-modal__section">
|
<div className="share-modal__section">
|
||||||
|
@ -33,11 +37,12 @@ function ShareModal(props) {
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
className="share-modal__input"
|
className="share-modal__input"
|
||||||
value={`${hostname}/projects/${props.projectId}`}
|
value={`${hostname}/projects/${this.props.projectId}`}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
);
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ShareModal.propTypes = {
|
ShareModal.propTypes = {
|
||||||
|
|
Loading…
Reference in a new issue