glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed merge from develop

Browse source
This commit is contained in:
Connor Turland 2014-10-23 20:19:40 -04:00
commit ed7844d195
2 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/src/Metamaps.JIT.js
View file

@ -1375,6 +1375,7 @@ Metamaps.JIT = {
if (!e.shiftKey && !e.ctrlKey) { if (!e.shiftKey && !e.ctrlKey) {
Metamaps.Control.deselectAllNodes(); Metamaps.Control.deselectAllNodes();
Metamaps.Control.deselectAllEdges(); Metamaps.Control.deselectAllEdges();
Metamaps.Control.selectEdge(adj);
} }
else if (e.shiftKey && e.ctrlKey){ else if (e.shiftKey && e.ctrlKey){
//no result //no result

1
app/views/layouts/application.html.erb
View file

@ -15,7 +15,6 @@
<%= stylesheet_link_tag "application", :media => "all" %> <%= stylesheet_link_tag "application", :media => "all" %>
<%= javascript_include_tag "application" %> <%= javascript_include_tag "application" %>
<% if Rails.env.production? %> <% if Rails.env.production? %>
<!-- for metamaps.thevalueweb.org --> <!-- for metamaps.thevalueweb.org -->
<script src="//use.typekit.net/jcy0yfj.js"></script> <script src="//use.typekit.net/jcy0yfj.js"></script>