diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..0e40fe8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ + +# Default ignored files +/workspace.xml \ No newline at end of file diff --git a/.idea/JSON-Lab-1.iml b/.idea/JSON-Lab-1.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/JSON-Lab-1.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..28a804d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..a5b9dac --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/js/colors.js b/js/colors.js index 6e4f350..965564d 100644 --- a/js/colors.js +++ b/js/colors.js @@ -1,10 +1,10 @@ -var colorsArray : { - colors=[ +var colorsArray={ + colors:[ { "name":"green", "red":"64", "green":"175", - "blue":"63", + "blue":"63" }, { "name":"yellow", @@ -13,21 +13,22 @@ var colorsArray : { "blue":"62" }, { - name:"red", - red:"192", - green:"46", - blue:"35" - } + "name":"red", + "red":"192", + "green":"46", + "blue":"35" + }, { "name":"blue", "red":"19", "green":"71", - "blue":"144", + "blue":"144" }, { - "name"="orange", - "red"="253", - "green"="92", - "blue"="48" - }, + "name":"orange", + "red":"253", + "green":"92", + "blue":"48" + } ] +} diff --git a/js/index.js b/js/index.js index 396b2e7..276ffc5 100644 --- a/js/index.js +++ b/js/index.js @@ -1,6 +1,6 @@ //Function to grab random int between min - max var randomInt = function (min, max) { - return Math.floor(Math.random() * (max - min + 1)) + min; + return Math.floor(Math.random() * (max - min + 1)) + min; } window.onload = function()