From 08018a1244644c939e7502be62aa5cc5dbf0a20e Mon Sep 17 00:00:00 2001
From: Luca Ongaro <lukeongaro@gmail.com>
Date: Thu, 9 May 2013 19:00:10 +0200
Subject: [PATCH] bump new version v1.0.4

---
 README.md                                      |  4 ++--
 examples/index.html                            |  2 +-
 examples/rectangular.html                      |  2 +-
 examples/vertical_words.html                   |  2 +-
 jqcloud/jqcloud-1.0.3.min.js                   | 11 -----------
 jqcloud/{jqcloud-1.0.3.js => jqcloud-1.0.4.js} | 10 +++++-----
 jqcloud/jqcloud-1.0.4.min.js                   | 11 +++++++++++
 test/index.html                                |  2 +-
 version.txt                                    |  2 +-
 9 files changed, 23 insertions(+), 23 deletions(-)
 delete mode 100644 jqcloud/jqcloud-1.0.3.min.js
 rename jqcloud/{jqcloud-1.0.3.js => jqcloud-1.0.4.js} (96%)
 create mode 100644 jqcloud/jqcloud-1.0.4.min.js

diff --git a/README.md b/README.md
index 96e0e1d..27923af 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ You can see a demo here: http://www.lucaongaro.eu/demos/jqcloud/
 Installing jQCloud is extremely simple:
 
 1. Make sure to import jQuery in your project.
-2. Download the jQCloud files. Place [jqcloud-1.0.3.js](https://raw.github.com/lucaong/jQCloud/master/jqcloud/jqcloud-1.0.3.js) (or the minified version [jqcloud-1.0.3.min.js](https://raw.github.com/lucaong/jQCloud/master/jqcloud/jqcloud-1.0.3.min.js)) and [jqcloud.css](https://raw.github.com/lucaong/jQCloud/master/jqcloud/jqcloud.css) somewhere in your project and import both of them in your HTML code.
+2. Download the jQCloud files. Place [jqcloud-1.0.4.js](https://raw.github.com/lucaong/jQCloud/master/jqcloud/jqcloud-1.0.4.js) (or the minified version [jqcloud-1.0.4.min.js](https://raw.github.com/lucaong/jQCloud/master/jqcloud/jqcloud-1.0.4.min.js)) and [jqcloud.css](https://raw.github.com/lucaong/jQCloud/master/jqcloud/jqcloud.css) somewhere in your project and import both of them in your HTML code.
 
 You can easily substitute jqcloud.css with a custom CSS stylesheet following the guidelines explained later.
 
@@ -31,7 +31,7 @@ Here is more detailed example:
     <title>jQCloud Example</title>
     <link rel="stylesheet" type="text/css" href="jqcloud.css" />
     <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
-    <script type="text/javascript" src="jqcloud-1.0.3.js"></script>
+    <script type="text/javascript" src="jqcloud-1.0.4.js"></script>
     <script type="text/javascript">
       /*!
        * Create an array of word objects, each representing a word in the cloud
diff --git a/examples/index.html b/examples/index.html
index c89b1a4..3e0089b 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -4,7 +4,7 @@
     <title>jQCloud Example</title>
     <link rel="stylesheet" type="text/css" href="../jqcloud/jqcloud.css" />
     <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.js"></script>
-    <script type="text/javascript" src="../jqcloud/jqcloud-1.0.3.js"></script>
+    <script type="text/javascript" src="../jqcloud/jqcloud-1.0.4.js"></script>
     <script type="text/javascript">
       var word_list = [
         {text: "Lorem", weight: 13, link: "https://github.com/DukeLeNoir/jQCloud"},
diff --git a/examples/rectangular.html b/examples/rectangular.html
index ea9339e..fbb1ca7 100644
--- a/examples/rectangular.html
+++ b/examples/rectangular.html
@@ -4,7 +4,7 @@
     <title>jQCloud Example</title>
     <link rel="stylesheet" type="text/css" href="../jqcloud/jqcloud.css" />
     <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.js"></script>
-    <script type="text/javascript" src="../jqcloud/jqcloud-1.0.3.js"></script>
+    <script type="text/javascript" src="../jqcloud/jqcloud-1.0.4.js"></script>
     <script type="text/javascript">
       var word_list = [
         {text: "Lorem", weight: 13},
diff --git a/examples/vertical_words.html b/examples/vertical_words.html
index 52c93fa..8f1aea1 100644
--- a/examples/vertical_words.html
+++ b/examples/vertical_words.html
@@ -10,7 +10,7 @@
     </style>
     <link rel="stylesheet" type="text/css" href="../jqcloud/jqcloud.css" />
     <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.js"></script>
-    <script type="text/javascript" src="../jqcloud/jqcloud-1.0.3.js"></script>
+    <script type="text/javascript" src="../jqcloud/jqcloud-1.0.4.js"></script>
     <script type="text/javascript">
       var word_list = [
         {text: "Lorem", weight: 13},
diff --git a/jqcloud/jqcloud-1.0.3.min.js b/jqcloud/jqcloud-1.0.3.min.js
deleted file mode 100644
index cd38692..0000000
--- a/jqcloud/jqcloud-1.0.3.min.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/*!
- * jQCloud Plugin for jQuery
- *
- * Version 1.0.3
- *
- * Copyright 2011, Luca Ongaro
- * Licensed under the MIT license.
- *
- * Date: 2013-05-06 15:03:15 -0700
-*/
-(function(a){"use strict",a.fn.jQCloud=function(b,c){var d=this,e=d.attr("id")||Math.floor(Math.random()*1e6).toString(36),f={width:d.width(),height:d.height(),center:{x:(c&&c.width?c.width:d.width())/2,y:(c&&c.height?c.height:d.height())/2},delayedMode:b.length>50,shape:!1,encodeURI:!0,doNotDrawOutsideContainer:!0};c=a.extend(f,c||{}),d.addClass("jqcloud").width(c.width).height(c.height),d.css("position")==="static"&&d.css("position","relative");var g=function(){var f=function(a,b){var c=function(a,b){return Math.abs(2*a.offsetLeft+a.offsetWidth-2*b.offsetLeft-b.offsetWidth)<a.offsetWidth+b.offsetWidth&&Math.abs(2*a.offsetTop+a.offsetHeight-2*b.offsetTop-b.offsetHeight)<a.offsetHeight+b.offsetHeight?!0:!1},d=0;for(d=0;d<b.length;d++)if(c(a,b[d]))return!0;return!1};for(var g=0;g<b.length;g++)b[g].weight=parseFloat(b[g].weight,10);b.sort(function(a,b){return a.weight<b.weight?1:a.weight>b.weight?-1:0});var h=c.shape==="rectangular"?18:2,i=[],j=c.width/c.height,k=function(g,k){var l=e+"_word_"+g,m="#"+l,n=6.28*Math.random(),o=0,p=0,q=0,r=5,s="",t="",u;k.html=a.extend(k.html,{id:l}),k.html&&k.html["class"]&&(s=k.html["class"],delete k.html["class"]),b[0].weight>b[b.length-1].weight&&(r=Math.round((k.weight-b[b.length-1].weight)/(b[0].weight-b[b.length-1].weight)*9)+1),u=a("<span>").attr(k.html).addClass("w"+r+" "+s),k.link?(typeof k.link=="string"&&(k.link={href:k.link}),c.encodeURI&&(k.link=a.extend(k.link,{href:encodeURI(k.link.href).replace(/'/g,"%27")})),t=a("<a>").attr(k.link).text(k.text)):t=k.text,u.append(t);if(!!k.handlers)for(var v in k.handlers)k.handlers.hasOwnProperty(v)&&typeof k.handlers[v]=="function"&&a(u).bind(v,k.handlers[v]);d.append(u);var w=u.width(),x=u.height(),y=c.center.x-w/2,z=c.center.y-x/2,A=u[0].style;A.position="absolute",A.left=y+"px",A.top=z+"px";while(f(u[0],i)){if(c.shape==="rectangular"){p++,p*h>(1+Math.floor(q/2))*h*(q%4%2===0?1:j)&&(p=0,q++);switch(q%4){case 1:y+=h*j+Math.random()*2;break;case 2:z-=h+Math.random()*2;break;case 3:y-=h*j+Math.random()*2;break;case 0:z+=h+Math.random()*2}}else o+=h,n+=(g%2===0?1:-1)*h,y=c.center.x-w/2+o*Math.cos(n)*j,z=c.center.y+o*Math.sin(n)-x/2;A.left=y+"px",A.top=z+"px"}if(c.doNotDrawOutsideContainer&&(y<0||z<0||y+w>c.width||z+x>c.height)){u.remove();return}i.push(u[0]),a.isFunction(k.afterWordRender)&&k.afterWordRender.call(u)},l=function(e){e=e||0;if(!d.is(":visible")){setTimeout(function(){l(e)},10);return}e<b.length?(k(e,b[e]),setTimeout(function(){l(e+1)},10)):a.isFunction(c.afterCloudRender)&&c.afterCloudRender.call(d)};c.delayedMode?l():(a.each(b,k),a.isFunction(c.afterCloudRender)&&c.afterCloudRender.call(d))};return setTimeout(function(){g()},10),d}})(jQuery);
\ No newline at end of file
diff --git a/jqcloud/jqcloud-1.0.3.js b/jqcloud/jqcloud-1.0.4.js
similarity index 96%
rename from jqcloud/jqcloud-1.0.3.js
rename to jqcloud/jqcloud-1.0.4.js
index e2b7a90..df339cb 100644
--- a/jqcloud/jqcloud-1.0.3.js
+++ b/jqcloud/jqcloud-1.0.4.js
@@ -1,12 +1,12 @@
 /*!
  * jQCloud Plugin for jQuery
  *
- * Version 1.0.3
+ * Version 1.0.4
  *
  * Copyright 2011, Luca Ongaro
  * Licensed under the MIT license.
  *
- * Date: 2013-05-06 15:03:15 -0700
+ * Date: 2013-05-09 18:54:22 +0200
 */
 
 (function( $ ) {
@@ -28,7 +28,7 @@
       delayedMode: word_array.length > 50,
       shape: false, // It defaults to elliptic shape
       encodeURI: true,
-      doNotDrawOutsideContainer: true
+      removeOverflowing: true
     };
 
     options = $.extend(default_options, options || {});
@@ -182,8 +182,8 @@
           word_style.top = top + "px";
         }
 
-        //don't render word if part of it would be outside the container
-        if (options.doNotDrawOutsideContainer && (left < 0 || top < 0 || (left + width) > options.width || (top + height) > options.height)) {
+        // Don't render word if part of it would be outside the container
+        if (options.removeOverflowing && (left < 0 || top < 0 || (left + width) > options.width || (top + height) > options.height)) {
           word_span.remove()
           return;
         }
diff --git a/jqcloud/jqcloud-1.0.4.min.js b/jqcloud/jqcloud-1.0.4.min.js
new file mode 100644
index 0000000..960a429
--- /dev/null
+++ b/jqcloud/jqcloud-1.0.4.min.js
@@ -0,0 +1,11 @@
+/*!
+ * jQCloud Plugin for jQuery
+ *
+ * Version 1.0.4
+ *
+ * Copyright 2011, Luca Ongaro
+ * Licensed under the MIT license.
+ *
+ * Date: 2013-05-09 18:54:22 +0200
+*/
+(function(e){"use strict";e.fn.jQCloud=function(t,n){var r=this,i=r.attr("id")||Math.floor(Math.random()*1e6).toString(36),s={width:r.width(),height:r.height(),center:{x:(n&&n.width?n.width:r.width())/2,y:(n&&n.height?n.height:r.height())/2},delayedMode:t.length>50,shape:!1,encodeURI:!0,removeOverflowing:!0};n=e.extend(s,n||{}),r.addClass("jqcloud").width(n.width).height(n.height),r.css("position")==="static"&&r.css("position","relative");var o=function(){var s=function(e,t){var n=function(e,t){return Math.abs(2*e.offsetLeft+e.offsetWidth-2*t.offsetLeft-t.offsetWidth)<e.offsetWidth+t.offsetWidth&&Math.abs(2*e.offsetTop+e.offsetHeight-2*t.offsetTop-t.offsetHeight)<e.offsetHeight+t.offsetHeight?!0:!1},r=0;for(r=0;r<t.length;r++)if(n(e,t[r]))return!0;return!1};for(var o=0;o<t.length;o++)t[o].weight=parseFloat(t[o].weight,10);t.sort(function(e,t){return e.weight<t.weight?1:e.weight>t.weight?-1:0});var u=n.shape==="rectangular"?18:2,a=[],f=n.width/n.height,l=function(o,l){var c=i+"_word_"+o,h="#"+c,p=6.28*Math.random(),d=0,v=0,m=0,g=5,y="",b="",w;l.html=e.extend(l.html,{id:c}),l.html&&l.html["class"]&&(y=l.html["class"],delete l.html["class"]),t[0].weight>t[t.length-1].weight&&(g=Math.round((l.weight-t[t.length-1].weight)/(t[0].weight-t[t.length-1].weight)*9)+1),w=e("<span>").attr(l.html).addClass("w"+g+" "+y),l.link?(typeof l.link=="string"&&(l.link={href:l.link}),n.encodeURI&&(l.link=e.extend(l.link,{href:encodeURI(l.link.href).replace(/'/g,"%27")})),b=e("<a>").attr(l.link).text(l.text)):b=l.text,w.append(b);if(!!l.handlers)for(var E in l.handlers)l.handlers.hasOwnProperty(E)&&typeof l.handlers[E]=="function"&&e(w).bind(E,l.handlers[E]);r.append(w);var S=w.width(),x=w.height(),T=n.center.x-S/2,N=n.center.y-x/2,C=w[0].style;C.position="absolute",C.left=T+"px",C.top=N+"px";while(s(w[0],a)){if(n.shape==="rectangular"){v++,v*u>(1+Math.floor(m/2))*u*(m%4%2===0?1:f)&&(v=0,m++);switch(m%4){case 1:T+=u*f+Math.random()*2;break;case 2:N-=u+Math.random()*2;break;case 3:T-=u*f+Math.random()*2;break;case 0:N+=u+Math.random()*2}}else d+=u,p+=(o%2===0?1:-1)*u,T=n.center.x-S/2+d*Math.cos(p)*f,N=n.center.y+d*Math.sin(p)-x/2;C.left=T+"px",C.top=N+"px"}if(n.removeOverflowing&&(T<0||N<0||T+S>n.width||N+x>n.height)){w.remove();return}a.push(w[0]),e.isFunction(l.afterWordRender)&&l.afterWordRender.call(w)},c=function(i){i=i||0;if(!r.is(":visible")){setTimeout(function(){c(i)},10);return}i<t.length?(l(i,t[i]),setTimeout(function(){c(i+1)},10)):e.isFunction(n.afterCloudRender)&&n.afterCloudRender.call(r)};n.delayedMode?c():(e.each(t,l),e.isFunction(n.afterCloudRender)&&n.afterCloudRender.call(r))};return setTimeout(function(){o()},10),r}})(jQuery);
\ No newline at end of file
diff --git a/test/index.html b/test/index.html
index 109316a..722f694 100644
--- a/test/index.html
+++ b/test/index.html
@@ -5,7 +5,7 @@
     <script src="http://code.jquery.com/jquery-latest.js"></script>
     <link rel="stylesheet" href="http://code.jquery.com/qunit/git/qunit.css" type="text/css" media="screen">
     <script type="text/javascript" src="http://code.jquery.com/qunit/git/qunit.js"></script>
-    <script type="text/javascript" src="../jqcloud/jqcloud-1.0.3.js"></script>
+    <script type="text/javascript" src="../jqcloud/jqcloud-1.0.4.js"></script>
     <link rel="stylesheet" href="../jqcloud/jqcloud.css" type="text/css" media="screen">
     <script type="text/javascript" src="core_tests.js"></script>
   </head>
diff --git a/version.txt b/version.txt
index 21e8796..ee90284 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.0.3
+1.0.4