twbs_less_rails 2.5.1 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d4a8c8ce4d544c30154681fc534f4c0cb0e9b6b
-  data.tar.gz: e3c289a8b3565d8d9b70aa191eecac79ffde903b
+  metadata.gz: 5ed81f61795e7a0eb4530dfd8671f7db00d68285
+  data.tar.gz: fd94424cd8f3d0c7e03397ce1ce33531e19ad855
 SHA512:
-  metadata.gz: 55724dc2da835566732be4fd44eed40aba31ddbc745673a5637300cd22b1172ca66774a8865bf84ef465165778bda02ecce4dd57f6de61e3e53de7efc309559c
-  data.tar.gz: 51f56d031bd9c7028dd6d387f0cccfa5d2a3d6f7a436dd05bc9f92712b27c3f78f3b10e8884a01256cf508a56c708c79f1add103820366bf660228f1a53ffdce
+  metadata.gz: e53d3813b24781e1b8d842d458daf9e18a8c2d3724a418aed5e4965339f1a0ab738add3b5c106d5c63723a9bcfb5fbdff4fc710779be6089383cfcdb1cfc610b
+  data.tar.gz: 3334a3a1e71a66043d71524a67cb5d8a8c5475dc5e163638474b59929dbf40812040de1e873d262d6dbfe64fe36419c917a39e483e6d97e04a3ee924dfa3510a

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+2.6.0
+-----
+* Bootstrap v3.0.3
+* Respond.js 1.4.1
+* Submodules locked to tags instead of master branch
+
 2.5.1
 -----
 * Rails 4.0.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    twbs_less_rails (2.5.1)
+    twbs_less_rails (2.6.0)
       less-rails
       rails (>= 3.2.16)
       therubyracer

data/Rakefile

@@ -27,6 +27,24 @@ end
 
 task default: :test
 
+SUBMODULES = {
+  bootstrap: {
+    name: 'Bootstrap',
+    sample_version: 'v3.0.3',
+    folder: File.expand_path('src/twbs/bootstrap')
+  },
+  fontawesome: {
+    name: 'Font Awesome',
+    sample_version: 'v4.0.3',
+    folder: File.expand_path('src/FortAwesome/Font-Awesome')
+  },
+  respond_js: {
+    name: 'Respond.js',
+    sample_version: '1.4.1',
+    folder: File.expand_path('src/scottjehl/Respond')
+  }
+}
+
 SOURCE_FILES = {
   bootstrap_stylesheets: File.expand_path('src/twbs/bootstrap/less/*.less'),
   bootstrap_javascripts: File.expand_path('src/twbs/bootstrap/js/*.js'),
@@ -43,33 +61,49 @@ DESTINATION_FOLDERS = {
   fontawesome_fonts: File.expand_path('app/assets/fonts'),
 }
 
-desc "Update assets"
-task :update_assets do
-  # git submodule add https://github.com/FortAwesome/Font-Awesome.git src/FortAwesome/Font-Awesome/
-  # git submodule add https://github.com/scottjehl/Respond.git src/scottjehl/Respond
-  # git submodule add https://github.com/twbs/bootstrap.git src/twbs/bootstrap
+namespace :update do
+  SUBMODULES.each do |submodule, v|
+    desc "Updates #{v[:name]} at specified tag"
+    task submodule, :tag do |t, args|
+      if args[:tag]
+        update_submodule(SUBMODULES[submodule], args[:tag])
+      else
+        puts "Please specify a tag, e.g: rake #{t}[#{SUBMODULES[submodule][:sample_version]}]"
+      end
+    end
+  end
+
+  desc "Update assets"
+  task :assets do
+    # git submodule add https://github.com/FortAwesome/Font-Awesome.git src/FortAwesome/Font-Awesome/
+    # git submodule add https://github.com/scottjehl/Respond.git src/scottjehl/Respond
+    # git submodule add https://github.com/twbs/bootstrap.git src/twbs/bootstrap
 
-  puts 'Updating submodules...'
-  `git submodule update --init`
-  `git submodule foreach git pull origin master`
+    puts 'Preparing destination folders...'
+    remove_content_from_destination_folders
 
-  puts 'Preparing destination folders...'
-  remove_content_from_destination_folders
+    puts 'Copying new assets...'
+    copy_source_files_to_destination_folders
 
-  puts 'Copying new assets...'
-  copy_source_files_to_destination_folders
+    puts 'Adding respond.js...'
+    FileUtils.cp File.expand_path('src/scottjehl/Respond/src/respond.js'), File.expand_path('vendor/assets/javascripts/respond.js')
 
-  puts 'Adding respond.js...'
-  FileUtils.cp File.expand_path('src/scottjehl/Respond/respond.src.js'), File.expand_path('vendor/assets/javascripts/respond.js')
+    puts 'Updating font paths...'
+    update_fontawesome_paths
+    update_glyphicons_paths
 
-  puts 'Updating font paths...'
-  update_fontawesome_paths
-  update_glyphicons_paths
+    puts 'Disabling glyphicons...'
+    disable_glyphicons
 
-  puts 'Disabling glyphicons...'
-  disable_glyphicons
+    puts 'Done. RUN TESTS NOW!'
+  end
+end
 
-  puts 'Done. RUN TESTS NOW!'
+private
+def update_submodule(submodule, tag)
+  return unless tag
+  puts "Updating #{submodule[:name]} at #{tag}..."
+  `cd #{submodule[:folder]} && exec git pull origin #{tag}`
 end
 
 def remove_content_from_destination_folders
@@ -98,7 +132,7 @@ def update_glyphicons_paths
   icon_font_name = File.read("#{DESTINATION_FOLDERS[:bootstrap_stylesheets]}/variables.less").match(/@icon\-font\-name:\s+"([^\"]+)"/)[1]
   file_name = "#{DESTINATION_FOLDERS[:bootstrap_stylesheets]}/glyphicons.less"
   text = File.read(file_name)
-  text.gsub! /url\(\'@{icon-font-path}@{icon-font-name}/, "asset-url('#{icon_font_name}"
+  text.gsub! /~\"url\(\'@{icon-font-path}@{icon-font-name}(.*)\"/, "asset-url('#{icon_font_name}\\1"
   File.open(file_name, 'w') { |file| file.puts text }
 end
 

data/lib/twbs_less_rails/version.rb

@@ -1,3 +1,3 @@
 module TwbsLessRails
-  VERSION = "2.5.1"
+  VERSION = "2.6.0"
 end

data/vendor/assets/javascripts/respond.js

@@ -1,65 +1,74 @@
-/*! matchMedia() polyfill - Test a CSS media type/query in JS. Authors & copyright (c) 2012: Scott Jehl, Paul Irish, Nicholas Zakas. Dual MIT/BSD license */
-/*! NOTE: If you're already including a window.matchMedia polyfill via Modernizr or otherwise, you don't need this part */
+/*! Respond.js v1.4.0: min/max-width media query polyfill. (c) Scott Jehl. MIT Lic. j.mp/respondjs  */
+(function( w ){
 
-window.matchMedia = window.matchMedia || (function( doc, undefined ) {
-
-  "use strict";
-
-  var bool,
-      docElem = doc.documentElement,
-      refNode = docElem.firstElementChild || docElem.firstChild,
-      // fakeBody required for <FF4 when executed in <head>
-      fakeBody = doc.createElement( "body" ),
-      div = doc.createElement( "div" );
-
-  div.id = "mq-test-1";
-  div.style.cssText = "position:absolute;top:-100em";
-  fakeBody.style.background = "none";
-  fakeBody.appendChild(div);
-
-  return function(q){
-
-    div.innerHTML = "&shy;<style media=\"" + q + "\"> #mq-test-1 { width: 42px; }</style>";
-
-    docElem.insertBefore( fakeBody, refNode );
-    bool = div.offsetWidth === 42;
-    docElem.removeChild( fakeBody );
-
-    return {
-      matches: bool,
-      media: q
-    };
-
-  };
-
-}( document ));
+	"use strict";
 
+	//exposed namespace
+	var respond = {};
+	w.respond = respond;
 
+	//define update even in native-mq-supporting browsers, to avoid errors
+	respond.update = function(){};
 
+	//define ajax obj
+	var requestQueue = [],
+		xmlHttp = (function() {
+			var xmlhttpmethod = false;
+			try {
+				xmlhttpmethod = new w.XMLHttpRequest();
+			}
+			catch( e ){
+				xmlhttpmethod = new w.ActiveXObject( "Microsoft.XMLHTTP" );
+			}
+			return function(){
+				return xmlhttpmethod;
+			};
+		})(),
 
+		//tweaked Ajax functions from Quirksmode
+		ajax = function( url, callback ) {
+			var req = xmlHttp();
+			if (!req){
+				return;
+			}
+			req.open( "GET", url, true );
+			req.onreadystatechange = function () {
+				if ( req.readyState !== 4 || req.status !== 200 && req.status !== 304 ){
+					return;
+				}
+				callback( req.responseText );
+			};
+			if ( req.readyState === 4 ){
+				return;
+			}
+			req.send( null );
+		};
 
-/*! Respond.js v1.3.0: min/max-width media query polyfill. (c) Scott Jehl. MIT/GPLv2 Lic. j.mp/respondjs  */
-(function( win ){
+	//expose for testing
+	respond.ajax = ajax;
+	respond.queue = requestQueue;
 
-	"use strict";
+	// expose for testing
+	respond.regex = {
+		media: /@media[^\{]+\{([^\{\}]*\{[^\}\{]*\})+/gi,
+		keyframes: /@.*keyframes[^\{]+\{(?:[^\{\}]*\{[^\}\{]*\})+[^\}]+\}/gi,
+		urls: /(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,
+		findStyles: /@media *([^\{]+)\{([\S\s]+?)$/,
+		only: /(only\s+)?([a-zA-Z]+)\s?/,
+		minw: /\([\s]*min\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/,
+		maxw: /\([\s]*max\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/
+	};
 
-	//exposed namespace
-	var respond = {};
-	win.respond = respond;
-	
-	//define update even in native-mq-supporting browsers, to avoid errors
-	respond.update = function(){};
-	
 	//expose media query support flag for external use
-	respond.mediaQueriesSupported	= win.matchMedia && win.matchMedia( "only all" ).matches;
-	
+	respond.mediaQueriesSupported = w.matchMedia && w.matchMedia( "only all" ) !== null && w.matchMedia( "only all" ).matches;
+
 	//if media queries are supported, exit here
 	if( respond.mediaQueriesSupported ){
 		return;
 	}
-	
+
 	//define vars
-	var doc = win.document,
+	var doc = w.document,
 		docElem = doc.documentElement,
 		mediastyles = [],
 		rules = [],
@@ -69,149 +78,62 @@ window.matchMedia = window.matchMedia || (function( doc, undefined ) {
 		head = doc.getElementsByTagName( "head" )[0] || docElem,
 		base = doc.getElementsByTagName( "base" )[0],
 		links = head.getElementsByTagName( "link" ),
-		requestQueue = [],
-		
-		//loop stylesheets, send text content to translate
-		ripCSS = function(){
 
-			for( var i = 0; i < links.length; i++ ){
-				var sheet = links[ i ],
-				href = sheet.href,
-				media = sheet.media,
-				isCSS = sheet.rel && sheet.rel.toLowerCase() === "stylesheet";
-
-				//only links plz and prevent re-parsing
-				if( !!href && isCSS && !parsedSheets[ href ] ){
-					// selectivizr exposes css through the rawCssText expando
-					if (sheet.styleSheet && sheet.styleSheet.rawCssText) {
-						translate( sheet.styleSheet.rawCssText, href, media );
-						parsedSheets[ href ] = true;
-					} else {
-						if( (!/^([a-zA-Z:]*\/\/)/.test( href ) && !base) ||
-							href.replace( RegExp.$1, "" ).split( "/" )[0] === win.location.host ){
-							requestQueue.push( {
-								href: href,
-								media: media
-							} );
-						}
-					}
-				}
-			}
-			makeRequests();
-		},
-		
-		//recurse through request queue, get css text
-		makeRequests	= function(){
-			if( requestQueue.length ){
-				var thisRequest = requestQueue.shift();
-				
-				ajax( thisRequest.href, function( styles ){
-					translate( styles, thisRequest.href, thisRequest.media );
-					parsedSheets[ thisRequest.href ] = true;
-
-					// by wrapping recursive function call in setTimeout 
-					// we prevent "Stack overflow" error in IE7
-					win.setTimeout(function(){ makeRequests(); },0);
-				} );
-			}
-		},
-		
-		//find media blocks in css text, convert to style blocks
-		translate = function( styles, href, media ){
-			var qs = styles.match(  /@media[^\{]+\{([^\{\}]*\{[^\}\{]*\})+/gi ),
-				ql = qs && qs.length || 0;
-
-			//try to get CSS path
-			href = href.substring( 0, href.lastIndexOf( "/" ) );
-
-			var repUrls	= function( css ){
-					return css.replace( /(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g, "$1" + href + "$2$3" );
-				},
-				useMedia = !ql && media;
-
-			//if path exists, tack on trailing slash
-			if( href.length ){ href += "/"; }	
-				
-			//if no internal queries exist, but media attr does, use that	
-			//note: this currently lacks support for situations where a media attr is specified on a link AND
-				//its associated stylesheet has internal CSS media queries.
-				//In those cases, the media attribute will currently be ignored.
-			if( useMedia ){
-				ql = 1;
-			}
-
-			for( var i = 0; i < ql; i++ ){
-				var fullq, thisq, eachq, eql;
-
-				//media attr
-				if( useMedia ){
-					fullq = media;
-					rules.push( repUrls( styles ) );
-				}
-				//parse for styles
-				else{
-					fullq = qs[ i ].match( /@media *([^\{]+)\{([\S\s]+?)$/ ) && RegExp.$1;
-					rules.push( RegExp.$2 && repUrls( RegExp.$2 ) );
-				}
-				
-				eachq = fullq.split( "," );
-				eql	= eachq.length;
-					
-				for( var j = 0; j < eql; j++ ){
-					thisq = eachq[ j ];
-					mediastyles.push( { 
-						media : thisq.split( "(" )[ 0 ].match( /(only\s+)?([a-zA-Z]+)\s?/ ) && RegExp.$2 || "all",
-						rules : rules.length - 1,
-						hasquery : thisq.indexOf("(") > -1,
-						minw : thisq.match( /\(\s*min\-width\s*:\s*(\s*[0-9\.]+)(px|em)\s*\)/ ) && parseFloat( RegExp.$1 ) + ( RegExp.$2 || "" ), 
-						maxw : thisq.match( /\(\s*max\-width\s*:\s*(\s*[0-9\.]+)(px|em)\s*\)/ ) && parseFloat( RegExp.$1 ) + ( RegExp.$2 || "" )
-					} );
-				}	
-			}
-
-			applyMedia();
-		},
-        
 		lastCall,
-		
 		resizeDefer,
-		
+
+		//cached container for 1em value, populated the first time it's needed
+		eminpx,
+
 		// returns the value of 1em in pixels
 		getEmValue = function() {
 			var ret,
 				div = doc.createElement('div'),
 				body = doc.body,
+				originalHTMLFontSize = docElem.style.fontSize,
+				originalBodyFontSize = body && body.style.fontSize,
 				fakeUsed = false;
-									
+
 			div.style.cssText = "position:absolute;font-size:1em;width:1em";
-					
+
 			if( !body ){
 				body = fakeUsed = doc.createElement( "body" );
 				body.style.background = "none";
 			}
-					
+
+			// 1em in a media query is the value of the default font size of the browser
+			// reset docElem and body to ensure the correct value is returned
+			docElem.style.fontSize = "100%";
+			body.style.fontSize = "100%";
+
 			body.appendChild( div );
-								
-			docElem.insertBefore( body, docElem.firstChild );
-								
+
+			if( fakeUsed ){
+				docElem.insertBefore( body, docElem.firstChild );
+			}
+
 			ret = div.offsetWidth;
-								
+
 			if( fakeUsed ){
 				docElem.removeChild( body );
 			}
 			else {
 				body.removeChild( div );
 			}
-			
+
+			// restore the original values
+			docElem.style.fontSize = originalHTMLFontSize;
+			if( originalBodyFontSize ) {
+				body.style.fontSize = originalBodyFontSize;
+			}
+
+
 			//also update eminpx before returning
 			ret = eminpx = parseFloat(ret);
-								
+
 			return ret;
 		},
-		
-		//cached container for 1em value, populated the first time it's needed 
-		eminpx,
-		
+
 		//enable/disable styles
 		applyMedia = function( fromResize ){
 			var name = "clientWidth",
@@ -221,16 +143,16 @@ window.matchMedia = window.matchMedia || (function( doc, undefined ) {
 				lastLink = links[ links.length-1 ],
 				now = (new Date()).getTime();
 
-			//throttle resize calls	
+			//throttle resize calls
 			if( fromResize && lastCall && now - lastCall < resizeThrottle ){
-				win.clearTimeout( resizeDefer );
-				resizeDefer = win.setTimeout( applyMedia, resizeThrottle );
+				w.clearTimeout( resizeDefer );
+				resizeDefer = w.setTimeout( applyMedia, resizeThrottle );
 				return;
 			}
 			else {
 				lastCall = now;
 			}
-										
+
 			for( var i in mediastyles ){
 				if( mediastyles.hasOwnProperty( i ) ){
 					var thisstyle = mediastyles[ i ],
@@ -239,14 +161,14 @@ window.matchMedia = window.matchMedia || (function( doc, undefined ) {
 						minnull = min === null,
 						maxnull = max === null,
 						em = "em";
-					
+
 					if( !!min ){
 						min = parseFloat( min ) * ( min.indexOf( em ) > -1 ? ( eminpx || getEmValue() ) : 1 );
 					}
 					if( !!max ){
 						max = parseFloat( max ) * ( max.indexOf( em ) > -1 ? ( eminpx || getEmValue() ) : 1 );
 					}
-					
+
 					// if there's no media query at all (the () part), or min or max is not null, and if either is present, they're true
 					if( !thisstyle.hasquery || ( !minnull || !maxnull ) && ( minnull || currWidth >= min ) && ( maxnull || currWidth <= max ) ){
 						if( !styleBlocks[ thisstyle.media ] ){
@@ -256,7 +178,7 @@ window.matchMedia = window.matchMedia || (function( doc, undefined ) {
 					}
 				}
 			}
-			
+
 			//remove any existing respond style element(s)
 			for( var j in appendedEls ){
 				if( appendedEls.hasOwnProperty( j ) ){
@@ -265,21 +187,21 @@ window.matchMedia = window.matchMedia || (function( doc, undefined ) {
 					}
 				}
 			}
-			
+
 			//inject active styles, grouped by media type
 			for( var k in styleBlocks ){
 				if( styleBlocks.hasOwnProperty( k ) ){
 					var ss = doc.createElement( "style" ),
 						css = styleBlocks[ k ].join( "\n" );
-					
-					ss.type = "text/css";	
+
+					ss.type = "text/css";
 					ss.media = k;
-					
+
 					//originally, ss was appended to a documentFragment and sheets were appended in bulk.
 					//this caused crashes in IE in a number of circumstances, such as when the HTML element had a bg image set, so appending beforehand seems best. Thanks to @dvelyk for the initial research on this one!
 					head.insertBefore( ss, lastLink.nextSibling );
-					
-					if ( ss.styleSheet ){ 
+
+					if ( ss.styleSheet ){
 						ss.styleSheet.cssText = css;
 					}
 					else {
@@ -291,52 +213,128 @@ window.matchMedia = window.matchMedia || (function( doc, undefined ) {
 				}
 			}
 		},
-		//tweaked Ajax functions from Quirksmode
-		ajax = function( url, callback ) {
-			var req = xmlHttp();
-			if (!req){
-				return;
-			}	
-			req.open( "GET", url, true );
-			req.onreadystatechange = function () {
-				if ( req.readyState !== 4 || req.status !== 200 && req.status !== 304 ){
-					return;
+		//find media blocks in css text, convert to style blocks
+		translate = function( styles, href, media ){
+			var qs = styles.replace( respond.regex.keyframes, '' ).match( respond.regex.media ),
+				ql = qs && qs.length || 0;
+
+			//try to get CSS path
+			href = href.substring( 0, href.lastIndexOf( "/" ) );
+
+			var repUrls = function( css ){
+					return css.replace( respond.regex.urls, "$1" + href + "$2$3" );
+				},
+				useMedia = !ql && media;
+
+			//if path exists, tack on trailing slash
+			if( href.length ){ href += "/"; }
+
+			//if no internal queries exist, but media attr does, use that
+			//note: this currently lacks support for situations where a media attr is specified on a link AND
+				//its associated stylesheet has internal CSS media queries.
+				//In those cases, the media attribute will currently be ignored.
+			if( useMedia ){
+				ql = 1;
+			}
+
+			for( var i = 0; i < ql; i++ ){
+				var fullq, thisq, eachq, eql;
+
+				//media attr
+				if( useMedia ){
+					fullq = media;
+					rules.push( repUrls( styles ) );
+				}
+				//parse for styles
+				else{
+					fullq = qs[ i ].match( respond.regex.findStyles ) && RegExp.$1;
+					rules.push( RegExp.$2 && repUrls( RegExp.$2 ) );
+				}
+
+				eachq = fullq.split( "," );
+				eql = eachq.length;
+
+				for( var j = 0; j < eql; j++ ){
+					thisq = eachq[ j ];
+					mediastyles.push( {
+						media : thisq.split( "(" )[ 0 ].match( respond.regex.only ) && RegExp.$2 || "all",
+						rules : rules.length - 1,
+						hasquery : thisq.indexOf("(") > -1,
+						minw : thisq.match( respond.regex.minw ) && parseFloat( RegExp.$1 ) + ( RegExp.$2 || "" ),
+						maxw : thisq.match( respond.regex.maxw ) && parseFloat( RegExp.$1 ) + ( RegExp.$2 || "" )
+					} );
 				}
-				callback( req.responseText );
-			};
-			if ( req.readyState === 4 ){
-				return;
 			}
-			req.send( null );
+
+			applyMedia();
 		},
-		//define ajax obj 
-		xmlHttp = (function() {
-			var xmlhttpmethod = false;	
-			try {
-				xmlhttpmethod = new win.XMLHttpRequest();
+
+		//recurse through request queue, get css text
+		makeRequests = function(){
+			if( requestQueue.length ){
+				var thisRequest = requestQueue.shift();
+
+				ajax( thisRequest.href, function( styles ){
+					translate( styles, thisRequest.href, thisRequest.media );
+					parsedSheets[ thisRequest.href ] = true;
+
+					// by wrapping recursive function call in setTimeout
+					// we prevent "Stack overflow" error in IE7
+					w.setTimeout(function(){ makeRequests(); },0);
+				} );
 			}
-			catch( e ){
-				xmlhttpmethod = new win.ActiveXObject( "Microsoft.XMLHTTP" );
+		},
+
+		//loop stylesheets, send text content to translate
+		ripCSS = function(){
+
+			for( var i = 0; i < links.length; i++ ){
+				var sheet = links[ i ],
+				href = sheet.href,
+				media = sheet.media,
+				isCSS = sheet.rel && sheet.rel.toLowerCase() === "stylesheet";
+
+				//only links plz and prevent re-parsing
+				if( !!href && isCSS && !parsedSheets[ href ] ){
+					// selectivizr exposes css through the rawCssText expando
+					if (sheet.styleSheet && sheet.styleSheet.rawCssText) {
+						translate( sheet.styleSheet.rawCssText, href, media );
+						parsedSheets[ href ] = true;
+					} else {
+						if( (!/^([a-zA-Z:]*\/\/)/.test( href ) && !base) ||
+							href.replace( RegExp.$1, "" ).split( "/" )[0] === w.location.host ){
+							// IE7 doesn't handle urls that start with '//' for ajax request
+							// manually add in the protocol
+							if ( href.substring(0,2) === "//" ) { href = w.location.protocol + href; }
+							requestQueue.push( {
+								href: href,
+								media: media
+							} );
+						}
+					}
+				}
 			}
-			return function(){
-				return xmlhttpmethod;
-			};
-		})();
-	
+			makeRequests();
+		};
+
 	//translate CSS
 	ripCSS();
-	
+
 	//expose update for re-running respond later on
 	respond.update = ripCSS;
-	
+
+	//expose getEmValue
+	respond.getEmValue = getEmValue;
+
 	//adjust on resize
 	function callMedia(){
 		applyMedia( true );
 	}
-	if( win.addEventListener ){
-		win.addEventListener( "resize", callMedia, false );
+
+	if( w.addEventListener ){
+		w.addEventListener( "resize", callMedia, false );
 	}
-	else if( win.attachEvent ){
-		win.attachEvent( "onresize", callMedia );
+	else if( w.attachEvent ){
+		w.attachEvent( "onresize", callMedia );
 	}
 })(this);