a bunch of javascript refactoring, but this specific commit introduces at least one bug (onCreateLabel isn't called)

This commit is contained in:
Devin Howard 2013-01-10 22:01:24 -05:00
parent d2383e50db
commit d69cafaf85
6 changed files with 812 additions and 878 deletions

View file

@ -0,0 +1,145 @@
function selectEdgeOnClickHandler(adj, e) {
//editing overrides everything else
if (e.altKey) {
editEdge(adj, e);
return;
}
var showDesc = adj.getData("showDesc");
if (showDesc && e.shiftKey) {
//deselecting an edge with shift
deselectEdge(adj);
} else if (!showDesc && e.shiftKey) {
//selecting an edge with shift
selectEdge(adj);
} else if (showDesc && !e.shiftKey) {
//deselecting an edge without shift - unselect all
deselectAllEdges();
} else if (!showDesc && !e.shiftKey) {
//selecting an edge without shift - unselect all but new one
deselectAllEdges();
selectEdge(adj);
}
Mconsole.plot();
}//selectEdgeOnClickHandler
function selectNodeOnClickHandler(node, e) {
//set final styles
if (!e.shiftKey) {
Mconsole.graph.eachNode(function (n) {
if (n.id != node.id) {
delete n.selected;
n.setData('onCanvas',false);
}
n.setData('dim', 25, 'current');
n.eachAdjacency(function (adj) {
deselectEdge(adj);
});
});
}
if (!node.selected) {
node.selected = true;
node.setData('dim', 30, 'current');
node.setData('onCanvas',true);
node.eachAdjacency(function (adj) {
selectEdge(adj);
});
Mconsole.plot();
} else {
node.setData('dim', 25, 'current');
delete node.selected;
node.setData('onCanvas',false);
}
//trigger animation to final styles
Mconsole.fx.animate({
modes: ['edge-property:lineWidth:color'],
duration: 500
});
Mconsole.plot();
}//selectNodeOnClickHandler
function canvasDoubleClickHandler(canvasLoc,e) {
var DOUBLE_CLICK_TOLERANCE = 300; //0.3 seconds
//grab the location and timestamp of the click
var storedTime = MetamapsModel.lastCanvasClick;
var now = Date.now(); //not compatible with IE8 FYI
if (now - storedTime < DOUBLE_CLICK_TOLERANCE) {
//pop up node creation :)
$('#topic_grabTopic').val("null");
$('#topic_addSynapse').val("false");
$('#new_topic').css('left', e.clientX + "px");
$('#new_topic').css('top', e.clientY + "px");
$('#topic_x').val(canvasLoc.x);
$('#topic_y').val(canvasLoc.y);
$('#new_topic').fadeIn('fast');
addMetacode();
$('#topic_name').focus();
} else {
MetamapsModel.lastCanvasClick = now;
$('#new_topic').fadeOut('fast');
$('#new_synapse').fadeOut('fast');
tempInit = false;
tempNode = null;
tempNode2 = null;
Mconsole.plot();
}
}//canvasDoubleClickHandler
function onDragMoveTopicHandler(node, eventInfo, e) {
if (node && !node.nodeFrom) {
$('#new_synapse').fadeOut('fast');
$('#new_topic').fadeOut('fast');
var pos = eventInfo.getPos();
// if it's a left click, move the node
if (e.button == 0 && !e.altKey && (e.buttons == 0 || e.buttons == 1 || e.buttons == undefined)) {
dragged = node.id;
node.pos.setc(pos.x, pos.y);
node.data.$xloc = pos.x;
node.data.$yloc = pos.y;
Mconsole.plot();
}
// if it's a right click or holding down alt, start synapse creation ->third option is for firefox
else if ((e.button == 2 || (e.button == 0 && e.altKey) || e.buttons == 2) && userid != null) {
if (tempInit == false) {
tempNode = node;
tempInit = true;
}
//
temp = eventInfo.getNode();
if (temp != false && temp.id != node.id) { // this means a Node has been returned
tempNode2 = temp;
Mconsole.plot();
renderMidArrow({ x: tempNode.pos.getc().x, y: tempNode.pos.getc().y }, { x: temp.pos.getc().x, y: temp.pos.getc().y }, 13, false, Mconsole.canvas);
// before making the highlighted one bigger, make sure all the others are regular size
Mconsole.graph.eachNode(function (n) {
n.setData('dim', 25, 'current');
});
temp.setData('dim',35,'current');
Mconsole.fx.plotNode(tempNode, Mconsole.canvas);
Mconsole.fx.plotNode(temp, Mconsole.canvas);
} else if (!temp) {
tempNode2 = null;
Mconsole.graph.eachNode(function (n) {
n.setData('dim', 25, 'current');
});
//pop up node creation :)
$('#topic_grabTopic').val("null");
var myX = e.clientX - 110;
var myY = e.clientY - 30;
$('#new_topic').css('left',myX + "px");
$('#new_topic').css('top',myY + "px");
$('#new_synapse').css('left',myX + "px");
$('#new_synapse').css('top',myY + "px");
$('#topic_x').val(eventInfo.getPos().x);
$('#topic_y').val(eventInfo.getPos().y);
Mconsole.plot();
renderMidArrow({ x: tempNode.pos.getc().x, y: tempNode.pos.getc().y }, { x: pos.x, y: pos.y }, 13, false, Mconsole.canvas);
Mconsole.fx.plotNode(tempNode, Mconsole.canvas);
}
}
}
}

View file

@ -0,0 +1,12 @@
/*
* @file
* This file holds the Model object that is referenced in other graphsettings
* files. It lists selected nodes, selected edges, and stores data about
* double clicks on the canvas
*/
var MetamapsModel = new Object();
MetamapsModel.selectedEdges = new Array();
MetamapsModel.lastCanvasClick = 0;
MetamapsModel.DOUBLE_CLICK_TOLERANCE = 300;
MetamapsModel.edgeHoveringOver = false;

File diff suppressed because it is too large Load diff

View file

@ -68,10 +68,12 @@ function initialize(type, loadLater){
if ( type == "centered") {
// init Rgraph
alert("Going in, and we're centered");
Mconsole = new $jit.RGraph(graphSettings(type));
}
else if ( type == "arranged" || type == "chaotic" ) {
// init ForceDirected
alert("Going in, and we're arranged/chaotic");
Mconsole = new $jit.ForceDirected(graphSettings(type));
}
else {

View file

@ -0,0 +1,279 @@
/*
* @file
* There is a lot of code that goes into creating the "label" of a node
* This includes editable cards with all node details, and some controls
* onCreateLabelHandler is the main function of this file, and the file
* also contains a bunch of helper functions
*
* html and littleHTML are potentially confusing variables
* html is the contents of the card shown when you click on a node's label.
* littleHTML creates little controls for removing/hiding nodes from the canvas
*
* This function features PHP-style variable substitution because the strings
* are so damn long. Values are identified by $_id_$, and then a regular
* expression is substituted in later (for html, in a separate function).
*/
function onCreateLabelHandler(domElement, node) {
var html = generateShowcardHTML();
html = replaceVariables(html, node);
var showCard = document.createElement('div');
showCard.className = 'showcard topic_' + node.id;
showCard.innerHTML = html;
showCard.style.display = "none";
domElement.appendChild(showCard);
// Create a 'name' button and add it to the main node label
var nameContainer = document.createElement('span'),
style = nameContainer.style;
nameContainer.className = 'name topic_' + node.id;
nameContainer.id = 'topic_' + node.id + '_label';
nameContainer.innerHTML = generateLittleHTML (node);
domElement.appendChild(nameContainer);
style.fontSize = "0.9em";
style.color = "#222222";
bindCallbacks(showCard, nameContainer, node);
}
function generateShowcardHTML() {
return ' \
<div class="CardOnGraph" \
id="topic_$_id_$"> \
<p class="type best_in_place best_in_place_metacode" \
data-url="/topics/$_id_$" \
data-object="topic" \
data-collection=$_metacode_choices_$ \
data-attribute="metacode" \
data-type="select">$_metacode_$</p> \
<img alt="$_metacode_$" \
class="icon" \
title="Click to hide card" \
height="50" \
width="50" \
src="$_imgsrc_$" /> \
<span class="title"> \
<span class="best_in_place best_in_place_name" \
data-url="/topics/$_id_$" \
data-object="topic" \
data-attribute="name" \
data-type="input">$_name_$</span> \
<a href="/topics/$_id_$" class="topic-go-arrow" target="_blank"> \
<img class="topic-go-arrow" \
title="Explore Topic" \
src="/assets/go-arrow.png" /> \
</a> \
<div class="clearfloat"></div> \
</span> \
<div class="contributor"> \
Added by: <a href="/users/$_userid_$" target="_blank">$_username_$ \
</a> \
</div> \
<div class="scroll"> \
<div class="desc"> \
<span class="best_in_place best_in_place_desc" \
data-url="/topics/$_id_$" \
data-object="topic" \
data-nil="$_desc_nil_$" \
data-attribute="desc" \
data-type="textarea">$_desc_$</span> \
<div class="clearfloat"></div> \
</div> \
</div> \
<div class="link"> \
$_go_link_$ \
$_a_tag_$<span class="best_in_place best_in_place_link" \
data-url="/topics/$_id_$" \
data-object="topic" \
data-attribute="link" \
data-type="input">$_link_$</span>$_close_a_tag_$ \
</div> \
<div class="clearfloat"></div> \
</div>';
}//generateShowcardHTML
function replaceVariables(html, node) {
//link is rendered differently if user is logged out or in
var go_link, a_tag, close_a_tag;
if (userid == null) {
go_link = '';
if (node.getData("link") != "") {
a_tag = '<a href="' + node.getData("link") + '">';
close_a_tag = '</a>';
}
else {
a_tag = '';
close_a_tag = '';
}
} else {
go_link = '<a href="' + node.getData("link") + '" ' +
' class="go-link" target="_blank">[go]</a>';
a_tag = '';
close_a_tag = '';
}
//create metacode_choices array from imgArray
var metacodes = new Array();
for (var key in imgArray) {
if (imgArray.hasOwnProperty(key)) {
if (key != node.getData("metacode")) {
metacodes.push(key);
}
}
}
//Arrange it how we want it
metacodes.sort();
metacodes.unshift(node.getData("metacode"));
var metacode_choices = "'[";
for (var i in metacodes) {
metacode_choices += '["' + metacodes[i] + '","' + metacodes[i] + '"],';
}
//remove trailing comma and add ]
metacode_choices = metacode_choices.slice(0, -1);
metacode_choices += "]'";
var desc_nil = "<span class='gray'>Click to add description.</span>";
var link_nil = "<span class='gray'>Click to add link.</span>";
html = html.replace(/\$_id_\$/g, node.id);
html = html.replace(/\$_metacode_\$/g, node.getData("metacode"));
html = html.replace(/\$_imgsrc_\$/g, imgArray[node.getData("metacode")].src);
html = html.replace(/\$_name_\$/g, node.name);
html = html.replace(/\$_userid_\$/g, node.getData("userid"));
html = html.replace(/\$_username_\$/g, node.getData("username"));
html = html.replace(/\$_metacode_choices_\$/g, metacode_choices);
html = html.replace(/\$_go_link_\$/g, go_link);
html = html.replace(/\$_a_tag_\$/g, a_tag);
html = html.replace(/\$_close_a_tag_\$/g, close_a_tag);
if (node.getData("link") == "" && userid != null) {
html = html.replace(/\$_link_\$/g, link_nil);
} else {
html = html.replace(/\$_link_\$/g, node.getData("link"));
}
html = html.replace(/\$_desc_nil_\$/g, desc_nil);
if (node.getData("desc") == "" && userid != null) {
//logged in but desc isn't there so it's invisible
html = html.replace(/\$_desc_\$/g, desc_nil);
} else {
html = html.replace(/\$_desc_\$/g, node.getData("desc"));
}
return html;
}
function generateLittleHTML(node) {
var littleHTML = ' \
<div class="label">$_name_$</div> \
<div class="nodeOptions">';
if ((userid == null || mapid == null) && node.id != Mconsole.root) {
//unauthenticated, not on a map: can remove from canvas
littleHTML += ' \
<span class="removeFromCanvas" \
onclick="removeFromCanvas($_id_$)" \
title="Click to remove topic from canvas"> \
</span>';
} else if (mapid != null && userid != null && node.id != Mconsole.root) {
//not on a map, authenticated, and not looking at root node
//(you can't delete the root node of a JIT graph)
littleHTML += ' \
<span class="removeFromCanvas" \
onclick="removeFromCanvas($_id_$)" \
title="Click to remove topic from canvas"> \
</span> \
<a href="/topics/$_mapid_$/$_id_$/removefrommap" \
title="Click to remove topic from map" \
class="removeFromMap" \
data-method="post" \
data-remote="true" \
rel="nofollow"> \
</a>';
}
if (userid != null && node.id != Mconsole.root) {
//logged in, whether you're on a map or not
littleHTML += ' \
<a href="/topics/$_id_$" \
title="Click to delete this topic" \
class="deleteTopic" \
data-confirm="Delete this topic and all synapses linking to it?" \
data-method="delete" \
data-remote="true" \
rel="nofollow"> \
</a>';
}
littleHTML += '</div>';
littleHTML = littleHTML.replace(/\$_id_\$/g, node.id);
littleHTML = littleHTML.replace(/\$_mapid_\$/g, mapid);
littleHTML = littleHTML.replace(/\$_name_\$/g, node.name);
}
function hideCard(id) {
var card = '.showcard';
if (node != null) {
card += '.topic_' + id;
}
$(card).fadeOut('fast', function(){
node.setData('dim', 25, 'current');
$('.name').show();
Mconsole.plot();
});
}
function bindCallbacks(showCard, nameContainer, node) {
// add some events to the label
$(showCard).find('img.icon').click(function(){
hideCard(node.id);
});
$(showCard).find('.scroll').mCustomScrollbar();
// add some events to the label
$(nameContainer).find('.label').click(function(e){
$('.showcard').css('display','none');
$('.name').css('display','block');
$('.name.topic_' + node.id).css('display','none');
$('.showcard.topic_' + node.id).fadeIn('fast');
selectNodeOnClickHandler(node,e);
node.setData('dim', 1, 'current');
});
nameContainer.onmouseover = function(){
$('.name.topic_' + node.id + ' .nodeOptions').css('display','block');
}
nameContainer.onmouseout = function(){
$('.name.topic_' + node.id + ' .nodeOptions').css('display','none');
}
//bind best_in_place ajax callbacks
$(showCard).find('.best_in_place_metacode').bind("ajax:success", function() {
var metacode = $(this).html();
//changing img alt, img src for top card (topic view page)
//and on-canvas card. Also changing image of node
$(showCard).find('img.icon').attr('alt', metacode);
$(showCard).find('img.icon').attr('src', imgArray[metacode].src);
node.setData("metacode", metacode);
Mconsole.plot();
});
$(showCard).find('.best_in_place_name').bind("ajax:success", function() {
var name = $(this).html();
$(nameContainer).find('.label').html(name);
});
//available if you want it :)
//$(showCard).find('.best_in_place_desc').bind("ajax:success", function() {
// var desc = $(this).html();
//});
$(showCard).find('.best_in_place_link').bind("ajax:success", function() {
var link = $(this).html();
$(showCard).find('.go-link').attr('href', link);
});
}

View file

@ -0,0 +1,185 @@
function editEdge(edge, e) {
//reset so we don't interfere with other edges
$('#edit_synapse').remove();
deselectEdge(edge); //so the label is missing while editing
var edit_div = document.createElement('div');
edit_div.setAttribute('id', 'edit_synapse');
$('.main .wrapper').append(edit_div);
$('#edit_synapse').attr('class', 'best_in_place best_in_place_desc');
$('#edit_synapse').attr('data-object', 'synapse');
$('#edit_synapse').attr('data-attribute', 'desc');
$('#edit_synapse').attr('data-type', 'input');
//TODO how to get blank data-nil
$('#edit_synapse').attr('data-nil', ' ');
$('#edit_synapse').attr('data-url', '/synapses/' + edge.getData("id"));
$('#edit_synapse').html(edge.getData("desc"));
$('#edit_synapse').css('position', 'absolute');
$('#edit_synapse').css('left', e.clientX);
$('#edit_synapse').css('top', e.clientY);
$('#edit_synapse').bind("ajax:success", function() {
var desc = $(this).html();
edge.setData("desc", desc);
selectEdge(edge);
Mconsole.plot();
$('#edit_synapse').remove();
});
$('#edit_synapse').focusout(function() {
//in case they cancel
$('#edit_synapse').hide();
});
//css stuff above moves it, this activates it
$('#edit_synapse').click();
$('#edit_synapse form').submit(function() {
//hide it once form submits.
//If you don't do this, and data is unchanged, it'll show up on canvas
$('#edit_synapse').hide();
});
$('#edit_synapse input').focus();
$('#edit_synapse').show();
}
function deselectAllEdges() {
for (var i = 0; i < MetamapsModel.selectedEdges.length; i += 1) {
var edge = MetamapsModel.selectedEdges[i];
deselectEdge(edge);
}
}
// this is for hiding one topic from your canvas
function removeEdge(edge) {
var id = edge.getData("id");
$.ajax({
type: "DELETE",
url: "/synapses/" + id,
success: function(){
hideEdge(edge);
},
});
}
function hideEdge(edge) {
var from = edge.nodeFrom.id;
var to = edge.nodeTo.id;
edge.setData('alpha', 0, 'end');
Mconsole.fx.animate({
modes: ['edge-property:alpha'],
duration: 1000
});
Mconsole.graph.removeAdjacence(from, to);
Mconsole.plot();
}
function hideSelectedEdges() {
for (var i = 0; i < MetamapsModel.selectedEdges.length; i += 1) {
var edge = MetamapsModel.selectedEdges[i];
hideEdge(edge);
}
MetamapsModel.selectedEdges = new Array();
}
function removeSelectedEdges() {
for (var i = 0; i < MetamapsModel.selectedEdges.length; i += 1) {
if (mapid != null) {
var edge = MetamapsModel.selectedEdges[i];
var id = edge.getData("id");
//delete mapping of id mapid
$.ajax({
type: "POST",
url: "/synapses/" + mapid + "/" + id + "/removefrommap",
});
}
hideEdge(edge);
}
MetamapsModel.selectedEdges = new Array();
}
function deleteSelectedEdges() {
for (var i = 0; i < MetamapsModel.selectedEdges.length; i += 1) {
var edge = MetamapsModel.selectedEdges[i];
var id = edge.getData("id");
$.ajax({
type: "DELETE",
url: "/synapses/" + id,
});
hideEdge(edge);
}
MetamapsModel.selectedEdges = new Array();
}
function selectEdge(edge) {
var showDesc = edge.getData("showDesc");
if (! showDesc) {
edge.setData('showDesc', true, 'current');
edge.setDataset('end', {
lineWidth: 4,
color: '#FFFFFF'
});
Mconsole.fx.animate({
modes: ['edge-property:lineWidth:color'],
duration: 100
});
}
MetamapsModel.selectedEdges.push(edge);
}
function deselectEdge(edge) {
var showDesc = edge.getData("showDesc");
if (showDesc) {
edge.setData('showDesc', false, 'current');
edge.setDataset('end', {
lineWidth: 2,
color: '#222222'
});
if (MetamapsModel.edgeHoveringOver == edge) {
edge.setDataset('end', {
lineWidth: 4,
color: '#222222'
});
}
Mconsole.fx.animate({
modes: ['edge-property:lineWidth:color'],
duration: 100
});
}
//remove the edge
MetamapsModel.selectedEdges.splice(
MetamapsModel.selectedEdges.indexOf(edge), 1);
}
function hideSelectedNodes() {
Mconsole.graph.eachNode( function (n) {
if (n.data.$onCanvas == true && n.id != Mconsole.root) {
removeFromCanvas(n.id);
}
});
}
function removeSelectedNodes() {
Mconsole.graph.eachNode( function (n) {
if (n.data.$onCanvas == true && n.id != Mconsole.root) {
$.ajax({
type: "POST",
url: "/topics/" + mapid + "/" + n.id + "/removefrommap",
});
}
});
}
function deleteSelectedNodes() {
Mconsole.graph.eachNode( function (n) {
if (n.data.$onCanvas == true && n.id != Mconsole.root) {
$.ajax({
type: "DELETE",
url: "/topics/" + n.id,
});
}
});
}