Stwillia94 пре 6 година
родитељ
комит
b60d416875
6 измењених фајлова са 187 додато и 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. 145
    0
      .idea/workspace.xml
  6. 13
    12
      js/colors.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>

+ 145
- 0
.idea/workspace.xml Прегледај датотеку

@@ -0,0 +1,145 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="ChangeListManager">
4
+    <list default="true" id="d889a549-d56c-4da0-8247-ee455df3060e" 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="2002923248">
13
+      <usages-collector id="statistics.lifecycle.project">
14
+        <counts>
15
+          <entry key="project.closed" value="1" />
16
+          <entry key="project.open.time.1" value="1" />
17
+          <entry key="project.opened" value="1" />
18
+        </counts>
19
+      </usages-collector>
20
+    </session>
21
+  </component>
22
+  <component name="Git.Settings">
23
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
24
+  </component>
25
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
26
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
27
+  <component name="JsGulpfileManager">
28
+    <detection-done>true</detection-done>
29
+    <sorting>DEFINITION_ORDER</sorting>
30
+  </component>
31
+  <component name="ProjectFrameBounds" extendedState="6">
32
+    <option name="y" value="34" />
33
+    <option name="width" value="1440" />
34
+    <option name="height" value="797" />
35
+  </component>
36
+  <component name="ProjectView">
37
+    <navigator proportions="" version="1">
38
+      <foldersAlwaysOnTop value="true" />
39
+    </navigator>
40
+    <panes>
41
+      <pane id="PackagesPane" />
42
+      <pane id="Scope" />
43
+      <pane id="ProjectPane">
44
+        <subPane>
45
+          <expand>
46
+            <path>
47
+              <item name="JSON-Lab-1" type="b2602c69:ProjectViewProjectNode" />
48
+              <item name="JSON-Lab-1" type="462c0819:PsiDirectoryNode" />
49
+            </path>
50
+          </expand>
51
+          <select />
52
+        </subPane>
53
+      </pane>
54
+    </panes>
55
+  </component>
56
+  <component name="PropertiesComponent">
57
+    <property name="WebServerToolWindowFactoryState" value="false" />
58
+    <property name="aspect.path.notification.shown" value="true" />
59
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
60
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
61
+  </component>
62
+  <component name="RunDashboard">
63
+    <option name="ruleStates">
64
+      <list>
65
+        <RuleState>
66
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
67
+        </RuleState>
68
+        <RuleState>
69
+          <option name="name" value="StatusDashboardGroupingRule" />
70
+        </RuleState>
71
+      </list>
72
+    </option>
73
+  </component>
74
+  <component name="SvnConfiguration">
75
+    <configuration />
76
+  </component>
77
+  <component name="TaskManager">
78
+    <task active="true" id="Default" summary="Default task">
79
+      <changelist id="d889a549-d56c-4da0-8247-ee455df3060e" name="Default Changelist" comment="" />
80
+      <created>1543542817083</created>
81
+      <option name="number" value="Default" />
82
+      <option name="presentableId" value="Default" />
83
+      <updated>1543542817083</updated>
84
+      <workItem from="1543542818651" duration="11000" />
85
+    </task>
86
+    <servers />
87
+  </component>
88
+  <component name="TimeTrackingManager">
89
+    <option name="totallyTimeSpent" value="11000" />
90
+  </component>
91
+  <component name="ToolWindowManager">
92
+    <frame x="0" y="23" width="1440" height="797" extended-state="6" />
93
+    <layout>
94
+      <window_info id="Image Layers" />
95
+      <window_info id="Designer" />
96
+      <window_info id="UI Designer" />
97
+      <window_info id="Capture Tool" />
98
+      <window_info id="Favorites" side_tool="true" />
99
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24964234" />
100
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
101
+      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
102
+      <window_info anchor="bottom" id="Version Control" />
103
+      <window_info anchor="bottom" id="Terminal" />
104
+      <window_info anchor="bottom" id="Event Log" side_tool="true" />
105
+      <window_info anchor="bottom" id="Message" order="0" />
106
+      <window_info anchor="bottom" id="Find" order="1" />
107
+      <window_info anchor="bottom" id="Run" order="2" />
108
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
109
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
110
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
111
+      <window_info anchor="bottom" id="TODO" order="6" />
112
+      <window_info anchor="right" id="Palette" />
113
+      <window_info anchor="right" id="Theme Preview" />
114
+      <window_info anchor="right" id="Capture Analysis" />
115
+      <window_info anchor="right" id="Palette&#9;" />
116
+      <window_info anchor="right" id="Database" />
117
+      <window_info anchor="right" id="Maven Projects" />
118
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
119
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
120
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
121
+    </layout>
122
+  </component>
123
+  <component name="TypeScriptGeneratedFilesManager">
124
+    <option name="version" value="1" />
125
+  </component>
126
+  <component name="VcsContentAnnotationSettings">
127
+    <option name="myLimit" value="2678400000" />
128
+  </component>
129
+  <component name="masterDetails">
130
+    <states>
131
+      <state key="ProjectJDKs.UI">
132
+        <settings>
133
+          <last-edited>1.8</last-edited>
134
+          <splitter-proportions>
135
+            <option name="proportions">
136
+              <list>
137
+                <option value="0.2" />
138
+              </list>
139
+            </option>
140
+          </splitter-proportions>
141
+        </settings>
142
+      </state>
143
+    </states>
144
+  </component>
145
+</project>

+ 13
- 12
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"
32
-        },
28
+            "name":"orange",
29
+            "red":"253",
30
+            "green":"92",
31
+            "blue":"48",
32
+        }
33 33
     ]
34
+  }