From 31bf654ee3600ec854a3221b5f93c0d090bdeee9 Mon Sep 17 00:00:00 2001 From: Zoran Pandovski Date: Fri, 26 Jan 2018 23:00:20 +0100 Subject: [PATCH 1/2] Fix copy to clipboard --- ckanext/querytool/fanstatic/javascript/public_query.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ckanext/querytool/fanstatic/javascript/public_query.js b/ckanext/querytool/fanstatic/javascript/public_query.js index 00e7d43c..026f6ce1 100644 --- a/ckanext/querytool/fanstatic/javascript/public_query.js +++ b/ckanext/querytool/fanstatic/javascript/public_query.js @@ -142,10 +142,9 @@ $('#appendedInputButtons').val(window.location.href); $('.copyToClipboard').on('click', function () { - var $temp = $(""); - $("body").append($temp); - $temp.val($('#appendedInputButtons').val()).select(); - document.execCommand("copy"); + var copyText = $('#appendedInputButtons'); + copyText.select(); + document.execCommand("Copy"); }); }); From 6f7c1b3232c641c094f4a232d616da04ffa91837 Mon Sep 17 00:00:00 2001 From: Zoran Pandovski Date: Sun, 28 Jan 2018 19:48:05 +0100 Subject: [PATCH 2/2] Change order of scripts --- ckanext/querytool/templates/querytool/public/read.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ckanext/querytool/templates/querytool/public/read.html b/ckanext/querytool/templates/querytool/public/read.html index dcdfd646..4289c008 100644 --- a/ckanext/querytool/templates/querytool/public/read.html +++ b/ckanext/querytool/templates/querytool/public/read.html @@ -1,7 +1,7 @@ -{% resource "querytool/javascript/public_query.js" %} {% resource 'querytool/vendor/c3/c3.css' %} {% resource 'querytool/vendor/d3/d3.js' %} {% resource 'querytool/vendor/c3/c3.js' %} +{% resource "querytool/javascript/public_query.js" %} {% resource 'querytool/javascript/modules/viz-preview.js' %} {% resource 'querytool/javascript/modules/tool-embed.js' %} {% import 'macros/form.html' as form %}