|
...
|
...
|
@@ -2,10 +2,7 @@ |
|
2
|
2
|
<project version="4">
|
|
3
|
3
|
<component name="ChangeListManager">
|
|
4
|
4
|
<list default="true" id="cbbcb0f9-d203-4967-aa4d-c08a939c7df0" name="Default" comment="">
|
|
5
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/kanjai.iml" afterPath="$PROJECT_DIR$/.idea/kanjai.iml" />
|
|
6
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
7
|
5
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Gemfile.lock" afterPath="$PROJECT_DIR$/Gemfile.lock" />
|
|
8
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js" afterPath="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js" />
|
|
9
|
6
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
|
|
10
|
7
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/kanjai/version.rb" afterPath="$PROJECT_DIR$/lib/kanjai/version.rb" />
|
|
11
|
8
|
</list>
|
|
...
|
...
|
@@ -38,11 +35,11 @@ |
|
38
|
35
|
</provider>
|
|
39
|
36
|
</entry>
|
|
40
|
37
|
</file>
|
|
41
|
|
- <file leaf-file-name="page_template.rb" pinned="false" current-in-tab="false">
|
|
42
|
|
- <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
|
|
|
38
|
+ <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
|
|
|
39
|
+ <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
|
|
43
|
40
|
<provider selected="true" editor-type-id="text-editor">
|
|
44
|
|
- <state relative-caret-position="2535">
|
|
45
|
|
- <caret line="169" column="15" lean-forward="false" selection-start-line="169" selection-start-column="15" selection-end-line="169" selection-end-column="15" />
|
|
|
41
|
+ <state relative-caret-position="45">
|
|
|
42
|
+ <caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
|
|
46
|
43
|
<folding />
|
|
47
|
44
|
</state>
|
|
48
|
45
|
</provider>
|
|
...
|
...
|
@@ -61,8 +58,8 @@ |
|
61
|
58
|
<file leaf-file-name="site_controller.rb" pinned="false" current-in-tab="false">
|
|
62
|
59
|
<entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
|
|
63
|
60
|
<provider selected="true" editor-type-id="text-editor">
|
|
64
|
|
- <state relative-caret-position="555">
|
|
65
|
|
- <caret line="37" column="17" lean-forward="false" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="17" />
|
|
|
61
|
+ <state relative-caret-position="195">
|
|
|
62
|
+ <caret line="13" column="39" lean-forward="true" selection-start-line="13" selection-start-column="39" selection-end-line="13" selection-end-column="39" />
|
|
66
|
63
|
<folding />
|
|
67
|
64
|
</state>
|
|
68
|
65
|
</provider>
|
|
...
|
...
|
@@ -88,6 +85,26 @@ |
|
88
|
85
|
</provider>
|
|
89
|
86
|
</entry>
|
|
90
|
87
|
</file>
|
|
|
88
|
+ <file leaf-file-name="frontend.js" pinned="false" current-in-tab="false">
|
|
|
89
|
+ <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
|
|
|
90
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
91
|
+ <state relative-caret-position="165">
|
|
|
92
|
+ <caret line="11" column="42" lean-forward="false" selection-start-line="11" selection-start-column="42" selection-end-line="11" selection-end-column="42" />
|
|
|
93
|
+ <folding />
|
|
|
94
|
+ </state>
|
|
|
95
|
+ </provider>
|
|
|
96
|
+ </entry>
|
|
|
97
|
+ </file>
|
|
|
98
|
+ <file leaf-file-name="frontend_extend.js" pinned="false" current-in-tab="false">
|
|
|
99
|
+ <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_extend.js">
|
|
|
100
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
101
|
+ <state relative-caret-position="0">
|
|
|
102
|
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
103
|
+ <folding />
|
|
|
104
|
+ </state>
|
|
|
105
|
+ </provider>
|
|
|
106
|
+ </entry>
|
|
|
107
|
+ </file>
|
|
91
|
108
|
<file leaf-file-name="application.html.erb" pinned="false" current-in-tab="false">
|
|
92
|
109
|
<entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/application.html.erb">
|
|
93
|
110
|
<provider selected="true" editor-type-id="text-editor">
|
|
...
|
...
|
@@ -112,9 +129,6 @@ |
|
112
|
129
|
</component>
|
|
113
|
130
|
<component name="FindInProjectRecents">
|
|
114
|
131
|
<findStrings>
|
|
115
|
|
- <find>element</find>
|
|
116
|
|
- <find>gsub!</find>
|
|
117
|
|
- <find>replace_attributes_marker</find>
|
|
118
|
132
|
<find>content_generator</find>
|
|
119
|
133
|
<find>subpart_generate</find>
|
|
120
|
134
|
<find>71</find>
|
|
...
|
...
|
@@ -142,6 +156,9 @@ |
|
142
|
156
|
<find>files = $.makeArray(fileInput.prop('files'));</find>
|
|
143
|
157
|
<find>If the files property is not available, the browser does</find>
|
|
144
|
158
|
<find>If the files property is not available, the browser does not</find>
|
|
|
159
|
+ <find>if (cookieValue.length > 0) break</find>
|
|
|
160
|
+ <find>Extracts flash array stored in cookie and clears</find>
|
|
|
161
|
+ <find>UnobtrusiveFlash</find>
|
|
145
|
162
|
</findStrings>
|
|
146
|
163
|
<dirStrings>
|
|
147
|
164
|
<dir>$PROJECT_DIR$/app/controllers</dir>
|
|
...
|
...
|
@@ -202,8 +219,8 @@ |
|
202
|
219
|
<option value="$PROJECT_DIR$/kanjai.gemspec" />
|
|
203
|
220
|
<option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
|
|
204
|
221
|
<option value="$PROJECT_DIR$/app/models/kanjai/page_template.rb" />
|
|
205
|
|
- <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
|
|
206
|
222
|
<option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js" />
|
|
|
223
|
+ <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
|
|
207
|
224
|
<option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
|
|
208
|
225
|
</list>
|
|
209
|
226
|
</option>
|
|
...
|
...
|
@@ -373,6 +390,62 @@ |
|
373
|
390
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
374
|
391
|
</PATH_ELEMENT>
|
|
375
|
392
|
</PATH>
|
|
|
393
|
+ <PATH>
|
|
|
394
|
+ <PATH_ELEMENT>
|
|
|
395
|
+ <option name="myItemId" value="kanjai" />
|
|
|
396
|
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
|
397
|
+ </PATH_ELEMENT>
|
|
|
398
|
+ <PATH_ELEMENT>
|
|
|
399
|
+ <option name="myItemId" value="kanjai" />
|
|
|
400
|
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
401
|
+ </PATH_ELEMENT>
|
|
|
402
|
+ <PATH_ELEMENT>
|
|
|
403
|
+ <option name="myItemId" value="app" />
|
|
|
404
|
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
405
|
+ </PATH_ELEMENT>
|
|
|
406
|
+ <PATH_ELEMENT>
|
|
|
407
|
+ <option name="myItemId" value="assets" />
|
|
|
408
|
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
409
|
+ </PATH_ELEMENT>
|
|
|
410
|
+ <PATH_ELEMENT>
|
|
|
411
|
+ <option name="myItemId" value="javascripts" />
|
|
|
412
|
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
413
|
+ </PATH_ELEMENT>
|
|
|
414
|
+ <PATH_ELEMENT>
|
|
|
415
|
+ <option name="myItemId" value="kanjai" />
|
|
|
416
|
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
417
|
+ </PATH_ELEMENT>
|
|
|
418
|
+ </PATH>
|
|
|
419
|
+ <PATH>
|
|
|
420
|
+ <PATH_ELEMENT>
|
|
|
421
|
+ <option name="myItemId" value="kanjai" />
|
|
|
422
|
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
|
423
|
+ </PATH_ELEMENT>
|
|
|
424
|
+ <PATH_ELEMENT>
|
|
|
425
|
+ <option name="myItemId" value="kanjai" />
|
|
|
426
|
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
427
|
+ </PATH_ELEMENT>
|
|
|
428
|
+ <PATH_ELEMENT>
|
|
|
429
|
+ <option name="myItemId" value="app" />
|
|
|
430
|
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
431
|
+ </PATH_ELEMENT>
|
|
|
432
|
+ <PATH_ELEMENT>
|
|
|
433
|
+ <option name="myItemId" value="assets" />
|
|
|
434
|
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
435
|
+ </PATH_ELEMENT>
|
|
|
436
|
+ <PATH_ELEMENT>
|
|
|
437
|
+ <option name="myItemId" value="javascripts" />
|
|
|
438
|
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
439
|
+ </PATH_ELEMENT>
|
|
|
440
|
+ <PATH_ELEMENT>
|
|
|
441
|
+ <option name="myItemId" value="kanjai" />
|
|
|
442
|
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
443
|
+ </PATH_ELEMENT>
|
|
|
444
|
+ <PATH_ELEMENT>
|
|
|
445
|
+ <option name="myItemId" value="frontend" />
|
|
|
446
|
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
447
|
+ </PATH_ELEMENT>
|
|
|
448
|
+ </PATH>
|
|
376
|
449
|
</subPane>
|
|
377
|
450
|
</pane>
|
|
378
|
451
|
<pane id="Scope" />
|
|
...
|
...
|
@@ -638,18 +711,18 @@ |
|
638
|
711
|
<workItem from="1513283335284" duration="121000" />
|
|
639
|
712
|
<workItem from="1513543303254" duration="7193000" />
|
|
640
|
713
|
<workItem from="1516654861781" duration="654000" />
|
|
641
|
|
- <workItem from="1519076359527" duration="4360000" />
|
|
|
714
|
+ <workItem from="1519076359527" duration="4794000" />
|
|
642
|
715
|
</task>
|
|
643
|
716
|
<servers />
|
|
644
|
717
|
</component>
|
|
645
|
718
|
<component name="TimeTrackingManager">
|
|
646
|
|
- <option name="totallyTimeSpent" value="26917000" />
|
|
|
719
|
+ <option name="totallyTimeSpent" value="27351000" />
|
|
647
|
720
|
</component>
|
|
648
|
721
|
<component name="ToolWindowManager">
|
|
649
|
722
|
<frame x="0" y="23" width="1280" height="728" extended-state="6" />
|
|
650
|
723
|
<editor active="true" />
|
|
651
|
724
|
<layout>
|
|
652
|
|
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.47738287" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
|
|
725
|
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34087238" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
|
653
|
726
|
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
|
654
|
727
|
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32930514" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
|
|
655
|
728
|
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
...
|
...
|
@@ -818,13 +891,6 @@ |
|
818
|
891
|
</state>
|
|
819
|
892
|
</provider>
|
|
820
|
893
|
</entry>
|
|
821
|
|
- <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_extend.js">
|
|
822
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
823
|
|
- <state relative-caret-position="0">
|
|
824
|
|
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
825
|
|
- </state>
|
|
826
|
|
- </provider>
|
|
827
|
|
- </entry>
|
|
828
|
894
|
<entry file="file://$PROJECT_DIR$/config/routes.rb">
|
|
829
|
895
|
<provider selected="true" editor-type-id="text-editor">
|
|
830
|
896
|
<state relative-caret-position="501">
|
|
...
|
...
|
@@ -940,14 +1006,6 @@ |
|
940
|
1006
|
</state>
|
|
941
|
1007
|
</provider>
|
|
942
|
1008
|
</entry>
|
|
943
|
|
- <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
|
|
944
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
945
|
|
- <state relative-caret-position="465">
|
|
946
|
|
- <caret line="31" column="0" lean-forward="false" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="42" />
|
|
947
|
|
- <folding />
|
|
948
|
|
- </state>
|
|
949
|
|
- </provider>
|
|
950
|
|
- </entry>
|
|
951
|
1009
|
<entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb">
|
|
952
|
1010
|
<provider selected="true" editor-type-id="text-editor">
|
|
953
|
1011
|
<state relative-caret-position="225">
|
|
...
|
...
|
@@ -996,23 +1054,23 @@ |
|
996
|
1054
|
</state>
|
|
997
|
1055
|
</provider>
|
|
998
|
1056
|
</entry>
|
|
999
|
|
- <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
|
|
|
1057
|
+ <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
|
|
1000
|
1058
|
<provider selected="true" editor-type-id="text-editor">
|
|
1001
|
|
- <state relative-caret-position="555">
|
|
1002
|
|
- <caret line="37" column="17" lean-forward="false" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="17" />
|
|
|
1059
|
+ <state relative-caret-position="0">
|
|
|
1060
|
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
1003
|
1061
|
<folding />
|
|
1004
|
1062
|
</state>
|
|
1005
|
1063
|
</provider>
|
|
1006
|
1064
|
</entry>
|
|
1007
|
|
- <entry file="file://$PROJECT_DIR$/config/initializers/wicked_pdf.rb">
|
|
|
1065
|
+ <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb">
|
|
1008
|
1066
|
<provider selected="true" editor-type-id="text-editor">
|
|
1009
|
|
- <state relative-caret-position="150">
|
|
1010
|
|
- <caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="6" />
|
|
|
1067
|
+ <state relative-caret-position="0">
|
|
|
1068
|
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
1011
|
1069
|
<folding />
|
|
1012
|
1070
|
</state>
|
|
1013
|
1071
|
</provider>
|
|
1014
|
1072
|
</entry>
|
|
1015
|
|
- <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
|
|
|
1073
|
+ <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/application.html.erb">
|
|
1016
|
1074
|
<provider selected="true" editor-type-id="text-editor">
|
|
1017
|
1075
|
<state relative-caret-position="0">
|
|
1018
|
1076
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
...
|
...
|
@@ -1020,15 +1078,31 @@ |
|
1020
|
1078
|
</state>
|
|
1021
|
1079
|
</provider>
|
|
1022
|
1080
|
</entry>
|
|
1023
|
|
- <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb">
|
|
|
1081
|
+ <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
|
|
1024
|
1082
|
<provider selected="true" editor-type-id="text-editor">
|
|
1025
|
|
- <state relative-caret-position="0">
|
|
1026
|
|
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
1083
|
+ <state relative-caret-position="165">
|
|
|
1084
|
+ <caret line="11" column="19" lean-forward="false" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="19" />
|
|
1027
|
1085
|
<folding />
|
|
1028
|
1086
|
</state>
|
|
1029
|
1087
|
</provider>
|
|
1030
|
1088
|
</entry>
|
|
1031
|
|
- <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/application.html.erb">
|
|
|
1089
|
+ <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js">
|
|
|
1090
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
1091
|
+ <state relative-caret-position="322">
|
|
|
1092
|
+ <caret line="1197" column="24" lean-forward="false" selection-start-line="1197" selection-start-column="24" selection-end-line="1197" selection-end-column="24" />
|
|
|
1093
|
+ <folding />
|
|
|
1094
|
+ </state>
|
|
|
1095
|
+ </provider>
|
|
|
1096
|
+ </entry>
|
|
|
1097
|
+ <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
|
|
|
1098
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
1099
|
+ <state relative-caret-position="165">
|
|
|
1100
|
+ <caret line="11" column="42" lean-forward="false" selection-start-line="11" selection-start-column="42" selection-end-line="11" selection-end-column="42" />
|
|
|
1101
|
+ <folding />
|
|
|
1102
|
+ </state>
|
|
|
1103
|
+ </provider>
|
|
|
1104
|
+ </entry>
|
|
|
1105
|
+ <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_extend.js">
|
|
1032
|
1106
|
<provider selected="true" editor-type-id="text-editor">
|
|
1033
|
1107
|
<state relative-caret-position="0">
|
|
1034
|
1108
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
...
|
...
|
@@ -1036,26 +1110,26 @@ |
|
1036
|
1110
|
</state>
|
|
1037
|
1111
|
</provider>
|
|
1038
|
1112
|
</entry>
|
|
1039
|
|
- <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
|
|
|
1113
|
+ <entry file="file://$PROJECT_DIR$/config/initializers/wicked_pdf.rb">
|
|
1040
|
1114
|
<provider selected="true" editor-type-id="text-editor">
|
|
1041
|
|
- <state relative-caret-position="511">
|
|
1042
|
|
- <caret line="180" column="0" lean-forward="false" selection-start-line="180" selection-start-column="0" selection-end-line="180" selection-end-column="0" />
|
|
|
1115
|
+ <state relative-caret-position="150">
|
|
|
1116
|
+ <caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="6" />
|
|
1043
|
1117
|
<folding />
|
|
1044
|
1118
|
</state>
|
|
1045
|
1119
|
</provider>
|
|
1046
|
1120
|
</entry>
|
|
1047
|
|
- <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
|
|
|
1121
|
+ <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
|
|
1048
|
1122
|
<provider selected="true" editor-type-id="text-editor">
|
|
1049
|
|
- <state relative-caret-position="165">
|
|
1050
|
|
- <caret line="11" column="19" lean-forward="false" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="19" />
|
|
|
1123
|
+ <state relative-caret-position="195">
|
|
|
1124
|
+ <caret line="13" column="39" lean-forward="true" selection-start-line="13" selection-start-column="39" selection-end-line="13" selection-end-column="39" />
|
|
1051
|
1125
|
<folding />
|
|
1052
|
1126
|
</state>
|
|
1053
|
1127
|
</provider>
|
|
1054
|
1128
|
</entry>
|
|
1055
|
|
- <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js">
|
|
|
1129
|
+ <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
|
|
1056
|
1130
|
<provider selected="true" editor-type-id="text-editor">
|
|
1057
|
|
- <state relative-caret-position="322">
|
|
1058
|
|
- <caret line="1197" column="24" lean-forward="false" selection-start-line="1197" selection-start-column="24" selection-end-line="1197" selection-end-column="24" />
|
|
|
1131
|
+ <state relative-caret-position="45">
|
|
|
1132
|
+ <caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
|
|
1059
|
1133
|
<folding />
|
|
1060
|
1134
|
</state>
|
|
1061
|
1135
|
</provider>
|
...
|
...
|
|