diff --git a/app/assets/images/MMCCicon_map_black.png b/app/assets/images/MMCCicon_map_black.png new file mode 100644 index 00000000..abefa2a1 Binary files /dev/null and b/app/assets/images/MMCCicon_map_black.png differ diff --git a/app/assets/images/MMCCicon_mapper_black.png b/app/assets/images/MMCCicon_mapper_black.png new file mode 100644 index 00000000..a324b3a9 Binary files /dev/null and b/app/assets/images/MMCCicon_mapper_black.png differ diff --git a/app/assets/images/MMCCicon_synapse_black.png b/app/assets/images/MMCCicon_synapse_black.png new file mode 100644 index 00000000..1f96a7e9 Binary files /dev/null and b/app/assets/images/MMCCicon_synapse_black.png differ diff --git a/app/assets/images/account_icon.png b/app/assets/images/account_icon.png deleted file mode 100644 index 403c656d..00000000 Binary files a/app/assets/images/account_icon.png and /dev/null differ diff --git a/app/assets/images/background.jpg b/app/assets/images/background.jpg deleted file mode 100644 index 0c0b6cca..00000000 Binary files a/app/assets/images/background.jpg and /dev/null differ diff --git a/app/assets/images/centerOn.png b/app/assets/images/centerOn.png deleted file mode 100644 index 8dbaaa6b..00000000 Binary files a/app/assets/images/centerOn.png and /dev/null differ diff --git a/app/assets/images/decision.png b/app/assets/images/decision.png index 0fda323e..878b9209 100644 Binary files a/app/assets/images/decision.png and b/app/assets/images/decision.png differ diff --git a/app/assets/images/delete.png b/app/assets/images/delete.png deleted file mode 100644 index 9e290c1f..00000000 Binary files a/app/assets/images/delete.png and /dev/null differ diff --git a/app/assets/images/experience.png b/app/assets/images/experience.png index 0e70033a..c030d671 100644 Binary files a/app/assets/images/experience.png and b/app/assets/images/experience.png differ diff --git a/app/assets/images/go-arrow-2.png b/app/assets/images/go-arrow-2.png deleted file mode 100644 index 646b6451..00000000 Binary files a/app/assets/images/go-arrow-2.png and /dev/null differ diff --git a/app/assets/images/go-arrow.png b/app/assets/images/go-arrow.png deleted file mode 100644 index 90944b62..00000000 Binary files a/app/assets/images/go-arrow.png and /dev/null differ diff --git a/app/assets/images/home_bg_2.png b/app/assets/images/home_bg_2.png deleted file mode 100644 index d0c6c82a..00000000 Binary files a/app/assets/images/home_bg_2.png and /dev/null differ diff --git a/app/assets/images/idea.png b/app/assets/images/idea.png index 81744c1f..937b1934 100644 Binary files a/app/assets/images/idea.png and b/app/assets/images/idea.png differ diff --git a/app/assets/images/minus.png b/app/assets/images/minus.png deleted file mode 100644 index 802a9fc4..00000000 Binary files a/app/assets/images/minus.png and /dev/null differ diff --git a/app/assets/images/my_maps_icon.png b/app/assets/images/my_maps_icon.png deleted file mode 100644 index 7cfbc33c..00000000 Binary files a/app/assets/images/my_maps_icon.png and /dev/null differ diff --git a/app/assets/images/person.png b/app/assets/images/person.png index 34036d6a..280fcc09 100644 Binary files a/app/assets/images/person.png and b/app/assets/images/person.png differ diff --git a/app/assets/images/removeFromCanvas.png b/app/assets/images/removeFromCanvas.png deleted file mode 100644 index dbe1af4f..00000000 Binary files a/app/assets/images/removeFromCanvas.png and /dev/null differ diff --git a/app/assets/images/removeFromMap.png b/app/assets/images/removeFromMap.png deleted file mode 100644 index 5b95117f..00000000 Binary files a/app/assets/images/removeFromMap.png and /dev/null differ diff --git a/app/assets/images/role.png b/app/assets/images/role.png index 26db929a..1b148f04 100644 Binary files a/app/assets/images/role.png and b/app/assets/images/role.png differ diff --git a/app/assets/images/synapse.png b/app/assets/images/synapse.png deleted file mode 100644 index 8ae3ca7b..00000000 Binary files a/app/assets/images/synapse.png and /dev/null differ diff --git a/app/assets/images/synapse2.png b/app/assets/images/synapse2.png deleted file mode 100644 index 0adecbac..00000000 Binary files a/app/assets/images/synapse2.png and /dev/null differ diff --git a/app/assets/images/tab.png b/app/assets/images/tab.png deleted file mode 100644 index 8e7f9e24..00000000 Binary files a/app/assets/images/tab.png and /dev/null differ diff --git a/app/assets/images/task2.png b/app/assets/images/task2.png new file mode 100644 index 00000000..ea8146d4 Binary files /dev/null and b/app/assets/images/task2.png differ diff --git a/app/assets/images/trajectory.png b/app/assets/images/trajectory.png index f6371031..95e8d585 100644 Binary files a/app/assets/images/trajectory.png and b/app/assets/images/trajectory.png differ diff --git a/app/assets/images/white-curved-arrow.png b/app/assets/images/white-curved-arrow.png deleted file mode 100644 index 50ebee68..00000000 Binary files a/app/assets/images/white-curved-arrow.png and /dev/null differ diff --git a/app/assets/javascripts/Jit/analyze.js b/app/assets/javascripts/Jit/analyze.js deleted file mode 100644 index 735ae7b2..00000000 --- a/app/assets/javascripts/Jit/analyze.js +++ /dev/null @@ -1,51 +0,0 @@ -//// -//// -//// -//// Define all the dynamic interactions for the Analyze using Jquery - -$(document).ready(function() { - - // this sets up the initial opening of the organize box - $('#sideOptionAnalyze').bind('click',function(){ - if (!analyzeOpen) openAnalyze(); - }); - - // this sets up the closing of the organize box, and the toggling between open and closed. - $('#closeAnalyze').bind('click',function(){ - if (analyzeOpen) closeAnalyze(); - }); -}); - -function openAnalyze() { - analyzeOpen = true; - if (findOpen) closeFind(); - if (organizeOpen) closeOrganize(); - $('#sideOptionFind').css('z-index','8'); - $('#sideOptionAnalyze, #closeAnalyze').css('z-index','10'); - $('#sideOptionOrganize').css('z-index','8'); - $('#sideOptionAnalyze').animate({ - width: '100px', - height: '76px' - }, 100); - $('#closeAnalyze').css('display','block'); - $('#sideOptionAnalyze').css('cursor','default'); - var numT = Object.keys(Mconsole.graph.nodes).length; - var numS = 0; - Mconsole.graph.eachNode(function (n) { - n.eachAdjacency(function () { - numS++; - }); - }); - numS = numS/2; - $('.analysis').html('
' + numT + ' topics
' + numS + ' synapses
'); -} - -function closeAnalyze() { - analyzeOpen = false; - $('#closeAnalyze').css('display','none'); - $('#sideOptionAnalyze').css('cursor','pointer'); - $('#sideOptionAnalyze').animate({ - width: '64px', - height: '32px' - }, 100); -} \ No newline at end of file diff --git a/app/assets/javascripts/Jit/find.js b/app/assets/javascripts/Jit/find.js index 9e27414c..dc409f8c 100644 --- a/app/assets/javascripts/Jit/find.js +++ b/app/assets/javascripts/Jit/find.js @@ -1,36 +1,4 @@ -// create filters for maps, and for card views - -// keep an array of which metacodes are currently visible. -var categoryVisible = new Object(); - -categoryVisible['Group'] = true; -categoryVisible['Person'] = true; -categoryVisible['Bizarre'] = true; -categoryVisible['Catalyst'] = true; -categoryVisible['Closed'] = true; -categoryVisible['Experience'] = true; -categoryVisible['Future Dev'] = true; -categoryVisible['Idea'] = true; -categoryVisible['Implication'] = true; -categoryVisible['Insight'] = true; -categoryVisible['Intention'] = true; -categoryVisible['Knowledge'] = true; -categoryVisible['Location'] = true; -categoryVisible['Open Issue'] = true; -categoryVisible['Opinion'] = true; -categoryVisible['Opportunity'] = true; -categoryVisible['Platform'] = true; -categoryVisible['Problem'] = true; -categoryVisible['Question'] = true; -categoryVisible['Reference'] = true; -categoryVisible['Requirement'] = true; -categoryVisible['Resource'] = true; -categoryVisible['Role'] = true; -categoryVisible['Task'] = true; -categoryVisible['Tool'] = true; -categoryVisible['Trajectory'] = true; -categoryVisible['Action'] = true; -categoryVisible['Activity'] = true; +// create filters for maps function switchVisible(category, duration) { if (categoryVisible[category] == true) { @@ -75,22 +43,14 @@ function showCategory(category, duration) { }); } -// Define the Find/Filters possibilities -var findTopics = ['name','metacode', 'mapper (by name)', 'map (by name)'] -var findSynapses = ['topics (by name)', 'directionality', 'mapper (by name)', 'map (by name)'] -var findMaps = ['name', 'topic (by name)', 'mapper (by name)', 'synapse (by topics)'] -var findMappers = ['name', 'topic (by name)', 'map (by name)', 'synapse (by topics)'] - // These functions toggle ALL nodes and synapses on the page function hideAll(duration) { if (duration == null) duration = 500; Mconsole.graph.eachNode( function (n) { - if (!(n.getData('greenCircle') || n.getData('whiteCircle'))) { - n.setData('alpha', 0.4, 'end'); - n.eachAdjacency(function(adj) { - adj.setData('alpha', 0.4, 'end'); - }); - } + n.setData('alpha', 0.4, 'end'); + n.eachAdjacency(function(adj) { + adj.setData('alpha', 0.2, 'end'); + }); }); Mconsole.fx.animate({ modes: ['node-property:alpha', @@ -103,7 +63,7 @@ function showAll(duration) { Mconsole.graph.eachNode( function (n) { n.setData('alpha', 1, 'end'); n.eachAdjacency(function(adj) { - adj.setData('alpha', 1, 'end'); + adj.setData('alpha', 0.4, 'end'); }); }); Mconsole.fx.animate({ @@ -113,44 +73,58 @@ function showAll(duration) { }); } -/// Traverse the Graph and only show the searched for nodes -function onCanvasSearch(searchQuery, mapID, mapperID) { - searchQuery = name.toLowerCase(); +function filterTopicsByMap(mapID) { + Mconsole.graph.eachNode(function (n) { + if (n.getData('inmaps').indexOf(parseInt(mapID)) !== -1) { + n.setData('alpha', 1, 'end'); + } + else { + n.setData('alpha', 0.4, 'end'); + } + Mconsole.fx.animate({ + modes: ['node-property:alpha', + 'edge-property:alpha'], + duration: 500 + }); + }); +} // filterTopicsByName + +function filterTopicsByMapper(mapperID) { + Mconsole.graph.eachNode(function (n) { + if (n.getData('userid').toString() == mapperID) { + n.setData('alpha', 1, 'end'); + } + else { + n.setData('alpha', 0.4, 'end'); + } + Mconsole.fx.animate({ + modes: ['node-property:alpha', + 'edge-property:alpha'], + duration: 500 + }); + }); +} // filterTopicsByName + +function filterTopicsByName(searchQuery) { Mconsole.graph.eachNode(function (n) { nodeName = n.name.toLowerCase(); - if (name != null) { - if (nodeName.indexOf(searchQuery) !== -1 && searchQuery != "") { - n.setData('whiteCircle', true); - } - else { - n.setData('whiteCircle', false); - } + if (nodeName.indexOf(searchQuery) !== -1 && searchQuery != "") { + n.setData('alpha', 1, 'end'); } - else if (mapID != null) { - if (n.getData('inmaps').indexOf(parseInt(mapID)) !== -1) { - n.setData('whiteCircle', true); - } - else { - n.setData('whiteCircle', false); - } + else { + n.setData('alpha', 0.4, 'end'); } - else if (mapperID != null) { - if (n.getData('userid').toString() == mapperID) { - n.setData('whiteCircle', true); - } - else { - n.setData('whiteCircle', false); - } - } - Mconsole.plot(); - }); -}//onCanvasSearch + Mconsole.fx.animate({ + modes: ['node-property:alpha', + 'edge-property:alpha'], + duration: 500 + }); + }); +} // filterTopicsByName function clearCanvas() { Mconsole.graph.eachNode(function(n) { Mconsole.graph.removeNode(n.id); - Mconsole.labels.disposeLabel(n.id); - delete Mconsole.labels.labels["" + n.id] }); Mconsole.plot(); } @@ -165,310 +139,34 @@ function clearCanvasExceptRoot() { ids.forEach(function(id, index) { if (id != root.id) { Mconsole.graph.removeNode(id); - //TODO is hideLabel correct? Maybe it is... - Mconsole.labels.hideLabel(id); - $('#topic_' + id + '_label').hide(); } }); fetchRelatives(root); //also runs Mconsole.plot() } -function clearFoundData() { - Mconsole.graph.eachNode( function(n) { - if (n.getData('greenCircle') === true) { - Mconsole.graph.removeNode(n.id); - //TODO is hideLabel correct? Maybe it is... - Mconsole.labels.hideLabel(n.id); - $('#topic_' + n.id + '_label').hide(); - } - }); - Mconsole.plot(); -} - /** - * Define all the dynamic interactions for the FIND/FILTER using Jquery + * Define all the dynamic interactions for the Filter By Metacode using Jquery */ - + $(document).ready(function() { - // this sets up the initial opening of the find box - $('#sideOptionFind').bind('click',function(){ - if (!findOpen) openFind(); - }); - - // this sets up the closing of the find box, and the toggling between open and closed. - $('#closeFind').bind('click',function(){ - if (findOpen) closeFind(); - }); - - // this is where interactions within the find box begin - //on keyup, start the countdown - $('#topic_by_name_input').typing({ - start: function (event, $elem) { - // grab the checkboxes to see if the search is on the canvas, in the commons, or both - onCanvasChecked = $("#onCanvas").is(':checked'); - inCommonsChecked = $("#inCommons").is(':checked'); - clearFoundData(); - - // only have the autocomplete enabled if they are searching in the commons - if (onCanvasChecked && inCommonsChecked){ - $('#topic_by_name_input').autocomplete( "option", "disabled", true ); - } - else if (onCanvasChecked){ - setTimeout(function(){showAll();},0); - $('#topic_by_name_input').autocomplete( "option", "disabled", true ); - } - else if (inCommonsChecked){ - $('#topic_by_name_input').autocomplete( "option", "disabled", true ); - } - else { - alert('You either need to have searching On Your Canvas or In the Commons enabled'); - } - }, - stop: function (event, $elem) { - // grab the checkboxes to see if the search is on the canvas, in the commons, or both - onCanvasChecked = $("#onCanvas").is(':checked'); - inCommonsChecked = $("#inCommons").is(':checked'); - - var topicName = $('#topic_by_name_input').val(); - // run a search on the canvas or in the commons (or both) - if (onCanvasChecked) { - setTimeout(function() { - onCanvasSearch(topicName, null, null); - }, 0); - } - if (inCommonsChecked) { - $('#topicsByName').val(topicName); - $('#topicsByUser').val(""); - $('#topicsByMap').val(""); - $('#get_topics_form').submit(); - } - - if (topicName == "") { - clearFoundData(); - } - }, - delay: 2000 - }); - - $('#sideOptionFind .select_content').change(function() { - firstVal = $(this).children("option[value='topics']").attr('selected'); - secondVal = $(this).children("option[value='maps']").attr('selected'); - thirdVal = $(this).children("option[value='mappers']").attr('selected'); - if (firstVal == 'selected') { - $('#sideOptionFind .select_type').children("option[value='metacode']").removeAttr('disabled'); - $('#sideOptionFind .select_type').children("option[value='map (by name)']").removeAttr('disabled'); - $('#sideOptionFind .select_type').children("option[value='mapper (by name)']").removeAttr('disabled'); - $('.find').css('display','none'); - $('.find_topic_by_name').css('display','block'); - $('#topic_by_name_input').focus(); - } - else if ( secondVal == 'selected' ) { - if ( $("#sideOptionFind .select_type").val() != "name") { - $("#sideOptionFind .select_type").val('name'); - $('#sideOptionFind').animate({ - width: '305px', - height: '76px' - }, 300, function() { - // Animation complete. - }); - } - $('#sideOptionFind .select_type').children("option[value='metacode']").attr('disabled','disabled'); - $('#sideOptionFind .select_type').children("option[value='map (by name)']").attr('disabled','disabled'); - $('#sideOptionFind .select_type').children("option[value='mapper (by name)']").attr('disabled','disabled'); - $('.find').css('display','none'); - $('.find_map_by_name').css('display','block'); - $('#map_by_name_input').focus(); - } - else if ( thirdVal == 'selected' ) { - $("#sideOptionFind .select_type").val('name'); - $('#sideOptionFind .select_type').children("option[value='metacode']").attr('disabled','disabled'); - $('#sideOptionFind .select_type').children("option[value='map (by name)']").attr('disabled','disabled'); - $('#sideOptionFind .select_type').children("option[value='mapper (by name)']").attr('disabled','disabled'); - $('.find').css('display','none'); - $('.find_mapper_by_name').css('display','block'); - $('#mapper_by_name_input').focus(); - } - }); - - $('#sideOptionFind .select_type').change(function() { - firstVal = $(this).children("option[value='name']").attr('selected'); - secondVal = $(this).children("option[value='metacode']").attr('selected'); - thirdVal = $(this).children("option[value='map (by name)']").attr('selected'); - fourthVal = $(this).children("option[value='mapper (by name)']").attr('selected'); - if (firstVal === 'selected') { - $('.find').fadeOut('fast', function() { + $('.sidebarFilterBox .showAll').click(function(e) { showAll(); - $('.find_topic_by_metacode ul li').not('#hideAll, #showAll').removeClass('toggledOff'); + $('#filter_by_metacode ul li').removeClass('toggledOff'); for (var catVis in categoryVisible) { categoryVisible[catVis] = true; } - $('#sideOptionFind').animate({ - width: '305px', - height: '76px' - }, 300, function() { - $('.find_topic_by_name').css('display','block'); - $('#topic_by_name_input').focus(); - }); - }); - } - else if ( secondVal === 'selected' ) { - $('.find').fadeOut('fast', function() { - $('#sideOptionFind').animate({ - width: '380px', - height: '463px' - }, 300, function() { - $('.find_topic_by_metacode').fadeIn('fast'); - }); - }); - } - else if ( thirdVal === 'selected' ) { - $('.find').fadeOut('fast', function() { - $('#sideOptionFind').animate({ - width: '305px', - height: '76px' - }, 300, function() { - $('.find_map_by_name').css('display','block'); - $('#map_by_name_input').focus(); - }); - }); - } - else if ( fourthVal === 'selected' ) { - $('.find').fadeOut('fast', function() { - $('#sideOptionFind').animate({ - width: '305px', - height: '76px' - }, 300, function() { - $('.find_mapper_by_name').css('display','block'); - $('#mapper_by_name_input').focus(); - }); - }); - } }); - - $('.find_topic_by_name #topic_by_name_input').bind('railsAutocomplete.select', function(event, data) { - /* Do something here */ - if (data.item.id != undefined) { - window.open("/topics/" + data.item.id) - } - $('.find_topic_by_name #topic_by_name_input').val(''); - }); - - $('.find_topic_by_name').bind('submit', function(event, data) { - event.preventDefault(); - }); - - $('.find_map_by_name #map_by_name_input').bind('railsAutocomplete.select', function(event, data) { - firstVal = $('#sideOptionFind .select_content').children("option[value='topics']").attr('selected'); - secondVal = $('#sideOptionFind .select_content').children("option[value='maps']").attr('selected'); - thirdVal = $('#sideOptionFind .select_content').children("option[value='mappers']").attr('selected'); - if (firstVal == 'selected') { - // grab the checkboxes to see if the search is on the canvas, in the commons, or both - firstNewVal = $("#onCanvas").attr('checked'); - secondNewVal = $("#inCommons").attr('checked'); - - // only have the autocomplete enabled if they are searching in the commons - if (firstNewVal == "checked" && secondNewVal == "checked") { - setTimeout(function(){onCanvasSearch(null,data.item.id,null);},0); - $('#topicsByMap').val(data.item.id); - $('#topicsByUser').val(""); - $('#topicsByName').val(""); - $('#get_topics_form').submit(); - } - else if (firstNewVal == "checked") { - setTimeout(function(){onCanvasSearch(null,data.item.id,null);},0); - } - else if (secondNewVal == "checked"){ - $('#topicsByMap').val(data.item.id); - $('#topicsByUser').val(""); - $('#topicsByName').val(""); - $('#get_topics_form').submit(); - } - else { - alert('You either need to have searching On Your Canvas or In the Commons enabled'); - } - } - else if ( secondVal == 'selected' ) { - if (data.item.id != undefined) { - window.open("/maps/" + data.item.id); - } - $('.find_map_by_name #map_by_name_input').val(''); - } - else if ( thirdVal == 'selected' ) { - //nothing - } - }); - - $('.find_map_by_name').bind('submit', function(event, data){ - event.preventDefault(); - }); - - $('.find_mapper_by_name #mapper_by_name_input').bind('railsAutocomplete.select', function(event, data){ - firstVal = $('#sideOptionFind .select_content').children("option[value='topics']").attr('selected'); - secondVal = $('#sideOptionFind .select_content').children("option[value='maps']").attr('selected'); - thirdVal = $('#sideOptionFind .select_content').children("option[value='mappers']").attr('selected'); - if ( firstVal == 'selected') { - // grab the checkboxes to see if the search is on the canvas, in the commons, or both - firstNewVal = $("#onCanvas").attr('checked'); - secondNewVal = $("#inCommons").attr('checked'); - - // only have the autocomplete enabled if they are searching in the commons - if (firstNewVal == "checked" && secondNewVal == "checked"){ - setTimeout(function(){onCanvasSearch(null,null,data.item.id.toString());},0); - $('#topicsByUser').val(data.item.id); - $('#topicsByMap').val(""); - $('#topicsByName').val(""); - $('#get_topics_form').submit(); - } - else if (firstNewVal == "checked"){ - setTimeout(function(){onCanvasSearch(null,null,data.item.id.toString());},0); - } - else if (secondNewVal == "checked"){ - $('#topicsByUser').val(data.item.id); - $('#topicsByMap').val(""); - $('#topicsByName').val(""); - $('#get_topics_form').submit(); - } - else { - alert('You either need to have searching On Your Canvas or In the Commons enabled'); - } - } - else if ( secondVal == 'selected' ) { - //nothing - } - else if ( thirdVal == 'selected' ) { - if (data.item.id != undefined) { - window.open("/users/" + data.item.id); - } - $('.find_mapper_by_name #mapper_by_name_input').val(''); - } - }); - - $('.find_mapper_by_name').bind('submit', function(event, data){ - event.preventDefault(); - }); - - // toggle visibility of topics with metacodes based on status in the filters list - $('.find_topic_by_metacode ul li').click(function(event) { - obj = document.getElementById('container'); - - var switchAll = $(this).attr('id'); - if ( switchAll === "showAll" || switchAll === "hideAll") { - if (switchAll == "showAll") { - showAll(); - $('.find_topic_by_metacode ul li').not('#hideAll, #showAll').removeClass('toggledOff'); - for (var catVis in categoryVisible) { - categoryVisible[catVis] = true; - } - } - else if (switchAll == "hideAll") { + $('.sidebarFilterBox .hideAll').click(function(e) { hideAll(); - $('.find_topic_by_metacode ul li').not('#hideAll, #showAll').addClass('toggledOff'); + $('#filter_by_metacode ul li').addClass('toggledOff'); for (var catVis in categoryVisible) { categoryVisible[catVis] = false; } - } - } - else { + }); + + // toggle visibility of topics with metacodes based on status in the filters list + $('#filter_by_metacode ul li').click(function(event) { + var category = $(this).children('img').attr('alt'); switchVisible(category); @@ -481,62 +179,5 @@ $(document).ready(function() { $(this).removeClass('toggledOff'); categoryVisible[category] = true; } - } }); -}); - -function openFind() { - findOpen = true; - if (analyzeOpen) closeAnalyze(); - if (organizeOpen) closeOrganize(); - $('#sideOptionFind, #closeFind').css('z-index','10'); - $('#sideOptionAnalyze').css('z-index','9'); - $('#sideOptionOrganize').css('z-index','8'); - firstVal = $('#sideOptionFind option[value="name"]').attr('selected'); - secondVal = $('#sideOptionFind option[value="metacode"]').attr('selected'); - thirdVal = $('#sideOptionFind option[value="map (by name)"]').attr('selected'); - fourthVal = $('#sideOptionFind option[value="mapper (by name)"]').attr('selected'); - if ( firstVal === 'selected' || thirdVal === 'selected' || fourthVal === 'selected' ) { - $('#sideOptionFind').animate({ - width: '305px', - height: '76px' - }, 100, function() { - $('#topic_by_name_input').focus(); - }); - } else if ( secondVal === 'selected') { - $('#sideOptionFind').animate({ - width: '380px', - height: '463px' - }, 100, function() { - // Animation complete. - }); - } else if ( thirdVal === 'selected' ) { - $('#sideOptionFind').animate({ - width: '305px', - height: '76px' - }, 100, function() { - $('#map_by_name_input').focus(); - }); - } else if ( fourthVal === 'selected' ) { - $('#sideOptionFind').animate({ - width: '305px', - height: '76px' - }, 100, function() { - $('#mapper_by_name_input').focus(); - }); - } - $('#closeFind, #findWhere').css('display','block'); - $('#sideOptionFind').css('cursor','default'); -} - -function closeFind() { - clearFoundData(); - - findOpen = false; - $('#closeFind, #findWhere').css('display','none'); - $('#sideOptionFind').css('cursor','pointer'); - $('#sideOptionFind').animate({ - width: '45px', - height: '32px' - }, 100); -}//closeFind +}); \ No newline at end of file diff --git a/app/assets/javascripts/Jit/graphsettings-event-handlers.js b/app/assets/javascripts/Jit/graphsettings-event-handlers.js index defdd7bb..73cf50fd 100644 --- a/app/assets/javascripts/Jit/graphsettings-event-handlers.js +++ b/app/assets/javascripts/Jit/graphsettings-event-handlers.js @@ -59,10 +59,6 @@ function enterKeyHandler() { if ( $('.new_topic').css('display') != 'none' ) { $('.new_topic').submit(); } - // if the metacode spinner is open, create topic when enter is pressed - else if ( $('.new_synapse').css('display') != 'none' ) { - $('.new_synapse').submit(); - } //var selectedNodesCopy = MetamapsModel.selectedNodes.slice(0); //var len = selectedNodesCopy.length; @@ -143,6 +139,8 @@ function selectNodeOnClickHandler(node, 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; @@ -161,6 +159,7 @@ function selectNodeOnClickHandler(node, e) { if (mapid && userid != null) menustring += '