From cf7a8addd41d377f963f48d04f7933db62e2d0d8 Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Sat, 18 Feb 2017 19:27:09 -0800 Subject: [PATCH] fix up right click menu's metacode editing --- app/assets/stylesheets/application.scss.erb | 2 +- frontend/src/Metamaps/JIT.js | 21 ++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/app/assets/stylesheets/application.scss.erb b/app/assets/stylesheets/application.scss.erb index 3b2b0fd6..31667ce7 100644 --- a/app/assets/stylesheets/application.scss.erb +++ b/app/assets/stylesheets/application.scss.erb @@ -1250,7 +1250,7 @@ h3.filterBox { box-shadow: 0px 3px 3px rgba(0,0,0,0.12), 0 3px 3px rgba(0,0,0,0.24); } .rightclickmenu .rc-permission:hover > ul, -.rightclickmenu .rc-metacode:hover > ul, +.rightclickmenu .rc-metacode:hover #metacodeOptions > ul, .rightclickmenu .rc-siblings:hover > ul { display: block; } diff --git a/frontend/src/Metamaps/JIT.js b/frontend/src/Metamaps/JIT.js index 8abd67c7..bd952c21 100644 --- a/frontend/src/Metamaps/JIT.js +++ b/frontend/src/Metamaps/JIT.js @@ -1480,11 +1480,16 @@ const JIT = { ReactDOM.render( React.createElement(MetacodeSelect, { onMetacodeSelect: metacodeId => { - const topic = DataModel.Topics.get(node.id) - topic.save({ - metacode_id: metacodeId - }) - Visulaize.mGraph.plot() + if (Selected.Nodes.length > 1) { + // batch update multiple topics + Control.updateSelectedMetacodes(metacodeId) + } else { + const topic = DataModel.Topics.get(node.id) + topic.save({ + metacode_id: metacodeId + }) + } + $(rightclickmenu).remove() }, metacodeSets: TopicCard.metacodeSets }), @@ -1537,12 +1542,6 @@ const JIT = { Control.updateSelectedPermissions($(this).text()) }) - // change the metacode of all the selected nodes that you have edit permission for - $('.rc-metacode li li').click(function() { - $('.rightclickmenu').remove() - Control.updateSelectedMetacodes($(this).attr('data-id')) - }) - // fetch relatives let fetchSent = false $('.rc-siblings').hover(function() {