#37 json1

Abierta
zmalone desea fusionar 1 commits de zmalone/JSON-Lab-1:master en master
Se han modificado 6 ficheros con 271 adiciones y 23 borrados
  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. 218
    0
      .idea/workspace.xml
  6. 24
    23
      js/colors.js

+ 9
- 0
.idea/JSON-Lab-1.iml Ver fichero

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

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

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

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

+ 218
- 0
.idea/workspace.xml Ver fichero

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

+ 24
- 23
js/colors.js Ver fichero

@@ -1,33 +1,34 @@
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
+};