Commit 7e0e7b98c491738fbc8dc5ebf6638219bdb47f06

Authored by Karpikau Andrei
1 parent 52ce14ac

change kanjai version

@@ -171,7 +171,8 @@ module Kanjai @@ -171,7 +171,8 @@ module Kanjai
171 js_array = [] 171 js_array = []
172 if params[:format].to_s == 'pdf' 172 if params[:format].to_s == 'pdf'
173 css_path = "#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/pdf.css')}" 173 css_path = "#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/pdf.css')}"
174 - layer.gsub!(marker, '<link rel="stylesheet" href="'+ css_path +'">') 174 + js_array << "<script type='text/javascript'>$('<link>', {rel: 'stylesheet',type: 'text/css',href: '#{css_path}'}).appendTo('head');</script>"
  175 + layer.gsub!(marker, js_array.join(''))
175 else 176 else
176 if current_admin_user 177 if current_admin_user
177 js_array << "<script src='#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend.js')}'></script>" 178 js_array << "<script src='#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend.js')}'></script>"
@@ -14,7 +14,7 @@ module Kanjai @@ -14,7 +14,7 @@ module Kanjai
14 end 14 end
15 15
16 initializer "kanjai.assets.precompile" do |app| 16 initializer "kanjai.assets.precompile" do |app|
17 - app.config.assets.precompile = %w(kanjai/general.css kanjai/general_admin.css kanjai/general_site.css kanjai/general_site_editor.css kanjai/frontend.css kanjai/frontend_extend.css kanjai/pdf.css kanjai/general.js kanjai/general_admin.js kanjai/general_site_editor.js kanjai/frontend.js kanjai/frontend_not_login.js kanjai/frontend_extend) 17 + app.config.assets.precompile = %w(kanjai/general.css kanjai/general_admin.css kanjai/general_site.css kanjai/general_site_editor.css kanjai/frontend.css kanjai/frontend_extend.css kanjai/pdf.css kanjai/general.js kanjai/general_admin.js kanjai/general_site_editor.js kanjai/frontend.js kanjai/frontend_not_login.js kanjai/frontend_extend kanjai/frontend_pdf)
18 end 18 end
19 19
20 20
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.84" 2 + VERSION = "0.0.85"
3 end 3 end