diff --git a/app/assets/images/ui-bg_flat_0_aaaaaa_40x100.png b/app/assets/images/images/ui-bg_flat_0_aaaaaa_40x100.png similarity index 100% rename from app/assets/images/ui-bg_flat_0_aaaaaa_40x100.png rename to app/assets/images/images/ui-bg_flat_0_aaaaaa_40x100.png diff --git a/app/assets/images/ui-bg_flat_75_ffffff_40x100.png b/app/assets/images/images/ui-bg_flat_75_ffffff_40x100.png similarity index 100% rename from app/assets/images/ui-bg_flat_75_ffffff_40x100.png rename to app/assets/images/images/ui-bg_flat_75_ffffff_40x100.png diff --git a/app/assets/images/ui-bg_glass_55_fbf9ee_1x400.png b/app/assets/images/images/ui-bg_glass_55_fbf9ee_1x400.png similarity index 100% rename from app/assets/images/ui-bg_glass_55_fbf9ee_1x400.png rename to app/assets/images/images/ui-bg_glass_55_fbf9ee_1x400.png diff --git a/app/assets/images/ui-bg_glass_65_ffffff_1x400.png b/app/assets/images/images/ui-bg_glass_65_ffffff_1x400.png similarity index 100% rename from app/assets/images/ui-bg_glass_65_ffffff_1x400.png rename to app/assets/images/images/ui-bg_glass_65_ffffff_1x400.png diff --git a/app/assets/images/ui-bg_glass_75_dadada_1x400.png b/app/assets/images/images/ui-bg_glass_75_dadada_1x400.png similarity index 100% rename from app/assets/images/ui-bg_glass_75_dadada_1x400.png rename to app/assets/images/images/ui-bg_glass_75_dadada_1x400.png diff --git a/app/assets/images/ui-bg_glass_75_e6e6e6_1x400.png b/app/assets/images/images/ui-bg_glass_75_e6e6e6_1x400.png similarity index 100% rename from app/assets/images/ui-bg_glass_75_e6e6e6_1x400.png rename to app/assets/images/images/ui-bg_glass_75_e6e6e6_1x400.png diff --git a/app/assets/images/ui-bg_glass_95_fef1ec_1x400.png b/app/assets/images/images/ui-bg_glass_95_fef1ec_1x400.png similarity index 100% rename from app/assets/images/ui-bg_glass_95_fef1ec_1x400.png rename to app/assets/images/images/ui-bg_glass_95_fef1ec_1x400.png diff --git a/app/assets/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/app/assets/images/images/ui-bg_highlight-soft_75_cccccc_1x100.png similarity index 100% rename from app/assets/images/ui-bg_highlight-soft_75_cccccc_1x100.png rename to app/assets/images/images/ui-bg_highlight-soft_75_cccccc_1x100.png diff --git a/app/assets/images/ui-icons_2e83ff_256x240.png b/app/assets/images/images/ui-icons_2e83ff_256x240.png similarity index 100% rename from app/assets/images/ui-icons_2e83ff_256x240.png rename to app/assets/images/images/ui-icons_2e83ff_256x240.png diff --git a/app/assets/images/ui-icons_454545_256x240.png b/app/assets/images/images/ui-icons_454545_256x240.png similarity index 100% rename from app/assets/images/ui-icons_454545_256x240.png rename to app/assets/images/images/ui-icons_454545_256x240.png diff --git a/app/assets/images/ui-icons_888888_256x240.png b/app/assets/images/images/ui-icons_888888_256x240.png similarity index 100% rename from app/assets/images/ui-icons_888888_256x240.png rename to app/assets/images/images/ui-icons_888888_256x240.png diff --git a/app/assets/images/ui-icons_cd0a0a_256x240.png b/app/assets/images/images/ui-icons_cd0a0a_256x240.png similarity index 100% rename from app/assets/images/ui-icons_cd0a0a_256x240.png rename to app/assets/images/images/ui-icons_cd0a0a_256x240.png diff --git a/app/assets/images/snow.png b/app/assets/images/snow.png deleted file mode 100644 index ab53fc0c..00000000 Binary files a/app/assets/images/snow.png and /dev/null differ diff --git a/app/assets/images/snow_@2X.png b/app/assets/images/snow_@2X.png deleted file mode 100644 index 4c0db0f9..00000000 Binary files a/app/assets/images/snow_@2X.png and /dev/null differ diff --git a/app/assets/images/ui-icons_222222_256x240.png b/app/assets/images/ui-icons_222222_256x240.png deleted file mode 100644 index b273ff11..00000000 Binary files a/app/assets/images/ui-icons_222222_256x240.png and /dev/null differ diff --git a/app/assets/javascripts/Jit/find.js b/app/assets/javascripts/Jit/filter.js similarity index 100% rename from app/assets/javascripts/Jit/find.js rename to app/assets/javascripts/Jit/filter.js diff --git a/app/assets/javascripts/Jit/graphsettings-event-handlers.js b/app/assets/javascripts/Jit/graphsettings-event-handlers.js index ee49e522..0730e7f3 100644 --- a/app/assets/javascripts/Jit/graphsettings-event-handlers.js +++ b/app/assets/javascripts/Jit/graphsettings-event-handlers.js @@ -1,544 +1,543 @@ function selectEdgeOnClickHandler(adj, e) { - if (Mconsole.busy) return; - - // catch right click on mac, which is often like ctrl+click - if (navigator.platform.indexOf("Mac")!=-1 && e.ctrlKey) { - selectEdgeOnRightClickHandler(adj, e) - return; - } - - if (synapseWasDoubleClicked()) { - synapseDoubleClickHandler(adj, e); - return; - } + if (Mconsole.busy) return; - var edgeIsSelected = MetamapsModel.selectedEdges.indexOf(adj); - if (edgeIsSelected == -1) edgeIsSelected = false; - else if (edgeIsSelected != -1) edgeIsSelected = true; - - if (edgeIsSelected && e.shiftKey) { - //deselecting an edge with shift - deselectEdge(adj); - } else if (!edgeIsSelected && e.shiftKey) { - //selecting an edge with shift - selectEdge(adj); - } else if (edgeIsSelected && !e.shiftKey) { - //deselecting an edge without shift - unselect all - deselectAllEdges(); - } else if (!edgeIsSelected && !e.shiftKey) { - //selecting an edge without shift - unselect all but new one - deselectAllEdges(); - selectEdge(adj); - } + // catch right click on mac, which is often like ctrl+click + if (navigator.platform.indexOf("Mac") != -1 && e.ctrlKey) { + selectEdgeOnRightClickHandler(adj, e) + return; + } - Mconsole.plot(); -}//selectEdgeOnClickHandler + if (synapseWasDoubleClicked()) { + synapseDoubleClickHandler(adj, e); + return; + } + + var edgeIsSelected = MetamapsModel.selectedEdges.indexOf(adj); + if (edgeIsSelected == -1) edgeIsSelected = false; + else if (edgeIsSelected != -1) edgeIsSelected = true; + + if (edgeIsSelected && e.shiftKey) { + //deselecting an edge with shift + deselectEdge(adj); + } else if (!edgeIsSelected && e.shiftKey) { + //selecting an edge with shift + selectEdge(adj); + } else if (edgeIsSelected && !e.shiftKey) { + //deselecting an edge without shift - unselect all + deselectAllEdges(); + } else if (!edgeIsSelected && !e.shiftKey) { + //selecting an edge without shift - unselect all but new one + deselectAllEdges(); + selectEdge(adj); + } + + Mconsole.plot(); +} //selectEdgeOnClickHandler function selectEdgeOnRightClickHandler(adj, e) { // the 'node' variable is a JIT node, the one that was clicked on // the 'e' variable is the click event - + e.preventDefault(); e.stopPropagation(); - + if (Mconsole.busy) return; - + selectEdge(adj); - + // delete old right click menu $('.rightclickmenu').remove(); // create new menu for clicked on node var rightclickmenu = document.createElement("div"); rightclickmenu.className = "rightclickmenu"; - + // add the proper options to the menu var menustring = '