From f9fa9d740333aac315bcc293d04fc66d7489c273 Mon Sep 17 00:00:00 2001
From: Avi Kohn <avi@ichro.me>
Date: Fri, 22 May 2015 09:18:36 -0400
Subject: [PATCH] Incremented version and changed UV due to limits

iChrome has been exceeding UserVoice's free plan limits (1,000,000
requests/month).  This change makes the auto-prompt code only load for
20% of page views.

This commit also increments the version, and moves the homepage override
up in the manifest so merges don't have to be handled manually.
---
 app/js/core/uservoice.js | 50 +++++++++++++++++++++++++---------------
 app/manifest.json        |  8 +++----
 2 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/app/js/core/uservoice.js b/app/js/core/uservoice.js
index 8ca22432..51a1de34 100644
--- a/app/js/core/uservoice.js
+++ b/app/js/core/uservoice.js
@@ -2,34 +2,46 @@
  * Initializes UserVoice and it's autoprompts
  */
 define(["core/uid"], function(uid) {
-	window.UserVoice = window.UserVoice || [];
+	var initUV = function() {
+		var uv = document.createElement("script");
 
-	var uv = document.createElement("script");
+		uv.async = true;
+		uv.type = "text/javascript";
+		uv.src = "https://widget.uservoice.com/YLT6rl3u3uU75IbSodIBw.js";
 
-	uv.async = true;
-	uv.type = "text/javascript";
-	uv.src = "https://widget.uservoice.com/YLT6rl3u3uU75IbSodIBw.js";
+		var s = document.getElementsByTagName("script")[0];
 
-	var s = document.getElementsByTagName("script")[0];
+		s.parentNode.insertBefore(uv, s);
 
-	s.parentNode.insertBefore(uv, s);
+		window.UserVoice.push(["set", {
+			accent_color: "#448dd6",
+			trigger_color: "white",
+			screenshot_enabled: "false",
+			trigger_background_color: "rgba(46, 49, 51, 0.6)"
+		}]);
 
-	window.UserVoice.push(["set", {
-		accent_color: "#448dd6",
-		trigger_color: "white",
-		screenshot_enabled: "false",
-		trigger_background_color: "rgba(46, 49, 51, 0.6)"
-	}]);
+		window.UserVoice.push(["identify", {
+			id: uid
+		}]);
 
-	window.UserVoice.push(["identify", {
-		id: uid
-	}]);
+		window.UserVoice.push(["autoprompt", {
+			position: "toast"
+		}]);
+	};
+
+	if (Math.random() * 5 < 1) {
+		window.UserVoice = window.UserVoice || [];
 
-	window.UserVoice.push(["autoprompt", {
-		position: "toast"
-	}]);
+		initUV();
+	}
 
 	return function() {
+		if (!window.UserVoice) {
+			window.UserVoice = [];
+
+			initUV();
+		}
+
 		window.UserVoice.push(Array.prototype.slice.call(arguments));
 	};
 });
\ No newline at end of file
diff --git a/app/manifest.json b/app/manifest.json
index c8b3eaa4..cf8f073a 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -40,6 +40,9 @@
 		"48": "icon/48.png",
 		"128": "icon/128.png"
 	},
+	"chrome_settings_overrides": {
+		"homepage": "http://ichro.me/redirect"
+	},
 	"permissions": [
 		"storage",
 		"topSites",
@@ -56,10 +59,7 @@
 		"bookmarks",
 		"management"
 	],
-	"chrome_settings_overrides": {
-		"homepage": "http://ichro.me/redirect"
-	},
-	"version": "2.1.17",
+	"version": "2.1.18",
 	"manifest_version": 2,
 	"default_locale": "en",
 	"short_name": "iChrome",