Skip to content

Commit

Permalink
bump new version v1.0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
lucaong committed May 9, 2013
1 parent c8c2c18 commit 08018a1
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 23 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand Down
2 changes: 1 addition & 1 deletion examples/rectangular.html
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
2 changes: 1 addition & 1 deletion examples/vertical_words.html
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
11 changes: 0 additions & 11 deletions jqcloud/jqcloud-1.0.3.min.js

This file was deleted.

10 changes: 5 additions & 5 deletions jqcloud/jqcloud-1.0.3.js → jqcloud/jqcloud-1.0.4.js
Original file line number Diff line number Diff line change
@@ -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( $ ) {
Expand All @@ -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 || {});
Expand Down Expand Up @@ -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;
}
Expand Down
11 changes: 11 additions & 0 deletions jqcloud/jqcloud-1.0.4.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.3
1.0.4

0 comments on commit 08018a1

Please sign in to comment.