Commit 03f6eefbe1b3d9ac347ca102644a3bb449dc37f9

Authored by Karpikau Andrei
1 parent 633038d7

change kanjai version

... ... @@ -169,9 +169,8 @@ module Kanjai
169 169 layer.gsub!(marker, $scheme + ADMIN_CONFIG['domain_name'])
170 170 when '###INCLUDE_JS_FILE###'
171 171 js_array = []
172   - if params[:format].to_s == 'pdf'
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 +'">')
  172 + if params[:format].to_s != 'pdf'
  173 + layer.gsub!(marker, '')
175 174 else
176 175 if current_admin_user
177 176 js_array << "<script src='#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend.js')}'></script>"
... ... @@ -185,7 +184,13 @@ module Kanjai
185 184 js_array << "<script type='text/javascript'>$('<link>', {rel: 'stylesheet',type: 'text/css',href: '#{css_path}'}).appendTo('head');</script>"
186 185 layer.gsub!(marker, js_array.join(''))
187 186 end
188   -
  187 + when '###INCLUDE_CSS_FILE###'
  188 + if params[:format].to_s == 'pdf'
  189 + css_path = "#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/pdf.css')}"
  190 + layer.gsub!(marker, '<link rel="stylesheet" href="'+ css_path +'">')
  191 + else
  192 + layer.gsub!(marker, '')
  193 + end
189 194 else
190 195 #if PageMarker.public_instance_methods.include?("process_#{marker.gsub('###', '')}".to_sym)
191 196 # page_marker = PageMarker.new
... ...
1 1 module Kanjai
2   - VERSION = "0.0.88"
  2 + VERSION = "0.0.89"
3 3 end
... ...