Combined and modularised init.js and snowplow.js.

Created new file init.js requiring the resulting module.

Author: fblundun

Gruntfile.js

@@ -65,11 +65,7 @@ module.exports = function(grunt) {
           'banner': '<%= banner %>'
         },
         src: ['src/js/banner.js',
-              'src/js/init.js',
-              'src/js/lib/cookie.js',
-              'src/js/lib/context.js',
-              'src/js/snowplow.js',
-              'src/js/constructor.js'],
+              'src/js/init.js'],
 
         dest: 'dist/snowplow.js'
       }
@@ -86,7 +82,8 @@ module.exports = function(grunt) {
           'src/js/lib/context.js:detectors',
           'src/js/lib/jstz.js:jstz',
           'src/js/lib/sha1.js:sha1',
-          'src/js/tracker.js:tracker'
+          'src/js/tracker.js:tracker',
+          'src/js/snowplow.js:snowplow'
           ]
         },
         files: {

examples/web/sync.html

@@ -20,7 +20,7 @@
     <!-- Snowplow starts plowing -->
     <script type="text/javascript">
     //var spSrc = ('https:' == document.location.protocol ? 'https' : 'http') + '://d1fc8wv8zag5ca.cloudfront.net/0.13.0/sp.js';
-     var spSrc = '../../dist/snowplow.js'; // For testing
+     var spSrc = '../../dist/bundle.js'; // For testing
     document.write(unescape("%3Cscript src='" + spSrc + "' type='text/javascript'%3E%3C/script%3E"));
     </script>
     <script type="text/javascript">

package.json

@@ -10,11 +10,11 @@
     "grunt-invalidate-cloudfront": "~0.1.4",
     "grunt-s3": "~0.2.0-alpha.3",
     "murmurhash": "0.0.2",
-    "sha1": "~1.1.0",
     "browserify": "~3.28.1",
     "grunt-browserify": "~1.3.0",
     "jstimezonedetect": "~1.0.5",
-    "JSON": "~1.0.0"
+    "JSON": "~1.0.0",
+    "Base64": "~0.2.0"
   },
   "contributors": [
     "Alex Dean",

src/js/constructor.js

@@ -32,55 +32,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/**
- * SnowPlow namespace.
- * Add classes and functions in this namespace.
- */
-
-var SnowPlow = SnowPlow || function() {
-	var windowAlias = window;
-
-	// SnowPlow Asynchronous Queue
-	windowAlias._snaq = windowAlias._snaq || [];
-	return {
-
-		/* Tracker identifier with version */
-		version: 'js-0.14.0', // Update banner.js too
-
-		/* Contains three variables that are shared with tracker.js and must be passed by reference */
-		mutSnowplowState: {
-			expireDateTime: null,
-
-			/* DOM Ready */
-			hasLoaded: false,
-			registeredOnLoadHandlers: []
-		},
-
-		/* Alias frequently used globals for added minification */
-		documentAlias: document,
-		windowAlias: windowAlias,
-		navigatorAlias: navigator,
-		screenAlias: screen,
-
-		/* Encode */
-		encodeWrapper: windowAlias.encodeURIComponent,
-
-		/* Decode */
-		decodeWrapper: windowAlias.decodeURIComponent,
-
-		/* decodeUrl */
-		decodeUrl: unescape,
-
-		/* Asynchronous tracker */
-		asyncTracker: null
-	}
-}();
-
-// Load all our modules (at least until we fully modularize & remove grunt-concat)
+// SnowPlow Asynchronous Queue
+window._snaq = window._snaq || [];
 
-var identifiers = require('identifiers');
-var payload = require('payload');
-var json2 = require('JSON');
-var cookie = require('cookie');
-var detectors = require('detectors');
-var tracker = require('tracker');
+var snowplow = require('snowplow');
+window.SnowPlow = window.SnowPlow || snowplow.build();