Skip to content

Commit

Permalink
https://github.com/LaserWeb/lw.comm-server/issues/31#issuecomment-305…
Browse files Browse the repository at this point in the history
…586448
  • Loading branch information
jorgerobles committed Jun 1, 2017
1 parent e8d807e commit ef5b631
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
6 changes: 1 addition & 5 deletions src/components/operation.js
Original file line number Diff line number Diff line change
Expand Up @@ -551,10 +551,6 @@ class Operation extends React.Component {
else
leftStyle = { display: 'table-cell', borderLeft: '4px solid transparent', borderRight: '4px solid transparent' };



let millFilter = (item) => settings.toolCncMode ? true : !item.match(/Mill/gi)

let header;

if (op.name && op.name.length)
Expand All @@ -573,7 +569,7 @@ class Operation extends React.Component {
<span style={{ display: 'flex', justifyContent: 'space-between' }}>

<div style={{ whiteSpace: 'nowrap' }}>
<select className="input-xs" value={op.type} onChange={this.setType}>{Object.keys(OPERATION_TYPES).filter(millFilter).map(type => <option key={type} disabled={!this.availableOps.includes(type)}>{type}</option>)}</select>
<select className="input-xs" value={op.type} onChange={this.setType}>{Object.keys(OPERATION_TYPES).map(type => <option key={type} disabled={!this.availableOps.includes(type)}>{type}</option>)}</select>
<MaterialPickerButton className="btn btn-success btn-xs" onApplyPreset={this.preset} operation={op} ><i className="fa fa-magic"></i></MaterialPickerButton>
</div>
<div className="btn-group">
Expand Down
2 changes: 0 additions & 2 deletions src/components/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,6 @@ class Settings extends React.Component {
<NumberField {...{ object: this.props.settings, field: 'toolGridMajorSpacing', setAttrs: setSettingsAttrs, description: 'Grid Major Spacing', units: 'mm' }} />
<hr/>
<SelectField {...{ object: this.props.settings, field: 'toolFeedUnits', setAttrs: setSettingsAttrs, data: ['mm/s', 'mm/min'], defaultValue: 'mm/min', description: 'Feed Units', selectProps: { clearable: false } }} />
<ToggleField {... { object: this.props.settings, field: 'toolSafetyLockDisabled', setAttrs: setSettingsAttrs, description: 'Disable Safety Lock' }} />
<ToggleField {... { object: this.props.settings, field: 'toolCncMode', setAttrs: setSettingsAttrs, description: 'Enable CNC Mode' }} />
<ToggleField {... { object: this.props.settings, field: 'toolUseNumpad', setAttrs: setSettingsAttrs, description: 'Use Numpad' }} />
<QuadrantField {... { object: this.props.settings, field: 'toolImagePosition', setAttrs: setSettingsAttrs, description: 'Raster Image Position' }} />
<hr/>
Expand Down

0 comments on commit ef5b631

Please sign in to comment.