Show TouchBar slider only state length > 0

jhen0409 · Mar 10, 2017 · adb8834 · adb8834
1 parent 11ba41d
commit adb8834
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/app/middlewares/reduxAPI.js b/app/middlewares/reduxAPI.js
@@ -77,13 +77,16 @@ export default inStore => {
       toWorker(action);
     }
     if (action.type === UPDATE_STATE || action.type === LIFTED_ACTION) {
-      setReduxDevToolsMethods(true, actions.liftedDispatch);
       next(action);
       const state = store.getState();
       const instances = state.instances;
       const id = getActiveInstance(instances);
       const liftedState = instances.states[id];
-      if (!action.action || !action.action.dontUpdateTouchBarSlider) {
+      if (
+        (!action.action || !action.action.dontUpdateTouchBarSlider) &&
+        liftedState.currentStateIndex > 0
+      ) {
+        setReduxDevToolsMethods(true, actions.liftedDispatch);
         updateSliderContent(liftedState);
       }
       return;

diff --git a/app/middlewares/touchBarBuilder.js b/app/middlewares/touchBarBuilder.js
@@ -78,13 +78,13 @@ export const setReduxDevToolsMethods = (enabled, dispatch) => {
       dontUpdateTouchBarSlider,
     });
 
-  leftBar.slider = new TouchBarSlider({
+  rightBar.slider = new TouchBarSlider({
     value: 0,
     minValue: 0,
     maxValue: 0,
     change: handleSliderChange,
   });
-  leftBar.prev = new TouchBarButton({
+  rightBar.prev = new TouchBarButton({
     label: 'Prev',
     click() {
       const nextIndex = storeLiftedState.currentStateIndex - 1;
@@ -93,7 +93,7 @@ export const setReduxDevToolsMethods = (enabled, dispatch) => {
       }
     },
   });
-  leftBar.next = new TouchBarButton({
+  rightBar.next = new TouchBarButton({
     label: 'Next',
     click() {
       const nextIndex = storeLiftedState.currentStateIndex + 1;
@@ -109,6 +109,6 @@ export const setReduxDevToolsMethods = (enabled, dispatch) => {
 export const updateSliderContent = liftedState => {
   storeLiftedState = liftedState;
   const { currentStateIndex, computedStates } = liftedState;
-  leftBar.slider.maxValue = computedStates.length - 1;
-  leftBar.slider.value = currentStateIndex;
+  rightBar.slider.maxValue = computedStates.length - 1;
+  rightBar.slider.value = currentStateIndex;
 };