Commit 25f3638f1e84a5e051ad0be7752584ecc947c5fa

Authored by Karpikau Andrei
1 parent 122874fc

test

... ... @@ -24,11 +24,11 @@
24 24 </component>
25 25 <component name="FileEditorManager">
26 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 28 <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
29 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 32 <folding />
33 33 </state>
34 34 </provider>
... ... @@ -130,10 +130,10 @@
130 130 </provider>
131 131 </entry>
132 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 134 <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">
135 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 137 <caret line="4" column="14" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" />
138 138 <folding />
139 139 </state>
... ... @@ -173,7 +173,6 @@
173 173 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" />
174 174 <option value="$PROJECT_DIR$/app/models/kanjai/page_content.rb" />
175 175 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb" />
176   - <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
177 176 <option value="$PROJECT_DIR$/app/views/kanjai/admin/page_langs/index.html.erb" />
178 177 <option value="$PROJECT_DIR$/Gemfile" />
179 178 <option value="$PROJECT_DIR$/Gemfile.lock" />
... ... @@ -196,6 +195,7 @@
196 195 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js" />
197 196 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js" />
198 197 <option value="$PROJECT_DIR$/lib/kanjai.rb" />
  198 + <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
199 199 </list>
200 200 </option>
201 201 </component>
... ... @@ -959,18 +959,18 @@
959 959 </state>
960 960 </provider>
961 961 </entry>
962   - <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
  962 + <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">
963 963 <provider selected="true" editor-type-id="text-editor">
964 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 966 <folding />
967 967 </state>
968 968 </provider>
969 969 </entry>
970   - <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">
  970 + <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
971 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 974 <folding />
975 975 </state>
976 976 </provider>
... ...
... ... @@ -5,6 +5,6 @@ module Kanjai
5 5 class Engine < ::Rails::Engine
6 6 isolate_namespace Kanjai
7 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 9 end
10 10 end
... ...