From 958d05742208d44bb20b7766f41fb1ada5a63b85 Mon Sep 17 00:00:00 2001 From: Liv Erickson Date: Wed, 18 Apr 2018 11:38:21 -0700 Subject: [PATCH 1/3] trim before importing from clipboard --- scripts/system/edit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/system/edit.js b/scripts/system/edit.js index 467842c712..9d50a42795 100644 --- a/scripts/system/edit.js +++ b/scripts/system/edit.js @@ -1679,7 +1679,7 @@ function importSVO(importURL) { visible: true }); - var success = Clipboard.importEntities(importURL); + var success = Clipboard.importEntities(importURL.trim()); if (success) { var VERY_LARGE = 10000; From d2335ea9f6e3675e28ba86b7e3957fc2c72664ac Mon Sep 17 00:00:00 2001 From: Liv Erickson Date: Wed, 18 Apr 2018 13:18:50 -0700 Subject: [PATCH 2/3] fix in where octree imports url so fix is global --- libraries/octree/src/Octree.cpp | 2 +- scripts/system/edit.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/octree/src/Octree.cpp b/libraries/octree/src/Octree.cpp index dafdfd5bf4..8191049971 100644 --- a/libraries/octree/src/Octree.cpp +++ b/libraries/octree/src/Octree.cpp @@ -1669,7 +1669,7 @@ QString getMarketplaceID(const QString& urlString) { bool Octree::readFromURL(const QString& urlString) { QString marketplaceID = getMarketplaceID(urlString); auto request = - std::unique_ptr(DependencyManager::get()->createResourceRequest(this, urlString)); + std::unique_ptr(DependencyManager::get()->createResourceRequest(this, urlString.trimmed())); if (!request) { return false; diff --git a/scripts/system/edit.js b/scripts/system/edit.js index 9d50a42795..467842c712 100644 --- a/scripts/system/edit.js +++ b/scripts/system/edit.js @@ -1679,7 +1679,7 @@ function importSVO(importURL) { visible: true }); - var success = Clipboard.importEntities(importURL.trim()); + var success = Clipboard.importEntities(importURL); if (success) { var VERY_LARGE = 10000; From afea18678496ba83b0d0ea49b6c3f0d4d0539bef Mon Sep 17 00:00:00 2001 From: Liv Erickson Date: Wed, 25 Apr 2018 14:39:04 -0700 Subject: [PATCH 3/3] fix for both functions --- libraries/octree/src/Octree.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/octree/src/Octree.cpp b/libraries/octree/src/Octree.cpp index 3e98d5b196..2efd32f2e8 100644 --- a/libraries/octree/src/Octree.cpp +++ b/libraries/octree/src/Octree.cpp @@ -795,9 +795,10 @@ QString getMarketplaceID(const QString& urlString) { } bool Octree::readFromURL(const QString& urlString) { - QString marketplaceID = getMarketplaceID(urlString); + QString trimmedUrl = urlString.trimmed(); + QString marketplaceID = getMarketplaceID(trimmedUrl); auto request = - std::unique_ptr(DependencyManager::get()->createResourceRequest(this, urlString.trimmed())); + std::unique_ptr(DependencyManager::get()->createResourceRequest(this, trimmedUrl)); if (!request) { return false;