Merge pull request adamwulf#151 from scm6079/master

adamwulf · adamwulf · commit 2e18d0eab90e · 2014-03-08T13:35:40.000-06:00
YUI-Compressor compatibility
diff --git a/src/jquery.columnizer.js b/src/jquery.columnizer.js
@@ -526,7 +526,12 @@
 					}
 				}
 				if(options.overflow && !scrollHorizontally){
-					var IE6 = false /*@cc_on || @_jscript_version < 5.7 @*/;
+					var IE6 = false;
+					/*@cc_on 
+					@if (@_jscript_version < 5.7)
+						IE6 = true;
+					@end
+					@*/
 					var IE7 = (document.all) && (navigator.appVersion.indexOf("MSIE 7.") != -1);
 					if(IE6 || IE7){
 						var html = "";

Original file line number	Diff line number	Diff line change
`@@ -526,7 +526,12 @@`
`526`	`526`	`}`
`527`	`527`	`}`
`528`	`528`	`if(options.overflow && !scrollHorizontally){`
`529`		`- var IE6 = false /@cc_on \|\| @_jscript_version < 5.7 @/;`
	`529`	`+ var IE6 = false;`
	`530`	`+ /*@cc_on`
	`531`	`+ @if (@_jscript_version < 5.7)`
	`532`	`+ IE6 = true;`
	`533`	`+ @end`
	`534`	`+ @*/`
`530`	`535`	`var IE7 = (document.all) && (navigator.appVersion.indexOf("MSIE 7.") != -1);`
`531`	`536`	`if(IE6 \|\| IE7){`
`532`	`537`	`var html = "";`