Use OverlayTrigger only when keypad jogging is enabled

cncjs · Apr 8, 2017 · 72f0579 · 72f0579
1 parent 589d0b8
commit 72f0579
Showing 1 changed file with 19 additions and 0 deletions.
diff --git a/src/web/widgets/Axes/Toolbar.jsx b/src/web/widgets/Axes/Toolbar.jsx
@@ -145,6 +145,7 @@ class ToolbarButton extends Component {
                 )}
             >
                 <div className="btn-group pull-left">
+                    {(canClick && keypadJogging) &&
                     <OverlayTrigger
                         overlay={keypadTooltip()}
                         placement="bottom"
@@ -166,6 +167,24 @@ class ToolbarButton extends Component {
                             {i18n._('Keypad')}
                         </button>
                     </OverlayTrigger>
+                    }
+                    {!(canClick && keypadJogging) &&
+                    <button
+                        type="button"
+                        className={classNames(
+                            'btn',
+                            'btn-xs',
+                            'btn-default',
+                            { 'btn-select': keypadJogging }
+                        )}
+                        onClick={actions.toggleKeypadJogging}
+                        disabled={!canClick}
+                    >
+                        <i className="fa fa-keyboard-o" />
+                        <span className="space" />
+                        {i18n._('Keypad')}
+                    </button>
+                    }
                 </div>
                 <div className="btn-group pull-right">
                     <DropdownButton