Skip to content

Glow flag/stop button when scripts are running #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rschamp merged 2 commits into from
Nov 28, 2016
Merged

Glow flag/stop button when scripts are running #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ebeac6
Fix names of script glow events
Nov 23, 2016
ad2eb55
Glow flag/stop button when scripts are running
Nov 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/components/green-flag/green-flag.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ const greenFlagIcon = require('./green-flag.svg');

const GreenFlagComponent = function (props) {
const {
active,
onClick,
title,
...componentProps
Expand All @@ -15,7 +16,9 @@ const GreenFlagComponent = function (props) {
position: 'absolute',
top: 380,
right: 440,
width: 50
width: 50,
// @todo Get real design here
filter: active ? 'saturate(200%) brightness(150%)' : 'none'
}}
title={title}
onClick={onClick}
Expand All @@ -25,11 +28,13 @@ const GreenFlagComponent = function (props) {
};

GreenFlagComponent.propTypes = {
active: React.PropTypes.bool,
onClick: React.PropTypes.func,
title: React.PropTypes.string
};

GreenFlagComponent.defaultProps = {
active: false,
title: 'Go'
};

Expand Down
7 changes: 6 additions & 1 deletion src/components/stop-all/stop-all.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ const stopAllIcon = require('./stop-all.svg');

const StopAllComponent = function (props) {
const {
active,
onClick,
title,
...componentProps
Expand All @@ -15,7 +16,9 @@ const StopAllComponent = function (props) {
position: 'absolute',
top: 380,
right: 380,
width: 50
width: 50,
// @todo Get real design here
filter: active ? 'saturate(200%) brightness(150%)' : 'none'
}}
title={title}
onClick={onClick}
Expand All @@ -25,11 +28,13 @@ const StopAllComponent = function (props) {
};

StopAllComponent.propTypes = {
active: React.PropTypes.bool,
onClick: React.PropTypes.func,
title: React.PropTypes.string
};

StopAllComponent.defaultProps = {
active: false,
title: 'Stop'
};

Expand Down
16 changes: 8 additions & 8 deletions src/containers/blocks.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ class Blocks extends React.Component {
bindAll(this, [
'attachVM',
'detachVM',
'onStackGlowOn',
'onStackGlowOff',
'onScriptGlowOn',
'onScriptGlowOff',
'onBlockGlowOn',
'onBlockGlowOff',
'onVisualReport',
Expand All @@ -36,25 +36,25 @@ class Blocks extends React.Component {
.getFlyout()
.getWorkspace()
.addChangeListener(this.props.vm.flyoutBlockListener);
this.props.vm.on('STACK_GLOW_ON', this.onStackGlowOn);
this.props.vm.on('STACK_GLOW_OFF', this.onStackGlowOff);
this.props.vm.on('SCRIPT_GLOW_ON', this.onScriptGlowOn);
this.props.vm.on('SCRIPT_GLOW_OFF', this.onScriptGlowOff);
this.props.vm.on('BLOCK_GLOW_ON', this.onBlockGlowOn);
this.props.vm.on('BLOCK_GLOW_OFF', this.onBlockGlowOff);
this.props.vm.on('VISUAL_REPORT', this.onVisualReport);
this.props.vm.on('workspaceUpdate', this.onWorkspaceUpdate);
}
detachVM () {
this.props.vm.off('STACK_GLOW_ON', this.onStackGlowOn);
this.props.vm.off('STACK_GLOW_OFF', this.onStackGlowOff);
this.props.vm.off('SCRIPT_GLOW_ON', this.onScriptGlowOn);
this.props.vm.off('SCRIPT_GLOW_OFF', this.onScriptGlowOff);
this.props.vm.off('BLOCK_GLOW_ON', this.onBlockGlowOn);
this.props.vm.off('BLOCK_GLOW_OFF', this.onBlockGlowOff);
this.props.vm.off('VISUAL_REPORT', this.onVisualReport);
this.props.vm.off('workspaceUpdate', this.onWorkspaceUpdate);
}
onStackGlowOn (data) {
onScriptGlowOn (data) {
this.workspace.glowStack(data.id, true);
}
onStackGlowOff (data) {
onScriptGlowOff (data) {
this.workspace.glowStack(data.id, false);
}
onBlockGlowOn (data) {
Expand Down
22 changes: 21 additions & 1 deletion src/containers/green-flag.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,26 @@ const GreenFlagComponent = require('../components/green-flag/green-flag.jsx');
class GreenFlag extends React.Component {
constructor (props) {
super(props);
bindAll(this, ['handleClick']);
bindAll(this, [
'handleClick',
'onProjectRunStart',
'onProjectRunStop'
]);
this.state = {projectRunning: false};
}
componentDidMount () {
this.props.vm.on('PROJECT_RUN_START', this.onProjectRunStart);
this.props.vm.on('PROJECT_RUN_STOP', this.onProjectRunStop);
}
componentWillUnmount () {
this.props.vm.off('PROJECT_RUN_START', this.onProjectRunStart);
this.props.vm.off('PROJECT_RUN_STOP', this.onProjectRunStop);
}
onProjectRunStart () {
this.setState({projectRunning: true});
}
onProjectRunStop () {
this.setState({projectRunning: false});
}
handleClick (e) {
e.preventDefault();
Expand All @@ -21,6 +40,7 @@ class GreenFlag extends React.Component {
} = this.props;
return (
<GreenFlagComponent
active={this.state.projectRunning}
onClick={this.handleClick}
{...props}
/>
Expand Down
22 changes: 21 additions & 1 deletion src/containers/stop-all.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,26 @@ const StopAllComponent = require('../components/stop-all/stop-all.jsx');
class StopAll extends React.Component {
constructor (props) {
super(props);
bindAll(this, ['handleClick']);
bindAll(this, [
'handleClick',
'onProjectRunStart',
'onProjectRunStop'
]);
this.state = {projectRunning: false};
}
componentDidMount () {
this.props.vm.on('PROJECT_RUN_START', this.onProjectRunStart);
this.props.vm.on('PROJECT_RUN_STOP', this.onProjectRunStop);
}
componentWillUnmount () {
this.props.vm.off('PROJECT_RUN_START', this.onProjectRunStart);
this.props.vm.off('PROJECT_RUN_STOP', this.onProjectRunStop);
}
onProjectRunStart () {
this.setState({projectRunning: true});
}
onProjectRunStop () {
this.setState({projectRunning: false});
}
handleClick (e) {
e.preventDefault();
Expand All @@ -20,6 +39,7 @@ class StopAll extends React.Component {
} = this.props;
return (
<StopAllComponent
active={!this.state.projectRunning}
onClick={this.handleClick}
{...props}
/>
Expand Down