Browse Source

bugs squashed

jacob andersen 6 years ago
parent
commit
97ea4323cc
7 changed files with 213 additions and 21 deletions
  1. 9
    0
      .idea/JSON-Lab-1.iml
  2. 4
    0
      .idea/encodings.xml
  3. 6
    0
      .idea/misc.xml
  4. 8
    0
      .idea/modules.xml
  5. 6
    0
      .idea/vcs.xml
  6. 158
    0
      .idea/workspace.xml
  7. 22
    21
      js/colors.js

+ 9
- 0
.idea/JSON-Lab-1.iml View File

@@ -0,0 +1,9 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<module type="JAVA_MODULE" version="4">
3
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
4
+    <exclude-output />
5
+    <content url="file://$MODULE_DIR$" />
6
+    <orderEntry type="inheritedJdk" />
7
+    <orderEntry type="sourceFolder" forTests="false" />
8
+  </component>
9
+</module>

+ 4
- 0
.idea/encodings.xml View File

@@ -0,0 +1,4 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
4
+</project>

+ 6
- 0
.idea/misc.xml View File

@@ -0,0 +1,6 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="JavaScriptSettings">
4
+    <option name="languageLevel" value="ES6" />
5
+  </component>
6
+</project>

+ 8
- 0
.idea/modules.xml View File

@@ -0,0 +1,8 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="ProjectModuleManager">
4
+    <modules>
5
+      <module fileurl="file://$PROJECT_DIR$/.idea/JSON-Lab-1.iml" filepath="$PROJECT_DIR$/.idea/JSON-Lab-1.iml" />
6
+    </modules>
7
+  </component>
8
+</project>

+ 6
- 0
.idea/vcs.xml View File

@@ -0,0 +1,6 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="VcsDirectoryMappings">
4
+    <mapping directory="" vcs="Git" />
5
+  </component>
6
+</project>

+ 158
- 0
.idea/workspace.xml View File

@@ -0,0 +1,158 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="ChangeListManager">
4
+    <list default="true" id="cc009811-9539-4f6c-96ad-2e15b1a5a6cd" name="Default Changelist" comment="">
5
+      <change beforePath="$PROJECT_DIR$/js/colors.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/colors.js" afterDir="false" />
6
+    </list>
7
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
8
+    <option name="SHOW_DIALOG" value="false" />
9
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
10
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
11
+    <option name="LAST_RESOLUTION" value="IGNORE" />
12
+  </component>
13
+  <component name="FileEditorManager">
14
+    <leaf>
15
+      <file pinned="false" current-in-tab="false">
16
+        <entry file="file://$PROJECT_DIR$/index.html">
17
+          <provider selected="true" editor-type-id="text-editor" />
18
+        </entry>
19
+      </file>
20
+      <file pinned="false" current-in-tab="true">
21
+        <entry file="file://$PROJECT_DIR$/js/colors.js">
22
+          <provider selected="true" editor-type-id="text-editor">
23
+            <state relative-caret-position="225">
24
+              <caret line="15" column="18" selection-start-line="15" selection-start-column="18" selection-end-line="15" selection-end-column="18" />
25
+            </state>
26
+          </provider>
27
+        </entry>
28
+      </file>
29
+    </leaf>
30
+  </component>
31
+  <component name="Git.Settings">
32
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
33
+  </component>
34
+  <component name="IdeDocumentHistory">
35
+    <option name="CHANGED_PATHS">
36
+      <list>
37
+        <option value="$PROJECT_DIR$/js/colors.js" />
38
+      </list>
39
+    </option>
40
+  </component>
41
+  <component name="ProjectFrameBounds">
42
+    <option name="y" value="-1057" />
43
+    <option name="width" value="1920" />
44
+    <option name="height" value="1057" />
45
+  </component>
46
+  <component name="ProjectView">
47
+    <navigator proportions="" version="1">
48
+      <foldersAlwaysOnTop value="true" />
49
+    </navigator>
50
+    <panes>
51
+      <pane id="Scope" />
52
+      <pane id="ProjectPane">
53
+        <subPane>
54
+          <expand>
55
+            <path>
56
+              <item name="JSON-Lab-1" type="b2602c69:ProjectViewProjectNode" />
57
+              <item name="JSON-Lab-1" type="462c0819:PsiDirectoryNode" />
58
+            </path>
59
+            <path>
60
+              <item name="JSON-Lab-1" type="b2602c69:ProjectViewProjectNode" />
61
+              <item name="JSON-Lab-1" type="462c0819:PsiDirectoryNode" />
62
+              <item name="js" type="462c0819:PsiDirectoryNode" />
63
+            </path>
64
+          </expand>
65
+          <select />
66
+        </subPane>
67
+      </pane>
68
+      <pane id="PackagesPane" />
69
+    </panes>
70
+  </component>
71
+  <component name="PropertiesComponent">
72
+    <property name="WebServerToolWindowFactoryState" value="false" />
73
+    <property name="android.sdk.path" value="$USER_HOME$/Library/Android/sdk" />
74
+    <property name="aspect.path.notification.shown" value="true" />
75
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
76
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
77
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
78
+  </component>
79
+  <component name="RunDashboard">
80
+    <option name="ruleStates">
81
+      <list>
82
+        <RuleState>
83
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
84
+        </RuleState>
85
+        <RuleState>
86
+          <option name="name" value="StatusDashboardGroupingRule" />
87
+        </RuleState>
88
+      </list>
89
+    </option>
90
+  </component>
91
+  <component name="SvnConfiguration">
92
+    <configuration />
93
+  </component>
94
+  <component name="TaskManager">
95
+    <task active="true" id="Default" summary="Default task">
96
+      <changelist id="cc009811-9539-4f6c-96ad-2e15b1a5a6cd" name="Default Changelist" comment="" />
97
+      <created>1543359353019</created>
98
+      <option name="number" value="Default" />
99
+      <option name="presentableId" value="Default" />
100
+      <updated>1543359353019</updated>
101
+      <workItem from="1543359354507" duration="5000" />
102
+      <workItem from="1543359376751" duration="100000" />
103
+    </task>
104
+    <servers />
105
+  </component>
106
+  <component name="TimeTrackingManager">
107
+    <option name="totallyTimeSpent" value="105000" />
108
+  </component>
109
+  <component name="ToolWindowManager">
110
+    <frame x="0" y="-1057" width="1920" height="1057" extended-state="6" />
111
+    <editor active="true" />
112
+    <layout>
113
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25239617" />
114
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
115
+      <window_info id="Image Layers" order="2" />
116
+      <window_info id="Designer" order="3" />
117
+      <window_info id="UI Designer" order="4" />
118
+      <window_info id="Capture Tool" order="5" />
119
+      <window_info id="Favorites" order="6" side_tool="true" />
120
+      <window_info anchor="bottom" id="Message" order="0" />
121
+      <window_info anchor="bottom" id="Find" order="1" />
122
+      <window_info anchor="bottom" id="Run" order="2" />
123
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
124
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
125
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
126
+      <window_info anchor="bottom" id="TODO" order="6" />
127
+      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
128
+      <window_info anchor="bottom" id="Version Control" order="8" />
129
+      <window_info anchor="bottom" id="Database Changes" order="9" />
130
+      <window_info anchor="bottom" id="Terminal" order="10" />
131
+      <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
132
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
133
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
134
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
135
+      <window_info anchor="right" id="Palette" order="3" />
136
+      <window_info anchor="right" id="Theme Preview" order="4" />
137
+      <window_info anchor="right" id="Maven" order="5" />
138
+      <window_info anchor="right" id="Capture Analysis" order="6" />
139
+      <window_info anchor="right" id="Palette&#9;" order="7" />
140
+      <window_info anchor="right" id="Database" order="8" />
141
+    </layout>
142
+  </component>
143
+  <component name="TypeScriptGeneratedFilesManager">
144
+    <option name="version" value="1" />
145
+  </component>
146
+  <component name="editorHistoryManager">
147
+    <entry file="file://$PROJECT_DIR$/index.html">
148
+      <provider selected="true" editor-type-id="text-editor" />
149
+    </entry>
150
+    <entry file="file://$PROJECT_DIR$/js/colors.js">
151
+      <provider selected="true" editor-type-id="text-editor">
152
+        <state relative-caret-position="225">
153
+          <caret line="15" column="18" selection-start-line="15" selection-start-column="18" selection-end-line="15" selection-end-column="18" />
154
+        </state>
155
+      </provider>
156
+    </entry>
157
+  </component>
158
+</project>

+ 22
- 21
js/colors.js View File

@@ -1,33 +1,34 @@
1
-var colorsArray : {
2
-    colors=[
1
+var colorsArray = {
2
+     colors:[
3 3
         {
4 4
             "name":"green",
5
-            "red":"64",
6
-            "green":"175",
7
-            "blue":"63",
5
+            "red":64,
6
+            "green":175,
7
+            "blue":63
8 8
         },
9 9
         {
10 10
             "name":"yellow",
11
-            "red":"239",
12
-            "green":"183",
13
-            "blue":"62"
11
+            "red":293,
12
+            "green":183,
13
+            "blue":62
14 14
         },
15 15
         {
16
-            name:"red",
17
-            red:"192",
18
-            green:"46",
19
-            blue:"35"
20
-        }
16
+            "name":"red",
17
+            "red":192,
18
+            "green":46,
19
+            "blue":35
20
+        },
21 21
         {
22 22
             "name":"blue",
23
-            "red":"19",
24
-            "green":"71",
25
-            "blue":"144",
23
+            "red":19,
24
+            "green":71,
25
+            "blue":144
26 26
         },
27 27
         {
28
-            "name"="orange",
29
-            "red"="253",
30
-            "green"="92",
31
-            "blue"="48"
32
-        },
28
+            "name":"orange",
29
+            "red":253,
30
+            "green":92,
31
+            "blue":48
32
+        }
33 33
     ]
34
+  }