diff --git a/app/assets/javascripts/Jit/filters.js b/app/assets/javascripts/Jit/filters.js
index 09902aeb..8a85d9ce 100644
--- a/app/assets/javascripts/Jit/filters.js
+++ b/app/assets/javascripts/Jit/filters.js
@@ -104,3 +104,228 @@ function showAll(duration) {
duration: duration
});
}
+
+
+ $(document).ready(function() {
+
+ $('.sideOption').bind('click',function(){
+ $('.sideOption').animate({
+ width: '250px',
+ height: '76px'
+ }, 700, function() {
+ $('#by_name_input').focus();
+ });
+ $('#closeFind').css('display','block');
+ $('.sideOption').unbind('click');
+ $('.sideOption').css('cursor','default');
+ });
+
+ $('#closeFind').click(function(){
+ $('#closeFind').css('display','none');
+ $('.sideOption').css('cursor','pointer');
+ $('.sideOption').animate({
+ width: '45px',
+ height: '32px'
+ }, 700, function() {
+ $('.sideOption').bind('click',function(){
+ firstVal = $('.sideOption option[value="name"]').attr('selected');
+ secondVal = $('.sideOption option[value="metacode"]').attr('selected');
+ if ( firstVal === 'selected') {
+ $('.sideOption').animate({
+ width: '250px',
+ height: '76px'
+ }, 700, function() {
+ $('#by_name_input').focus();
+ });
+ } else if ( secondVal === 'selected') {
+ $('.sideOption').animate({
+ width: '380px',
+ height: '463px'
+ }, 700, function() {
+ // Animation complete.
+ });
+ }
+ $('#closeFind').css('display','block');
+ $('.sideOption').unbind('click');
+ $('.sideOption').css('cursor','default');
+ });
+ });
+ });
+
+ $('.sideOption .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') {
+ $('.sideOption .select_type').children("option[value='metacode']").removeAttr('disabled');
+ $('.find').css('display','none');
+ $('.find_topic_by_name').css('display','block');
+ $('#topic_by_name_input').focus();
+
+ }
+ else if ( secondVal == 'selected' ) {
+ if ( $(".sideOption .select_type").val() != "name") {
+ $(".sideOption .select_type").val('name');
+ $('.sideOption').animate({
+ width: '250px',
+ height: '76px'
+ }, 700, function() {
+ // Animation complete.
+ });
+ }
+ $('.sideOption .select_type').children("option[value='metacode']").attr('disabled','disabled');
+ $('.find').css('display','none');
+ $('.find_map_by_name').css('display','block');
+ $('#map_by_name_input').focus();
+ }
+ else if ( thirdVal == 'selected' ) {
+ $(".sideOption .select_type").val('name');
+ $('.sideOption .select_type').children("option[value='metacode']").attr('disabled','disabled');
+ $('.find').css('display','none');
+ $('.find_mapper_by_name').css('display','block');
+ $('#mapper_by_name_input').focus();
+ }
+ });
+
+ $('.sideOption .select_type').change(function() {
+ firstVal = $(this).children("option[value='name']").attr('selected');
+ secondVal = $(this).children("option[value='metacode']").attr('selected');
+ if ( firstVal === 'selected') {
+ $('.find_topic_by_metacode').fadeOut('fast', function() {
+ showAll();
+ $('.find_topic_by_metacode ul li').not('#hideAll, #showAll').removeClass('toggledOff');
+ for (var catVis in categoryVisible) {
+ categoryVisible[catVis] = true;
+ }
+ $('.sideOption').animate({
+ width: '250px',
+ height: '76px'
+ }, 700, function() {
+ // Animation complete.
+ });
+ $('.find_topic_by_name').fadeIn('fast');
+ });
+ }
+ else if ( secondVal === 'selected' ) {
+ $('.find_topic_by_name').fadeOut('fast', function() {
+ $('.sideOption').animate({
+ width: '380px',
+ height: '463px'
+ }, 700, function() {
+ // Animation complete.
+ });
+ $('.find_topic_by_metacode').fadeIn('fast');
+ });
+ }
+ });
+
+ $('.find_topic_by_name #topic_by_name_input').bind('railsAutocomplete.select', function(event, data){
+ /* Do something here */
+ if (data.item.user_id != undefined && data.item.id != undefined) {
+ window.open("/users/" + data.item.user_id + "/items/" + 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){
+ /* Do something here */
+ if (data.item.user_id != undefined && data.item.id != undefined) {
+ window.open("/users/" + data.item.user_id + "/maps/" + data.item.id)
+ }
+ $('.find_map_by_name #map_by_name_input').val('');
+ });
+
+ $('.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){
+ /* Do something here */
+ 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 item categories 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") {
+ // this means that we are on a map view
+ if (obj != null) {
+ showAll();
+ }
+ // this means that we are on a card view
+ else {
+ $('.item').fadeIn('slow');
+ }
+ $('.find_topic_by_metacode ul li').not('#hideAll, #showAll').removeClass('toggledOff');
+ for (var catVis in categoryVisible) {
+ categoryVisible[catVis] = true;
+ }
+ }
+ else if (switchAll == "hideAll") {
+ // this means that we are on a map view
+ if (obj != null) {
+ hideAll();
+ }
+ // this means that we are on a card view
+ else {
+ $('.item').fadeOut('slow');
+ }
+ $('.find_topic_by_metacode ul li').not('#hideAll, #showAll').addClass('toggledOff');
+ for (var catVis in categoryVisible) {
+ categoryVisible[catVis] = false;
+ }
+ }
+ }
+ else {
+ var category = $(this).children('img').attr('alt');
+
+ // this means that we are on a map view
+ if (obj != null) {
+ switchVisible(category);
+ }
+ // this means that we are on a card view
+ else {
+ if (categoryVisible[category] == true) {
+ if (category.split(' ').length == 1) {
+ $('#cards .' + category).fadeOut('slow');
+ }
+ else {
+ $('#cards .' + category.split(' ')[0]).fadeOut('slow');
+ }
+ }
+ else if (categoryVisible[category] == false) {
+ if (category.split(' ').length == 1) {
+ $('#cards .' + category).fadeIn('slow');
+ }
+ else {
+ $('#cards .' + category.split(' ')[0]).fadeIn('slow');
+ }
+ }
+ }
+ // toggle the image and the boolean array value
+ if (categoryVisible[category] == true) {
+ $(this).addClass('toggledOff');
+ categoryVisible[category] = false;
+ }
+ else if (categoryVisible[category] == false) {
+ $(this).removeClass('toggledOff');
+ categoryVisible[category] = true;
+ }
+ }
+ });
+});
\ No newline at end of file
diff --git a/app/assets/javascripts/Jit/graphsettings.js b/app/assets/javascripts/Jit/graphsettings.js
index e9e6e3c7..9ee000cf 100644
--- a/app/assets/javascripts/Jit/graphsettings.js
+++ b/app/assets/javascripts/Jit/graphsettings.js
@@ -41,21 +41,7 @@ function graphSettings(type) {
//Add Tips
Tips: {
enable: false,
- onShow: function (tip, node) {
-
- //display node info in tooltip
- var html =
- '' + node.getData("itemcatname") + '
' +
- '' + node.getData('link') + ' ';
-
- tip.innerHTML = '
';
- $jit.id('item_' + node.id).innerHTML = html;
- $("#_tooltip .scroll").mCustomScrollbar();
- }
+ onShow: function (tip, node) {}
},
// Add node events
Events: {
@@ -142,12 +128,7 @@ function graphSettings(type) {
// add some events to the label
nameContainer.onclick = function(){
- node.setData('dim', 1, 'current');
- $('.showcard').css('display','none');
- $('.name').css('display','block');
- $('.name.item_' + node.id).css('display','none');
- $('.showcard.item_' + node.id).fadeIn('fast');
- Mconsole.plot();
+ selectNodeOnClickHandler(node)
}
},
// Change node styles when DOM labels are placed
@@ -209,16 +190,8 @@ function graphSettings(type) {
},
//Add Tips
Tips: {
- enable: true,
- onShow: function (tip, node) {
- //count connections
- var count = 0;
- node.eachAdjacency(function () {
- count++;
- });
- //display node info in tooltip
- tip.innerHTML = "" + node.name + "
" + "connections: " + count + "
";
- }
+ enable: false,
+ onShow: function (tip, node) {}
},
// Add node events
Events: {
@@ -226,10 +199,10 @@ function graphSettings(type) {
type: 'HTML',
//Change cursor style when hovering a node
onMouseEnter: function () {
- //Mconsole.canvas.getElement().style.cursor = 'move';
+
},
onMouseLeave: function () {
- //Mconsole.canvas.getElement().style.cursor = '';
+
},
//Update node positions when dragged
onDragMove: function (node, eventInfo, e) {
@@ -243,83 +216,82 @@ function graphSettings(type) {
this.onDragMove(node, eventInfo, e);
},
//Add also a click handler to nodes
- onClick: function (node) {
- if (!node) return;
- //set final styles
- Mconsole.graph.eachNode(function (n) {
- if (n.id != node.id) delete n.selected;
- n.setData('dim', 25, 'end');
- n.eachAdjacency(function (adj) {
- adj.setDataset('end', {
- lineWidth: 1,
- color: '#222222'
- });
- adj.setData('showDesc', false, 'current');
- });
- });
- if (!node.selected) {
- node.selected = true;
- node.setData('dim', 35, 'end');
- node.eachAdjacency(function (adj) {
- adj.setDataset('end', {
- lineWidth: 3,
- color: '#FFF'
- });
- adj.setData('showDesc', true, 'current');
- });
+ onClick: function (node, eventInfo, e) {
+ //clicking on a node, or clicking on blank part of canvas?
+ if (node) {
+ if (!Mconsole.busy) {
+ selectNodeOnClickHandler(node);
+ Mconsole.onClick(node.id, {
+ hideLabels: false
+ });
+ }
} else {
- delete node.selected;
- }
- //trigger animation to final styles
- Mconsole.fx.animate({
- modes: ['node-property:dim',
- 'edge-property:lineWidth:color'],
- duration: 500
- });
- // Build the right column relations list.
- // This is done by traversing the clicked node connections.
- var html =
- '' + node.getData("itemcatname") + '
' +
- '' + node.getData('link') + ' ';
-
- //append connections information
- $jit.id('showcard').innerHTML = '
';
- $jit.id('item_' + node.id).innerHTML = html;
- $("#showcard .scroll").mCustomScrollbar();
- }
+ canvasDoubleClickHandler(eventInfo.getPos(), e);
+ }//if
+ }//onClick
},
- //Number of iterations for the Mconsole algorithm
+ //Number of iterations for the FD algorithm
iterations: 200,
//Edge length
levelDistance: 200,
// Add text to the labels. This method is only triggered
// on label creation and only for DOM labels (not native canvas ones).
onCreateLabel: function (domElement, node) {
- // Create a 'name' and 'close' buttons and add them
- // to the main node label
- domElement.innerHTML = '' + node.name + '
';
- domElement.onclick = function () {
- Mconsole.onClick(node.id, {
- onComplete: function () {
- var html =
- '' + node.getData("itemcatname") + '
' +
- '' + node.getData('link') + ' ';
-
- //append connections information
- $jit.id('showcard').innerHTML = '
';
- $jit.id('item_' + node.id).innerHTML = html;
- $("#showcard .scroll").mCustomScrollbar();
- }
- });
- }
+ var html =
+ '';
+ var showCard = document.createElement('div');
+ showCard.className = 'showcard item_' + node.id;
+ showCard.innerHTML = html;
+ showCard.style.display = "none";
+ domElement.appendChild(showCard);
+
+ // add some events to the label
+ showCard.onclick = function(){
+ if (!Mconsole.busy) {
+ delete node.selected;
+ node.setData('dim', 25, 'current');
+ node.eachAdjacency(function (adj) {
+ adj.setDataset('end', {
+ lineWidth: 0.5,
+ color: '#222222'
+ });
+ adj.setData('showDesc', false, 'current');
+ });
+ Mconsole.fx.animate({
+ modes: ['edge-property:lineWidth:color'],
+ duration: 500
+ });
+ $('.showcard.item_' + node.id).fadeOut('fast', function(){
+ $('.name').css('display','block');
+ Mconsole.plot();
+ });
+ }
+ }
+
+ // Create a 'name' button and add it
+ // to the main node label
+ var nameContainer = document.createElement('span'),
+ style = nameContainer.style;
+ nameContainer.className = 'name item_' + node.id;
+ nameContainer.innerHTML = '' + node.name + '
';
+ domElement.appendChild(nameContainer);
+ style.fontSize = "0.9em";
+ style.color = "#222222";
+
+ // add some events to the label
+ nameContainer.onclick = function(){
+ if (!Mconsole.busy) {
+ selectNodeOnClickHandler(node);
+ Mconsole.onClick(node.id, {
+ hideLabels: false
+ });
+ }
+ }
},
// Change node styles when DOM labels are placed
// or moved.
@@ -328,9 +300,8 @@ function graphSettings(type) {
var left = parseInt(style.left);
var top = parseInt(style.top);
var w = domElement.offsetWidth;
- var dim = node.getData('dim');
style.left = (left - w / 2) + 'px';
- style.top = (top + dim) + 'px';
+ style.top = (top+25) + 'px';
style.display = '';
}
};
@@ -410,7 +381,6 @@ function selectNodeOnClickHandler(node) {
$('.name').css('display','block');
$('.name.item_' + node.id).css('display','none');
$('.showcard.item_' + node.id).fadeIn('fast');
- Mconsole.plot();
//set final styles
Mconsole.graph.eachNode(function (n) {
@@ -426,7 +396,8 @@ function selectNodeOnClickHandler(node) {
});
if (!node.selected) {
node.selected = true;
- node.setData('dim', 1, 'current');
+ node.setData('dim', 1, 'current');
+
node.eachAdjacency(function (adj) {
adj.setDataset('end', {
lineWidth: 3,
@@ -458,6 +429,7 @@ function canvasDoubleClickHandler(canvasLoc,e) {
if (now - storedTime < TOLERANCE) {
//pop up node creation :)
+ $('#item_grabItem').val("null");
document.getElementById('new_item').style.left = e.x + "px";
document.getElementById('new_item').style.top = e.y + "px";
$('#item_x').val(canvasLoc.x);
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 36e960a6..ba9675d2 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -20,103 +20,21 @@
var viewMode = "list";
$(document).ready(function() {
-
- $('.sideOption').bind('click',function(){
- $('.sideOption').animate({
- width: '245px',
- height: '76px'
- }, 700, function() {
- $('#by_name_input').focus();
- });
- $('#closeFind').css('display','block');
- $('.sideOption').unbind('click');
- $('.sideOption').css('cursor','default');
- });
-
- $('#closeFind').click(function(){
- $('#closeFind').css('display','none');
- $('.sideOption').css('cursor','pointer');
- $('.sideOption').animate({
- width: '45px',
- height: '32px'
- }, 700, function() {
- $('.sideOption').bind('click',function(){
- firstVal = $('.sideOption option[value="name"]').attr('selected');
- secondVal = $('.sideOption option[value="metacode"]').attr('selected');
- if ( firstVal === 'selected') {
- $('.sideOption').animate({
- width: '245px',
- height: '76px'
- }, 700, function() {
- $('#by_name_input').focus();
- });
- } else if ( secondVal === 'selected') {
- $('.sideOption').animate({
- width: '380px',
- height: '463px'
- }, 700, function() {
- // Animation complete.
- });
- }
- $('#closeFind').css('display','block');
- $('.sideOption').unbind('click');
- $('.sideOption').css('cursor','default');
- });
- });
- });
-
- $('.sideOption .select_type').change(function() {
- firstVal = $(this).children("option[value='name']").attr('selected');
- secondVal = $(this).children("option[value='metacode']").attr('selected');
- if ( firstVal === 'selected') {
- $('.find_topic_by_metacode').fadeOut('fast', function() {
- showAll();
- $('.find_topic_by_metacode ul li').not('#hideAll, #showAll').removeClass('toggledOff');
- for (var catVis in categoryVisible) {
- categoryVisible[catVis] = true;
- }
- $('.sideOption').animate({
- width: '245px',
- height: '76px'
- }, 700, function() {
- // Animation complete.
- });
- $('.find_topic_by_name').fadeIn('fast');
- });
- }
- else if ( secondVal === 'selected' ) {
- $('.find_topic_by_name').fadeOut('fast', function() {
- $('.sideOption').animate({
- width: '380px',
- height: '463px'
- }, 700, function() {
- // Animation complete.
- });
- $('.find_topic_by_metacode').fadeIn('fast');
- });
- }
- });
-
- $('.find_topic_by_name #by_name_input').bind('railsAutocomplete.select', function(event, data){
- /* Do something here */
- if (data.item.user_id != undefined && data.item.id != undefined) {
- window.open("/users/" + data.item.user_id + "/items/" + data.item.id)
- }
- else if (data.item.value == "no existing match"){
- $('.find_topic_by_name #by_name_input').val('');
+
+ /// this is for the topic creation autocomplete fielf
+ $('#item_name').bind('railsAutocomplete.select', function(event, data){
+ if (data.item.id != undefined) {
+ $('#item_grabItem').val(data.item.id);
+ $('#new_item').submit();
}
});
-
- $('.find_topic_by_name').bind('submit', function(event, data){
- event.preventDefault();
- });
-
+
$(".focus .desc").mCustomScrollbar();
$(".scroll").mCustomScrollbar();
$('.nodemargin').css('padding-top',$('.focus').css('height'));
- // controls the sliding hover of the filters
+ // controls the sliding hover of the menus at the top
var sliding1 = false;
$(".accountWrap").hover(
function () {
@@ -156,80 +74,6 @@ var viewMode = "list";
}
}
);
-
- // toggle visibility of item categories 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") {
- // this means that we are on a map view
- if (obj != null) {
- showAll();
- }
- // this means that we are on a card view
- else {
- $('.item').fadeIn('slow');
- }
- $('.find_topic_by_metacode ul li').not('#hideAll, #showAll').removeClass('toggledOff');
- for (var catVis in categoryVisible) {
- categoryVisible[catVis] = true;
- }
- }
- else if (switchAll == "hideAll") {
- // this means that we are on a map view
- if (obj != null) {
- hideAll();
- }
- // this means that we are on a card view
- else {
- $('.item').fadeOut('slow');
- }
- $('.find_topic_by_metacode ul li').not('#hideAll, #showAll').addClass('toggledOff');
- for (var catVis in categoryVisible) {
- categoryVisible[catVis] = false;
- }
- }
- }
- else {
- var category = $(this).children('img').attr('alt');
-
- // this means that we are on a map view
- if (obj != null) {
- switchVisible(category);
- }
- // this means that we are on a card view
- else {
- if (categoryVisible[category] == true) {
- if (category.split(' ').length == 1) {
- $('#cards .' + category).fadeOut('slow');
- }
- else {
- $('#cards .' + category.split(' ')[0]).fadeOut('slow');
- }
- }
- else if (categoryVisible[category] == false) {
- if (category.split(' ').length == 1) {
- $('#cards .' + category).fadeIn('slow');
- }
- else {
- $('#cards .' + category.split(' ')[0]).fadeIn('slow');
- }
- }
- }
- // toggle the image and the boolean array value
- if (categoryVisible[category] == true) {
- $(this).addClass('toggledOff');
- categoryVisible[category] = false;
- }
- else if (categoryVisible[category] == false) {
- $(this).removeClass('toggledOff');
- categoryVisible[category] = true;
- }
- }
- });
// this is to save the layout of maps
var coor = "";
diff --git a/app/assets/javascripts/autocomplete-rails-uncompressed.js b/app/assets/javascripts/autocomplete-rails-uncompressed.js
index edd20c45..37b61fea 100644
--- a/app/assets/javascripts/autocomplete-rails-uncompressed.js
+++ b/app/assets/javascripts/autocomplete-rails-uncompressed.js
@@ -1,130 +1,130 @@
-/*
-* Unobtrusive autocomplete
-*
-* To use it, you just have to include the HTML attribute autocomplete
-* with the autocomplete URL as the value
-*
-* Example:
-*
<%= form_for Item.new, url: user_items_url(user), remote: true do |form| %>
- <%= form.text_field :name %>
+ <%= form.autocomplete_field :name, autocomplete_item_name_items_path, :placeholder => "What is the name of your topic?" %>
<%= form.hidden_field :x, :value => 0 %>
<%= form.hidden_field :y, :value => 0 %>
+ <%= form.hidden_field :grabItem, :value => "null" %>
<% end %>
diff --git a/app/views/items/create.js.erb b/app/views/items/create.js.erb
index eeeda9b7..132788a7 100644
--- a/app/views/items/create.js.erb
+++ b/app/views/items/create.js.erb
@@ -1,5 +1,8 @@
$('#new_item').fadeOut('fast');
-$('#new_item')[0].reset();
+$('#item_name').data().autocomplete.term = null;
+$('.ui-autocomplete').children().remove();
+$('.ui-autocomplete').css('display','none');
+$('#item_name').attr('value','');
if(viewMode == "graph") {
var newnode = <%= @item.self_as_json.html_safe %>;
@@ -9,6 +12,12 @@ if(viewMode == "graph") {
if (Mconsole != null) {
Mconsole.graph.addNode(newnode);
+
+ // set the animation for everything back to normal
+ Mconsole.graph.eachNode( function (n) {
+ n.setData('dim', 25, 'start');
+ n.setData('dim', 25, 'end');
+ });
var temp = Mconsole.graph.getNode('<%= @item.id %>');
temp.setData('dim', 1, 'start');
temp.setData('dim', 40, 'end');
@@ -37,12 +46,8 @@ if(viewMode == "graph") {
json = newnode;
initialize("chaotic");
}
- // add the new node to the synapse select lists
- $("#node1_id").prepend("<%= @item.name %> ");
- $("#node2_id").prepend("<%= @item.name %> ");
-
}
else {
$('#cards').prepend('<%= escape_javascript(render(@item)) %>');
$(".scroll").mCustomScrollbar();
-}
+}
\ No newline at end of file
diff --git a/app/views/items/show.html.erb b/app/views/items/show.html.erb
index 649752ba..ece31552 100644
--- a/app/views/items/show.html.erb
+++ b/app/views/items/show.html.erb
@@ -20,8 +20,6 @@
-
-
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index ec77181e..83d04042 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -12,6 +12,8 @@
<%= javascript_include_tag "application" %>
+
+
<%= csrf_meta_tags %>
@@ -55,66 +57,7 @@
<%= yield %>
- close
-
-
Find...
-
- Topics
-
-
-
by
-
- Name
- Metacode
-
-
- <%= form_for Item.new, :html => { :class => "find_topic_by_name", :id => "find_topic_by_name" } do |f| %>
- <%= f.autocomplete_field :name, autocomplete_item_name_items_path, :id => "by_name_input", :placeholder => "Search for topics..." %>
- <% end %>
-
-
