fixed merge from develop

2014-10-23 20:19:40 -04:00 · 2014-10-23 20:19:40 -04:00 · ed7844d195
parent 2d0793c083 852f62f85e
commit ed7844d195
2 changed files with 1 additions and 1 deletions
--- a/app/assets/javascripts/src/Metamaps.JIT.js
+++ b/app/assets/javascripts/src/Metamaps.JIT.js
@ -1375,6 +1375,7 @@ Metamaps.JIT = {
                    if (!e.shiftKey && !e.ctrlKey) {
                        Metamaps.Control.deselectAllNodes();
                        Metamaps.Control.deselectAllEdges();
+                        Metamaps.Control.selectEdge(adj);
                    }
                    else if (e.shiftKey && e.ctrlKey){
                        //no result
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@ -15,7 +15,6 @@
  <%= stylesheet_link_tag    "application", :media => "all" %>
  <%= javascript_include_tag "application" %>

-
  <% if Rails.env.production? %>
    <!-- for metamaps.thevalueweb.org -->
    <script src="//use.typekit.net/jcy0yfj.js"></script>