Merge branch 'dev'

Author: ShMcK

lib/reducers/alert/index.js

@@ -7,65 +7,62 @@ var _alert = {
 };
 var open = {
     open: true,
-    pass: true,
+    action: 'pass',
 };
 var current = _alert;
+function setAlert(options) {
+    current = Object.assign({}, open, options);
+    return current;
+}
 function alertReducer(alert, action) {
     if (alert === void 0) { alert = _alert; }
     var statusBarAlert = document.getElementsByClassName('cr-alert-replay')[0];
     switch (action.type) {
         case _types_1.ALERT_REPLAY:
-            return Object.assign({}, current, open);
+            return setAlert(current);
         case _types_1.ALERT_TOGGLE:
             return action.payload.alert || _alert;
         case _types_1.TUTORIAL_UPDATE:
-            current = Object.assign({}, {
+            return setAlert({
                 message: "run `npm install --save-dev " + action.payload.name + "`",
                 action: 'note',
                 duration: 4000,
-            }, open);
-            return current;
+            });
         case _types_1.TEST_RESULT:
             var result = action.payload.result;
             if (result.pass && result.change > 0) {
                 statusBarAlert.style.color = '#73C990';
-                current = Object.assign({}, {
+                return setAlert({
                     message: result.msg,
                     duration: result.duration || 1500,
-                }, open);
-                return current;
+                });
             }
             else if (result.pass === false && result.change < 1) {
                 statusBarAlert.style.color = '#FF4081';
-                current = Object.assign({}, {
+                return setAlert({
                     message: result.msg,
                     action: 'fail',
                     duration: result.duration || 2500,
-                }, open);
-                return current;
+                });
             }
             statusBarAlert.style.color = '#9DA5B4';
-            current = Object.assign({}, {
+            return setAlert({
                 message: result.msg,
                 action: 'note',
                 duration: result.duration || 2500,
-            }, open);
-            return current;
+            });
         case _types_1.COMPLETE_PAGE:
-            current = Object.assign({}, {
+            return setAlert({
                 message: "Page " + (action.payload.position.page + 1) + " Complete",
-            }, open);
-            return current;
+            });
         case _types_1.COMPLETE_CHAPTER:
-            current = Object.assign({}, {
+            return setAlert({
                 message: "Chapter " + (action.payload.chapter + 1) + " Complete",
-            }, open);
-            return current;
+            });
         case _types_1.COMPLETE_TUTORIAL:
-            current = Object.assign({}, {
+            return setAlert({
                 message: 'Tutorial Complete',
-            }, open);
-            return current;
+            });
         default:
             return alert;
     }

src/components/Alert/_alert.less

@@ -1,29 +1,24 @@
 @import "ui-variables";
 
-.cr-alert.pass {
+.cr-alert {
   button {
+    position: relative;
     span {
-      color: @background-color-success;
+      position: absolute;
+      top: -8px;
     }
   }
 }
-.cr-alert.fail {
-  button {
-    span {
-      color: @background-color-error;
-    }
-  }
+.cr-alert.pass button span {
+  color: @background-color-success;
 }
-.cr-alert.note {
-  button {
-    span {
-      color: @background-color-info;
-    }
-  }
+.cr-alert.fail button span {
+  color: @background-color-error;
+}
+.cr-alert.note button span {
+  color: @background-color-info;
 }
-
 .cr-alert-replay {
   display: inline-block;
-  margin-left: 10px;
-  margin-right: 10px;
+  margin: 0 10px;
 }

src/reducers/alert/index.ts

@@ -11,70 +11,68 @@ const _alert: CR.Alert = {
 };
 const open = {
   open: true,
-  pass: true,
+  action: 'pass',
 };
 
 let current: CR.Alert = _alert;
 
+function setAlert(options) {
+  current = Object.assign({}, open, options);
+  return current;
+}
+
 export default function alertReducer(
   alert = _alert, action: Action
 ): CR.Alert {
   let statusBarAlert = <HTMLElement>document.getElementsByClassName('cr-alert-replay')[0];
   switch (action.type) {
     case ALERT_REPLAY:
-      return Object.assign({}, current, open);
+      return setAlert(current);
     case ALERT_TOGGLE:
       return action.payload.alert || _alert;
     case TUTORIAL_UPDATE:
-      current = Object.assign({}, {
+      return setAlert({
         message: `run \`npm install --save-dev ${action.payload.name}\``,
         action: 'note',
         duration: 4000,
-      }, open);
-      return current;
+      });
     case TEST_RESULT:
       let result = action.payload.result;
       if (result.pass && result.change > 0) {
         // Pass
         statusBarAlert.style.color = '#73C990';
-        current = Object.assign({}, {
+        return setAlert({
           message: result.msg,
           duration: result.duration || 1500,
-        }, open);
-        return current;
+        });
       } else if (result.pass === false && result.change < 1) {
         // Fail
         statusBarAlert.style.color = '#FF4081';
-        current = Object.assign({}, {
+        return setAlert({
           message: result.msg,
           action: 'fail',
           duration: result.duration || 2500,
-        }, open);
-        return current;
+        });
       }
       // Alert
       statusBarAlert.style.color = '#9DA5B4';
-      current = Object.assign({}, {
+      return setAlert({
         message: result.msg,
         action: 'note',
         duration: result.duration || 2500,
-      }, open);
-      return current;
+      });
     case COMPLETE_PAGE:
-      current = Object.assign({}, {
+      return setAlert({
         message: `Page ${action.payload.position.page + 1} Complete`,
-      }, open);
-      return current;
+      });
     case COMPLETE_CHAPTER:
-      current = Object.assign({}, {
+      return setAlert({
         message: `Chapter ${action.payload.chapter + 1} Complete`,
-      }, open);
-      return current;
+      });
     case COMPLETE_TUTORIAL:
-      current = Object.assign({}, {
+      return setAlert({
         message: 'Tutorial Complete',
-      }, open);
-      return current;
+      });
     default:
       return alert;
   }