glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix a bug with event/e and eslint

Browse source
This commit is contained in:
Devin Howard 2017-04-11 08:16:56 -07:00
parent bb04117ce7
commit 6975b16c1c
2 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
frontend/src/Metamaps/Import.js
View file

@ -6,7 +6,6 @@ import _ from 'lodash'
import Active from './Active' import Active from './Active'
import AutoLayout from './AutoLayout' import AutoLayout from './AutoLayout'
import DataModel from './DataModel' import DataModel from './DataModel'
import GlobalUI from './GlobalUI'
import Map from './Map' import Map from './Map'
import Synapse from './Synapse' import Synapse from './Synapse'
import Topic from './Topic' import Topic from './Topic'
@ -388,7 +387,7 @@ const Import = {
} }
) )
}, },
handleTEXT: function(text, opts = {}) { handleTEXT: function(text, opts = {}) {
let coords = opts.coords let coords = opts.coords
if (!coords || coords.x === undefined || coords.y === undefined) { if (!coords || coords.x === undefined || coords.y === undefined) {
@ -396,11 +395,11 @@ const Import = {
} }
const name = text const name = text
const url = "" const url = ''
const metacode = opts.metacode || 'Wildcard' const metacode = opts.metacode || 'Wildcard'
const importId = opts.importId || null // don't store a cidMapping const importId = opts.importId || null // don't store a cidMapping
const permission = opts.permission || null // use default const permission = opts.permission || null // use default
const desc = opts.desc || "" const desc = opts.desc || ''
Import.createTopicWithParameters( Import.createTopicWithParameters(
name, name,

21
frontend/src/Metamaps/PasteInput.js
View file

@ -19,7 +19,7 @@ const PasteInput = {
e = e || window.event e = e || window.event
// prevent conflict with react-dropzone file uploader // prevent conflict with react-dropzone file uploader
if (event.target.id !== 'infovis-canvas') return if (e.target.id !== 'infovis-canvas') return
e.preventDefault() e.preventDefault()
var coords = Util.pixelsToCoords(Visualize.mGraph, { x: e.clientX, y: e.clientY }) var coords = Util.pixelsToCoords(Visualize.mGraph, { x: e.clientX, y: e.clientY })
@ -29,7 +29,7 @@ const PasteInput = {
// OMG import bookmarks 😍 (Or just text :P) // OMG import bookmarks 😍 (Or just text :P)
if (e.dataTransfer.items && e.dataTransfer.items.length > 0) { if (e.dataTransfer.items && e.dataTransfer.items.length > 0) {
e.dataTransfer.items[0].getAsString(function(text) { e.dataTransfer.items[0].getAsString(function(text) {
self.handle(text,coords) self.handle(text, coords)
}) })
} }
}, false) }, false)
@ -68,17 +68,16 @@ const PasteInput = {
} else if (text.match(/^[Tt]opics\t/) || text.match(/^[Ss]ynapses\t/)) { } else if (text.match(/^[Tt]opics\t/) || text.match(/^[Ss]ynapses\t/)) {
Import.handleTSV(text) Import.handleTSV(text)
} else { } else {
//Handle as plain text // Handle as plain text
let textItems = text.split("\n") let textItems = text.split('\n')
if (textItems.length === 1){ if (textItems.length === 1) {
if(textItems[0].trim() !== ""){ if (textItems[0].trim() !== '') {
Import.handleTEXT(textItems[0].trim(),coords) Import.handleTEXT(textItems[0].trim(), coords)
} }
} } else if (window.confirm('Are you sure you want to create ' + textItems.length + ' new topics?')) {
else if (window.confirm('Are you sure you want to create ' + textItems.length + ' new topics?')) {
textItems.forEach(item => { textItems.forEach(item => {
if(item.trim() !== ""){ if (item.trim() !== '') {
self.handle(item.trim(),coords) self.handle(item.trim(), coords)
} }
}) })
} }