fixed synapse creation. replaced homepage bg image

app/assets/javascripts/src/Metamaps.Router.js

@@ -215,7 +215,7 @@
             if (href.attr === "") Metamaps.Router.home();
             else {
                 console.log(segments);
-                Metamaps.Router[segments[0]](segments[1]);
+                Metamaps.Router[segments[0]](segments[1], segments[2]);
             }
         }
     };

app/assets/javascripts/src/Metamaps.js

@@ -749,6 +749,10 @@ Metamaps.Create = {
                 if (datum.id) { // if they clicked on an existing synapse get it
                     Metamaps.Synapse.getSynapseFromAutocomplete(datum.id);
                 }
+                else {
+                    Metamaps.Create.newSynapse.description = datum.value;
+                    Metamaps.Synapse.createSynapseLocally();
+                }
             });
         },
         beingCreated: false,
@@ -3469,38 +3473,67 @@ Metamaps.Filter = {
                 else console.log(topic);
             }
         });
+
+        // flag all the edges back to 'untouched'
         Metamaps.Synapses.each(function(synapse) {
            var e = synapse.get('edge');
-           var desc = synapse.get("desc");
+           e.setData('touched', false);
+        });
+        Metamaps.Synapses.each(function(synapse) {
+           var e = synapse.get('edge');
+           var desc;
            var user_id = synapse.get("user_id").toString();
 
-            if (visible.synapses.indexOf(desc) == -1) passesSynapse = false;
+           if (e && !e.getData('touched')) {
-            else passesSynapse = true;
 
-            if (onMap) {
+                var synapses = e.getData('synapses');
-                // when on a map, 
-                // we filter by mapper according to the person who added the 
-                // topic or synapse to the map
-                user_id = synapse.getMapping().get("user_id").toString();
-            }
-            if (visible.mappers.indexOf(user_id) == -1) passesMapper = false;
-            else passesMapper = true;
 
-            var color = Metamaps.Settings.colors.synapses.normal;
+                // if any of the synapses represent by the edge are still unfiltered
-            if (passesSynapse && passesMapper) {
+                // leave the edge visible
-                if (e) {
+                passesSynapse = false;
+                for (var i = 0; i < synapses.length; i++) {
+                    desc = synapses[i].get("desc");
+                    if (visible.synapses.indexOf(desc) > -1) passesSynapse = true;
+                }
+
+                // if the synapse description being displayed is now being
+                // filtered, set the displayIndex to the first unfiltered synapse if there is one
+                var displayIndex = e.getData("displayIndex") ? e.getData("displayIndex") : 0;
+                var displayedSynapse = synapses[displayIndex];
+                desc = displayedSynapse.get("desc");
+                if (passesSynapse && visible.synapses.indexOf(desc) == -1) {
+                    // iterate and find an unfiltered one
+                    for (var i = 0; i < synapses.length; i++) {
+                        desc = synapses[i].get("desc");
+                        if (visible.synapses.indexOf(desc) > -1) {
+                            e.setData('displayIndex', i);
+                            break;
+                        }
+                    }
+                }
+
+                if (onMap) {
+                    // when on a map, 
+                    // we filter by mapper according to the person who added the 
+                    // topic or synapse to the map
+                    user_id = synapse.getMapping().get("user_id").toString();
+                }
+                if (visible.mappers.indexOf(user_id) == -1) passesMapper = false;
+                else passesMapper = true;
+
+                var color = Metamaps.Settings.colors.synapses.normal;
+                if (passesSynapse && passesMapper) {
                     e.setData('alpha', 1, 'end');
                     e.setData('color', color, 'end');
                 }
-                else console.log(synapse);
+                else {
-            }
-            else {
-                if (e) {
                     Metamaps.Control.deselectEdge(e, true);
                     e.setData('alpha', opacityForFilter, 'end');
                 }
-                else console.log(synapse);
+
+                e.setData('touched', true);
             }
+            else if (!e) console.log(synapse);
         });
             
         // run the animation
@@ -4538,7 +4571,6 @@ Metamaps.Map = {
             encoded_image: canvas.canvas.toDataURL()
         };
 
-        console.log(imageData.encoded_image);
         var map = Metamaps.Active.Map;
 
         var today = new Date();

app/assets/stylesheets/clean.css

@@ -802,10 +802,10 @@
 }
 
 .fullWidthWrapper.withPartners {
-    background: url(homepage_bg.png) no-repeat center -300px;
+    background: url(homepage_bg_fade.png) no-repeat center -300px;
 }
 .homeWrapper.homePartners {
-    padding: 64px 0 100px;
+    padding: 64px 0 280px;
     height: 96px;
     background: url(partner_logos.png) no-repeat 0 64px;
 }