minor code organization change

4zik88 · Jun 18, 2013 · 3f15434 · 3f15434
1 parent 17f6fa9
commit 3f15434
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/jquery.autosize-min.js b/jquery.autosize-min.js
diff --git a/jquery.autosize.js b/jquery.autosize.js
@@ -55,12 +55,20 @@
 			maxHeight,
 			minHeight,
 			boxOffset = 0,
-			callback = $.isFunction(options.callback);
+			callback = $.isFunction(options.callback),
+			originalStyles = {
+				height: ta.style.height,
+				overflow: ta.style.overflow,
+				overflowY: ta.style.overflowY,
+				wordWrap: ta.style.wordWrap,
+				resize: ta.style.resize
+			};
 
 			if ($ta.data('autosize')) {
 				// exit if autosize has already been applied, or if the textarea is the mirror element.
 				return;
 			}
+			$ta.data('autosize', true);
 
 			if ($ta.css('box-sizing') === 'border-box' || $ta.css('-moz-box-sizing') === 'border-box' || $ta.css('-webkit-box-sizing') === 'border-box'){
 				boxOffset = $ta.outerHeight() - $ta.height();
@@ -69,15 +77,6 @@
 			// IE8 and lower return 'auto', which parses to NaN, if no min-height is set.
 			minHeight = Math.max(parseInt($ta.css('minHeight'), 10) - boxOffset || 0, $ta.height());
 
-			// Save the original styles in case autosize is removed
-			$ta.data('autosize', {
-				height: ta.style.height,
-				overflow: ta.style.overflow,
-				overflowY: ta.style.overflowY,
-				wordWrap: ta.style.wordWrap,
-				resize: ta.style.resize
-			});
-
 			$ta.css({
 				overflow: 'hidden',
 				overflowY: 'hidden',
@@ -219,7 +218,7 @@
 				$ta
 					.off('autosize')
 					.off('.autosize')
-					.css($ta.data('autosize'))
+					.css(originalStyles)
 					.removeData('autosize');
 			});