EDIT / kanjai · Commits

Commit 019d6f3db76944e3c8fa671cc089ee3a4499f288

Authored by Karpikau Andrei
1 parent ea89a75d

test

Inline Side-by-side
Showing 4 changed files with 44 additions and 39 deletions
@@ -27,18 +27,18 @@ @@ -27,18 +27,18 @@
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="false">
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="7" column="33" selection-start-line="7" selection-start-column="33" selection-end-line="7" selection-end-column="33" /> 30 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
  31 + <caret line="10" column="175" selection-start-line="10" selection-start-column="175" selection-end-line="10" selection-end-column="175" />
32 <folding /> 32 <folding />
33 </state> 33 </state>
34 </provider> 34 </provider>
35 </entry> 35 </entry>
36 </file> 36 </file>
37 - <file leaf-file-name=".ruby-version" pinned="false" current-in-tab="false">  
38 - <entry file="file://$PROJECT_DIR$/.ruby-version"> 37 + <file leaf-file-name="assets.rb" pinned="false" current-in-tab="false">
  38 + <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb">
39 <provider selected="true" editor-type-id="text-editor"> 39 <provider selected="true" editor-type-id="text-editor">
40 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="105">  
41 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 40 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="285">
  41 + <caret line="13" column="140" selection-start-line="13" selection-start-column="50" selection-end-line="13" selection-end-column="140" />
42 <folding /> 42 <folding />
43 </state> 43 </state>
44 </provider> 44 </provider>
@@ -54,16 +54,6 @@ @@ -54,16 +54,6 @@
54 </provider> 54 </provider>
55 </entry> 55 </entry>
56 </file> 56 </file>
57 - <file leaf-file-name="frontend.js" pinned="false" current-in-tab="false">  
58 - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">  
59 - <provider selected="true" editor-type-id="text-editor">  
60 - <state vertical-scroll-proportion="0.0" vertical-offset="109" max-vertical-offset="540">  
61 - <caret line="27" column="28" selection-start-line="27" selection-start-column="28" selection-end-line="27" selection-end-column="28" />  
62 - <folding />  
63 - </state>  
64 - </provider>  
65 - </entry>  
66 - </file>  
67 <file leaf-file-name="html_editor.js" pinned="false" current-in-tab="false"> 57 <file leaf-file-name="html_editor.js" pinned="false" current-in-tab="false">
68 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js"> 58 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js">
69 <provider selected="true" editor-type-id="text-editor"> 59 <provider selected="true" editor-type-id="text-editor">
@@ -184,9 +174,9 @@ @@ -184,9 +174,9 @@
184 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js" /> 174 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js" />
185 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js" /> 175 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js" />
186 <option value="$PROJECT_DIR$/lib/kanjai.rb" /> 176 <option value="$PROJECT_DIR$/lib/kanjai.rb" />
187 - <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />  
188 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" /> 177 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
189 <option value="$PROJECT_DIR$/app/models/kanjai/image.rb" /> 178 <option value="$PROJECT_DIR$/app/models/kanjai/image.rb" />
  179 + <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
190 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" /> 180 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
191 </list> 181 </list>
192 </option> 182 </option>
@@ -282,7 +272,7 @@ @@ -282,7 +272,7 @@
282 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 272 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
283 </PATH_ELEMENT> 273 </PATH_ELEMENT>
284 <PATH_ELEMENT> 274 <PATH_ELEMENT>
285 - <option name="myItemId" value="app" /> 275 + <option name="myItemId" value="config" />
286 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 276 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
287 </PATH_ELEMENT> 277 </PATH_ELEMENT>
288 </PATH> 278 </PATH>
@@ -296,15 +286,25 @@ @@ -296,15 +286,25 @@
296 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 286 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
297 </PATH_ELEMENT> 287 </PATH_ELEMENT>
298 <PATH_ELEMENT> 288 <PATH_ELEMENT>
299 - <option name="myItemId" value="app" /> 289 + <option name="myItemId" value="config" />
300 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 290 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
301 </PATH_ELEMENT> 291 </PATH_ELEMENT>
302 <PATH_ELEMENT> 292 <PATH_ELEMENT>
303 - <option name="myItemId" value="models" /> 293 + <option name="myItemId" value="initializers" />
304 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 294 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
305 </PATH_ELEMENT> 295 </PATH_ELEMENT>
  296 + </PATH>
  297 + <PATH>
306 <PATH_ELEMENT> 298 <PATH_ELEMENT>
307 <option name="myItemId" value="kanjai" /> 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" /> 308 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
309 </PATH_ELEMENT> 309 </PATH_ELEMENT>
310 </PATH> 310 </PATH>
@@ -831,14 +831,6 @@ @@ -831,14 +831,6 @@
831 </state> 831 </state>
832 </provider> 832 </provider>
833 </entry> 833 </entry>
834 - <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb">  
835 - <provider selected="true" editor-type-id="text-editor">  
836 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="285">  
837 - <caret line="12" column="168" selection-start-line="12" selection-start-column="168" selection-end-line="12" selection-end-column="168" />  
838 - <folding />  
839 - </state>  
840 - </provider>  
841 - </entry>  
842 <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake"> 834 <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
843 <provider selected="true" editor-type-id="text-editor"> 835 <provider selected="true" editor-type-id="text-editor">
844 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634"> 836 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
@@ -967,10 +959,18 @@ @@ -967,10 +959,18 @@
967 </state> 959 </state>
968 </provider> 960 </provider>
969 </entry> 961 </entry>
970 - <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb"> 962 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
971 <provider selected="true" editor-type-id="text-editor"> 963 <provider selected="true" editor-type-id="text-editor">
972 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="240">  
973 - <caret line="7" column="33" selection-start-line="7" selection-start-column="33" selection-end-line="7" selection-end-column="33" /> 964 + <state vertical-scroll-proportion="0.0" vertical-offset="1481" max-vertical-offset="2115">
  965 + <caret line="123" column="13" selection-start-line="123" selection-start-column="13" selection-end-line="123" selection-end-column="13" />
  966 + <folding />
  967 + </state>
  968 + </provider>
  969 + </entry>
  970 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/image.rb">
  971 + <provider selected="true" editor-type-id="text-editor">
  972 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
  973 + <caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
974 <folding /> 974 <folding />
975 </state> 975 </state>
976 </provider> 976 </provider>
@@ -983,18 +983,18 @@ @@ -983,18 +983,18 @@
983 </state> 983 </state>
984 </provider> 984 </provider>
985 </entry> 985 </entry>
986 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> 986 + <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb">
987 <provider selected="true" editor-type-id="text-editor"> 987 <provider selected="true" editor-type-id="text-editor">
988 - <state vertical-scroll-proportion="0.0" vertical-offset="1481" max-vertical-offset="2115">  
989 - <caret line="123" column="13" selection-start-line="123" selection-start-column="13" selection-end-line="123" selection-end-column="13" /> 988 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="285">
  989 + <caret line="13" column="140" selection-start-line="13" selection-start-column="50" selection-end-line="13" selection-end-column="140" />
990 <folding /> 990 <folding />
991 </state> 991 </state>
992 </provider> 992 </provider>
993 </entry> 993 </entry>
994 - <entry file="file://$PROJECT_DIR$/app/models/kanjai/image.rb"> 994 + <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
995 <provider selected="true" editor-type-id="text-editor"> 995 <provider selected="true" editor-type-id="text-editor">
996 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">  
997 - <caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" /> 996 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
  997 + <caret line="10" column="175" selection-start-line="10" selection-start-column="175" selection-end-line="10" selection-end-column="175" />
998 <folding /> 998 <folding />
999 </state> 999 </state>
1000 </provider> 1000 </provider>
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.3) 4 + kanjai (0.0.4)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 aws-sdk 7 aws-sdk
@@ -6,5 +6,10 @@ module Kanjai @@ -6,5 +6,10 @@ module Kanjai
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 << Kanjai::Engine.root.join("app", "assets", "fonts") 8 config.assets.paths << Kanjai::Engine.root.join("app", "assets", "fonts")
  9 +
  10 + initializer "kanjai.assets.precompile" do |app|
  11 + app.config.assets.precompile = %w(general.css general_admin.css general_site.css general_site_editor.css frontend.css general.js general_admin.js general_site_editor.js frontend.js)
  12 + end
  13 +
9 end 14 end
10 end 15 end
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.4" 2 + VERSION = "0.0.5"
3 end 3 end