Xcuello 6 vuotta sitten
vanhempi
commit
5fbcfddff1
6 muutettua tiedostoa jossa 295 lisäystä ja 23 poistoa
  1. 9
    0
      .idea/JSON-Lab-1.iml
  2. 6
    0
      .idea/misc.xml
  3. 8
    0
      .idea/modules.xml
  4. 6
    0
      .idea/vcs.xml
  5. 241
    0
      .idea/workspace.xml
  6. 25
    23
      js/colors.js

+ 9
- 0
.idea/JSON-Lab-1.iml Näytä tiedosto

@@ -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>

+ 6
- 0
.idea/misc.xml Näytä tiedosto

@@ -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 Näytä tiedosto

@@ -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 Näytä tiedosto

@@ -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>

+ 241
- 0
.idea/workspace.xml Näytä tiedosto

@@ -0,0 +1,241 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="ChangeListManager">
4
+    <list default="true" id="c40c2f52-b6ba-4697-9dbb-ee3fc61c523f" name="Default Changelist" comment="">
5
+      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
6
+      <change beforePath="$PROJECT_DIR$/js/colors.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/colors.js" afterDir="false" />
7
+    </list>
8
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9
+    <option name="SHOW_DIALOG" value="false" />
10
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
11
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
12
+    <option name="LAST_RESOLUTION" value="IGNORE" />
13
+  </component>
14
+  <component name="FUSProjectUsageTrigger">
15
+    <session id="266639375">
16
+      <usages-collector id="statistics.lifecycle.project">
17
+        <counts>
18
+          <entry key="project.open.time.1" value="1" />
19
+          <entry key="project.opened" value="1" />
20
+        </counts>
21
+      </usages-collector>
22
+      <usages-collector id="statistics.file.extensions.open">
23
+        <counts>
24
+          <entry key="css" value="1" />
25
+          <entry key="iml" value="1" />
26
+          <entry key="jpg" value="1" />
27
+          <entry key="js" value="2" />
28
+          <entry key="png" value="1" />
29
+          <entry key="xml" value="3" />
30
+        </counts>
31
+      </usages-collector>
32
+      <usages-collector id="statistics.file.types.open">
33
+        <counts>
34
+          <entry key="CSS" value="1" />
35
+          <entry key="IDEA_MODULE" value="1" />
36
+          <entry key="Image" value="2" />
37
+          <entry key="JavaScript" value="2" />
38
+          <entry key="XML" value="3" />
39
+        </counts>
40
+      </usages-collector>
41
+      <usages-collector id="statistics.file.extensions.edit">
42
+        <counts>
43
+          <entry key="js" value="55" />
44
+        </counts>
45
+      </usages-collector>
46
+      <usages-collector id="statistics.file.types.edit">
47
+        <counts>
48
+          <entry key="JavaScript" value="55" />
49
+        </counts>
50
+      </usages-collector>
51
+    </session>
52
+  </component>
53
+  <component name="FileEditorManager">
54
+    <leaf>
55
+      <file pinned="false" current-in-tab="true">
56
+        <entry file="file://$PROJECT_DIR$/js/colors.js">
57
+          <provider selected="true" editor-type-id="text-editor">
58
+            <state relative-caret-position="510">
59
+              <caret line="34" column="2" selection-start-line="34" selection-start-column="2" selection-end-line="34" selection-end-column="2" />
60
+            </state>
61
+          </provider>
62
+        </entry>
63
+      </file>
64
+      <file pinned="false" current-in-tab="false">
65
+        <entry file="file://$PROJECT_DIR$/js/index.js">
66
+          <provider selected="true" editor-type-id="text-editor" />
67
+        </entry>
68
+      </file>
69
+    </leaf>
70
+  </component>
71
+  <component name="Git.Settings">
72
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
73
+  </component>
74
+  <component name="IdeDocumentHistory">
75
+    <option name="CHANGED_PATHS">
76
+      <list>
77
+        <option value="$PROJECT_DIR$/js/colors.js" />
78
+      </list>
79
+    </option>
80
+  </component>
81
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
82
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
83
+  <component name="JsGulpfileManager">
84
+    <detection-done>true</detection-done>
85
+    <sorting>DEFINITION_ORDER</sorting>
86
+  </component>
87
+  <component name="ProjectFrameBounds">
88
+    <option name="y" value="23" />
89
+    <option name="width" value="1275" />
90
+    <option name="height" value="689" />
91
+  </component>
92
+  <component name="ProjectView">
93
+    <navigator proportions="" version="1">
94
+      <foldersAlwaysOnTop value="true" />
95
+    </navigator>
96
+    <panes>
97
+      <pane id="ProjectPane">
98
+        <subPane>
99
+          <expand>
100
+            <path>
101
+              <item name="JSON-Lab-1" type="b2602c69:ProjectViewProjectNode" />
102
+              <item name="JSON-Lab-1" type="462c0819:PsiDirectoryNode" />
103
+            </path>
104
+            <path>
105
+              <item name="JSON-Lab-1" type="b2602c69:ProjectViewProjectNode" />
106
+              <item name="JSON-Lab-1" type="462c0819:PsiDirectoryNode" />
107
+              <item name=".idea" type="462c0819:PsiDirectoryNode" />
108
+            </path>
109
+            <path>
110
+              <item name="JSON-Lab-1" type="b2602c69:ProjectViewProjectNode" />
111
+              <item name="JSON-Lab-1" type="462c0819:PsiDirectoryNode" />
112
+              <item name="images" type="462c0819:PsiDirectoryNode" />
113
+            </path>
114
+            <path>
115
+              <item name="JSON-Lab-1" type="b2602c69:ProjectViewProjectNode" />
116
+              <item name="JSON-Lab-1" type="462c0819:PsiDirectoryNode" />
117
+              <item name="images" type="462c0819:PsiDirectoryNode" />
118
+              <item name="logos" type="462c0819:PsiDirectoryNode" />
119
+            </path>
120
+            <path>
121
+              <item name="JSON-Lab-1" type="b2602c69:ProjectViewProjectNode" />
122
+              <item name="JSON-Lab-1" type="462c0819:PsiDirectoryNode" />
123
+              <item name="js" type="462c0819:PsiDirectoryNode" />
124
+            </path>
125
+          </expand>
126
+          <select />
127
+        </subPane>
128
+      </pane>
129
+      <pane id="PackagesPane" />
130
+      <pane id="Scope" />
131
+    </panes>
132
+  </component>
133
+  <component name="PropertiesComponent">
134
+    <property name="WebServerToolWindowFactoryState" value="false" />
135
+    <property name="aspect.path.notification.shown" value="true" />
136
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
137
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
138
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
139
+  </component>
140
+  <component name="RunDashboard">
141
+    <option name="ruleStates">
142
+      <list>
143
+        <RuleState>
144
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
145
+        </RuleState>
146
+        <RuleState>
147
+          <option name="name" value="StatusDashboardGroupingRule" />
148
+        </RuleState>
149
+      </list>
150
+    </option>
151
+  </component>
152
+  <component name="SvnConfiguration">
153
+    <configuration />
154
+  </component>
155
+  <component name="TaskManager">
156
+    <task active="true" id="Default" summary="Default task">
157
+      <changelist id="c40c2f52-b6ba-4697-9dbb-ee3fc61c523f" name="Default Changelist" comment="" />
158
+      <created>1543414311568</created>
159
+      <option name="number" value="Default" />
160
+      <option name="presentableId" value="Default" />
161
+      <updated>1543414311568</updated>
162
+      <workItem from="1543414313111" duration="594000" />
163
+    </task>
164
+    <servers />
165
+  </component>
166
+  <component name="TimeTrackingManager">
167
+    <option name="totallyTimeSpent" value="594000" />
168
+  </component>
169
+  <component name="ToolWindowManager">
170
+    <frame x="0" y="23" width="1275" height="689" extended-state="0" />
171
+    <editor active="true" />
172
+    <layout>
173
+      <window_info id="Image Layers" />
174
+      <window_info id="Designer" />
175
+      <window_info id="UI Designer" />
176
+      <window_info id="Capture Tool" />
177
+      <window_info id="Favorites" side_tool="true" />
178
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24979724" />
179
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
180
+      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
181
+      <window_info anchor="bottom" id="Version Control" />
182
+      <window_info anchor="bottom" id="Terminal" />
183
+      <window_info anchor="bottom" id="Event Log" side_tool="true" />
184
+      <window_info anchor="bottom" id="Message" order="0" />
185
+      <window_info anchor="bottom" id="Find" order="1" />
186
+      <window_info anchor="bottom" id="Run" order="2" />
187
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
188
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
189
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
190
+      <window_info anchor="bottom" id="TODO" order="6" />
191
+      <window_info anchor="right" id="Palette" />
192
+      <window_info anchor="right" id="Theme Preview" />
193
+      <window_info anchor="right" id="Capture Analysis" />
194
+      <window_info anchor="right" id="Palette&#9;" />
195
+      <window_info anchor="right" id="Database" />
196
+      <window_info anchor="right" id="Maven Projects" />
197
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
198
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
199
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
200
+    </layout>
201
+  </component>
202
+  <component name="TypeScriptGeneratedFilesManager">
203
+    <option name="version" value="1" />
204
+  </component>
205
+  <component name="VcsContentAnnotationSettings">
206
+    <option name="myLimit" value="2678400000" />
207
+  </component>
208
+  <component name="editorHistoryManager">
209
+    <entry file="file://$PROJECT_DIR$/css/style.css">
210
+      <provider selected="true" editor-type-id="text-editor" />
211
+    </entry>
212
+    <entry file="file://$PROJECT_DIR$/images/logos/js_logo.png">
213
+      <provider selected="true" editor-type-id="images" />
214
+    </entry>
215
+    <entry file="file://$PROJECT_DIR$/images/logos/zip_logo.jpg">
216
+      <provider selected="true" editor-type-id="images" />
217
+    </entry>
218
+    <entry file="file://$PROJECT_DIR$/.idea/JSON-Lab-1.iml">
219
+      <provider selected="true" editor-type-id="text-editor" />
220
+    </entry>
221
+    <entry file="file://$PROJECT_DIR$/js/index.js">
222
+      <provider selected="true" editor-type-id="text-editor" />
223
+    </entry>
224
+    <entry file="file://$PROJECT_DIR$/.idea/modules.xml">
225
+      <provider selected="true" editor-type-id="text-editor" />
226
+    </entry>
227
+    <entry file="file://$PROJECT_DIR$/.idea/misc.xml">
228
+      <provider selected="true" editor-type-id="text-editor" />
229
+    </entry>
230
+    <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
231
+      <provider selected="true" editor-type-id="text-editor" />
232
+    </entry>
233
+    <entry file="file://$PROJECT_DIR$/js/colors.js">
234
+      <provider selected="true" editor-type-id="text-editor">
235
+        <state relative-caret-position="510">
236
+          <caret line="34" column="2" selection-start-line="34" selection-start-column="2" selection-end-line="34" selection-end-column="2" />
237
+        </state>
238
+      </provider>
239
+    </entry>
240
+  </component>
241
+</project>

+ 25
- 23
js/colors.js Näytä tiedosto

@@ -1,33 +1,35 @@
1
-var colorsArray : {
2
-    colors=[
1
+let colorsArray = {
2
+    colors: [
3 3
         {
4
-            "name":"green",
5
-            "red":"64",
6
-            "green":"175",
7
-            "blue":"63",
4
+            "name": "green",
5
+            "red": 64,
6
+            "green": 175,
7
+            "blue": 63,
8 8
         },
9 9
         {
10
-            "name":"yellow",
11
-            "red":"239",
12
-            "green":"183",
13
-            "blue":"62"
10
+            "name": "yellow",
11
+            "red": 239,
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
-            "name":"blue",
23
-            "red":"19",
24
-            "green":"71",
25
-            "blue":"144",
22
+            "name": "blue",
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"
28
+            "name": "orange",
29
+            "red": 253,
30
+            "green": 92,
31
+            "blue": 48,
32 32
         },
33
+
33 34
     ]
35
+};