From d65a4b610007c0ca60fa3f9ac9df06e74d6beb99 Mon Sep 17 00:00:00 2001
From: vzvu3k6k <vzvu3k6k@gmail.com>
Date: Fri, 27 Mar 2015 04:18:02 +0900
Subject: web: upgrade to react-router 0.13.2

---
 web/package.json                | 2 +-
 web/src/js/components/common.js | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'web')

diff --git a/web/package.json b/web/package.json
index 5b15f695..e55081a3 100644
--- a/web/package.json
+++ b/web/package.json
@@ -20,7 +20,7 @@
     "jquery": "",
     "lodash": "",
     "react": "^0.13.1",
-    "react-router": "^0.13.1"
+    "react-router": "^0.13.2"
   },
   "devDependencies": {
     "browserify": "=8.0.1",
diff --git a/web/src/js/components/common.js b/web/src/js/components/common.js
index 956a46d2..ba4c93c2 100644
--- a/web/src/js/components/common.js
+++ b/web/src/js/components/common.js
@@ -45,7 +45,6 @@ var Navigation = _.extend({}, ReactRouter.Navigation, {
                 q[i] = dict[i] || undefined; //falsey values shall be removed.
             }
         }
-        q._ = "_"; // workaround for https://github.com/rackt/react-router/pull/957
         this.replaceWith(this.context.router.getCurrentPath(), this.context.router.getCurrentParams(), q);
     },
     replaceWith: function(routeNameOrPath, params, query) {
@@ -59,8 +58,6 @@ var Navigation = _.extend({}, ReactRouter.Navigation, {
             query = this.context.router.getCurrentQuery();
         }
 
-        // FIXME: react-router is just broken,
-        // we hopefully just need to wait for the next release with https://github.com/rackt/react-router/pull/957.
         this.context.router.replaceWith(routeNameOrPath, params, query);
     }
 });
-- 
cgit v1.2.3