Merge pull request davatron5000#31 from darcyclarke/master

Made some micro optimizations
liangfflia · Jun 14, 2012 · fa3b29a · fa3b29a
2 parents 96677fd + 832fe8d
commit fa3b29a
Showing 1 changed file with 11 additions and 12 deletions.
diff --git a/jquery.fittext.js b/jquery.fittext.js
@@ -12,19 +12,18 @@
 (function( $ ){
 
   $.fn.fitText = function( kompressor, options ) {
-
-    var settings = {
-      'minFontSize' : Number.NEGATIVE_INFINITY,
-      'maxFontSize' : Number.POSITIVE_INFINITY
-    };
+
+    // Setup options
+    var compressor = kompressor || 1,
+        settings = $.extend({
+          'minFontSize' : Number.NEGATIVE_INFINITY,
+          'maxFontSize' : Number.POSITIVE_INFINITY
+        }, options);
 
     return this.each(function(){
-      var $this = $(this);              // store the object
-		  var compressor = kompressor || 1; // set the compressor
-
-      if ( options ) { 
-        $.extend( settings, options );
-      }
+
+      // Store the object
+      var $this = $(this); 
 
       // Resizer() resizes items based on the object width divided by the compressor * 10
       var resizer = function () {
@@ -35,7 +34,7 @@
       resizer();
 
       // Call on resize. Opera debounces their resize by default. 
-      $(window).resize(resizer);
+      $(window).on('resize', resizer);
 
     });