Skip to content

Clear the async timeout on override cloud. #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pokop wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Clear the async timeout on override cloud. #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions jqcloud/jqcloud-1.0.4.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@
var $this = this;
// Namespace word ids to avoid collisions between multiple clouds
var cloud_namespace = $this.attr('id') || Math.floor((Math.random()*1000000)).toString(36);

// Clear previous timeout.
if ($this.data('jqcloud_timeout')) {
clearTimeout($this.data('jqcloud_timeout'));
}

// Default options value
var default_options = {
Expand Down Expand Up @@ -200,12 +205,12 @@
var drawOneWordDelayed = function(index) {
index = index || 0;
if (!$this.is(':visible')) { // if not visible then do not attempt to draw
setTimeout(function(){drawOneWordDelayed(index);},10);
$this.data('jqcloud_timeout', setTimeout(function(){drawOneWordDelayed(index);},10));
return;
}
if (index < word_array.length) {
drawOneWord(index, word_array[index]);
setTimeout(function(){drawOneWordDelayed(index + 1);}, 10);
$this.data('jqcloud_timeout', setTimeout(function(){drawOneWordDelayed(index + 1);}, 10));
} else {
if ($.isFunction(options.afterCloudRender)) {
options.afterCloudRender.call($this);
Expand All @@ -226,7 +231,7 @@
};

// Delay execution so that the browser can render the page before the computatively intensive word cloud drawing
setTimeout(function(){drawWordCloud();}, 10);
$this.data('jqcloud_timeout', setTimeout(function(){drawWordCloud();}, 10));
return $this;
};
})(jQuery);
11 changes: 8 additions & 3 deletions src/jqcloud/jqcloud.js.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@
var $this = this;
// Namespace word ids to avoid collisions between multiple clouds
var cloud_namespace = $this.attr('id') || Math.floor((Math.random()*1000000)).toString(36);

// Clear previous timeout.
if ($this.data('jqcloud_timeout')) {
clearTimeout($this.data('jqcloud_timeout'));
}

// Default options value
var default_options = {
Expand Down Expand Up @@ -200,12 +205,12 @@
var drawOneWordDelayed = function(index) {
index = index || 0;
if (!$this.is(':visible')) { // if not visible then do not attempt to draw
setTimeout(function(){drawOneWordDelayed(index);},10);
$this.data('jqcloud_timeout', setTimeout(function(){drawOneWordDelayed(index);},10));
return;
}
if (index < word_array.length) {
drawOneWord(index, word_array[index]);
setTimeout(function(){drawOneWordDelayed(index + 1);}, 10);
$this.data('jqcloud_timeout', setTimeout(function(){drawOneWordDelayed(index + 1);}, 10));
} else {
if ($.isFunction(options.afterCloudRender)) {
options.afterCloudRender.call($this);
Expand All @@ -226,7 +231,7 @@
};

// Delay execution so that the browser can render the page before the computatively intensive word cloud drawing
setTimeout(function(){drawWordCloud();}, 10);
$this.data('jqcloud_timeout', setTimeout(function(){drawWordCloud();}, 10));
return $this;
};
})(jQuery);