EDIT / kanjai · Commits

Commit 1a7c199bbf1172c076e5f599307fecdb8dc3148f

Authored by Karpikau Andrei
1 parent 06d1c96e

show wrapper without any process

Inline Side-by-side
Showing 4 changed files with 15 additions and 15 deletions
@@ -48,8 +48,8 @@ @@ -48,8 +48,8 @@
48 <file leaf-file-name="pages_helper.rb" pinned="false" current-in-tab="false"> 48 <file leaf-file-name="pages_helper.rb" pinned="false" current-in-tab="false">
49 <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb"> 49 <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb">
50 <provider selected="true" editor-type-id="text-editor"> 50 <provider selected="true" editor-type-id="text-editor">
51 - <state vertical-scroll-proportion="-15.259259" vertical-offset="443" max-vertical-offset="2055">  
52 - <caret line="57" column="20" selection-start-line="57" selection-start-column="20" selection-end-line="57" selection-end-column="20" /> 51 + <state vertical-scroll-proportion="-13.592592" vertical-offset="473" max-vertical-offset="2055">
  52 + <caret line="56" column="69" selection-start-line="56" selection-start-column="69" selection-end-line="56" selection-end-column="69" />
53 <folding /> 53 <folding />
54 </state> 54 </state>
55 </provider> 55 </provider>
@@ -58,8 +58,8 @@ @@ -58,8 +58,8 @@
58 <file leaf-file-name="page_content.rb" pinned="false" current-in-tab="false"> 58 <file leaf-file-name="page_content.rb" pinned="false" current-in-tab="false">
59 <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb"> 59 <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">
60 <provider selected="true" editor-type-id="text-editor"> 60 <provider selected="true" editor-type-id="text-editor">
61 - <state vertical-scroll-proportion="-8.592592" vertical-offset="1658" max-vertical-offset="2520">  
62 - <caret line="126" column="28" selection-start-line="126" selection-start-column="8" selection-end-line="126" selection-end-column="28" /> 61 + <state vertical-scroll-proportion="-19.703703" vertical-offset="1658" max-vertical-offset="2520">
  62 + <caret line="146" column="26" selection-start-line="146" selection-start-column="8" selection-end-line="146" selection-end-column="26" />
63 <folding /> 63 <folding />
64 </state> 64 </state>
65 </provider> 65 </provider>
@@ -974,26 +974,26 @@ @@ -974,26 +974,26 @@
974 </state> 974 </state>
975 </provider> 975 </provider>
976 </entry> 976 </entry>
977 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> 977 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">
978 <provider selected="true" editor-type-id="text-editor"> 978 <provider selected="true" editor-type-id="text-editor">
979 - <state vertical-scroll-proportion="19.74074" vertical-offset="1268" max-vertical-offset="2505">  
980 - <caret line="49" column="26" selection-start-line="49" selection-start-column="8" selection-end-line="49" selection-end-column="26" /> 979 + <state vertical-scroll-proportion="-19.703703" vertical-offset="1658" max-vertical-offset="2520">
  980 + <caret line="146" column="26" selection-start-line="146" selection-start-column="8" selection-end-line="146" selection-end-column="26" />
981 <folding /> 981 <folding />
982 </state> 982 </state>
983 </provider> 983 </provider>
984 </entry> 984 </entry>
985 - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb"> 985 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
986 <provider selected="true" editor-type-id="text-editor"> 986 <provider selected="true" editor-type-id="text-editor">
987 - <state vertical-scroll-proportion="-8.592592" vertical-offset="1658" max-vertical-offset="2520">  
988 - <caret line="126" column="28" selection-start-line="126" selection-start-column="8" selection-end-line="126" selection-end-column="28" /> 987 + <state vertical-scroll-proportion="19.74074" vertical-offset="1268" max-vertical-offset="2505">
  988 + <caret line="49" column="26" selection-start-line="49" selection-start-column="8" selection-end-line="49" selection-end-column="26" />
989 <folding /> 989 <folding />
990 </state> 990 </state>
991 </provider> 991 </provider>
992 </entry> 992 </entry>
993 <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb"> 993 <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb">
994 <provider selected="true" editor-type-id="text-editor"> 994 <provider selected="true" editor-type-id="text-editor">
995 - <state vertical-scroll-proportion="-15.259259" vertical-offset="443" max-vertical-offset="2055">  
996 - <caret line="57" column="20" selection-start-line="57" selection-start-column="20" selection-end-line="57" selection-end-column="20" /> 995 + <state vertical-scroll-proportion="-13.592592" vertical-offset="473" max-vertical-offset="2055">
  996 + <caret line="56" column="69" selection-start-line="56" selection-start-column="69" selection-end-line="56" selection-end-column="69" />
997 <folding /> 997 <folding />
998 </state> 998 </state>
999 </provider> 999 </provider>
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.41) 4 + kanjai (0.0.42)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 aws-sdk 7 aws-sdk
@@ -55,7 +55,7 @@ module Kanjai @@ -55,7 +55,7 @@ module Kanjai
55 html_attributes['data-page_data_id'] = page_data.id 55 html_attributes['data-page_data_id'] = page_data.id
56 56
57 if page_content.type_content.split('-').include?('wrapper') 57 if page_content.type_content.split('-').include?('wrapper')
58 - html += (page_content.get_content_frontend).html_safe 58 + html += (page_content.get_simple_content).html_safe
59 else 59 else
60 html += ActionController::Base.helpers.content_tag(:div, '', html_attributes) do 60 html += ActionController::Base.helpers.content_tag(:div, '', html_attributes) do
61 ActionController::Base.helpers.concat((page_content.nil? ? '' : page_content.get_content_frontend).html_safe) 61 ActionController::Base.helpers.concat((page_content.nil? ? '' : page_content.get_content_frontend).html_safe)
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.42" 2 + VERSION = "0.0.43"
3 end 3 end