check include js to pdf

Karpikau Andrei
1 parent b365020f
Showing 6 changed files with 43 additions and 56 deletions
.idea/kanjai.iml
.idea/workspace.xml
Gemfile.lock
app/assets/javascripts/kanjai/admin/jquery.fileupload.js
app/controllers/kanjai/pages_controller.rb
lib/kanjai/version.rb
--- a/.idea/kanjai.iml
View file @6be1121
+++ b/.idea/kanjai.iml
View file @6be1121
@@ -141,7 +141,7 @@
     <orderEntry type="library" scope="PROVIDED" name="bundler (v1.9.0, rbenv: 2.1.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.0.5, rbenv: 2.1.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="daemons (v1.2.6, rbenv: 2.1.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="delayed_job (v4.1.3, rbenv: 2.1.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="delayed_job (v4.1.4, rbenv: 2.1.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="delayed_job_active_record (v4.1.2, rbenv: 2.1.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="devise (v4.4.0, rbenv: 2.1.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, rbenv: 2.1.3) [gem]" level="application" />
@@ -162,7 +162,7 @@
     <orderEntry type="library" scope="PROVIDED" name="mini_mime (v1.0.0, rbenv: 2.1.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="mini_portile (v0.5.3, rbenv: 2.1.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="minitest (v5.8.4, rbenv: 2.1.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.12.2, rbenv: 2.1.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.13.1, rbenv: 2.1.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.6.1, rbenv: 2.1.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="orm_adapter (v0.5.0, rbenv: 2.1.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="pg (v0.17.1, rbenv: 2.1.3) [gem]" level="application" />
@@ -187,7 +187,7 @@
     <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.4.1, rbenv: 2.1.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rspec-rails (v3.4.2, rbenv: 2.1.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.4.1, rbenv: 2.1.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="sass (v3.5.3, rbenv: 2.1.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="sass (v3.5.5, rbenv: 2.1.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="sass-listen (v4.0.0, rbenv: 2.1.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="sass-rails (v5.0.7, rbenv: 2.1.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="sdoc (v0.4.2, rbenv: 2.1.3) [gem]" level="application" />
--- a/.idea/workspace.xml
View file @6be1121
+++ b/.idea/workspace.xml
View file @6be1121
@@ -5,6 +5,7 @@
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/kanjai.iml" afterPath="$PROJECT_DIR$/.idea/kanjai.iml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Gemfile.lock" afterPath="$PROJECT_DIR$/Gemfile.lock" />
+      <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" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/kanjai/version.rb" afterPath="$PROJECT_DIR$/lib/kanjai/version.rb" />
     </list>
@@ -27,21 +28,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
+      <file leaf-file-name="jquery.fileupload.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="413">
-              <caret line="178" column="10" lean-forward="false" selection-start-line="178" selection-start-column="10" selection-end-line="178" selection-end-column="10" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="install.rake" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="165">
-              <caret line="11" column="19" lean-forward="false" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="19" />
+            <state relative-caret-position="322">
+              <caret line="1197" column="24" lean-forward="false" selection-start-line="1197" selection-start-column="24" selection-end-line="1197" selection-end-column="24" />
               <folding />
             </state>
           </provider>
@@ -57,16 +48,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="page_datum.rb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_datum.rb">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
           <provider selected="true" editor-type-id="text-editor">
@@ -131,9 +112,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>edit_template</find>
-      <find>page_content_markers</find>
-      <find>replace_text_marker</find>
       <find>element</find>
       <find>gsub!</find>
       <find>replace_attributes_marker</find>
@@ -161,6 +139,9 @@
       <find>check_permission</find>
       <find>admin_email</find>
       <find>INCLUDE_JS_FILE</find>
+      <find>files = $.makeArray(fileInput.prop('files'));</find>
+      <find>If the files property is not available, the browser does</find>
+      <find>If the files property is not available, the browser does not</find>
     </findStrings>
     <dirStrings>
       <dir>$PROJECT_DIR$/app/controllers</dir>
@@ -173,7 +154,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
         <option value="$PROJECT_DIR$/lib/kanjai/template_parser.rb" />
         <option value="$PROJECT_DIR$/app/models/kanjai/page_content_marker.rb" />
         <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js" />
@@ -223,6 +203,7 @@
         <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
         <option value="$PROJECT_DIR$/app/models/kanjai/page_template.rb" />
         <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
+        <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js" />
         <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
       </list>
     </option>
@@ -657,12 +638,12 @@
       <workItem from="1513283335284" duration="121000" />
       <workItem from="1513543303254" duration="7193000" />
       <workItem from="1516654861781" duration="654000" />
-      <workItem from="1519076359527" duration="2873000" />
+      <workItem from="1519076359527" duration="4360000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="25430000" />
+    <option name="totallyTimeSpent" value="26917000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="23" width="1280" height="728" extended-state="6" />
@@ -711,13 +692,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="137" column="319" lean-forward="false" selection-start-line="137" selection-start-column="319" selection-end-line="137" selection-end-column="319" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -1062,6 +1036,14 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="511">
+          <caret line="180" column="0" lean-forward="false" selection-start-line="180" selection-start-column="0" selection-end-line="180" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="165">
@@ -1070,10 +1052,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
+    <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="413">
-          <caret line="178" column="10" lean-forward="false" selection-start-line="178" selection-start-column="10" selection-end-line="178" selection-end-column="10" />
+        <state relative-caret-position="322">
+          <caret line="1197" column="24" lean-forward="false" selection-start-line="1197" selection-start-column="24" selection-end-line="1197" selection-end-column="24" />
           <folding />
         </state>
       </provider>
--- a/Gemfile.lock
View file @6be1121
+++ b/Gemfile.lock
View file @6be1121
 PATH
   remote: .
   specs:
-    kanjai (0.0.76)
+    kanjai (0.0.77)
       acts_as_list
       acts_as_tree
       aws-sdk (= 2.6.32)
@@ -77,13 +77,13 @@ GEM
     bcrypt (3.1.11)
     builder (3.2.2)
     concurrent-ruby (1.0.5)
-    daemons (1.2.5)
-    delayed_job (4.1.3)
+    daemons (1.2.6)
+    delayed_job (4.1.4)
       activesupport (>= 3.0, < 5.2)
     delayed_job_active_record (4.1.2)
       activerecord (>= 3.0, < 5.2)
       delayed_job (>= 3.0, < 5)
-    devise (4.3.0)
+    devise (4.4.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0, < 5.2)
@@ -117,7 +117,7 @@ GEM
     mini_mime (1.0.0)
     mini_portile (0.5.3)
     minitest (5.8.4)
-    multi_json (1.12.2)
+    multi_json (1.13.1)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
     orm_adapter (0.5.0)
@@ -180,7 +180,7 @@ GEM
       rspec-mocks (~> 3.4.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    sass (3.5.3)
+    sass (3.5.5)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -209,7 +209,7 @@ GEM
     tilt (2.0.8)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (4.0.2)
+    uglifier (4.1.3)
       execjs (>= 0.3.0, < 3)
     warden (1.2.7)
       rack (>= 1.0)
--- a/app/assets/javascripts/kanjai/admin/jquery.fileupload.js
View file @6be1121
+++ b/app/assets/javascripts/kanjai/admin/jquery.fileupload.js
View file @6be1121
@@ -1187,10 +1187,10 @@
                 if (!value) {
                     return $.Deferred().resolve([]).promise();
                 }
-                // If the files property is not available, the browser does not
+                // If1 the files property is not available, the browser does not
                 // support the File API and we add a pseudo File object with
                 // the input value as name with path information removed:
-                files = [{name: value.replace(/^.*\\/, '')}];
+                //files = [{name: value.replace(/^.*/, '')}];
             } else if (files[0].name === undefined && files[0].fileName) {
                 // File normalization for Safari 4 and Firefox 3:
                 $.each(files, function (index, file) {
--- a/app/controllers/kanjai/pages_controller.rb
View file @6be1121
+++ b/app/controllers/kanjai/pages_controller.rb
View file @6be1121
 module Kanjai
   class PagesController < SiteController
+    include WickedPdf::WickedPdfHelper::Assets
+
     include Admin::PagesHelper
     after_filter :skip_set_cookies_header
@@ -171,10 +173,13 @@ module Kanjai
               else
                 js_array << "<script src='#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend_not_login.js')}'></script>"
               end
+              js_array << "<script src='#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend_extend.js')}'></script>"
+              css_path = "#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend_extend.css')}"
+              js_array << "<script type='text/javascript'>$('<link>', {rel: 'stylesheet',type: 'text/css',href: '#{css_path}'}).appendTo('head');</script>"
+            else
+              js_array << wicked_pdf_javascript_include_tag('kanjai/frontend_extend.js')
+              js_array << wicked_pdf_stylesheet_link_tag('kanjai/frontend_extend.css')
             end
-            js_array << "<script src='#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend_extend.js')}'></script>"
-            css_path = "#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend_extend.css')}"
-            js_array << "<script type='text/javascript'>$('<link>', {rel: 'stylesheet',type: 'text/css',href: '#{css_path}'}).appendTo('head');</script>"
             layer.gsub!(marker, js_array.join(''))
           else
             #if PageMarker.public_instance_methods.include?("process_#{marker.gsub('###', '')}".to_sym)
--- a/lib/kanjai/version.rb
View file @6be1121
+++ b/lib/kanjai/version.rb
View file @6be1121
 module Kanjai
-  VERSION = "0.0.77"
+  VERSION = "0.0.78"
 end