github/diceware
1
0
Fork 0
mirror of https://github.com/dmuth/diceware.git synced 2024-11-28 14:12:02 -05:00
Code Issues Projects Releases Packages Wiki Activity

Moved functions to display row and results out of jQuery callback and parametertized them.

Browse source
This commit is contained in:
Douglas Muth 2015-04-26 15:32:56 -04:00
parent cc962b1b24
commit 20bb5a6e08
1 changed files with 54 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
main.js
View file

@ -52,6 +52,57 @@ jQuery(".dice_button").on("click", function(e) {
}); });
/**
* This function displays each dice roll.
*
*
*/
function display_row(rows, cb) {
if (rows.length) {
//
// Display a row, then call ourselves again then done.
//
var row = rows.shift();
row.hide().appendTo(".results").fadeIn(500, function() {
jQuery(".results").append("<br clear=\"all\" />");
display_row(rows, cb);
});
} else {
//
// All done with displaying rows, fire our callback and get outta here.
//
cb();
}
} // End of display_row()
/**
* Display the actual results.
*/
function display_results() {
jQuery(".results_words_key").hide().clone().appendTo(".results");
jQuery(".results_words_value").hide().clone().appendTo(".results");
jQuery(".results").append("<br clear=\"all\" />");
jQuery(".results_phrase_key").hide().clone().appendTo(".results");
jQuery(".results_phrase_value").hide().clone().appendTo(".results");
jQuery(".results_words_key").fadeIn(500, function() {
jQuery(".results_words_value").fadeIn(500, function() {
jQuery(".results_phrase_key").fadeIn(500, function() {
jQuery(".results_phrase_value").fadeIn(500);
});
});
});
} // End of display_results()
// //
// Handler when the "Roll Dice" button is clicked. It gets the // Handler when the "Roll Dice" button is clicked. It gets the
// passphrase and updates the HTML with it. // passphrase and updates the HTML with it.
@ -98,50 +149,8 @@ jQuery("#roll_dice").on("click", function(e) {
} }
//
// This function goes through our rows, calling itself and
// displaying each row after a delay.
//
function process_row(rows) {
if (rows.length) { display_row(rows, display_results);
var row = rows.shift();
row.hide().appendTo(".results").fadeIn(500, function() {
jQuery(".results").append("<br clear=\"all\" />");
process_row(rows);
});
} else {
//
// All done with displaying dice, now display the results.
//
display_results();
}
}
process_row(rows);
//
// Display the actual results
//
function display_results() {
jQuery(".results_words_key").hide().clone().appendTo(".results");
jQuery(".results_words_value").hide().clone().appendTo(".results");
jQuery(".results").append("<br clear=\"all\" />");
jQuery(".results_phrase_key").hide().clone().appendTo(".results");
jQuery(".results_phrase_value").hide().clone().appendTo(".results");
jQuery(".results_words_key").fadeIn(500, function() {
jQuery(".results_words_value").fadeIn(500, function() {
jQuery(".results_phrase_key").fadeIn(500, function() {
jQuery(".results_phrase_value").fadeIn(500);
});
});
});
}
}); });
@ -151,7 +160,8 @@ jQuery("#roll_dice").on("click", function(e) {
// //
jQuery.getScript("./wordlist.js").done( jQuery.getScript("./wordlist.js").done(
function(data) { function(data) {
//jQuery("#roll_dice").click(); // Debugging // TEST
jQuery("#roll_dice").click(); // Debugging
}).fail( }).fail(
function(jqxhr, settings, exception) { function(jqxhr, settings, exception) {