Lauren Green 6 年之前
父節點
當前提交
9efb8786ce
共有 7 個檔案被更改,包括 262 行新增12 行删除
  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. 220
    0
      .idea/workspace.xml
  6. 12
    11
      js/colors.js
  7. 1
    1
      js/index.js

+ 9
- 0
.idea/JSON-Lab-1.iml 查看文件

@@ -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 查看文件

@@ -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 查看文件

@@ -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 查看文件

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

+ 220
- 0
.idea/workspace.xml 查看文件

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

+ 12
- 11
js/colors.js 查看文件

@@ -1,5 +1,5 @@
1
-var colorsArray : {
2
-    colors=[
1
+var colorsArray = {
2
+    colors: [
3 3
         {
4 4
             "name":"green",
5 5
             "red":"64",
@@ -13,11 +13,11 @@ var colorsArray : {
13 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 23
             "red":"19",
@@ -25,9 +25,10 @@ var colorsArray : {
25 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
+  }

+ 1
- 1
js/index.js 查看文件

@@ -136,4 +136,4 @@ window.onload = function()
136 136
 	//set interval so we can draw then update our drawing
137 137
 	// every 30 milisecond
138 138
 	setInterval(draw,30);
139
-}
139
+}