Showing
2 changed files
with
37 additions
and
39 deletions
| ... | ... | @@ -24,21 +24,21 @@ |
| 24 | 24 | </component> |
| 25 | 25 | <component name="FileEditorManager"> |
| 26 | 26 | <leaf> |
| 27 | - <file leaf-file-name="engine.rb" pinned="false" current-in-tab="true"> | |
| 27 | + <file leaf-file-name="engine.rb" pinned="false" current-in-tab="false"> | |
| 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.25240386" vertical-offset="0" max-vertical-offset="416"> | |
| 30 | + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="240"> | |
| 31 | 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> |
| 35 | 35 | </entry> |
| 36 | 36 | </file> |
| 37 | - <file leaf-file-name="kanjai.gemspec" pinned="false" current-in-tab="false"> | |
| 38 | - <entry file="file://$PROJECT_DIR$/kanjai.gemspec"> | |
| 37 | + <file leaf-file-name=".ruby-version" pinned="false" current-in-tab="false"> | |
| 38 | + <entry file="file://$PROJECT_DIR$/.ruby-version"> | |
| 39 | 39 | <provider selected="true" editor-type-id="text-editor"> |
| 40 | - <state vertical-scroll-proportion="0.0" vertical-offset="465" max-vertical-offset="1140"> | |
| 41 | - <caret line="65" column="0" selection-start-line="65" selection-start-column="0" selection-end-line="65" selection-end-column="0" /> | |
| 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" /> | |
| 42 | 42 | <folding /> |
| 43 | 43 | </state> |
| 44 | 44 | </provider> |
| ... | ... | @@ -118,23 +118,21 @@ |
| 118 | 118 | </provider> |
| 119 | 119 | </entry> |
| 120 | 120 | </file> |
| 121 | - <file leaf-file-name="jquery.fileupload.js" pinned="false" current-in-tab="false"> | |
| 122 | - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js"> | |
| 121 | + <file leaf-file-name="kanjai.rb" pinned="false" current-in-tab="false"> | |
| 122 | + <entry file="file://$PROJECT_DIR$/lib/kanjai.rb"> | |
| 123 | 123 | <provider selected="true" editor-type-id="text-editor"> |
| 124 | - <state vertical-scroll-proportion="0.0" vertical-offset="11295" max-vertical-offset="22245"> | |
| 125 | - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | |
| 126 | - <folding> | |
| 127 | - <element signature="n#!!doc" expanded="true" /> | |
| 128 | - </folding> | |
| 124 | + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="240"> | |
| 125 | + <caret line="4" column="14" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" /> | |
| 126 | + <folding /> | |
| 129 | 127 | </state> |
| 130 | 128 | </provider> |
| 131 | 129 | </entry> |
| 132 | 130 | </file> |
| 133 | - <file leaf-file-name="kanjai.rb" pinned="false" current-in-tab="false"> | |
| 134 | - <entry file="file://$PROJECT_DIR$/lib/kanjai.rb"> | |
| 131 | + <file leaf-file-name="version.rb" pinned="false" current-in-tab="true"> | |
| 132 | + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> | |
| 135 | 133 | <provider selected="true" editor-type-id="text-editor"> |
| 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" /> | |
| 134 | + <state vertical-scroll-proportion="0.036057692" vertical-offset="0" max-vertical-offset="416"> | |
| 135 | + <caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" /> | |
| 138 | 136 | <folding /> |
| 139 | 137 | </state> |
| 140 | 138 | </provider> |
| ... | ... | @@ -145,7 +143,6 @@ |
| 145 | 143 | <component name="IdeDocumentHistory"> |
| 146 | 144 | <option name="CHANGED_PATHS"> |
| 147 | 145 | <list> |
| 148 | - <option value="$PROJECT_DIR$/lib/admin.rb" /> | |
| 149 | 146 | <option value="$PROJECT_DIR$/config/initializers/devise.rb" /> |
| 150 | 147 | <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/sessions_controller.rb" /> |
| 151 | 148 | <option value="$PROJECT_DIR$/app/views/devise/sessions/new.html.erb" /> |
| ... | ... | @@ -196,6 +193,7 @@ |
| 196 | 193 | <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js" /> |
| 197 | 194 | <option value="$PROJECT_DIR$/lib/kanjai.rb" /> |
| 198 | 195 | <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" /> |
| 196 | + <option value="$PROJECT_DIR$/lib/kanjai/version.rb" /> | |
| 199 | 197 | </list> |
| 200 | 198 | </option> |
| 201 | 199 | </component> |
| ... | ... | @@ -509,7 +507,7 @@ |
| 509 | 507 | <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> |
| 510 | 508 | <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" /> |
| 511 | 509 | <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" /> |
| 512 | - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25767368" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> | |
| 510 | + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25767368" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> | |
| 513 | 511 | <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" /> |
| 514 | 512 | <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" /> |
| 515 | 513 | <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" /> |
| ... | ... | @@ -540,22 +538,6 @@ |
| 540 | 538 | <watches-manager /> |
| 541 | 539 | </component> |
| 542 | 540 | <component name="editorHistoryManager"> |
| 543 | - <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/_edit_resource_links.html.erb"> | |
| 544 | - <provider selected="true" editor-type-id="text-editor"> | |
| 545 | - <state vertical-scroll-proportion="-1.875" vertical-offset="0" max-vertical-offset="180"> | |
| 546 | - <caret line="3" column="51" selection-start-line="3" selection-start-column="37" selection-end-line="3" selection-end-column="51" /> | |
| 547 | - <folding /> | |
| 548 | - </state> | |
| 549 | - </provider> | |
| 550 | - </entry> | |
| 551 | - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb"> | |
| 552 | - <provider selected="true" editor-type-id="text-editor"> | |
| 553 | - <state vertical-scroll-proportion="13.958333" vertical-offset="665" max-vertical-offset="1275"> | |
| 554 | - <caret line="22" column="57" selection-start-line="22" selection-start-column="57" selection-end-line="22" selection-end-column="57" /> | |
| 555 | - <folding /> | |
| 556 | - </state> | |
| 557 | - </provider> | |
| 558 | - </entry> | |
| 559 | 541 | <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_operation.html.erb"> |
| 560 | 542 | <provider selected="true" editor-type-id="text-editor"> |
| 561 | 543 | <state vertical-scroll-proportion="-8.75" vertical-offset="0" max-vertical-offset="315"> |
| ... | ... | @@ -959,6 +941,22 @@ |
| 959 | 941 | </state> |
| 960 | 942 | </provider> |
| 961 | 943 | </entry> |
| 944 | + <entry file="file://$PROJECT_DIR$/.ruby-version"> | |
| 945 | + <provider selected="true" editor-type-id="text-editor"> | |
| 946 | + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416"> | |
| 947 | + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | |
| 948 | + <folding /> | |
| 949 | + </state> | |
| 950 | + </provider> | |
| 951 | + </entry> | |
| 952 | + <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb"> | |
| 953 | + <provider selected="true" editor-type-id="text-editor"> | |
| 954 | + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="240"> | |
| 955 | + <caret line="7" column="33" selection-start-line="7" selection-start-column="33" selection-end-line="7" selection-end-column="33" /> | |
| 956 | + <folding /> | |
| 957 | + </state> | |
| 958 | + </provider> | |
| 959 | + </entry> | |
| 962 | 960 | <entry file="file://$PROJECT_DIR$/lib/kanjai.rb"> |
| 963 | 961 | <provider selected="true" editor-type-id="text-editor"> |
| 964 | 962 | <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="240"> |
| ... | ... | @@ -967,10 +965,10 @@ |
| 967 | 965 | </state> |
| 968 | 966 | </provider> |
| 969 | 967 | </entry> |
| 970 | - <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb"> | |
| 968 | + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> | |
| 971 | 969 | <provider selected="true" editor-type-id="text-editor"> |
| 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" /> | |
| 970 | + <state vertical-scroll-proportion="0.036057692" vertical-offset="0" max-vertical-offset="416"> | |
| 971 | + <caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" /> | |
| 974 | 972 | <folding /> |
| 975 | 973 | </state> |
| 976 | 974 | </provider> | ... | ... |