Merge pull request #167 from snowplow/feature/1.0.1

Feature/1.0.1
snowplow · Apr 9, 2014 · b0d5ff1 · b0d5ff1
2 parents 9a1f7e5 + 2b296e3
commit b0d5ff1
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,8 @@
+Version 1.0.1 (2014-04-09)
+--------------------------
+Fixed lodash.js to work in the presence of AMD modules (#165)
+Added missing variable declarations (#166)
+
 Version 1.0.0 (2014-03-27)
 --------------------------
 Added extra meta-data to package.json (#83)

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -81,6 +81,7 @@ module.exports = function(grunt) {
       build: {
         dest: 'src/js/lib/lodash.js',
         options: {
+          exports: 'node',
           include: 'isArray, isFunction, isString, isObject, isDate, isUndefined, isNull',
           flags: ['debug']
         }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "snowplow-tracker",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "devDependencies": {
     "grunt": "~0.4.2",
     "intern": "~1.4.0",

diff --git a/src/js/lib/detectors.js b/src/js/lib/detectors.js
@@ -37,7 +37,7 @@
 	var 
 		lodash = require('./lodash'),
 		helpers = require('./helpers'),
-		cookie = require('./cookie')
+		cookie = require('./cookie'),
 		murmurhash3_32_gc = require('murmurhash').v3,
 		tz = require('jstimezonedetect').jstz.determine(),
 

diff --git a/src/js/payload.js b/src/js/payload.js
@@ -147,7 +147,7 @@
 			function recurse(json) {
 				var translated = {};
 				for (var prop in json) {
-					var key = prop, value = json[prop];
+					var key = prop, value = json[prop], type;
 
 					// Special treatment...
 					if (json.hasOwnProperty(key)) {

diff --git a/src/js/tracker.js b/src/js/tracker.js
@@ -719,7 +719,7 @@
 			sb.add('se_pr', property);
 			sb.add('se_va', value);
 			sb.addJson('cx', 'co', context);
-			request = getRequest(sb, 'structEvent');
+			var request = getRequest(sb, 'structEvent');
 			sendRequest(request, configTrackerPause);
 		}
 
@@ -736,7 +736,7 @@
 			sb.add('ue_na', name);
 			sb.addJson('ue_px', 'ue_pr', properties);
 			sb.addJson('cx', 'co', context);
-			request = getRequest(sb, 'unstructEvent');
+			var request = getRequest(sb, 'unstructEvent');
 			sendRequest(request, configTrackerPause);
 		}
 
@@ -843,7 +843,7 @@
 			sb.add('ad_ad', advertiserId);
 			sb.add('ad_uid', userId);
 			sb.addJson('cx', 'co', context);
-			request = getRequest(sb, 'impression');
+			var request = getRequest(sb, 'impression');
 			sendRequest(request, configTrackerPause);
 		}