[refactor] add random string adjectives count

Author: zombieFox

package-lock.json

@@ -1,6 +1,6 @@
 {
 "name": "nightTab",
-"version": "5.5.4",
+"version": "5.6.0",
 "description": "A neutral new tab page accented with a chosen colour. Customise the layout, style, background and bookmarks in nightTab.",
 "main": "index.js",
 "scripts":{

package.json

@@ -22,13 +22,13 @@ var helper = (function(){
 
 varrandomString=function(override){
 varoptions={
-mix: null,
-letter: null
+letter: null,
+adjectivesCount: null
 };
 if(override){
 options=applyOptions(options,override);
 };
-varalphabet="abcdefghijklmnopqrstuvwxyz";
+varalphabet=["a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z"];
 varadjectives={
 a: ["Aback","Abaft","Abandoned","Abashed","Aberrant","Abhorrent","Abiding","Abject","Ablaze","Able","Abnormal","Aboriginal","Abortive","Abounding","Abrasive","Abrupt","Absent","Absorbed","Absorbing","Abstracted","Absurd","Abundant","Abusive","Acceptable","Accessible","Accidental","Accurate","Acid","Acidic","Acoustic","Acrid","Adamant","Adaptable","Addicted","Adhesive","Adjoining","Adorable","Adventurous","Afraid","Aggressive","Agonizing","Agreeable","Ahead","Ajar","Alert","Alike","Alive","Alleged","Alluring","Aloof","Amazing","Ambiguous","Ambitious","Amuck","Amused","Amusing","Ancient","Angry","Animated","Annoyed","Annoying","Anxious","Apathetic","Aquatic","Aromatic","Arrogant","Ashamed","Aspiring","Assorted","Astonishing","Attractive","Auspicious","Automatic","Available","Average","Aware","Awesome","Axiomatic"],
 b: ["Bad","Barbarous","Bashful","Bawdy","Beautiful","Befitting","Belligerent","Beneficial","Bent","Berserk","Bewildered","Big","Billowy","Bitter","Bizarre","Black","Bloody","Blue","Blushing","Boiling","Boorish","Bored","Boring","Bouncy","Boundless","Brainy","Brash","Brave","Brawny","Breakable","Breezy","Brief","Bright","Broad","Broken","Brown","Bumpy","Burly","Bustling","Busy"],
@@ -83,26 +83,71 @@ var helper = (function(){
 w: ["Wallaby","Walrus","Wasp","Weasel","Whale","Wolf","Wolverine","Wombat","Woodcock","Woodpecker","Worm","Wren"],
 x: ["Xaviers Greenbul","Xeme","Xingu Corydoras","Xolo"],
 y: ["Yabby","Yak","Yellowhammer","Yellowjacket"],
-z: ["Zebra","Zebu","Zokor","Zorilla"],
-};
-varseed;
-varmix=function(){
-varadjectivesSeed=alphabet[Math.floor(Math.random()*alphabet.length)];
-varanimalsSeed=alphabet[Math.floor(Math.random()*alphabet.length)];
-returnadjectives[adjectivesSeed][Math.floor(Math.random()*adjectives[adjectivesSeed].length)]+" "+animals[animalsSeed][Math.floor(Math.random()*animals[animalsSeed].length)];
+z: ["Zebra","Zebu","Zokor","Zorilla"]
+};
+
+varaction={
+alliteration: {
+short: function(){
+varrandomAdjective=adjectives[options.letter.toLowerCase()][Math.floor(Math.random()*adjectives[options.letter.toLowerCase()].length)];
+varrandomAnimal=animals[options.letter.toLowerCase()][Math.floor(Math.random()*animals[options.letter.toLowerCase()].length)];
+returnrandomAdjective+" "+randomAnimal;
+},
+long: function(){
+varrandomAdjective="";
+for(vari=1;i<=options.adjectivesCount;i++){
+if(adjectives[options.letter.toLowerCase()].length>0){
+if(randomAdjective.length>0){
+randomAdjective=randomAdjective+" ";
+};
+randomAdjective=randomAdjective+adjectives[options.letter.toLowerCase()].splice(Math.floor(Math.random()*adjectives[options.letter.toLowerCase()].length),1);
+};
+};
+varrandomAnimal=animals[options.letter.toLowerCase()][Math.floor(Math.random()*animals[options.letter.toLowerCase()].length)];
+returnrandomAdjective+" "+randomAnimal;
+}
+},
+mix: {
+short: function(){
+varadjectivesSeed=alphabet[Math.floor(Math.random()*(alphabet.length-1))];
+varanimalsSeed=alphabet[Math.floor(Math.random()*(alphabet.length-1))];
+varrandomAdjective=adjectives[adjectivesSeed][Math.floor(Math.random()*adjectives[adjectivesSeed].length)];
+varrandomAnimal=animals[animalsSeed][Math.floor(Math.random()*animals[animalsSeed].length)];
+returnrandomAdjective+" "+randomAnimal;
+},
+long: function(){
+varrandomAdjective="";
+for(vari=1;i<=options.adjectivesCount;i++){
+varadjectiveLetter=alphabet[Math.floor(Math.random()*(alphabet.length-1))];
+if(adjectiveLetterinadjectives&&adjectives[adjectiveLetter].length>0){
+if(randomAdjective.length>0){
+randomAdjective=randomAdjective+" ";
+};
+randomAdjective=randomAdjective+adjectives[adjectiveLetter].splice(Math.floor(Math.random()*adjectives[adjectiveLetter].length),1);
+if(adjectives[adjectiveLetter].length==0){
+deleteadjectives[adjectiveLetter];
+};
+};
+};
+varrandomAnimalArray=animals[alphabet[Math.floor(Math.random()*(alphabet.length-1))]]
+varrandomAnimal=randomAnimalArray[Math.floor(Math.random()*(randomAnimalArray.length-1))];
+returnrandomAdjective+" "+randomAnimal;
+}
+}
 };
-varalliteration=function(){
-if(options.letter!=null){
-returnadjectives[options.letter.toLowerCase()][Math.floor(Math.random()*adjectives[options.letter.toLowerCase()].length)]+" "+animals[options.letter.toLowerCase()][Math.floor(Math.random()*animals[options.letter.toLowerCase()].length)];
+
+if(options.letter!=null&&alphabet.includes(options.letter.toLowerCase())){
+if(options.adjectivesCount!=null&&options.adjectivesCount>0){
+returnaction.alliteration.long();
 }else{
-varseed=alphabet[Math.floor(Math.random()*alphabet.length)];
-returnadjectives[seed][Math.floor(Math.random()*adjectives[seed].length)]+" "+animals[seed][Math.floor(Math.random()*animals[seed].length)];
+returnaction.alliteration.short();
 };
-};
-if(options.mix){
-returnmix();
 }else{
-returnalliteration();
+if(options.adjectivesCount!=null&&options.adjectivesCount>0){
+returnaction.mix.long();
+}else{
+returnaction.mix.short();
+};
 };
 };
 

src/js/helper.js

@@ -647,7 +647,7 @@ var link = (function(){
 },false);
 groupFormRandomNameButton.addEventListener("click",function(event){
 varrandomName=helper.randomString({
-mix: true
+adjectivesCount: 2
 });
 stagedGroup.group.name.text=randomName;
 groupFormInputName.value=randomName;
@@ -1187,7 +1187,7 @@ var link = (function(){
 },false);
 groupNewRandomNameButton.addEventListener("click",function(event){
 varrandomName=helper.randomString({
-mix: true
+adjectivesCount: 2
 });
 stagedLink.position.group.name.text=randomName;
 groupNewInput.value=randomName;

src/js/link.js

@@ -2079,7 +2079,7 @@ var theme = (function(){
 
 randomButton.addEventListener("click",function(event){
 varrandomName=helper.randomString({
-mix: true
+adjectivesCount: 2
 });
 stagedThemeCustom.theme.name=randomName;
 nameInput.value=randomName;

src/js/theme.js

@@ -1,6 +1,6 @@
 varversion=(function(){
 
-varcurrent="5.5.4";
+varcurrent="5.6.0";
 
 varname="Zonked Tarsier";
 

src/js/version.js

@@ -2,7 +2,7 @@
 "name": "nightTab",
 "short_name": "nightTab",
 "description": "A neutral new tab page accented with a chosen colour. Customise the layout, style, background and bookmarks in nightTab.",
-"version": "5.5.4",
+"version": "5.6.0",
 "manifest_version": 2,
 "chrome_url_overrides":{
 "newtab": "index.html"