EDIT / kanjai · Commits

Commit eac935db18948e2186cb03bc5caf5ce6fb2461f3

Authored by Karpikau Andrei
1 parent e7244671

check repeat variables

Inline Side-by-side
Showing 5 changed files with 77 additions and 47 deletions
@@ -28,7 +28,27 @@ @@ -28,7 +28,27 @@
28 <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake"> 28 <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
29 <provider selected="true" editor-type-id="text-editor"> 29 <provider selected="true" editor-type-id="text-editor">
30 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390"> 30 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
31 - <caret line="8" column="5" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="5" /> 31 + <caret line="11" column="19" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="19" />
  32 + <folding />
  33 + </state>
  34 + </provider>
  35 + </entry>
  36 + </file>
  37 + <file leaf-file-name="page_template.rb" pinned="false" current-in-tab="false">
  38 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
  39 + <provider selected="true" editor-type-id="text-editor">
  40 + <state vertical-scroll-proportion="0.0" vertical-offset="390" max-vertical-offset="2745">
  41 + <caret line="54" column="61" selection-start-line="54" selection-start-column="34" selection-end-line="54" selection-end-column="61" />
  42 + <folding />
  43 + </state>
  44 + </provider>
  45 + </entry>
  46 + </file>
  47 + <file leaf-file-name="template_parser.rb" pinned="false" current-in-tab="false">
  48 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_parser.rb">
  49 + <provider selected="true" editor-type-id="text-editor">
  50 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2250">
  51 + <caret line="25" column="21" selection-start-line="25" selection-start-column="8" selection-end-line="25" selection-end-column="21" />
32 <folding /> 52 <folding />
33 </state> 53 </state>
34 </provider> 54 </provider>
@@ -77,8 +97,8 @@ @@ -77,8 +97,8 @@
77 <file leaf-file-name="template_generator.rb" pinned="false" current-in-tab="false"> 97 <file leaf-file-name="template_generator.rb" pinned="false" current-in-tab="false">
78 <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb"> 98 <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
79 <provider selected="true" editor-type-id="text-editor"> 99 <provider selected="true" editor-type-id="text-editor">
80 - <state vertical-scroll-proportion="0.0" vertical-offset="1092" max-vertical-offset="4065">  
81 - <caret line="99" column="17" selection-start-line="99" selection-start-column="17" selection-end-line="99" selection-end-column="17" /> 100 + <state vertical-scroll-proportion="0.0" vertical-offset="2655" max-vertical-offset="4125">
  101 + <caret line="199" column="55" selection-start-line="199" selection-start-column="55" selection-end-line="199" selection-end-column="55" />
82 <folding /> 102 <folding />
83 </state> 103 </state>
84 </provider> 104 </provider>
@@ -94,26 +114,6 @@ @@ -94,26 +114,6 @@
94 </provider> 114 </provider>
95 </entry> 115 </entry>
96 </file> 116 </file>
97 - <file leaf-file-name="application_controller.rb" pinned="false" current-in-tab="false">  
98 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">  
99 - <provider selected="true" editor-type-id="text-editor">  
100 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">  
101 - <caret line="12" column="13" selection-start-line="12" selection-start-column="6" selection-end-line="12" selection-end-column="13" />  
102 - <folding />  
103 - </state>  
104 - </provider>  
105 - </entry>  
106 - </file>  
107 - <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">  
108 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">  
109 - <provider selected="true" editor-type-id="text-editor">  
110 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2160">  
111 - <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />  
112 - <folding />  
113 - </state>  
114 - </provider>  
115 - </entry>  
116 - </file>  
117 <file leaf-file-name="site_controller.rb" pinned="false" current-in-tab="false"> 117 <file leaf-file-name="site_controller.rb" pinned="false" current-in-tab="false">
118 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb"> 118 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
119 <provider selected="true" editor-type-id="text-editor"> 119 <provider selected="true" editor-type-id="text-editor">
@@ -129,7 +129,6 @@ @@ -129,7 +129,6 @@
129 <component name="IdeDocumentHistory"> 129 <component name="IdeDocumentHistory">
130 <option name="CHANGED_PATHS"> 130 <option name="CHANGED_PATHS">
131 <list> 131 <list>
132 - <option value="$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb" />  
133 <option value="$PROJECT_DIR$/app/models/kanjai/page_template.rb" /> 132 <option value="$PROJECT_DIR$/app/models/kanjai/page_template.rb" />
134 <option value="$PROJECT_DIR$/app/views/kanjai/shared/_new_resource_links.html.erb" /> 133 <option value="$PROJECT_DIR$/app/views/kanjai/shared/_new_resource_links.html.erb" />
135 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/new.html.erb" /> 134 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/new.html.erb" />
@@ -178,6 +177,7 @@ @@ -178,6 +177,7 @@
178 <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" /> 177 <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
179 <option value="$PROJECT_DIR$/lib/tasks/install.rake" /> 178 <option value="$PROJECT_DIR$/lib/tasks/install.rake" />
180 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss" /> 179 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss" />
  180 + <option value="$PROJECT_DIR$/lib/kanjai/template_parser.rb" />
181 <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" /> 181 <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
182 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" /> 182 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
183 </list> 183 </list>
@@ -326,6 +326,28 @@ @@ -326,6 +326,28 @@
326 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 326 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
327 </PATH_ELEMENT> 327 </PATH_ELEMENT>
328 <PATH_ELEMENT> 328 <PATH_ELEMENT>
  329 + <option name="myItemId" value="models" />
  330 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  331 + </PATH_ELEMENT>
  332 + <PATH_ELEMENT>
  333 + <option name="myItemId" value="kanjai" />
  334 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  335 + </PATH_ELEMENT>
  336 + </PATH>
  337 + <PATH>
  338 + <PATH_ELEMENT>
  339 + <option name="myItemId" value="kanjai" />
  340 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  341 + </PATH_ELEMENT>
  342 + <PATH_ELEMENT>
  343 + <option name="myItemId" value="kanjai" />
  344 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  345 + </PATH_ELEMENT>
  346 + <PATH_ELEMENT>
  347 + <option name="myItemId" value="app" />
  348 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  349 + </PATH_ELEMENT>
  350 + <PATH_ELEMENT>
329 <option name="myItemId" value="assets" /> 351 <option name="myItemId" value="assets" />
330 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 352 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
331 </PATH_ELEMENT> 353 </PATH_ELEMENT>
@@ -608,20 +630,6 @@ @@ -608,20 +630,6 @@
608 <watches-manager /> 630 <watches-manager />
609 </component> 631 </component>
610 <component name="editorHistoryManager"> 632 <component name="editorHistoryManager">
611 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_langs/index.html.erb">  
612 - <provider selected="true" editor-type-id="text-editor">  
613 - <state vertical-scroll-proportion="-10.708333" vertical-offset="193" max-vertical-offset="585">  
614 - <caret line="30" column="14" selection-start-line="30" selection-start-column="14" selection-end-line="30" selection-end-column="14" />  
615 - </state>  
616 - </provider>  
617 - </entry>  
618 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_langs/new.html.erb">  
619 - <provider selected="true" editor-type-id="text-editor">  
620 - <state vertical-scroll-proportion="-6.25" vertical-offset="0" max-vertical-offset="345">  
621 - <caret line="10" column="39" selection-start-line="10" selection-start-column="39" selection-end-line="10" selection-end-column="39" />  
622 - </state>  
623 - </provider>  
624 - </entry>  
625 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_langs/edit.html.erb"> 633 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_langs/edit.html.erb">
626 <provider selected="true" editor-type-id="text-editor"> 634 <provider selected="true" editor-type-id="text-editor">
627 <state vertical-scroll-proportion="-6.875" vertical-offset="0" max-vertical-offset="360"> 635 <state vertical-scroll-proportion="-6.875" vertical-offset="0" max-vertical-offset="360">
@@ -954,26 +962,42 @@ @@ -954,26 +962,42 @@
954 </state> 962 </state>
955 </provider> 963 </provider>
956 </entry> 964 </entry>
  965 + <entry file="file://$PROJECT_DIR$/Gemfile">
  966 + <provider selected="true" editor-type-id="text-editor">
  967 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
  968 + <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
  969 + <folding />
  970 + </state>
  971 + </provider>
  972 + </entry>
957 <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake"> 973 <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
958 <provider selected="true" editor-type-id="text-editor"> 974 <provider selected="true" editor-type-id="text-editor">
959 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390"> 975 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
960 - <caret line="8" column="5" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="5" /> 976 + <caret line="11" column="19" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="19" />
961 <folding /> 977 <folding />
962 </state> 978 </state>
963 </provider> 979 </provider>
964 </entry> 980 </entry>
965 - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb"> 981 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
966 <provider selected="true" editor-type-id="text-editor"> 982 <provider selected="true" editor-type-id="text-editor">
967 - <state vertical-scroll-proportion="0.0" vertical-offset="1092" max-vertical-offset="4065">  
968 - <caret line="99" column="17" selection-start-line="99" selection-start-column="17" selection-end-line="99" selection-end-column="17" /> 983 + <state vertical-scroll-proportion="0.0" vertical-offset="390" max-vertical-offset="2745">
  984 + <caret line="54" column="61" selection-start-line="54" selection-start-column="34" selection-end-line="54" selection-end-column="61" />
969 <folding /> 985 <folding />
970 </state> 986 </state>
971 </provider> 987 </provider>
972 </entry> 988 </entry>
973 - <entry file="file://$PROJECT_DIR$/Gemfile"> 989 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_parser.rb">
974 <provider selected="true" editor-type-id="text-editor"> 990 <provider selected="true" editor-type-id="text-editor">
975 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">  
976 - <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" /> 991 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2250">
  992 + <caret line="25" column="21" selection-start-line="25" selection-start-column="8" selection-end-line="25" selection-end-column="21" />
  993 + <folding />
  994 + </state>
  995 + </provider>
  996 + </entry>
  997 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
  998 + <provider selected="true" editor-type-id="text-editor">
  999 + <state vertical-scroll-proportion="0.0" vertical-offset="2655" max-vertical-offset="4125">
  1000 + <caret line="199" column="55" selection-start-line="199" selection-start-column="55" selection-end-line="199" selection-end-column="55" />
977 <folding /> 1001 <folding />
978 </state> 1002 </state>
979 </provider> 1003 </provider>
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.20) 4 + kanjai (0.0.21)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 aws-sdk 7 aws-sdk
@@ -194,6 +194,10 @@ module Kanjai @@ -194,6 +194,10 @@ module Kanjai
194 when 'repeat' 194 when 'repeat'
195 @original_hash_value.each do |key, value| 195 @original_hash_value.each do |key, value|
196 if key > 0 196 if key > 0
  197 + if(key == 1)
  198 + value['###FIRST_ITEM_ACTIVE###'] = 'active'
  199 + end
  200 + value['###REPEAT_NUMBER###'] = key.to_i
197 self.content_generator(item[:children], subparts, value) 201 self.content_generator(item[:children], subparts, value)
198 end 202 end
199 end 203 end
@@ -25,7 +25,9 @@ module Kanjai @@ -25,7 +25,9 @@ module Kanjai
25 25
26 def find_subparts 26 def find_subparts
27 result = [] 27 result = []
  28 + p '!!!!!!!'
28 @html_source.scan(/<!--###START element[\w\W]+?-->/).each do |item| 29 @html_source.scan(/<!--###START element[\w\W]+?-->/).each do |item|
  30 + p '!!!!!!!!!!!!!!'
29 31
30 name, type, code = item.scan(/<!--###START\s+element\(name="([\w\s]+)",\s+type="([\w\s]+)"\)\s+###/)[0] 32 name, type, code = item.scan(/<!--###START\s+element\(name="([\w\s]+)",\s+type="([\w\s]+)"\)\s+###/)[0]
31 33
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.21" 2 + VERSION = "0.0.22"
3 end 3 end