From b584941c491821611538103fee0917415c30bbc1 Mon Sep 17 00:00:00 2001 From: johnS93 Date: Fri, 13 Aug 2021 00:06:52 -0400 Subject: [PATCH 1/2] I too, enjoy blocks --- .idea/.gitignore | 3 +++ .idea/JSON-Lab-1.iml | 9 +++++++++ .idea/misc.xml | 6 ++++++ .idea/modules.xml | 8 ++++++++ .idea/vcs.xml | 6 ++++++ js/colors.js | 17 +++++++++-------- 6 files changed, 41 insertions(+), 8 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/JSON-Lab-1.iml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml 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..639900d --- /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..bd13a95 100644 --- a/js/colors.js +++ b/js/colors.js @@ -1,5 +1,5 @@ -var colorsArray : { - colors=[ +var colorsArray = { + "colors":[ { "name":"green", "red":"64", @@ -17,7 +17,7 @@ var colorsArray : { red:"192", green:"46", blue:"35" - } + }, { "name":"blue", "red":"19", @@ -25,9 +25,10 @@ var colorsArray : { "blue":"144", }, { - "name"="orange", - "red"="253", - "green"="92", - "blue"="48" - }, + "name":"orange", + "red":"253", + "green":"92", + "blue":"48" + } ] +} \ No newline at end of file From 9aef250a01bb35d263483236621e2c3c11b5fe51 Mon Sep 17 00:00:00 2001 From: johnS93 Date: Fri, 13 Aug 2021 00:09:59 -0400 Subject: [PATCH 2/2] deleted uneeded quotations on numbers --- js/colors.js | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/js/colors.js b/js/colors.js index bd13a95..350bf15 100644 --- a/js/colors.js +++ b/js/colors.js @@ -2,33 +2,33 @@ var colorsArray = { "colors":[ { "name":"green", - "red":"64", - "green":"175", - "blue":"63", + "red":64, + "green":175, + "blue":63, }, { "name":"yellow", - "red":"239", - "green":"183", - "blue":"62" + "red":239, + "green":183, + "blue":62 }, { name:"red", - red:"192", - green:"46", - blue:"35" + red:192, + green:46, + blue:35 }, { "name":"blue", - "red":"19", - "green":"71", - "blue":"144", + "red":19, + "green":71, + "blue":144, }, { "name":"orange", - "red":"253", - "green":"92", - "blue":"48" + "red":253, + "green":92, + "blue":48 } ] } \ No newline at end of file