EDIT / kanjai · Commits

Commit 6be112125382d80feafd7044ed73080fc518699c

Authored by Karpikau Andrei
1 parent b365020f

check include js to pdf

Inline Side-by-side
Showing 6 changed files with 43 additions and 56 deletions
... ... @@ -141,7 +141,7 @@
141 141 <orderEntry type="library" scope="PROVIDED" name="bundler (v1.9.0, rbenv: 2.1.3) [gem]" level="application" />
142 142 <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.0.5, rbenv: 2.1.3) [gem]" level="application" />
143 143 <orderEntry type="library" scope="PROVIDED" name="daemons (v1.2.6, rbenv: 2.1.3) [gem]" level="application" />
144   - <orderEntry type="library" scope="PROVIDED" name="delayed_job (v4.1.3, rbenv: 2.1.3) [gem]" level="application" />
  144 + <orderEntry type="library" scope="PROVIDED" name="delayed_job (v4.1.4, rbenv: 2.1.3) [gem]" level="application" />
145 145 <orderEntry type="library" scope="PROVIDED" name="delayed_job_active_record (v4.1.2, rbenv: 2.1.3) [gem]" level="application" />
146 146 <orderEntry type="library" scope="PROVIDED" name="devise (v4.4.0, rbenv: 2.1.3) [gem]" level="application" />
147 147 <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, rbenv: 2.1.3) [gem]" level="application" />
... ... @@ -162,7 +162,7 @@
162 162 <orderEntry type="library" scope="PROVIDED" name="mini_mime (v1.0.0, rbenv: 2.1.3) [gem]" level="application" />
163 163 <orderEntry type="library" scope="PROVIDED" name="mini_portile (v0.5.3, rbenv: 2.1.3) [gem]" level="application" />
164 164 <orderEntry type="library" scope="PROVIDED" name="minitest (v5.8.4, rbenv: 2.1.3) [gem]" level="application" />
165   - <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.12.2, rbenv: 2.1.3) [gem]" level="application" />
  165 + <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.13.1, rbenv: 2.1.3) [gem]" level="application" />
166 166 <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.6.1, rbenv: 2.1.3) [gem]" level="application" />
167 167 <orderEntry type="library" scope="PROVIDED" name="orm_adapter (v0.5.0, rbenv: 2.1.3) [gem]" level="application" />
168 168 <orderEntry type="library" scope="PROVIDED" name="pg (v0.17.1, rbenv: 2.1.3) [gem]" level="application" />
... ... @@ -187,7 +187,7 @@
187 187 <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.4.1, rbenv: 2.1.3) [gem]" level="application" />
188 188 <orderEntry type="library" scope="PROVIDED" name="rspec-rails (v3.4.2, rbenv: 2.1.3) [gem]" level="application" />
189 189 <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.4.1, rbenv: 2.1.3) [gem]" level="application" />
190   - <orderEntry type="library" scope="PROVIDED" name="sass (v3.5.3, rbenv: 2.1.3) [gem]" level="application" />
  190 + <orderEntry type="library" scope="PROVIDED" name="sass (v3.5.5, rbenv: 2.1.3) [gem]" level="application" />
191 191 <orderEntry type="library" scope="PROVIDED" name="sass-listen (v4.0.0, rbenv: 2.1.3) [gem]" level="application" />
192 192 <orderEntry type="library" scope="PROVIDED" name="sass-rails (v5.0.7, rbenv: 2.1.3) [gem]" level="application" />
193 193 <orderEntry type="library" scope="PROVIDED" name="sdoc (v0.4.2, rbenv: 2.1.3) [gem]" level="application" />
... ...
... ... @@ -5,6 +5,7 @@
5 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/kanjai.iml" afterPath="$PROJECT_DIR$/.idea/kanjai.iml" />
6 6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
7 7 <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" />
8 9 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
9 10 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/kanjai/version.rb" afterPath="$PROJECT_DIR$/lib/kanjai/version.rb" />
10 11 </list>
... ... @@ -27,21 +28,11 @@
27 28 </component>
28 29 <component name="FileEditorManager">
29 30 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
30   - <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
31   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  31 + <file leaf-file-name="jquery.fileupload.js" pinned="false" current-in-tab="false">
  32 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js">
32 33 <provider selected="true" editor-type-id="text-editor">
33   - <state relative-caret-position="413">
34   - <caret line="178" column="10" lean-forward="false" selection-start-line="178" selection-start-column="10" selection-end-line="178" selection-end-column="10" />
35   - <folding />
36   - </state>
37   - </provider>
38   - </entry>
39   - </file>
40   - <file leaf-file-name="install.rake" pinned="false" current-in-tab="false">
41   - <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
42   - <provider selected="true" editor-type-id="text-editor">
43   - <state relative-caret-position="165">
44   - <caret line="11" column="19" lean-forward="false" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="19" />
  34 + <state relative-caret-position="322">
  35 + <caret line="1197" column="24" lean-forward="false" selection-start-line="1197" selection-start-column="24" selection-end-line="1197" selection-end-column="24" />
45 36 <folding />
46 37 </state>
47 38 </provider>
... ... @@ -57,16 +48,6 @@
57 48 </provider>
58 49 </entry>
59 50 </file>
60   - <file leaf-file-name="page_datum.rb" pinned="false" current-in-tab="false">
61   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_datum.rb">
62   - <provider selected="true" editor-type-id="text-editor">
63   - <state relative-caret-position="0">
64   - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
65   - <folding />
66   - </state>
67   - </provider>
68   - </entry>
69   - </file>
70 51 <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
71 52 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
72 53 <provider selected="true" editor-type-id="text-editor">
... ... @@ -131,9 +112,6 @@
131 112 </component>
132 113 <component name="FindInProjectRecents">
133 114 <findStrings>
134   - <find>edit_template</find>
135   - <find>page_content_markers</find>
136   - <find>replace_text_marker</find>
137 115 <find>element</find>
138 116 <find>gsub!</find>
139 117 <find>replace_attributes_marker</find>
... ... @@ -161,6 +139,9 @@
161 139 <find>check_permission</find>
162 140 <find>admin_email</find>
163 141 <find>INCLUDE_JS_FILE</find>
  142 + <find>files = $.makeArray(fileInput.prop('files'));</find>
  143 + <find>If the files property is not available, the browser does</find>
  144 + <find>If the files property is not available, the browser does not</find>
164 145 </findStrings>
165 146 <dirStrings>
166 147 <dir>$PROJECT_DIR$/app/controllers</dir>
... ... @@ -173,7 +154,6 @@
173 154 <component name="IdeDocumentHistory">
174 155 <option name="CHANGED_PATHS">
175 156 <list>
176   - <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
177 157 <option value="$PROJECT_DIR$/lib/kanjai/template_parser.rb" />
178 158 <option value="$PROJECT_DIR$/app/models/kanjai/page_content_marker.rb" />
179 159 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js" />
... ... @@ -223,6 +203,7 @@
223 203 <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
224 204 <option value="$PROJECT_DIR$/app/models/kanjai/page_template.rb" />
225 205 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
  206 + <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js" />
226 207 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
227 208 </list>
228 209 </option>
... ... @@ -657,12 +638,12 @@
657 638 <workItem from="1513283335284" duration="121000" />
658 639 <workItem from="1513543303254" duration="7193000" />
659 640 <workItem from="1516654861781" duration="654000" />
660   - <workItem from="1519076359527" duration="2873000" />
  641 + <workItem from="1519076359527" duration="4360000" />
661 642 </task>
662 643 <servers />
663 644 </component>
664 645 <component name="TimeTrackingManager">
665   - <option name="totallyTimeSpent" value="25430000" />
  646 + <option name="totallyTimeSpent" value="26917000" />
666 647 </component>
667 648 <component name="ToolWindowManager">
668 649 <frame x="0" y="23" width="1280" height="728" extended-state="6" />
... ... @@ -711,13 +692,6 @@
711 692 <watches-manager />
712 693 </component>
713 694 <component name="editorHistoryManager">
714   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js">
715   - <provider selected="true" editor-type-id="text-editor">
716   - <state relative-caret-position="0">
717   - <caret line="137" column="319" lean-forward="false" selection-start-line="137" selection-start-column="319" selection-end-line="137" selection-end-column="319" />
718   - </state>
719   - </provider>
720   - </entry>
721 695 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
722 696 <provider selected="true" editor-type-id="text-editor">
723 697 <state relative-caret-position="0">
... ... @@ -1062,6 +1036,14 @@
1062 1036 </state>
1063 1037 </provider>
1064 1038 </entry>
  1039 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  1040 + <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" />
  1043 + <folding />
  1044 + </state>
  1045 + </provider>
  1046 + </entry>
1065 1047 <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
1066 1048 <provider selected="true" editor-type-id="text-editor">
1067 1049 <state relative-caret-position="165">
... ... @@ -1070,10 +1052,10 @@
1070 1052 </state>
1071 1053 </provider>
1072 1054 </entry>
1073   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  1055 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js">
1074 1056 <provider selected="true" editor-type-id="text-editor">
1075   - <state relative-caret-position="413">
1076   - <caret line="178" column="10" lean-forward="false" selection-start-line="178" selection-start-column="10" selection-end-line="178" selection-end-column="10" />
  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" />
1077 1059 <folding />
1078 1060 </state>
1079 1061 </provider>
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.76)
  4 + kanjai (0.0.77)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk (= 2.6.32)
... ... @@ -77,13 +77,13 @@ GEM
77 77 bcrypt (3.1.11)
78 78 builder (3.2.2)
79 79 concurrent-ruby (1.0.5)
80   - daemons (1.2.5)
81   - delayed_job (4.1.3)
  80 + daemons (1.2.6)
  81 + delayed_job (4.1.4)
82 82 activesupport (>= 3.0, < 5.2)
83 83 delayed_job_active_record (4.1.2)
84 84 activerecord (>= 3.0, < 5.2)
85 85 delayed_job (>= 3.0, < 5)
86   - devise (4.3.0)
  86 + devise (4.4.0)
87 87 bcrypt (~> 3.0)
88 88 orm_adapter (~> 0.1)
89 89 railties (>= 4.1.0, < 5.2)
... ... @@ -117,7 +117,7 @@ GEM
117 117 mini_mime (1.0.0)
118 118 mini_portile (0.5.3)
119 119 minitest (5.8.4)
120   - multi_json (1.12.2)
  120 + multi_json (1.13.1)
121 121 nokogiri (1.6.1)
122 122 mini_portile (~> 0.5.0)
123 123 orm_adapter (0.5.0)
... ... @@ -180,7 +180,7 @@ GEM
180 180 rspec-mocks (~> 3.4.0)
181 181 rspec-support (~> 3.4.0)
182 182 rspec-support (3.4.1)
183   - sass (3.5.3)
  183 + sass (3.5.5)
184 184 sass-listen (~> 4.0.0)
185 185 sass-listen (4.0.0)
186 186 rb-fsevent (~> 0.9, >= 0.9.4)
... ... @@ -209,7 +209,7 @@ GEM
209 209 tilt (2.0.8)
210 210 tzinfo (1.2.2)
211 211 thread_safe (~> 0.1)
212   - uglifier (4.0.2)
  212 + uglifier (4.1.3)
213 213 execjs (>= 0.3.0, < 3)
214 214 warden (1.2.7)
215 215 rack (>= 1.0)
... ...
... ... @@ -1187,10 +1187,10 @@
1187 1187 if (!value) {
1188 1188 return $.Deferred().resolve([]).promise();
1189 1189 }
1190   - // If the files property is not available, the browser does not
  1190 + // If1 the files property is not available, the browser does not
1191 1191 // support the File API and we add a pseudo File object with
1192 1192 // the input value as name with path information removed:
1193   - files = [{name: value.replace(/^.*\\/, '')}];
  1193 + //files = [{name: value.replace(/^.*/, '')}];
1194 1194 } else if (files[0].name === undefined && files[0].fileName) {
1195 1195 // File normalization for Safari 4 and Firefox 3:
1196 1196 $.each(files, function (index, file) {
... ...
1 1 module Kanjai
2 2 class PagesController < SiteController
3 3
  4 + include WickedPdf::WickedPdfHelper::Assets
  5 +
4 6 include Admin::PagesHelper
5 7
6 8 after_filter :skip_set_cookies_header
... ... @@ -171,10 +173,13 @@ module Kanjai
171 173 else
172 174 js_array << "<script src='#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend_not_login.js')}'></script>"
173 175 end
  176 + js_array << "<script src='#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend_extend.js')}'></script>"
  177 + css_path = "#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend_extend.css')}"
  178 + js_array << "<script type='text/javascript'>$('<link>', {rel: 'stylesheet',type: 'text/css',href: '#{css_path}'}).appendTo('head');</script>"
  179 + else
  180 + js_array << wicked_pdf_javascript_include_tag('kanjai/frontend_extend.js')
  181 + js_array << wicked_pdf_stylesheet_link_tag('kanjai/frontend_extend.css')
174 182 end
175   - js_array << "<script src='#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend_extend.js')}'></script>"
176   - css_path = "#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend_extend.css')}"
177   - js_array << "<script type='text/javascript'>$('<link>', {rel: 'stylesheet',type: 'text/css',href: '#{css_path}'}).appendTo('head');</script>"
178 183 layer.gsub!(marker, js_array.join(''))
179 184 else
180 185 #if PageMarker.public_instance_methods.include?("process_#{marker.gsub('###', '')}".to_sym)
... ...
1 1 module Kanjai
2   - VERSION = "0.0.77"
  2 + VERSION = "0.0.78"
3 3 end
... ...