From 53867caae83e5fe0b11c11489ed56cf8f96ad4fb Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Sat, 26 Mar 2016 14:20:49 +0800 Subject: [PATCH] allow JSON or TSV parsing --- app/assets/javascripts/src/Metamaps.Import.js.erb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/src/Metamaps.Import.js.erb b/app/assets/javascripts/src/Metamaps.Import.js.erb index 92c9566d..bfce14bd 100644 --- a/app/assets/javascripts/src/Metamaps.Import.js.erb +++ b/app/assets/javascripts/src/Metamaps.Import.js.erb @@ -37,7 +37,16 @@ Metamaps.Import = { $('body').bind('paste', function(e) { var text = e.originalEvent.clipboardData.getData('text/plain'); - var results = self.parseTabbedString(text); + var results; + if (text[0] === '{') { + try { + results = JSON.parse(text); + } catch (Error e) { + results = false; + } + } else { + results = self.parseTabbedString(text); + } if (results === false) return; var topics = results.topics;