From e669726ed378fe5f47bea771ac4e1c567f9169db Mon Sep 17 00:00:00 2001
From: Les De Ridder <les@lesderid.net>
Date: Mon, 18 Jan 2016 17:30:29 +0100
Subject: [PATCH] Fix URLs without query strings

---
 background.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/background.js b/background.js
index 1264171..460f547 100644
--- a/background.js
+++ b/background.js
@@ -33,7 +33,7 @@ chrome.pageAction.onClicked.addListener(function(tab) {
 	getCurrentTabUrl(function(url) {
 		var betterUrl = getBetterUrl(url);
 		var filename = betterUrl.substr(betterUrl.lastIndexOf("/"));
-		filename = filename.substr(0, filename.indexOf('?'));
+		filename = removeQueryString(filename);
 
 		chrome.storage.sync.get({url: '', tabbehaviour: '', copytoclipboard: false, replacebookmark: false}, function(config) {
 			if(config.url == '') {
@@ -82,12 +82,19 @@ function getBetterUrl(url) {
 	return url;
 }
 
+function removeQueryString(url) {
+	if(url.indexOf('?') != -1) {
+		return url.substr(0, url.indexOf('?'));
+	} else {
+		return url;
+	}
+}
+
 function isCoolUrl(url) {
 	url = url.toLowerCase();
 
 	var extensionIndex = url.lastIndexOf('.');
-	var extension = url.substr(extensionIndex + 1);
-	extension = extension.substr(0, extension.indexOf('?'));
+	var extension = removeQueryString(url.substr(extensionIndex + 1));
 
 	var validExtensions = ["jpg", "jpeg", "png", "gif", "webm", "gifv", "mp4", "mp3", "ogg", "opus"];