Moved hasSessionStorage and hasLocalStorage into detectors.js (snowplow#91)

Author: fblundun

CHANGELOG

@@ -16,6 +16,7 @@ Renamed SnowPlow everywhere to Snowplow (#69) (TODO)
 Prepended window. or SnowPlow.windowAlias. onto _snaq everywhere (#39)
 Removed legacy Piwik plugin framework (#56)
 Rebased with 0.14.0 (#87)
+Moved hasSessionStorage and hasLocalStorage into detectors.js (#91)
 
 Version 0.14.0 (2014-02-12)
 ---------------------------

Gruntfile.js

@@ -121,7 +121,7 @@ module.exports = function(grunt) {
         },
         files: [
           {
-          src: 'dist/bundle.js',
+          src: 'dist/snowplow.js',
           dest: 'dist/sp.js'
           }
         ]

src/js/lib/detectors.js

@@ -40,6 +40,32 @@
 	var helpers = require('helpers');
 	var murmurhash3_32_gc = require('murmurhash').v3;
 
+	/*
+	 * Checks whether sessionStorage is available, in a way that
+	 * does not throw a SecurityError in Firefox if "always ask"
+	 * is enabled for cookies (https://github.com/snowplow/snowplow/issues/163).
+	 */
+	object.hasSessionStorage = function () {
+		try {
+			return !!window.sessionStorage;
+		} catch (e) {
+			return true; // SecurityError when referencing it means it exists
+		}
+	}
+
+	/*
+	 * Checks whether localStorage is available, in a way that
+	 * does not throw a SecurityError in Firefox if "always ask"
+	 * is enabled for cookies (https://github.com/snowplow/snowplow/issues/163).
+	 */
+	object.hasLocalStorage = function () {
+		try {
+			return !!window.localStorage;
+		} catch (e) {
+			return true; // SecurityError when referencing it means it exists
+		}
+	}
+
 	/*
 	 * Does browser have cookies enabled (for this site)?
 	 */
@@ -66,8 +92,8 @@
 	        navigator.userAgent,
 	        [ screen.height, screen.width, screen.colorDepth ].join("x"),
 	        ( new Date() ).getTimezoneOffset(),
-	        helpers.hasSessionStorage(),
-	        helpers.hasLocalStorage(),
+	        object.hasSessionStorage(),
+	        object.hasLocalStorage(),
 	    ];
 
 	    var plugins = [];

src/js/lib/helpers.js

@@ -70,32 +70,6 @@
 		return matches ? matches[1] : url;
 	}
 
-	/*
-	 * Checks whether sessionStorage is available, in a way that
-	 * does not throw a SecurityError in Firefox if "always ask"
-	 * is enabled for cookies (https://github.com/snowplow/snowplow/issues/163).
-	 */
-	object.hasSessionStorage = function () {
-		try {
-			return !!window.sessionStorage;
-		} catch (e) {
-			return true; // SecurityError when referencing it means it exists
-		}
-	}
-
-	/*
-	 * Checks whether localStorage is available, in a way that
-	 * does not throw a SecurityError in Firefox if "always ask"
-	 * is enabled for cookies (https://github.com/snowplow/snowplow/issues/163).
-	 */
-	object.hasLocalStorage = function () {
-		try {
-			return !!window.localStorage;
-		} catch (e) {
-			return true; // SecurityError when referencing it means it exists
-		}
-	}
-
 	/*
 	 * Fix-up URL when page rendered from search engine cache or translated page.
 	 * TODO: it would be nice to generalise this and/or move into the ETL phase.