Merge pull request #9 from JSteunou/issue-8

Add UMD loader + return boxfit
michikono · Aug 25, 2014 · 754bd2f · 754bd2f
2 parents 9413228 + d9d3548
commit 754bd2f
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 12 deletions.
diff --git a/.jshintrc b/.jshintrc
@@ -19,6 +19,7 @@
   "trailing": true,
   "smarttabs": true,
   "globals": {
+    "define": false,
     "after": false,
     "afterEach": false,
     "before": false,
@@ -32,4 +33,4 @@
     "jQuery": false,
     "spyOn": false
   }
-}
+}
diff --git a/dist/jquery.boxfit.js b/dist/jquery.boxfit.js
@@ -5,11 +5,24 @@
  To use: $('#target-div').boxFit()
  Will make the *text* content inside the div (or whatever tag) scale to fit that tag
  */
-'use strict';
 
-(function ($) {
-  $.fn.boxfit = function (options) {
-    return this.each(function () {
+
+(function (root, factory) {
+  'use strict';
+  if (typeof define === 'function' && define.amd) {
+    // AMD
+    define(['jquery'], function($) { return factory(root, $); });
+  } else if (typeof exports === 'object') {
+    // CommonJS
+    module.exports = factory(root, require('jquery'));
+  } else {
+    // Browser globals
+    factory(root, jQuery);
+  }
+}(this, function (window, $) {
+  'use strict';
+  var boxfit = function ($nodes, options) {
+    return $nodes.each(function () {
       var current_step, inner_span, next_font_size, original_height, original_text, original_width, settings, span;
       settings = {
         // manually set a width/height if you haven't set one explicitly via CSS
@@ -74,6 +87,8 @@
         }
         // fixing issue where custom line-heights would break wrapped text
         inner_span.css('line-height', '100%');
+
+        // keep growing the target so long as we haven't exceeded the width or height
         inner_span.css('font-size', settings.minimum_font_size);
         while ($(this).width() <= original_width && $(this).height() <= original_height) {
           if (current_step++ > settings.step_limit) {
@@ -92,4 +107,6 @@
       }
     });
   };
-})(jQuery);
+  $.fn.boxfit = function(options) { return boxfit(this, options); };
+  return boxfit;
+}));
diff --git a/dist/jquery.boxfit.min.js b/dist/jquery.boxfit.min.js
diff --git a/src/jquery.boxfit.js b/src/jquery.boxfit.js
@@ -5,11 +5,24 @@
  To use: $('#target-div').boxFit()
  Will make the *text* content inside the div (or whatever tag) scale to fit that tag
  */
-'use strict';
 
-(function ($) {
-  $.fn.boxfit = function (options) {
-    return this.each(function () {
+
+(function (root, factory) {
+  'use strict';
+  if (typeof define === 'function' && define.amd) {
+    // AMD
+    define(['jquery'], function($) { return factory(root, $); });
+  } else if (typeof exports === 'object') {
+    // CommonJS
+    module.exports = factory(root, require('jquery'));
+  } else {
+    // Browser globals
+    factory(root, jQuery);
+  }
+}(this, function (window, $) {
+  'use strict';
+  var boxfit = function ($nodes, options) {
+    return $nodes.each(function () {
       var current_step, inner_span, next_font_size, original_height, original_text, original_width, settings, span;
       settings = {
         // manually set a width/height if you haven't set one explicitly via CSS
@@ -94,4 +107,6 @@
       }
     });
   };
-})(jQuery);
+  $.fn.boxfit = function(options) { return boxfit(this, options); };
+  return boxfit;
+}));