From b09eed715b1fa05a0e6d2f12593b4afe5a7b50d1 Mon Sep 17 00:00:00 2001
From: Robert Best <chessscholar@gmail.com>
Date: Sat, 2 Aug 2014 14:32:07 -0400
Subject: [PATCH] specify redis gem version number

---
 Gemfile                                            | 2 +-
 Gemfile.lock                                       | 4 ++--
 app/assets/javascripts/metamaps/Metamaps.Router.js | 4 ++--
 app/assets/javascripts/metamaps/metamaps.js        | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 51ddc1db..8fd03a16 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,7 @@ gem 'rails', '3.2.17'
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 
 gem 'devise'
-gem 'redis'
+gem 'redis', '2.2.2'
 gem 'pg'
 gem 'cancan'
 gem 'formula'
diff --git a/Gemfile.lock b/Gemfile.lock
index e4bbb146..b4efab8d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -117,7 +117,7 @@ GEM
     rake (10.3.2)
     rdoc (3.12.2)
       json (~> 1.4)
-    redis (3.0.7)
+    redis (2.2.2)
     sass (3.3.7)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
@@ -160,6 +160,6 @@ DEPENDENCIES
   pg
   rails (= 3.2.17)
   rails3-jquery-autocomplete
-  redis
+  redis (= 2.2.2)
   sass-rails
   uglifier (>= 1.0.3)
diff --git a/app/assets/javascripts/metamaps/Metamaps.Router.js b/app/assets/javascripts/metamaps/Metamaps.Router.js
index 812b9108..7ecb49b3 100644
--- a/app/assets/javascripts/metamaps/Metamaps.Router.js
+++ b/app/assets/javascripts/metamaps/Metamaps.Router.js
@@ -14,7 +14,7 @@
     });
     Metamaps.Router = new Router();
     Metamaps.Router.init = function () {
-        Backbone.history.start({
+        /*Backbone.history.start({
             pushState: true,
             root: ''
         });
@@ -30,6 +30,6 @@
                 evt.preventDefault();
                 Backbone.history.navigate(href.attr, true);
             }
-        });
+        });*/
     }
 })();
\ No newline at end of file
diff --git a/app/assets/javascripts/metamaps/metamaps.js b/app/assets/javascripts/metamaps/metamaps.js
index cc796c14..fdc97cfa 100644
--- a/app/assets/javascripts/metamaps/metamaps.js
+++ b/app/assets/javascripts/metamaps/metamaps.js
@@ -2261,8 +2261,8 @@ Metamaps.Topic = {
         } else {
             Metamaps.Visualize.mGraph.loadJSON(newnode);
             nodeOnViz = Metamaps.Visualize.mGraph.graph.getNode(newnode.id);
-            mapping.set('node', nodeOnViz);
-            mapping.updateNode(); // links the topic and the mapping to the node 
+            topic.set('node', nodeOnViz);
+            topic.updateNode(); // links the topic and the mapping to the node 
 
             nodeOnViz.setData("dim", 1, "start");
             nodeOnViz.setData("dim", 25, "end");