fixed autocomplete bugginess, fixed synapse half opacity bug
|
@ -83,7 +83,8 @@ function canvasDoubleClickHandler(canvasLoc,e) {
|
||||||
$('#new_topic').css('left', e.clientX + "px");
|
$('#new_topic').css('left', e.clientX + "px");
|
||||||
$('#new_topic').css('top', e.clientY + "px");
|
$('#new_topic').css('top', e.clientY + "px");
|
||||||
$('#topic_x').val(canvasLoc.x);
|
$('#topic_x').val(canvasLoc.x);
|
||||||
$('#topic_y').val(canvasLoc.y);
|
$('#topic_y').val(canvasLoc.y);
|
||||||
|
$('#topic_name').autocomplete('enable');
|
||||||
$('#new_topic').fadeIn('fast');
|
$('#new_topic').fadeIn('fast');
|
||||||
addMetacode();
|
addMetacode();
|
||||||
$('#topic_name').focus();
|
$('#topic_name').focus();
|
||||||
|
@ -106,9 +107,9 @@ function onDragMoveTopicHandler(node, eventInfo, e) {
|
||||||
// if it's a left click, move the node
|
// if it's a left click, move the node
|
||||||
if (e.button == 0 && !e.altKey && (e.buttons == 0 || e.buttons == 1 || e.buttons == undefined)) {
|
if (e.button == 0 && !e.altKey && (e.buttons == 0 || e.buttons == 1 || e.buttons == undefined)) {
|
||||||
dragged = node.id;
|
dragged = node.id;
|
||||||
node.pos.setc(pos.x, pos.y);
|
node.pos.setc(pos.x, pos.y);
|
||||||
node.data.$xloc = pos.x;
|
node.data.$xloc = pos.x;
|
||||||
node.data.$yloc = pos.y;
|
node.data.$yloc = pos.y;
|
||||||
Mconsole.plot();
|
Mconsole.plot();
|
||||||
}
|
}
|
||||||
// if it's a right click or holding down alt, start synapse creation ->third option is for firefox
|
// if it's a right click or holding down alt, start synapse creation ->third option is for firefox
|
||||||
|
|
|
@ -412,6 +412,7 @@ function onDragEndTopicHandler(node, eventInfo, e, allowRealtime) {
|
||||||
$('#topic_addSynapse').val("false");
|
$('#topic_addSynapse').val("false");
|
||||||
$('#synapse_topic1id').val(tempNode.id);
|
$('#synapse_topic1id').val(tempNode.id);
|
||||||
$('#synapse_topic2id').val(tempNode2.id);
|
$('#synapse_topic2id').val(tempNode2.id);
|
||||||
|
$('#synapse_desc').autocomplete('enable');
|
||||||
$('#new_synapse').fadeIn('fast');
|
$('#new_synapse').fadeIn('fast');
|
||||||
$('#synapse_desc').focus();
|
$('#synapse_desc').focus();
|
||||||
tempNode = null;
|
tempNode = null;
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
* compiled file, but it's generally better to create a new file per style scope.
|
* compiled file, but it's generally better to create a new file per style scope.
|
||||||
*
|
*
|
||||||
*= require_self
|
*= require_self
|
||||||
|
*= require_tree ../../../vendor/assets/stylesheets
|
||||||
*= require_tree .
|
*= require_tree .
|
||||||
*= require base
|
*= require base
|
||||||
*= require ForceDirected
|
*= require ForceDirected
|
||||||
|
|
|
@ -91,7 +91,7 @@ class TopicsController < ApplicationController
|
||||||
@synapse = "false"
|
@synapse = "false"
|
||||||
if params[:topic][:addSynapse] == "true"
|
if params[:topic][:addSynapse] == "true"
|
||||||
@synapse = "true"
|
@synapse = "true"
|
||||||
end
|
end
|
||||||
|
|
||||||
# also create an object to return the position to the canvas
|
# also create an object to return the position to the canvas
|
||||||
@position = Hash.new()
|
@position = Hash.new()
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
* @file
|
* @file
|
||||||
* Javascript called when you create a new synapse.
|
* Javascript called when you create a new synapse.
|
||||||
*/
|
*/
|
||||||
|
$('#synapse_desc').autocomplete('disable');
|
||||||
$('#new_synapse').fadeOut('fast');
|
$('#new_synapse').fadeOut('fast');
|
||||||
$('#synapse_desc').attr('value','');
|
$('#synapse_desc').attr('value','');
|
||||||
$('#synapse_topic1id').attr('value','0');
|
$('#synapse_topic1id').attr('value','0');
|
||||||
|
@ -32,10 +33,6 @@ if ( Mconsole != null) {
|
||||||
temp.data.$direction = d;
|
temp.data.$direction = d;
|
||||||
Mconsole.fx.plotLine(temp, Mconsole.canvas);
|
Mconsole.fx.plotLine(temp, Mconsole.canvas);
|
||||||
selectEdge(temp);
|
selectEdge(temp);
|
||||||
Mconsole.fx.animate({
|
|
||||||
modes: ['edge-property:lineWidth:color'],
|
|
||||||
duration: 400
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
json = <%= @synapse.selfplusnodes_as_json.html_safe %>
|
json = <%= @synapse.selfplusnodes_as_json.html_safe %>
|
||||||
|
|
|
@ -2,11 +2,8 @@
|
||||||
* @file
|
* @file
|
||||||
* This javascript is returned and executed when you create a new node.
|
* This javascript is returned and executed when you create a new node.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
$('#new_topic').fadeOut('fast');
|
$('#new_topic').fadeOut('fast');
|
||||||
$('#topic_name').data().autocomplete.term = null;
|
$('#topic_name').autocomplete('disable');
|
||||||
$('.ui-autocomplete').children().remove();
|
|
||||||
$('.ui-autocomplete').css('display','none');
|
|
||||||
$('#topic_name').attr('value','');
|
$('#topic_name').attr('value','');
|
||||||
$('#topic_grabTopic').attr('value','null');
|
$('#topic_grabTopic').attr('value','null');
|
||||||
$('#topic_addSynapse').attr('value','false');
|
$('#topic_addSynapse').attr('value','false');
|
||||||
|
@ -49,6 +46,7 @@ if (!$.isEmptyObject(Mconsole.graph.nodes)) {
|
||||||
if ( '<%= @synapse %>' == "true" ) {
|
if ( '<%= @synapse %>' == "true" ) {
|
||||||
$('#synapse_topic1id').val(tempNode.id);
|
$('#synapse_topic1id').val(tempNode.id);
|
||||||
$('#synapse_topic2id').val(temp.id);
|
$('#synapse_topic2id').val(temp.id);
|
||||||
|
$('#synapse_desc').autocomplete('enable');
|
||||||
$('#new_synapse').fadeIn('fast');
|
$('#new_synapse').fadeIn('fast');
|
||||||
$('#synapse_desc').focus();
|
$('#synapse_desc').focus();
|
||||||
Mconsole.fx.animate({
|
Mconsole.fx.animate({
|
||||||
|
@ -83,7 +81,7 @@ if (!$.isEmptyObject(Mconsole.graph.nodes)) {
|
||||||
temp.setData('dim', 25, 'end');
|
temp.setData('dim', 25, 'end');
|
||||||
temp.setData('onCanvas', false);
|
temp.setData('onCanvas', false);
|
||||||
temp.setData('inCommons', false);
|
temp.setData('inCommons', false);
|
||||||
if (gType == "arranged" || gType == "chaotic") {
|
if ((gType == "arranged" || gType == "chaotic") && mapid != null) {
|
||||||
temp.setData('mappingid', <%= @mapping.id %>);
|
temp.setData('mappingid', <%= @mapping.id %>);
|
||||||
}
|
}
|
||||||
temp.setPos(new $jit.Complex(x, y), 'current');
|
temp.setPos(new $jit.Complex(x, y), 'current');
|
||||||
|
|
BIN
vendor/assets/images/ui-bg_flat_0_aaaaaa_40x100.png
vendored
Normal file
After Width: | Height: | Size: 180 B |
BIN
vendor/assets/images/ui-bg_flat_75_ffffff_40x100.png
vendored
Normal file
After Width: | Height: | Size: 178 B |
BIN
vendor/assets/images/ui-bg_glass_55_fbf9ee_1x400.png
vendored
Normal file
After Width: | Height: | Size: 120 B |
BIN
vendor/assets/images/ui-bg_glass_65_ffffff_1x400.png
vendored
Normal file
After Width: | Height: | Size: 105 B |
BIN
vendor/assets/images/ui-bg_glass_75_dadada_1x400.png
vendored
Normal file
After Width: | Height: | Size: 111 B |
BIN
vendor/assets/images/ui-bg_glass_75_e6e6e6_1x400.png
vendored
Normal file
After Width: | Height: | Size: 110 B |
BIN
vendor/assets/images/ui-bg_glass_95_fef1ec_1x400.png
vendored
Normal file
After Width: | Height: | Size: 119 B |
BIN
vendor/assets/images/ui-bg_highlight-soft_75_cccccc_1x100.png
vendored
Normal file
After Width: | Height: | Size: 101 B |
BIN
vendor/assets/images/ui-icons_222222_256x240.png
vendored
Normal file
After Width: | Height: | Size: 4.3 KiB |
BIN
vendor/assets/images/ui-icons_2e83ff_256x240.png
vendored
Normal file
After Width: | Height: | Size: 4.3 KiB |
BIN
vendor/assets/images/ui-icons_454545_256x240.png
vendored
Normal file
After Width: | Height: | Size: 4.3 KiB |
BIN
vendor/assets/images/ui-icons_888888_256x240.png
vendored
Normal file
After Width: | Height: | Size: 4.3 KiB |
BIN
vendor/assets/images/ui-icons_cd0a0a_256x240.png
vendored
Normal file
After Width: | Height: | Size: 4.3 KiB |