Merge branch 'master' into GMC_0.6.2

Lanny McNie · Lanny McNie · commit 44e9b5a5e299 · 2015-11-26T13:46:00.000-07:00
diff --git a/src/preloadjs/utils/RequestUtils.js b/src/preloadjs/utils/RequestUtils.js
@@ -150,9 +150,9 @@
 		}
 
 		if (idx != -1) {
-			return src.slice(0, idx) + '?' + this._formatQueryString(data, query);
+			return src.slice(0, idx) + '?' + this.formatQueryString(data, query);
 		} else {
-			return src + '?' + this._formatQueryString(data, query);
+			return src + '?' + this.formatQueryString(data, query);
 		}
 	};
 

Original file line number	Diff line number	Diff line change
`@@ -150,9 +150,9 @@`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`if (idx != -1) {`
`153`		`- return src.slice(0, idx) + '?' + this._formatQueryString(data, query);`
	`153`	`+ return src.slice(0, idx) + '?' + this.formatQueryString(data, query);`
`154`	`154`	`} else {`
`155`		`- return src + '?' + this._formatQueryString(data, query);`
	`155`	`+ return src + '?' + this.formatQueryString(data, query);`
`156`	`156`	`}`
`157`	`157`	`};`
`158`	`158`