Merge pull request #9 from rottencandy/mithrilv2-0

Update Mithril to v2.0.4

webui-src/app/config/config_network.js

@@ -29,7 +29,7 @@ let SetNwMode = () => {
 let SetLimits = () => {
   let dlim = undefined;
   let ulim = undefined;
-  let setMaxRates = () => rs.JsonApiRequest('/rsConfig/SetMaxDataRates', {
+  let setMaxRates = () => rs.rsJsonApiRequest('/rsConfig/SetMaxDataRates', {
     downKb: dlim,
     upKb: ulim
   });

webui-src/app/main.js

@@ -29,14 +29,12 @@ const navbar = () => {
         'nav.tab-menu',
         Object.keys(vnode.attrs.links).map((linkName, i) =>
           m(
-            'a.tab-menu-item',
+            m.route.Link,
             {
               href: vnode.attrs.links[linkName],
-              class: active === i ? 'selected-tab-item' : '',
-              oncreate: m.route.link,
-              onclick: () => {
-                active = i;
-              }
+              class:
+                (active === i ? 'selected-tab-item' : '') + ' tab-menu-item',
+              onclick: () => (active = i)
             },
             [navIcon[linkName], linkName]
           )

webui-src/app/rswebui.js

@@ -48,7 +48,7 @@ function rsJsonApiRequest(
       },
       serialize: handleSerialize,
       headers: headers,
-      data: data
+      body: data
     })
     .then(result => {
       if (result.status === 200) {
@@ -56,6 +56,7 @@ function rsJsonApiRequest(
       } else {
         loginKey.isVerified = false;
         callback(result, false);
+        m.route.set('/');
       }
       return result;
     })

webui-src/app/widgets.js

@@ -5,16 +5,11 @@ const Sidebar = () => {
   let active = 0;
   return {
     view: (v) => m('.sidebar',
-      v.attrs.tabs.map((panelName, index) => m('a', {
-          href: v.attrs.baseRoute + panelName,
-          oncreate: m.route.link,
-          class: index === active ?
-            'selected-sidebar-link' : '',
-          onclick: function() {
-            active = index;
-          },
-        },
-        panelName)),
+      v.attrs.tabs.map((panelName, index) => m(m.route.Link, {
+        class: index === active? 'selected-sidebar-link': '',
+        onclick: () => (active = index),
+        href: v.attrs.baseRoute + panelName
+      }, panelName)),
     ),
   };
 };
@@ -32,10 +27,9 @@ function popupMessage(message) {
       }, m('i.fas.fa-times')),
       message,
     ]));
-};
+}
 
 module.exports = {
   Sidebar,
   popupMessage,
 };
-