EDIT / kanjai · Commits

Commit 1b811a9a0844615c0ac6b1772d6bce7e1039ce6c

Authored by Karpikau Andrei
1 parent 16c3c63c

add solution show in element name any char

Inline Side-by-side
Showing 5 changed files with 137 additions and 149 deletions
... ... @@ -137,8 +137,8 @@
137 137 <orderEntry type="library" scope="PROVIDED" name="acts_as_tree (v2.4.0, rbenv: 2.1.3) [gem]" level="application" />
138 138 <orderEntry type="library" scope="PROVIDED" name="arel (v6.0.3, rbenv: 2.1.3) [gem]" level="application" />
139 139 <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.3.22, rbenv: 2.1.3) [gem]" level="application" />
140   - <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.3.20, rbenv: 2.1.3) [gem]" level="application" />
141   - <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.3.20, rbenv: 2.1.3) [gem]" level="application" />
  140 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.3.22, rbenv: 2.1.3) [gem]" level="application" />
  141 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.3.22, rbenv: 2.1.3) [gem]" level="application" />
142 142 <orderEntry type="library" scope="PROVIDED" name="backport_new_renderer (v1.0.0, rbenv: 2.1.3) [gem]" level="application" />
143 143 <orderEntry type="library" scope="PROVIDED" name="bcrypt (v3.1.11, rbenv: 2.1.3) [gem]" level="application" />
144 144 <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.2, rbenv: 2.1.3) [gem]" level="application" />
... ... @@ -156,10 +156,9 @@
156 156 <orderEntry type="library" scope="PROVIDED" name="globalid (v0.3.6, rbenv: 2.1.3) [gem]" level="application" />
157 157 <orderEntry type="library" scope="PROVIDED" name="i18n (v0.7.0, rbenv: 2.1.3) [gem]" level="application" />
158 158 <orderEntry type="library" scope="PROVIDED" name="jbuilder (v2.5.0, rbenv: 2.1.3) [gem]" level="application" />
159   - <orderEntry type="library" scope="PROVIDED" name="jmespath (v1.2.4, rbenv: 2.1.3) [gem]" level="application" />
  159 + <orderEntry type="library" scope="PROVIDED" name="jmespath (v1.3.0, rbenv: 2.1.3) [gem]" level="application" />
160 160 <orderEntry type="library" scope="PROVIDED" name="jquery-rails (v3.1.2, rbenv: 2.1.3) [gem]" level="application" />
161 161 <orderEntry type="library" scope="PROVIDED" name="json (v1.8.3, rbenv: 2.1.3) [gem]" level="application" />
162   - <orderEntry type="library" scope="PROVIDED" name="json_pure (v2.0.1, rbenv: 2.1.3) [gem]" level="application" />
163 162 <orderEntry type="library" scope="PROVIDED" name="libv8 (v3.16.14.15, rbenv: 2.1.3) [gem]" level="application" />
164 163 <orderEntry type="library" scope="PROVIDED" name="loofah (v2.0.3, rbenv: 2.1.3) [gem]" level="application" />
165 164 <orderEntry type="library" scope="PROVIDED" name="mail (v2.6.4, rbenv: 2.1.3) [gem]" level="application" />
... ...
... ... @@ -25,91 +25,101 @@
25 25 </component>
26 26 <component name="FileEditorManager">
27 27 <leaf>
28   - <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
29   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  28 + <file leaf-file-name="frontend_extend.css.scss" pinned="false" current-in-tab="false">
  29 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend_extend.css.scss">
30 30 <provider selected="true" editor-type-id="text-editor">
31   - <state vertical-scroll-proportion="0.0" vertical-offset="2070" max-vertical-offset="2565">
32   - <caret line="138" column="131" selection-start-line="138" selection-start-column="131" selection-end-line="138" selection-end-column="131" />
  31 + <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="90">
  32 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
33 33 <folding />
34 34 </state>
35 35 </provider>
36 36 </entry>
37 37 </file>
38   - <file leaf-file-name="site_controller.rb" pinned="false" current-in-tab="false">
39   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
  38 + <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
  39 + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
40 40 <provider selected="true" editor-type-id="text-editor">
41   - <state vertical-scroll-proportion="0.0" vertical-offset="378" max-vertical-offset="1035">
42   - <caret line="32" column="24" selection-start-line="32" selection-start-column="6" selection-end-line="32" selection-end-column="24" />
  41 + <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
  42 + <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
43 43 <folding />
44 44 </state>
45 45 </provider>
46 46 </entry>
47 47 </file>
48   - <file leaf-file-name="frontend_extend.css.scss" pinned="false" current-in-tab="false">
49   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend_extend.css.scss">
  48 + <file leaf-file-name="page.rb" pinned="false" current-in-tab="false">
  49 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
50 50 <provider selected="true" editor-type-id="text-editor">
51   - <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="90">
52   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  51 + <state vertical-scroll-proportion="0.0" vertical-offset="210" max-vertical-offset="1410">
  52 + <caret line="25" column="16" selection-start-line="25" selection-start-column="8" selection-end-line="25" selection-end-column="16" />
53 53 <folding />
54 54 </state>
55 55 </provider>
56 56 </entry>
57 57 </file>
58   - <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
59   - <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
  58 + <file leaf-file-name="install.rake" pinned="false" current-in-tab="false">
  59 + <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
60 60 <provider selected="true" editor-type-id="text-editor">
61   - <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
62   - <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
  61 + <state vertical-scroll-proportion="0.0" vertical-offset="240" max-vertical-offset="390">
  62 + <caret line="16" column="34" selection-start-line="16" selection-start-column="34" selection-end-line="16" selection-end-column="34" />
63 63 <folding />
64 64 </state>
65 65 </provider>
66 66 </entry>
67 67 </file>
68   - <file leaf-file-name="assets.rb" pinned="false" current-in-tab="false">
69   - <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb">
  68 + <file leaf-file-name="README.rdoc" pinned="false" current-in-tab="false">
  69 + <entry file="file://$PROJECT_DIR$/README.rdoc">
70 70 <provider selected="true" editor-type-id="text-editor">
71   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
  71 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="120">
72 72 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
73 73 <folding />
74 74 </state>
75 75 </provider>
76 76 </entry>
77 77 </file>
78   - <file leaf-file-name="engine.rb" pinned="false" current-in-tab="false">
79   - <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
  78 + <file leaf-file-name="kanjai.gemspec" pinned="false" current-in-tab="false">
  79 + <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
  80 + <provider selected="true" editor-type-id="text-editor">
  81 + <state vertical-scroll-proportion="0.0" vertical-offset="483" max-vertical-offset="1140">
  82 + <caret line="47" column="27" selection-start-line="47" selection-start-column="20" selection-end-line="47" selection-end-column="27" />
  83 + <folding />
  84 + </state>
  85 + </provider>
  86 + </entry>
  87 + </file>
  88 + <file leaf-file-name="aws.rb" pinned="false" current-in-tab="false">
  89 + <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
80 90 <provider selected="true" editor-type-id="text-editor">
81   - <state vertical-scroll-proportion="0.0" vertical-offset="240" max-vertical-offset="435">
82   - <caret line="16" column="181" selection-start-line="16" selection-start-column="181" selection-end-line="16" selection-end-column="181" />
  91 + <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="180">
  92 + <caret line="5" column="9" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="9" />
83 93 <folding />
84 94 </state>
85 95 </provider>
86 96 </entry>
87 97 </file>
88   - <file leaf-file-name="template_generator.rb" pinned="false" current-in-tab="false">
89   - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
  98 + <file leaf-file-name="page_template.rb" pinned="false" current-in-tab="false">
  99 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
90 100 <provider selected="true" editor-type-id="text-editor">
91   - <state vertical-scroll-proportion="0.0" vertical-offset="2981" max-vertical-offset="4395">
92   - <caret line="93" column="68" selection-start-line="93" selection-start-column="68" selection-end-line="93" selection-end-column="68" />
  101 + <state vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="2745">
  102 + <caret line="39" column="37" selection-start-line="39" selection-start-column="37" selection-end-line="39" selection-end-column="37" />
93 103 <folding />
94 104 </state>
95 105 </provider>
96 106 </entry>
97 107 </file>
98   - <file leaf-file-name="content_function.rb" pinned="false" current-in-tab="false">
99   - <entry file="file://$PROJECT_DIR$/lib/kanjai/content_function.rb">
  108 + <file leaf-file-name="template_parser.rb" pinned="false" current-in-tab="false">
  109 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_parser.rb">
100 110 <provider selected="true" editor-type-id="text-editor">
101   - <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="2520">
102   - <caret line="5" column="15" selection-start-line="5" selection-start-column="8" selection-end-line="5" selection-end-column="15" />
  111 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2250">
  112 + <caret line="71" column="40" selection-start-line="71" selection-start-column="40" selection-end-line="71" selection-end-column="40" />
103 113 <folding />
104 114 </state>
105 115 </provider>
106 116 </entry>
107 117 </file>
108   - <file leaf-file-name="devise.rb" pinned="false" current-in-tab="false">
109   - <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
  118 + <file leaf-file-name="frontend_extend.js" pinned="false" current-in-tab="false">
  119 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_extend.js">
110 120 <provider selected="true" editor-type-id="text-editor">
111   - <state vertical-scroll-proportion="0.0" vertical-offset="2858" max-vertical-offset="4110">
112   - <caret line="208" column="0" selection-start-line="208" selection-start-column="0" selection-end-line="208" selection-end-column="0" />
  121 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
  122 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
113 123 <folding />
114 124 </state>
115 125 </provider>
... ... @@ -152,7 +162,6 @@
152 162 <option value="$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb" />
153 163 <option value="$PROJECT_DIR$/lib/tasks/install.rake" />
154 164 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss" />
155   - <option value="$PROJECT_DIR$/lib/kanjai/template_parser.rb" />
156 165 <option value="$PROJECT_DIR$/app/models/kanjai/page.rb" />
157 166 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb" />
158 167 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin_extend.js" />
... ... @@ -170,6 +179,7 @@
170 179 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
171 180 <option value="$PROJECT_DIR$/app/models/kanjai/page_content.rb" />
172 181 <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
  182 + <option value="$PROJECT_DIR$/lib/kanjai/template_parser.rb" />
173 183 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
174 184 </list>
175 185 </option>
... ... @@ -205,6 +215,8 @@
205 215 <sortByType />
206 216 </navigator>
207 217 <panes>
  218 + <pane id="Scope" />
  219 + <pane id="RailsProjectView" />
208 220 <pane id="ProjectPane">
209 221 <subPane>
210 222 <PATH>
... ... @@ -308,37 +320,9 @@
308 320 <option name="myItemId" value="assets" />
309 321 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
310 322 </PATH_ELEMENT>
311   - <PATH_ELEMENT>
312   - <option name="myItemId" value="stylesheets" />
313   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
314   - </PATH_ELEMENT>
315   - <PATH_ELEMENT>
316   - <option name="myItemId" value="kanjai" />
317   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
318   - </PATH_ELEMENT>
319   - </PATH>
320   - <PATH>
321   - <PATH_ELEMENT>
322   - <option name="myItemId" value="kanjai" />
323   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
324   - </PATH_ELEMENT>
325   - <PATH_ELEMENT>
326   - <option name="myItemId" value="kanjai" />
327   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
328   - </PATH_ELEMENT>
329   - <PATH_ELEMENT>
330   - <option name="myItemId" value="app" />
331   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
332   - </PATH_ELEMENT>
333   - <PATH_ELEMENT>
334   - <option name="myItemId" value="assets" />
335   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
336   - </PATH_ELEMENT>
337 323 </PATH>
338 324 </subPane>
339 325 </pane>
340   - <pane id="Scope" />
341   - <pane id="RailsProjectView" />
342 326 </panes>
343 327 </component>
344 328 <component name="PropertiesComponent">
... ... @@ -526,20 +510,20 @@
526 510 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
527 511 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
528 512 <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
529   - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.39822295" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
  513 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.411147" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
530 514 <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
531 515 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
532 516 <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
533 517 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
534 518 <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
  519 + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32930514" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
535 520 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
536   - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
537 521 <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
538 522 <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
539 523 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
540   - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
541   - <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
542 524 <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
  525 + <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
  526 + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
543 527 </layout>
544 528 </component>
545 529 <component name="Vcs.Log.UiProperties">
... ... @@ -563,13 +547,6 @@
563 547 <watches-manager />
564 548 </component>
565 549 <component name="editorHistoryManager">
566   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb">
567   - <provider selected="true" editor-type-id="text-editor">
568   - <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="90">
569   - <caret line="0" column="37" selection-start-line="0" selection-start-column="37" selection-end-line="0" selection-end-column="37" />
570   - </state>
571   - </provider>
572   - </entry>
573 550 <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/404.html.erb">
574 551 <provider selected="true" editor-type-id="text-editor">
575 552 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
... ... @@ -584,20 +561,6 @@
584 561 </state>
585 562 </provider>
586 563 </entry>
587   - <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
588   - <provider selected="true" editor-type-id="text-editor">
589   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">
590   - <caret line="5" column="58" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="58" />
591   - </state>
592   - </provider>
593   - </entry>
594   - <entry file="file://$PROJECT_DIR$/README.rdoc">
595   - <provider selected="true" editor-type-id="text-editor">
596   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
597   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
598   - </state>
599   - </provider>
600   - </entry>
601 564 <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb">
602 565 <provider selected="true" editor-type-id="text-editor">
603 566 <state vertical-scroll-proportion="0.0" vertical-offset="473" max-vertical-offset="2055">
... ... @@ -605,13 +568,6 @@
605 568 </state>
606 569 </provider>
607 570 </entry>
608   - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_parser.rb">
609   - <provider selected="true" editor-type-id="text-editor">
610   - <state vertical-scroll-proportion="0.0" vertical-offset="510" max-vertical-offset="2250">
611   - <caret line="25" column="21" selection-start-line="25" selection-start-column="8" selection-end-line="25" selection-end-column="21" />
612   - </state>
613   - </provider>
614   - </entry>
615 571 <entry file="file://$PROJECT_DIR$/.ruby-version">
616 572 <provider selected="true" editor-type-id="text-editor">
617 573 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
... ... @@ -633,13 +589,6 @@
633 589 </state>
634 590 </provider>
635 591 </entry>
636   - <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
637   - <provider selected="true" editor-type-id="text-editor">
638   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
639   - <caret line="20" column="3" selection-start-line="20" selection-start-column="3" selection-end-line="20" selection-end-column="3" />
640   - </state>
641   - </provider>
642   - </entry>
643 592 <entry file="file://$PROJECT_DIR$/db/migrate/20160707115443_add_show_public_only_to_kanjai_pages.rb">
644 593 <provider selected="true" editor-type-id="text-editor">
645 594 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="165">
... ... @@ -788,13 +737,6 @@
788 737 </state>
789 738 </provider>
790 739 </entry>
791   - <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
792   - <provider selected="true" editor-type-id="text-editor">
793   - <state vertical-scroll-proportion="0.0" vertical-offset="483" max-vertical-offset="1140">
794   - <caret line="51" column="32" selection-start-line="51" selection-start-column="20" selection-end-line="51" selection-end-column="32" />
795   - </state>
796   - </provider>
797   - </entry>
798 740 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb">
799 741 <provider selected="true" editor-type-id="text-editor">
800 742 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="375">
... ... @@ -802,13 +744,6 @@
802 744 </state>
803 745 </provider>
804 746 </entry>
805   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
806   - <provider selected="true" editor-type-id="text-editor">
807   - <state vertical-scroll-proportion="0.0" vertical-offset="210" max-vertical-offset="1410">
808   - <caret line="25" column="16" selection-start-line="25" selection-start-column="8" selection-end-line="25" selection-end-column="16" />
809   - </state>
810   - </provider>
811   - </entry>
812 747 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
813 748 <provider selected="true" editor-type-id="text-editor">
814 749 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="540">
... ... @@ -816,13 +751,6 @@
816 751 </state>
817 752 </provider>
818 753 </entry>
819   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_extend.js">
820   - <provider selected="true" editor-type-id="text-editor">
821   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
822   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
823   - </state>
824   - </provider>
825   - </entry>
826 754 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_not_login.js">
827 755 <provider selected="true" editor-type-id="text-editor">
828 756 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
... ... @@ -830,13 +758,6 @@
830 758 </state>
831 759 </provider>
832 760 </entry>
833   - <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb">
834   - <provider selected="true" editor-type-id="text-editor">
835   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
836   - <caret line="0" column="12" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="12" />
837   - </state>
838   - </provider>
839   - </entry>
840 761 <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
841 762 <provider selected="true" editor-type-id="text-editor">
842 763 <state vertical-scroll-proportion="0.0" vertical-offset="2858" max-vertical-offset="4110">
... ... @@ -865,7 +786,6 @@
865 786 <provider selected="true" editor-type-id="text-editor">
866 787 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4395">
867 788 <caret line="93" column="68" selection-start-line="93" selection-start-column="68" selection-end-line="93" selection-end-column="68" />
868   - <folding />
869 789 </state>
870 790 </provider>
871 791 </entry>
... ... @@ -873,7 +793,6 @@
873 793 <provider selected="true" editor-type-id="text-editor">
874 794 <state vertical-scroll-proportion="0.0" vertical-offset="2070" max-vertical-offset="2565">
875 795 <caret line="138" column="131" selection-start-line="138" selection-start-column="131" selection-end-line="138" selection-end-column="131" />
876   - <folding />
877 796 </state>
878 797 </provider>
879 798 </entry>
... ... @@ -914,6 +833,62 @@
914 833 </state>
915 834 </provider>
916 835 </entry>
  836 + <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb">
  837 + <provider selected="true" editor-type-id="text-editor">
  838 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  839 + <caret line="0" column="12" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="12" />
  840 + <folding />
  841 + </state>
  842 + </provider>
  843 + </entry>
  844 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
  845 + <provider selected="true" editor-type-id="text-editor">
  846 + <state vertical-scroll-proportion="0.0" vertical-offset="210" max-vertical-offset="1410">
  847 + <caret line="25" column="16" selection-start-line="25" selection-start-column="8" selection-end-line="25" selection-end-column="16" />
  848 + <folding />
  849 + </state>
  850 + </provider>
  851 + </entry>
  852 + <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
  853 + <provider selected="true" editor-type-id="text-editor">
  854 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
  855 + <caret line="16" column="34" selection-start-line="16" selection-start-column="34" selection-end-line="16" selection-end-column="34" />
  856 + <folding />
  857 + </state>
  858 + </provider>
  859 + </entry>
  860 + <entry file="file://$PROJECT_DIR$/README.rdoc">
  861 + <provider selected="true" editor-type-id="text-editor">
  862 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  863 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  864 + <folding />
  865 + </state>
  866 + </provider>
  867 + </entry>
  868 + <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
  869 + <provider selected="true" editor-type-id="text-editor">
  870 + <state vertical-scroll-proportion="0.0" vertical-offset="483" max-vertical-offset="1140">
  871 + <caret line="47" column="27" selection-start-line="47" selection-start-column="20" selection-end-line="47" selection-end-column="27" />
  872 + <folding />
  873 + </state>
  874 + </provider>
  875 + </entry>
  876 + <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
  877 + <provider selected="true" editor-type-id="text-editor">
  878 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">
  879 + <caret line="5" column="9" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="9" />
  880 + <folding />
  881 + </state>
  882 + </provider>
  883 + </entry>
  884 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_extend.js">
  885 + <provider selected="true" editor-type-id="text-editor">
  886 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  887 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  888 + <folding />
  889 + </state>
  890 + </provider>
  891 + </entry>
917 892 <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend_extend.css.scss">
918 893 <provider selected="true" editor-type-id="text-editor">
919 894 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
... ... @@ -922,6 +897,22 @@
922 897 </state>
923 898 </provider>
924 899 </entry>
  900 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
  901 + <provider selected="true" editor-type-id="text-editor">
  902 + <state vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="2745">
  903 + <caret line="39" column="37" selection-start-line="39" selection-start-column="37" selection-end-line="39" selection-end-column="37" />
  904 + <folding />
  905 + </state>
  906 + </provider>
  907 + </entry>
  908 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_parser.rb">
  909 + <provider selected="true" editor-type-id="text-editor">
  910 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2250">
  911 + <caret line="71" column="40" selection-start-line="71" selection-start-column="40" selection-end-line="71" selection-end-column="40" />
  912 + <folding />
  913 + </state>
  914 + </provider>
  915 + </entry>
925 916 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
926 917 <provider selected="true" editor-type-id="text-editor">
927 918 <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.44)
  4 + kanjai (0.0.45)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk
... ... @@ -64,12 +64,12 @@ GEM
64 64 acts_as_tree (2.4.0)
65 65 activerecord (>= 3.0.0)
66 66 arel (6.0.3)
67   - aws-sdk (2.3.20)
68   - aws-sdk-resources (= 2.3.20)
69   - aws-sdk-core (2.3.20)
  67 + aws-sdk (2.3.22)
  68 + aws-sdk-resources (= 2.3.22)
  69 + aws-sdk-core (2.3.22)
70 70 jmespath (~> 1.0)
71   - aws-sdk-resources (2.3.20)
72   - aws-sdk-core (= 2.3.20)
  71 + aws-sdk-resources (2.3.22)
  72 + aws-sdk-core (= 2.3.22)
73 73 backport_new_renderer (1.0.0)
74 74 rails
75 75 bcrypt (3.1.11)
... ... @@ -101,13 +101,11 @@ GEM
101 101 jbuilder (2.5.0)
102 102 activesupport (>= 3.0.0, < 5.1)
103 103 multi_json (~> 1.2)
104   - jmespath (1.2.4)
105   - json_pure (>= 1.8.1)
  104 + jmespath (1.3.0)
106 105 jquery-rails (3.1.2)
107 106 railties (>= 3.0, < 5.0)
108 107 thor (>= 0.14, < 2.0)
109 108 json (1.8.3)
110   - json_pure (2.0.1)
111 109 libv8 (3.16.14.15)
112 110 loofah (2.0.3)
113 111 nokogiri (>= 1.5.9)
... ...
... ... @@ -29,11 +29,11 @@ module Kanjai
29 29 @html_source.scan(/<!--###START element[\w\W]+?-->/).each do |item|
30 30 p '!!!!!!!!!!!!!!'
31 31
32   - 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="([^"]+)",\s+type="([\w\s]+)"\)\s+###/)[0]
33 33
34 34 if name.present? and type.present?
35 35
36   - source = item.gsub(/<!--###START\s+element\(name="([\w\s]+)",\s+type="([\w\s]+)"\)\s+###/, '')
  36 + source = item.gsub(/<!--###START\s+element\(name="([^"]+)",\s+type="([\w\s]+)"\)\s+###/, '')
37 37 source = source.gsub('-->', '')
38 38 source = source.gsub("\n", '')
39 39 source = source.gsub("\r", '')
... ...
1 1 module Kanjai
2   - VERSION = "0.0.45"
  2 + VERSION = "0.0.46"
3 3 end
... ...