diff --git a/app/assets/javascripts/src/Metamaps.Control.js b/app/assets/javascripts/src/Metamaps.Control.js
index 4db7f82b..a6058ac2 100644
--- a/app/assets/javascripts/src/Metamaps.Control.js
+++ b/app/assets/javascripts/src/Metamaps.Control.js
@@ -111,6 +111,14 @@ Metamaps.Control = {
}
},
removeSelectedNodes: function () { // refers to removing topics permanently from a map
+ if (Metamaps.Active.Topic) {
+ // hideNode will handle synapses as well
+ _.each(Metamaps.Selected.Nodes, function(node) {
+ Metamaps.Control.hideNode(node.id)
+ Metamaps.Topics.remove(node.id)
+ })
+ return
+ }
if (!Metamaps.Active.Map) return
var l = Metamaps.Selected.Nodes.length,
@@ -285,12 +293,13 @@ Metamaps.Control = {
}
},
removeSelectedEdges: function () {
+ // Topic view is handled by removeSelectedNodes
+ if (!Metamaps.Active.Map) return
+
var l = Metamaps.Selected.Edges.length,
i,
edge
- if (!Metamaps.Active.Map) return
-
var authorized = Metamaps.Active.Map.authorizeToEdit(Metamaps.Active.Mapper)
if (!authorized) {
diff --git a/app/assets/javascripts/src/Metamaps.JIT.js b/app/assets/javascripts/src/Metamaps.JIT.js
index 63c89b67..26c33b4c 100644
--- a/app/assets/javascripts/src/Metamaps.JIT.js
+++ b/app/assets/javascripts/src/Metamaps.JIT.js
@@ -1332,6 +1332,7 @@ Metamaps.JIT = {
if (Metamaps.Active.Map) menustring += '
Hide until refreshCtrl+H
'
if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += 'Remove from mapCtrl+M
'
+ if (Metamaps.Active.Topic) menustring += 'Remove from viewCtrl+M
'
if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += 'DeleteCtrl+D
'
if (Metamaps.Active.Topic) {
@@ -1416,7 +1417,7 @@ Metamaps.JIT = {
}
// remove the selected things from the map
- if (authorized) {
+ if (Metamaps.Active.Topic || authorized) {
$('.rc-remove').click(function () {
$('.rightclickmenu').remove()
Metamaps.Control.removeSelectedEdges()
@@ -1459,11 +1460,11 @@ Metamaps.JIT = {
})
// fetch relatives
- var fetched = false
+ var fetch_sent = false
$('.rc-siblings').hover(function () {
- if (!fetched) {
+ if (!fetch_sent) {
Metamaps.JIT.populateRightClickSiblings(node)
- fetched = true
+ fetch_sent = true
}
})
$('.rc-siblings .fetchAll').click(function () {
@@ -1476,13 +1477,6 @@ Metamaps.JIT = {
var self = Metamaps.JIT
// depending on how many topics are selected, do different things
- /*if (Metamaps.Selected.Nodes.length > 1) {
- // we don't bother filling the submenu with
- // specific numbers, because there are too many topics
- // selected to find those numbers
- $('#loadingSiblings').remove()
- return
- }*/
var topic = node.getData('topic')
@@ -1513,7 +1507,7 @@ Metamaps.JIT = {
}
$.ajax({
- type: 'Get',
+ type: 'GET',
url: '/topics/' + topic.id + '/relative_numbers.json?network=' + topics_string,
success: successCallback,
error: function () {}
@@ -1586,6 +1580,7 @@ Metamaps.JIT = {
if (Metamaps.Active.Map) menustring += 'Hide until refreshCtrl+H
'
if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += 'Remove from mapCtrl+M
'
+ if (Metamaps.Active.Topic) menustring += 'Remove from viewCtrl+M
'
if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += 'DeleteCtrl+D
'
if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += ''