Commit `2717861f`

mo khan <mo@mokhan.ca>

2014-01-06 03:52:07

remove turbolinks.

master

1 parent f7dfc2e

Changed files (15)

app

assets

javascripts

application.js

controllers

profiles_controller.rb

views

creation_tags

show.html.erb

creations

_form.html.erb

index.html.erb

show.html.erb

layouts

admin.html.erb

application.html.erb

photos

index.html.erb

settings

index.html.erb

tutorial_tags

show.html.erb

tutorials

_form.html.erb

index.html.erb

Gemfile

Gemfile.lock

@@ -20,7 +20,6 @@
 //= require jquery.masonry
 //= require jquery-fileupload
 //= require jquery.embedly
-//= require turbolinks
 //= require tag-it
 //= require bootstrap
 //= require_tree .

@@ -10,7 +10,7 @@ class ProfilesController < ApplicationController
     @user = User.find(params[:id])
     @creations = @user.creations.includes([:user, :photos]).page(params[:page]).per(18)
     @nearby_users = @user.nearbys(50) || []
-    @map_url = "http://maps.google.com/maps/api/staticmap?size=450x300&sensor=false&markers=#{@user.latitude}%2C#{@user.longitude}"
+    @map_url = "https://maps.google.com/maps/api/staticmap?size=450x300&sensor=false&markers=#{@user.latitude}%2C#{@user.longitude}"
     @nearby_users.each do |user|
       @map_url += "&markers=#{user.latitude}%2C#{user.longitude}"
     end

@@ -8,7 +8,6 @@
     });
   };
   $(document).ready(ready);
-  $(document).on('page:load', ready);
 </script>
 <% end -%>
 <div class="row">

@@ -6,7 +6,6 @@
       $('#tags').tagit({ availableTags: all_tags });
     };
     $(document).ready(loadTags);
-    $(document).on('page:load', loadTags);
   </script>
 <% end %>
 <%= form_for(@creation, :html => {:multipart => true, :class => "form-horizontal"}) do |f| %>

@@ -3,8 +3,6 @@
 <script type="text/javascript">
   var ready = function(){ new Masonry('#creations-div').load(); };
   $(document).ready(ready);
-  $(document).on('page:load', ready);
-  $(document).on('page:restore', ready);
 </script>
 <% end -%>
 <% unless user_signed_in?  -%>

@@ -4,7 +4,6 @@
 <script type="text/javascript">
   var ready = function(){ Creations.Show.initialize(); };
   $(document).ready(ready);
-  $(document).on('page:load', ready);
 </script>
 <% end -%>
 <% if @creation.user == current_user %>

@@ -6,7 +6,7 @@
 <title><%= full_title(yield(:title)) %></title>
 <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 <meta name="description" content="<%= yield(:description) %>" />
-<%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %>
+<%= stylesheet_link_tag "application", media: "all" %>
 <%= yield :head %>
 <%= csrf_meta_tags %>
 </head>
@@ -16,7 +16,7 @@
   <%= render "layouts/messages" %>
   <%= yield %>
 </div>
-<%= javascript_include_tag "application", "data-turbolinks-track" => true %>
+<%= javascript_include_tag "application" %>
 <%= yield :javascript %>
 </body>
 </html>

@@ -7,7 +7,7 @@
 <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 <meta name="google-site-verification" content="X9sZ3dovM2s1pJg68Bb0q1oRqqiJYdzAwGeaGlOy6PM" />
 <meta name="description" content="<%= yield(:description) %>" />
-<%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %>
+<%= stylesheet_link_tag "application", media: "all" %>
 <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.no-icons.min.css" rel="stylesheet">
 <link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet">
 <%= favicon_link_tag 'favicon.ico' %>
@@ -16,13 +16,6 @@
 <%= favicon_link_tag 'apple-touch-icon-114x114.png', :rel => 'apple-touch-icon', :type => 'image/png', :sizes => "114x114" %>
 <%= yield :head %>
 <%= csrf_meta_tags %>
-<%= javascript_include_tag "application", "data-turbolinks-track" => true %>
-<!--[if lt IE 9]>
-  <script src="https://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
-<%= render "layouts/mixpanel"%>
-<%= render "layouts/embedly"%>
-<%= yield :javascript %>
 </head>
 <body>
 <%= render "layouts/facebook" %>
@@ -32,6 +25,13 @@
   <%= yield %>
 </div> <!-- /container -->
 <%= render "layouts/footer" %>
+<%= javascript_include_tag "application" %>
+<!--[if lt IE 9]>
+  <script src="https://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+<![endif]-->
+<%= render "layouts/mixpanel"%>
+<%= render "layouts/embedly"%>
+<%= yield :javascript %>
 <%= render "layouts/uservoice_feedback"%>
 <%= render "layouts/chrome_frame"%>
 <%= render "layouts/disqus_comments_count" %>

@@ -1,4 +1,3 @@
-
 <div class="row">
   <div class="span12">
     <%= link_to "&laquo; Back to creation".html_safe, creation_path(@creation) %>

@@ -3,7 +3,6 @@
 <script type="text/javascript" charset="utf-8">
   var ready = function(){ DeviseUsers.Edit.initialize(jQuery); };
   $(document).ready(ready);
-  $(document).on('page:load', ready);
 </script>
 <% end %>

@@ -8,7 +8,6 @@
     });
   };
   $(document).ready(ready);
-  $(document).on('page:load', ready);
 </script>
 <% end -%>
 <div class="row">

@@ -7,7 +7,6 @@ $(function(){
     $('#tags').tagit({ availableTags: all_tags });
   };
   $(document).ready(ready);
-  $(document).on('page:load', ready);
 });
 </script>
 <% end %>

@@ -3,8 +3,6 @@
 <script type="text/javascript">  
   var ready = function(){ new Masonry('#tutorials-div').load(); };
   $(document).ready(ready);
-  $(document).on('page:load', ready);
-  $(document).on('page:restore', ready);
 </script>
 <% end -%>
 <div id="tutorials-div" class="row">

@@ -5,7 +5,6 @@ gem 'sass-rails', '~> 4.0.0'
 gem 'uglifier', '>= 1.3.0'
 gem 'coffee-rails', '~> 4.0.0'
 gem 'jquery-rails'
-gem 'turbolinks'
 gem 'jbuilder', '~> 1.2'
 group :doc do
   # bundle exec rake doc:rails generates the API under doc/api.

@@ -254,8 +254,6 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    turbolinks (2.1.0)
-      coffee-rails
     tzinfo (0.3.38)
     uglifier (2.4.0)
       execjs (>= 0.3.0)
@@ -325,7 +323,6 @@ DEPENDENCIES
   simplecov
   sqlite3
   teaspoon
-  turbolinks
   uglifier (>= 1.3.0)
   unf
   unicorn

Commit 2717861f

Commit `2717861f`