EDIT / kanjai · Commits

Commit 25f3638f1e84a5e051ad0be7752584ecc947c5fa

Authored by Karpikau Andrei
1 parent 122874fc

test

Inline Side-by-side
Showing 2 changed files with 12 additions and 12 deletions
@@ -24,11 +24,11 @@ @@ -24,11 +24,11 @@
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"> 27 + <file leaf-file-name="engine.rb" pinned="false" current-in-tab="true">
28 <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb"> 28 <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
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="240">  
31 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 30 + <state vertical-scroll-proportion="0.25240386" vertical-offset="0" max-vertical-offset="416">
  31 + <caret line="7" column="33" selection-start-line="7" selection-start-column="33" selection-end-line="7" selection-end-column="33" />
32 <folding /> 32 <folding />
33 </state> 33 </state>
34 </provider> 34 </provider>
@@ -130,10 +130,10 @@ @@ -130,10 +130,10 @@
130 </provider> 130 </provider>
131 </entry> 131 </entry>
132 </file> 132 </file>
133 - <file leaf-file-name="kanjai.rb" pinned="false" current-in-tab="true"> 133 + <file leaf-file-name="kanjai.rb" pinned="false" current-in-tab="false">
134 <entry file="file://$PROJECT_DIR$/lib/kanjai.rb"> 134 <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">
135 <provider selected="true" editor-type-id="text-editor"> 135 <provider selected="true" editor-type-id="text-editor">
136 - <state vertical-scroll-proportion="0.14423077" vertical-offset="0" max-vertical-offset="416"> 136 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="240">
137 <caret line="4" column="14" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" /> 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>
@@ -173,7 +173,6 @@ @@ -173,7 +173,6 @@
173 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" /> 173 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" />
174 <option value="$PROJECT_DIR$/app/models/kanjai/page_content.rb" /> 174 <option value="$PROJECT_DIR$/app/models/kanjai/page_content.rb" />
175 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb" /> 175 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb" />
176 - <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />  
177 <option value="$PROJECT_DIR$/app/views/kanjai/admin/page_langs/index.html.erb" /> 176 <option value="$PROJECT_DIR$/app/views/kanjai/admin/page_langs/index.html.erb" />
178 <option value="$PROJECT_DIR$/Gemfile" /> 177 <option value="$PROJECT_DIR$/Gemfile" />
179 <option value="$PROJECT_DIR$/Gemfile.lock" /> 178 <option value="$PROJECT_DIR$/Gemfile.lock" />
@@ -196,6 +195,7 @@ @@ -196,6 +195,7 @@
196 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js" /> 195 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js" />
197 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js" /> 196 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js" />
198 <option value="$PROJECT_DIR$/lib/kanjai.rb" /> 197 <option value="$PROJECT_DIR$/lib/kanjai.rb" />
  198 + <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
199 </list> 199 </list>
200 </option> 200 </option>
201 </component> 201 </component>
@@ -959,18 +959,18 @@ @@ -959,18 +959,18 @@
959 </state> 959 </state>
960 </provider> 960 </provider>
961 </entry> 961 </entry>
962 - <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb"> 962 + <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">
963 <provider selected="true" editor-type-id="text-editor"> 963 <provider selected="true" editor-type-id="text-editor">
964 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="240"> 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" /> 965 + <caret line="4" column="14" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" />
966 <folding /> 966 <folding />
967 </state> 967 </state>
968 </provider> 968 </provider>
969 </entry> 969 </entry>
970 - <entry file="file://$PROJECT_DIR$/lib/kanjai.rb"> 970 + <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
971 <provider selected="true" editor-type-id="text-editor"> 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" /> 972 + <state vertical-scroll-proportion="0.25240386" vertical-offset="0" max-vertical-offset="416">
  973 + <caret line="7" column="33" selection-start-line="7" selection-start-column="33" selection-end-line="7" selection-end-column="33" />
974 <folding /> 974 <folding />
975 </state> 975 </state>
976 </provider> 976 </provider>
@@ -5,6 +5,6 @@ module Kanjai @@ -5,6 +5,6 @@ module Kanjai
5 class Engine < ::Rails::Engine 5 class Engine < ::Rails::Engine
6 isolate_namespace Kanjai 6 isolate_namespace Kanjai
7 config.autoload_paths += %W(#{config.root}/lib) 7 config.autoload_paths += %W(#{config.root}/lib)
8 - config.assets.paths << Rails.root.join("app", "assets", "fonts") 8 + config.assets.paths << Kanjai::Engine.root.join("app", "assets", "fonts")
9 end 9 end
10 end 10 end