EDIT / kanjai · Commits

Commit 122874fcfd611d6d224145937b8c8d4ed0f1260f

Authored by Karpikau Andrei
1 parent a433119a

test

Inline Side-by-side
Showing 3 changed files with 37 additions and 104 deletions
@@ -136,7 +136,7 @@ @@ -136,7 +136,7 @@
136 <orderEntry type="library" scope="PROVIDED" name="acts_as_list (v0.7.4, rbenv: 2.1.3) [gem]" level="application" /> 136 <orderEntry type="library" scope="PROVIDED" name="acts_as_list (v0.7.4, rbenv: 2.1.3) [gem]" level="application" />
137 <orderEntry type="library" scope="PROVIDED" name="acts_as_tree (v2.4.0, rbenv: 2.1.3) [gem]" level="application" /> 137 <orderEntry type="library" scope="PROVIDED" name="acts_as_tree (v2.4.0, rbenv: 2.1.3) [gem]" level="application" />
138 <orderEntry type="library" scope="PROVIDED" name="arel (v6.0.3, rbenv: 2.1.3) [gem]" level="application" /> 138 <orderEntry type="library" scope="PROVIDED" name="arel (v6.0.3, rbenv: 2.1.3) [gem]" level="application" />
139 - <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.2.36, rbenv: 2.1.3) [gem]" level="application" /> 139 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.2.37, rbenv: 2.1.3) [gem]" level="application" />
140 <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.2.36, rbenv: 2.1.3) [gem]" level="application" /> 140 <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.2.36, rbenv: 2.1.3) [gem]" level="application" />
141 <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.2.36, rbenv: 2.1.3) [gem]" level="application" /> 141 <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.2.36, rbenv: 2.1.3) [gem]" level="application" />
142 <orderEntry type="library" scope="PROVIDED" name="backport_new_renderer (v1.0.0, rbenv: 2.1.3) [gem]" level="application" /> 142 <orderEntry type="library" scope="PROVIDED" name="backport_new_renderer (v1.0.0, rbenv: 2.1.3) [gem]" level="application" />
@@ -24,6 +24,16 @@ @@ -24,6 +24,16 @@
24 </component> 24 </component>
25 <component name="FileEditorManager"> 25 <component name="FileEditorManager">
26 <leaf> 26 <leaf>
  27 + <file leaf-file-name="engine.rb" pinned="false" current-in-tab="false">
  28 + <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
  29 + <provider selected="true" editor-type-id="text-editor">
  30 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="240">
  31 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  32 + <folding />
  33 + </state>
  34 + </provider>
  35 + </entry>
  36 + </file>
27 <file leaf-file-name="kanjai.gemspec" pinned="false" current-in-tab="false"> 37 <file leaf-file-name="kanjai.gemspec" pinned="false" current-in-tab="false">
28 <entry file="file://$PROJECT_DIR$/kanjai.gemspec"> 38 <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
29 <provider selected="true" editor-type-id="text-editor"> 39 <provider selected="true" editor-type-id="text-editor">
@@ -80,10 +90,10 @@ @@ -80,10 +90,10 @@
80 </provider> 90 </provider>
81 </entry> 91 </entry>
82 </file> 92 </file>
83 - <file leaf-file-name="html_editor.js" pinned="false" current-in-tab="true"> 93 + <file leaf-file-name="html_editor.js" pinned="false" current-in-tab="false">
84 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js"> 94 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js">
85 <provider selected="true" editor-type-id="text-editor"> 95 <provider selected="true" editor-type-id="text-editor">
86 - <state vertical-scroll-proportion="0.6915167" vertical-offset="2896" max-vertical-offset="5490"> 96 + <state vertical-scroll-proportion="-9.962963" vertical-offset="2896" max-vertical-offset="5490">
87 <caret line="211" column="51" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="51" /> 97 <caret line="211" column="51" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="51" />
88 <folding> 98 <folding>
89 <marker date="1461763907000" expanded="true" signature="2474:2516" placeholder="..." /> 99 <marker date="1461763907000" expanded="true" signature="2474:2516" placeholder="..." />
@@ -120,21 +130,11 @@ @@ -120,21 +130,11 @@
120 </provider> 130 </provider>
121 </entry> 131 </entry>
122 </file> 132 </file>
123 - <file leaf-file-name="Gemfile" pinned="false" current-in-tab="false">  
124 - <entry file="file://$PROJECT_DIR$/Gemfile"> 133 + <file leaf-file-name="kanjai.rb" pinned="false" current-in-tab="true">
  134 + <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">
125 <provider selected="true" editor-type-id="text-editor"> 135 <provider selected="true" editor-type-id="text-editor">
126 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">  
127 - <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />  
128 - <folding />  
129 - </state>  
130 - </provider>  
131 - </entry>  
132 - </file>  
133 - <file leaf-file-name="Gemfile.lock" pinned="false" current-in-tab="false">  
134 - <entry file="file://$PROJECT_DIR$/Gemfile.lock">  
135 - <provider selected="true" editor-type-id="text-editor">  
136 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3345">  
137 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 136 + <state vertical-scroll-proportion="0.14423077" vertical-offset="0" max-vertical-offset="416">
  137 + <caret line="4" column="14" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" />
138 <folding /> 138 <folding />
139 </state> 139 </state>
140 </provider> 140 </provider>
@@ -192,10 +192,10 @@ @@ -192,10 +192,10 @@
192 <option value="$PROJECT_DIR$/public/test_template/index.html" /> 192 <option value="$PROJECT_DIR$/public/test_template/index.html" />
193 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" /> 193 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
194 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/show_frontend_editor.html.erb" /> 194 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/show_frontend_editor.html.erb" />
195 - <option value="$PROJECT_DIR$/lib/kanjai.rb" />  
196 <option value="$PROJECT_DIR$/kanjai.gemspec" /> 195 <option value="$PROJECT_DIR$/kanjai.gemspec" />
197 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js" /> 196 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js" />
198 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js" /> 197 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js" />
  198 + <option value="$PROJECT_DIR$/lib/kanjai.rb" />
199 </list> 199 </list>
200 </option> 200 </option>
201 </component> 201 </component>
@@ -272,47 +272,7 @@ @@ -272,47 +272,7 @@
272 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 272 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
273 </PATH_ELEMENT> 273 </PATH_ELEMENT>
274 <PATH_ELEMENT> 274 <PATH_ELEMENT>
275 - <option name="myItemId" value="app" />  
276 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
277 - </PATH_ELEMENT>  
278 - </PATH>  
279 - <PATH>  
280 - <PATH_ELEMENT>  
281 - <option name="myItemId" value="kanjai" />  
282 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
283 - </PATH_ELEMENT>  
284 - <PATH_ELEMENT>  
285 - <option name="myItemId" value="kanjai" />  
286 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
287 - </PATH_ELEMENT>  
288 - <PATH_ELEMENT>  
289 - <option name="myItemId" value="app" />  
290 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
291 - </PATH_ELEMENT>  
292 - <PATH_ELEMENT>  
293 - <option name="myItemId" value="assets" />  
294 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
295 - </PATH_ELEMENT>  
296 - </PATH>  
297 - <PATH>  
298 - <PATH_ELEMENT>  
299 - <option name="myItemId" value="kanjai" />  
300 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
301 - </PATH_ELEMENT>  
302 - <PATH_ELEMENT>  
303 - <option name="myItemId" value="kanjai" />  
304 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
305 - </PATH_ELEMENT>  
306 - <PATH_ELEMENT>  
307 - <option name="myItemId" value="app" />  
308 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
309 - </PATH_ELEMENT>  
310 - <PATH_ELEMENT>  
311 - <option name="myItemId" value="assets" />  
312 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
313 - </PATH_ELEMENT>  
314 - <PATH_ELEMENT>  
315 - <option name="myItemId" value="javascripts" /> 275 + <option name="myItemId" value="lib" />
316 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 276 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
317 </PATH_ELEMENT> 277 </PATH_ELEMENT>
318 <PATH_ELEMENT> 278 <PATH_ELEMENT>
@@ -333,22 +293,6 @@ @@ -333,22 +293,6 @@
333 <option name="myItemId" value="app" /> 293 <option name="myItemId" value="app" />
334 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 294 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
335 </PATH_ELEMENT> 295 </PATH_ELEMENT>
336 - <PATH_ELEMENT>  
337 - <option name="myItemId" value="assets" />  
338 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
339 - </PATH_ELEMENT>  
340 - <PATH_ELEMENT>  
341 - <option name="myItemId" value="javascripts" />  
342 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
343 - </PATH_ELEMENT>  
344 - <PATH_ELEMENT>  
345 - <option name="myItemId" value="kanjai" />  
346 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
347 - </PATH_ELEMENT>  
348 - <PATH_ELEMENT>  
349 - <option name="myItemId" value="frontend" />  
350 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
351 - </PATH_ELEMENT>  
352 </PATH> 296 </PATH>
353 <PATH> 297 <PATH>
354 <PATH_ELEMENT> 298 <PATH_ELEMENT>
@@ -367,18 +311,6 @@ @@ -367,18 +311,6 @@
367 <option name="myItemId" value="assets" /> 311 <option name="myItemId" value="assets" />
368 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 312 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
369 </PATH_ELEMENT> 313 </PATH_ELEMENT>
370 - <PATH_ELEMENT>  
371 - <option name="myItemId" value="javascripts" />  
372 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
373 - </PATH_ELEMENT>  
374 - <PATH_ELEMENT>  
375 - <option name="myItemId" value="kanjai" />  
376 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
377 - </PATH_ELEMENT>  
378 - <PATH_ELEMENT>  
379 - <option name="myItemId" value="admin" />  
380 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
381 - </PATH_ELEMENT>  
382 </PATH> 314 </PATH>
383 </subPane> 315 </subPane>
384 </pane> 316 </pane>
@@ -724,14 +656,6 @@ @@ -724,14 +656,6 @@
724 </state> 656 </state>
725 </provider> 657 </provider>
726 </entry> 658 </entry>
727 - <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">  
728 - <provider selected="true" editor-type-id="text-editor">  
729 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="240">  
730 - <caret line="7" column="68" selection-start-line="7" selection-start-column="68" selection-end-line="7" selection-end-column="68" />  
731 - <folding />  
732 - </state>  
733 - </provider>  
734 - </entry>  
735 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_langs/index.html.erb"> 659 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_langs/index.html.erb">
736 <provider selected="true" editor-type-id="text-editor"> 660 <provider selected="true" editor-type-id="text-editor">
737 <state vertical-scroll-proportion="-10.708333" vertical-offset="193" max-vertical-offset="585"> 661 <state vertical-scroll-proportion="-10.708333" vertical-offset="193" max-vertical-offset="585">
@@ -939,14 +863,6 @@ @@ -939,14 +863,6 @@
939 </state> 863 </state>
940 </provider> 864 </provider>
941 </entry> 865 </entry>
942 - <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">  
943 - <provider selected="true" editor-type-id="text-editor">  
944 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="225">  
945 - <caret line="3" column="34" selection-start-line="3" selection-start-column="34" selection-end-line="3" selection-end-column="34" />  
946 - <folding />  
947 - </state>  
948 - </provider>  
949 - </entry>  
950 <entry file="file://$PROJECT_DIR$/Gemfile"> 866 <entry file="file://$PROJECT_DIR$/Gemfile">
951 <provider selected="true" editor-type-id="text-editor"> 867 <provider selected="true" editor-type-id="text-editor">
952 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255"> 868 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
@@ -1031,7 +947,7 @@ @@ -1031,7 +947,7 @@
1031 </entry> 947 </entry>
1032 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js"> 948 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js">
1033 <provider selected="true" editor-type-id="text-editor"> 949 <provider selected="true" editor-type-id="text-editor">
1034 - <state vertical-scroll-proportion="0.6915167" vertical-offset="2896" max-vertical-offset="5490"> 950 + <state vertical-scroll-proportion="-9.962963" vertical-offset="2896" max-vertical-offset="5490">
1035 <caret line="211" column="51" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="51" /> 951 <caret line="211" column="51" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="51" />
1036 <folding> 952 <folding>
1037 <marker date="1461763907000" expanded="true" signature="2474:2516" placeholder="..." /> 953 <marker date="1461763907000" expanded="true" signature="2474:2516" placeholder="..." />
@@ -1043,5 +959,21 @@ @@ -1043,5 +959,21 @@
1043 </state> 959 </state>
1044 </provider> 960 </provider>
1045 </entry> 961 </entry>
  962 + <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
  963 + <provider selected="true" editor-type-id="text-editor">
  964 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="240">
  965 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  966 + <folding />
  967 + </state>
  968 + </provider>
  969 + </entry>
  970 + <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">
  971 + <provider selected="true" editor-type-id="text-editor">
  972 + <state vertical-scroll-proportion="0.14423077" vertical-offset="0" max-vertical-offset="416">
  973 + <caret line="4" column="14" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" />
  974 + <folding />
  975 + </state>
  976 + </provider>
  977 + </entry>
1046 </component> 978 </component>
1047 </project> 979 </project>
@@ -2,6 +2,7 @@ require 'rubygems' @@ -2,6 +2,7 @@ require 'rubygems'
2 require "devise" 2 require "devise"
3 require "aws-sdk" 3 require "aws-sdk"
4 require "delayed_job_active_record" 4 require "delayed_job_active_record"
  5 +require "rails"
5 require "kanjai/engine" 6 require "kanjai/engine"
6 7
7 module Kanjai 8 module Kanjai