v1.1 Added HTML5 Local Storage support and bug fixes.

dsternlicht · Jan 29, 2012 · 5d5890a · 5d5890a
1 parent 68bf0c1
commit 5d5890a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/jquery.yourhere.js b/jquery.yourhere.js
@@ -59,11 +59,7 @@
 
 			// Click event on an element
 			box.children($.yourhere.opts.supportedElements).click(function(e){
-<<<<<<< HEAD
 				var lineHeight = parseFloat($(this).css('lineHeight')) > parseFloat($(this).css('fontSize')) ? parseFloat($(this).css('lineHeight')) : parseFloat($(this).css('fontSize'));	
-=======
-				var lineHeight = $(this).css('lineHeight').replace('px', '') > $(this).css('fontSize').replace('px', '') ? $(this).css('lineHeight').replace('px', '') : $(this).css('fontSize').replace('px', '');	
->>>>>>> f3cf4a71cbfee6040b544fdd1c47c6bf795f2cb9
 				var elmOffset = $(this).offset().top;
 				var z = e.pageY - elmOffset;
 				var e = Math.floor(z / lineHeight);