#28 completed JSON1

Отворени
sambhutani заяви обединяване на 1 ревизии от sambhutani/JSON-Lab-1:master във master
променени са 6 файла, в които са добавени 232 реда и са изтрити 13 реда
  1. 6
    0
      .idea/misc.xml
  2. 8
    0
      .idea/modules.xml
  3. 6
    0
      .idea/vcs.xml
  4. 189
    0
      .idea/workspace.xml
  5. 9
    0
      JSON-Lab-1.iml
  6. 14
    13
      js/colors.js

+ 6
- 0
.idea/misc.xml Целия файл

@@ -0,0 +1,6 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="ProjectRootManager">
4
+    <output url="file://$PROJECT_DIR$/out" />
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$/JSON-Lab-1.iml" filepath="$PROJECT_DIR$/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>

+ 189
- 0
.idea/workspace.xml Целия файл

@@ -0,0 +1,189 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="ChangeListManager">
4
+    <list default="true" id="a4e462ad-083c-4647-a397-febb39e89fa5" name="Default Changelist" comment="" />
5
+    <ignored path="$PROJECT_DIR$/out/" />
6
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
7
+    <option name="SHOW_DIALOG" value="false" />
8
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
9
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
10
+    <option name="LAST_RESOLUTION" value="IGNORE" />
11
+  </component>
12
+  <component name="FUSProjectUsageTrigger">
13
+    <session id="-861779250">
14
+      <usages-collector id="statistics.lifecycle.project">
15
+        <counts>
16
+          <entry key="project.closed" value="1" />
17
+          <entry key="project.open.time.2" value="1" />
18
+          <entry key="project.opened" value="1" />
19
+        </counts>
20
+      </usages-collector>
21
+      <usages-collector id="statistics.file.extensions.open">
22
+        <counts>
23
+          <entry key="js" value="1" />
24
+        </counts>
25
+      </usages-collector>
26
+      <usages-collector id="statistics.file.types.open">
27
+        <counts>
28
+          <entry key="JavaScript" value="1" />
29
+        </counts>
30
+      </usages-collector>
31
+    </session>
32
+  </component>
33
+  <component name="FileEditorManager">
34
+    <leaf>
35
+      <file pinned="false" current-in-tab="true">
36
+        <entry file="file://$PROJECT_DIR$/js/colors.js">
37
+          <provider selected="true" editor-type-id="text-editor" />
38
+        </entry>
39
+      </file>
40
+    </leaf>
41
+  </component>
42
+  <component name="Git.Settings">
43
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
44
+  </component>
45
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
46
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
47
+  <component name="JsGulpfileManager">
48
+    <detection-done>true</detection-done>
49
+    <sorting>DEFINITION_ORDER</sorting>
50
+  </component>
51
+  <component name="ProjectFrameBounds">
52
+    <option name="y" value="23" />
53
+    <option name="width" value="1440" />
54
+    <option name="height" value="823" />
55
+  </component>
56
+  <component name="ProjectView">
57
+    <navigator proportions="" version="1">
58
+      <foldersAlwaysOnTop value="true" />
59
+    </navigator>
60
+    <panes>
61
+      <pane id="ProjectPane">
62
+        <subPane>
63
+          <expand>
64
+            <path>
65
+              <item name="JSON-Lab-1" type="b2602c69:ProjectViewProjectNode" />
66
+              <item name="JSON-Lab-1" type="462c0819:PsiDirectoryNode" />
67
+            </path>
68
+            <path>
69
+              <item name="JSON-Lab-1" type="b2602c69:ProjectViewProjectNode" />
70
+              <item name="JSON-Lab-1" type="462c0819:PsiDirectoryNode" />
71
+              <item name="js" type="462c0819:PsiDirectoryNode" />
72
+            </path>
73
+          </expand>
74
+          <select />
75
+        </subPane>
76
+      </pane>
77
+      <pane id="PackagesPane" />
78
+      <pane id="Scope" />
79
+    </panes>
80
+  </component>
81
+  <component name="PropertiesComponent">
82
+    <property name="WebServerToolWindowFactoryState" value="false" />
83
+    <property name="aspect.path.notification.shown" value="true" />
84
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1543423002541" />
85
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
86
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
87
+    <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
88
+  </component>
89
+  <component name="RunDashboard">
90
+    <option name="ruleStates">
91
+      <list>
92
+        <RuleState>
93
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
94
+        </RuleState>
95
+        <RuleState>
96
+          <option name="name" value="StatusDashboardGroupingRule" />
97
+        </RuleState>
98
+      </list>
99
+    </option>
100
+  </component>
101
+  <component name="RunManager">
102
+    <configuration name="index.html" type="JavascriptDebugType" factoryName="JavaScript Debug" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/JSON-Lab-1/index.html">
103
+      <method v="2" />
104
+    </configuration>
105
+    <recent_temporary>
106
+      <list>
107
+        <item itemvalue="JavaScript Debug.index.html" />
108
+      </list>
109
+    </recent_temporary>
110
+  </component>
111
+  <component name="SvnConfiguration">
112
+    <configuration />
113
+  </component>
114
+  <component name="TaskManager">
115
+    <task active="true" id="Default" summary="Default task">
116
+      <changelist id="a4e462ad-083c-4647-a397-febb39e89fa5" name="Default Changelist" comment="" />
117
+      <created>1543422128378</created>
118
+      <option name="number" value="Default" />
119
+      <option name="presentableId" value="Default" />
120
+      <updated>1543422128378</updated>
121
+      <workItem from="1543422131002" duration="220000" />
122
+    </task>
123
+    <servers />
124
+  </component>
125
+  <component name="TimeTrackingManager">
126
+    <option name="totallyTimeSpent" value="220000" />
127
+  </component>
128
+  <component name="ToolWindowManager">
129
+    <frame x="0" y="23" width="1440" height="823" extended-state="0" />
130
+    <editor active="true" />
131
+    <layout>
132
+      <window_info id="Image Layers" />
133
+      <window_info id="Designer" />
134
+      <window_info id="UI Designer" />
135
+      <window_info id="Capture Tool" />
136
+      <window_info id="Favorites" side_tool="true" />
137
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24964234" />
138
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
139
+      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
140
+      <window_info anchor="bottom" id="Version Control" />
141
+      <window_info anchor="bottom" id="Terminal" />
142
+      <window_info anchor="bottom" id="Event Log" side_tool="true" />
143
+      <window_info anchor="bottom" id="Message" order="0" />
144
+      <window_info anchor="bottom" id="Find" order="1" />
145
+      <window_info anchor="bottom" id="Run" order="2" />
146
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
147
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
148
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
149
+      <window_info anchor="bottom" id="TODO" order="6" />
150
+      <window_info anchor="right" id="Palette" />
151
+      <window_info anchor="right" id="Theme Preview" />
152
+      <window_info anchor="right" id="Capture Analysis" />
153
+      <window_info anchor="right" id="Palette&#9;" />
154
+      <window_info anchor="right" id="SciView" />
155
+      <window_info anchor="right" id="Database" />
156
+      <window_info anchor="right" id="Maven Projects" />
157
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
158
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
159
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
160
+    </layout>
161
+  </component>
162
+  <component name="TypeScriptGeneratedFilesManager">
163
+    <option name="version" value="1" />
164
+  </component>
165
+  <component name="VcsContentAnnotationSettings">
166
+    <option name="myLimit" value="2678400000" />
167
+  </component>
168
+  <component name="editorHistoryManager">
169
+    <entry file="file://$PROJECT_DIR$/js/colors.js">
170
+      <provider selected="true" editor-type-id="text-editor" />
171
+    </entry>
172
+  </component>
173
+  <component name="masterDetails">
174
+    <states>
175
+      <state key="ProjectJDKs.UI">
176
+        <settings>
177
+          <last-edited>1.8</last-edited>
178
+          <splitter-proportions>
179
+            <option name="proportions">
180
+              <list>
181
+                <option value="0.2" />
182
+              </list>
183
+            </option>
184
+          </splitter-proportions>
185
+        </settings>
186
+      </state>
187
+    </states>
188
+  </component>
189
+</project>

+ 9
- 0
JSON-Lab-1.iml Целия файл

@@ -0,0 +1,9 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<module type="WEB_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>

+ 14
- 13
js/colors.js Целия файл

@@ -1,10 +1,10 @@
1
-var colorsArray : {
2
-    colors=[
1
+var colorsArray = {
2
+    "colors":[
3 3
         {
4 4
             "name":"green",
5 5
             "red":"64",
6 6
             "green":"175",
7
-            "blue":"63",
7
+            "blue":"63"
8 8
         },
9 9
         {
10 10
             "name":"yellow",
@@ -13,21 +13,22 @@ 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",
24 24
             "green":"71",
25
-            "blue":"144",
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
+};