playground
/
entrydns
mirror of https://github.com/EntryDNS/entrydns.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

replace pjax with turbolinks

pull/1/head
Nicolae Claudius 12 years ago
parent
fb5e773527
commit
593b6c1a42
14 changed files with 28 additions and 52 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Gemfile
  2. 5
      Gemfile.lock
  3. 3
      app/assets/javascripts/application.js.coffee
  4. 30
      app/assets/javascripts/components/behaviors.js.coffee
  5. 6
      app/views/layouts/admin.html.erb
  6. 6
      app/views/layouts/errors.html.erb
  7. 6
      app/views/layouts/home.html.erb
  8. 6
      app/views/layouts/public.html.erb
  9. 6
      app/views/layouts/users.html.erb
  10. 2
      app/views/shared/_bottom.html.erb
  11. 2
      app/views/shared/_navigation.html.erb
  12. 2
      app/views/shared/navigation/_users.html.erb
  13. 2
      app/views/users/shared/_links.erb
  14. 2
      vendor/assets/javascripts/slides.js

2
Gemfile
Unescape View File

@ -47,7 +47,7 @@ gem 'dalli', '~> 1.1.3'
gem 'active_scaffold', '~> 3.2.16' gem 'active_scaffold', '~> 3.2.16'
# git: 'https://github.com/activescaffold/active_scaffold.git' # git: 'https://github.com/activescaffold/active_scaffold.git'
# path: '/home/clyfe/dev/active_scaffold' # path: '/home/clyfe/dev/active_scaffold'
gem 'pjax_rails', '~> 0.2.0' gem 'turbolinks', '~> 0.5.1'
# gem 'foreigner' ? # gem 'foreigner' ?
group :development do group :development do

5
Gemfile.lock
Unescape View File

@ -172,8 +172,6 @@ GEM
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
nokogiri (1.5.5) nokogiri (1.5.5)
orm_adapter (0.4.0) orm_adapter (0.4.0)
pjax_rails (0.2.2)
jquery-rails
polyamorous (0.5.0) polyamorous (0.5.0)
activerecord (~> 3.0) activerecord (~> 3.0)
polyglot (0.3.3) polyglot (0.3.3)
@ -294,6 +292,7 @@ GEM
treetop (1.4.10) treetop (1.4.10)
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
turbolinks (0.5.1)
tzinfo (0.3.33) tzinfo (0.3.33)
uglifier (1.3.0) uglifier (1.3.0)
execjs (>= 0.3.0) execjs (>= 0.3.0)
@ -335,7 +334,6 @@ DEPENDENCIES
mysql2 mysql2
navigasmic (~> 0.5.6)! navigasmic (~> 0.5.6)!
nilify_blanks (~> 1.0.0) nilify_blanks (~> 1.0.0)
pjax_rails (~> 0.2.0)
quiet_assets (~> 1.0.1) quiet_assets (~> 1.0.1)
rails (= 3.2.8) rails (= 3.2.8)
rails-backbone (~> 0.7.0) rails-backbone (~> 0.7.0)
@ -354,6 +352,7 @@ DEPENDENCIES
squeel (~> 1.0.0) squeel (~> 1.0.0)
switch_user (~> 0.6.0) switch_user (~> 0.6.0)
therubyracer therubyracer
turbolinks (~> 0.5.1)
uglifier (>= 1.0.3) uglifier (>= 1.0.3)
userstamp (~> 2.0.2)! userstamp (~> 2.0.2)!
validates_hostname (~> 1.0.0)! validates_hostname (~> 1.0.0)!

3
app/assets/javascripts/application.js.coffee
Unescape View File

@ -7,8 +7,7 @@
#= require jquery #= require jquery
#= require jquery-ui #= require jquery-ui
#= require jquery_ujs #= require jquery_ujs
#= require jquery.pjax #= require turbolinks
#= require pjax/page_triggers
#= require slides #= require slides
#= require bootstrap #= require bootstrap
#= require active_scaffold #= require active_scaffold

30
app/assets/javascripts/components/behaviors.js.coffee
Unescape View File

@ -1,24 +1,12 @@
$ -> $ ->
$(document).popover(selector: '[rel=popover]') $(document).popover(selector: '[rel=popover]')
$(document).tooltip(selector: '[rel=tooltip]') $(document).tooltip(selector: '[rel=tooltip]')
pjaxContainer = '[data-pjax-container]' # fix for Turbolinks with Bootstrap
$pjaxContainer = $(pjaxContainer) # https://github.com/rails/turbolinks/issues/16
$pjaxContainerParent = $(pjaxContainer).parent() proto = $.fn.dropdown.Constructor.prototype
$body = $('body') toggle = '[data-toggle=dropdown]'
fixLayout = -> $(document)
if $pjaxContainer.find('.container').length > 0 .on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', (e) -> e.stopPropagation())
$pjaxContainerParent.removeClass 'container' .on('click.dropdown.data-api touchstart.dropdown.data-api', toggle, proto.toggle)
else .on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]', proto.keydown)
$pjaxContainerParent.addClass 'container'
if $body.has('.page-home-section').length > 0
$body.addClass('with-home-section')
else
$body.removeClass('with-home-section')
fixLayout()
$('.pjax-nav a:not([data-remote]):not([data-behavior]):not([data-skip-pjax])').pjax(pjaxContainer)
$pjaxContainer.on 'pjax:success', (event, data, status, xhr, options) ->
$('.pjax-nav').find('li.active').removeClass 'active'
$(".pjax-nav a[href=\"#{window.location.pathname}\"]").parents('li').addClass 'active'
fixLayout()

6
app/views/layouts/admin.html.erb
Unescape View File

@ -18,10 +18,8 @@
<body class="users"> <body class="users">
<div class="container" id="main"> <div class="container" id="main">
<div data-pjax-container="true"> <%= flash_display 'flash' %>
<%= flash_display 'flash' %> <%= yield %>
<%= yield %>
</div>
</div> </div>
<div class="container"> <div class="container">

6
app/views/layouts/errors.html.erb
Unescape View File

@ -15,10 +15,8 @@
<%= render 'shared/public_top' %> <%= render 'shared/public_top' %>
<div class="container" id="main"> <div class="container" id="main">
<div data-pjax-container="true"> <%= flash_display 'flash' %>
<%= flash_display 'flash' %> <%= yield %>
<%= yield %>
</div>
</div> </div>
<div class="container"> <div class="container">

6
app/views/layouts/home.html.erb
Unescape View File

@ -4,10 +4,8 @@
<%= render 'shared/navigation' %> <%= render 'shared/navigation' %>
<div id="main"> <div id="main">
<div data-pjax-container="true"> <%= flash_display 'flash' %>
<%= flash_display 'flash' %> <%= yield %>
<%= yield %>
</div>
</div> </div>
<div class="container"> <div class="container">

6
app/views/layouts/public.html.erb
Unescape View File

@ -4,10 +4,8 @@
<%= render 'shared/navigation' %> <%= render 'shared/navigation' %>
<div class="container" id="main"> <div class="container" id="main">
<div data-pjax-container="true"> <%= flash_display 'flash' %>
<%= flash_display 'flash' %> <%= yield %>
<%= yield %>
</div>
</div> </div>
<div class="container"> <div class="container">

6
app/views/layouts/users.html.erb
Unescape View File

@ -19,10 +19,8 @@
<%= render 'shared/navigation' %> <%= render 'shared/navigation' %>
<div class="container" id="main"> <div class="container" id="main">
<div data-pjax-container="true"> <%= flash_display 'flash' %>
<%= flash_display 'flash' %> <%= yield %>
<%= yield %>
</div>
</div> </div>
<div class="container"> <div class="container">

2
app/views/shared/_bottom.html.erb
Unescape View File

@ -4,7 +4,7 @@
<%= switch_user_select %> <%= switch_user_select %>
</p> </p>
<% semantic_navigation :footer_nav, html: { class: 'nav nav-pills pjax-nav' } do |n| %> <% semantic_navigation :footer_nav, html: { class: 'nav nav-pills' } do |n| %>
<%= n.item "Terms & Conditions", link: page_path('terms') %> <%= n.item "Terms & Conditions", link: page_path('terms') %>
<%= n.item "Privacy Policy", link: page_path('privacy') %> <%= n.item "Privacy Policy", link: page_path('privacy') %>
<%= n.item "Contact", link: page_path('contact') %> <%= n.item "Contact", link: page_path('contact') %>

2
app/views/shared/_navigation.html.erb
Unescape View File

@ -1,6 +1,6 @@
<div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container pjax-nav"> <div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>

2
app/views/shared/navigation/_users.html.erb
Unescape View File

@ -27,7 +27,7 @@
<%= n.item '', link: edit_user_registration_path, html: { rel: 'tooltip', title: "IP: #{client_remote_ip}" } do %> <%= n.item '', link: edit_user_registration_path, html: { rel: 'tooltip', title: "IP: #{client_remote_ip}" } do %>
<i class="icon-cog"></i> Settings <i class="icon-cog"></i> Settings
<% end %> <% end %>
<%= n.item '', link: destroy_user_session_path, link_html: { data: { :'skip-pjax' => true } } do %> <%= n.item '', link: destroy_user_session_path do %>
<i class="icon-off"></i> Sign out <i class="icon-off"></i> Sign out
<% end %> <% end %>
<% end %> <% end %>

2
app/views/users/shared/_links.erb
Unescape View File

@ -1,5 +1,5 @@
<br /> <br />
<% semantic_navigation :devise_nav, html: { class: 'nav nav-tabs pjax-nav' } do |n| %> <% semantic_navigation :devise_nav, html: { class: 'nav nav-tabs' } do |n| %>
<%= n.item "Sign in", link: new_session_path(resource_name) %> <%= n.item "Sign in", link: new_session_path(resource_name) %>
<%= n.item "Sign up", link: new_registration_path(resource_name) %> <%= n.item "Sign up", link: new_registration_path(resource_name) %>
<%= n.item "Forgot your password?", link: new_password_path(resource_name) %> <%= n.item "Forgot your password?", link: new_password_path(resource_name) %>

2
vendor/assets/javascripts/slides.js vendored
Unescape View File

@ -717,7 +717,7 @@
this.slides.each( this.slides.each(
$.proxy(function(index, element) { $.proxy(function(index, element) {
$("<li><a href='#" + index + "' class='slidesNavigation slidesPaginationItem' data-slidesindex=" + index + " data-skip-pjax=true> " + ( index + 1 ) + "</a></li>").appendTo(this.pagination); $("<li><a href='#" + index + "' class='slidesNavigation slidesPaginationItem' data-slidesindex=" + index + " data-no-turbolink=true> " + ( index + 1 ) + "</a></li>").appendTo(this.pagination);
},this) },this)
); );

Write Preview
Loading…
Cancel
Save