diff --git a/plugins/pjax/public/javascripts/pjax.js b/plugins/pjax/public/javascripts/pjax.js index 85bc418..206936f 100644 --- a/plugins/pjax/public/javascripts/pjax.js +++ b/plugins/pjax/public/javascripts/pjax.js @@ -8,7 +8,7 @@ pjax = { themes: {}, load: function() { - var target = jQuery('#content'); + var target = jQuery('#wrap-1'); var content = jQuery('#content-inner'); var loadingTarget = jQuery('#content'); @@ -52,7 +52,7 @@ pjax = { from_state = this.current_state || this.initial_state; if (state.layout_template != from_state.layout_template) { - var lt_css = jQuery('head link[href^="/designs/templates"]'); + var lt_css = jQuery('head link[href*="designs/templates"]'); lt_css.attr('href', lt_css.attr('href').replace(/templates\/.+\/stylesheets/, 'templates/'+state.layout_template+'/stylesheets')); } @@ -78,7 +78,7 @@ pjax = { return !pjax.css_loaded('/designs/themes/'+state.theme.id+'/style.css'); }); - var css = jQuery('head link[href^="/designs/themes/'+from_state.theme.id+'/style"]'); + var css = jQuery('head link[href*="designs/themes/'+from_state.theme.id+'/style"]'); css.attr('href', css.attr('href').replace(/themes\/.+\/style/, 'themes/'+state.theme.id+'/style')); jQuery('head link[rel="shortcut icon"]').attr('href', state.theme.favicon); @@ -88,7 +88,7 @@ pjax = { jQuery('#navigation ul').html(state.theme.extra_navigation); jQuery('#theme-footer').html(state.theme.footer); - jQuery('head script[src^="/designs/themes/'+from_state.theme.id+'/theme.js"]').remove(); + jQuery('head script[src*="designs/themes/'+from_state.theme.id+'/theme.js"]').remove(); if (state.theme.js_src) { var script = document.createElement('script'); script.type = 'text/javascript', script.src = state.theme.js_src; diff --git a/plugins/pjax/views/layouts/pjax.html.erb b/plugins/pjax/views/layouts/pjax.html.erb index 1056f5a..5ab9927 100644 --- a/plugins/pjax/views/layouts/pjax.html.erb +++ b/plugins/pjax/views/layouts/pjax.html.erb @@ -1,10 +1,10 @@ <% - update_js = render(:file => "#{Rails.root}/public/designs/themes/#{current_theme}/pjax_update.js.erb").to_json rescue nil + update_js = render(file: "#{Rails.root}/public/designs/themes/#{current_theme}/pjax_update.js.erb").to_json rescue nil %> <%= h page_title %> -<%= render :file => "#{Rails.root}/public/designs/themes/#{current_theme}/layouts/_content.html.erb" rescue +<%= render file: "#{Rails.root}/public/designs/themes/#{current_theme}/layouts/_content.html.erb" rescue render "layouts/content" %> <%= javascript_tag do %> -- libgit2 0.21.2