Skip to content
This repository was archived by the owner on Aug 26, 2024. It is now read-only.

Commit

Permalink
updating to jquery mobile rails v1.0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
tscolari committed Feb 3, 2012
1 parent cc7404a commit 5a86f04
Show file tree
Hide file tree
Showing 38 changed files with 176 additions and 42 deletions.
79 changes: 41 additions & 38 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -40,36 +40,38 @@ GEM
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.1.2)
columnize (0.3.4)
coffee-script-source (1.2.0)
columnize (0.3.6)
diff-lcs (1.1.3)
erubis (2.7.0)
execjs (1.2.6)
execjs (1.3.0)
multi_json (~> 1.0)
factory_girl (2.1.0)
factory_girl_rails (1.2.0)
factory_girl (~> 2.1.0)
factory_girl (2.5.1)
activesupport
factory_girl_rails (1.6.0)
factory_girl (~> 2.5.0)
railties (>= 3.0.0)
hike (1.2.1)
i18n (0.6.0)
jquery-rails (1.0.14)
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
jquery_mobile_rails (1.0b3.1)
rails (~> 3.1.0)
jquery_mobile_rails (1.0.4)
rails (>= 3.1.0)
json (1.6.5)
linecache19 (0.5.12)
ruby_core_source (>= 0.1.4)
mail (2.3.0)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
mobylette (1.2.0)
rails (~> 3.1.0)
multi_json (1.0.3)
pg (0.11.0)
polyglot (0.3.2)
rack (1.3.2)
mime-types (1.17.2)
mobylette (1.6.0)
actionpack (>= 3.0)
multi_json (1.0.4)
pg (0.12.2)
polyglot (0.3.3)
rack (1.3.6)
rack-cache (1.0.3)
rack (>= 0.4)
rack-mount (0.8.3)
Expand All @@ -93,21 +95,22 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2)
rdoc (3.9.4)
rspec (2.6.0)
rspec-core (~> 2.6.0)
rspec-expectations (~> 2.6.0)
rspec-mocks (~> 2.6.0)
rspec-core (2.6.4)
rspec-expectations (2.6.0)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
rspec (2.8.0)
rspec-core (~> 2.8.0)
rspec-expectations (~> 2.8.0)
rspec-mocks (~> 2.8.0)
rspec-core (2.8.0)
rspec-expectations (2.8.0)
diff-lcs (~> 1.1.2)
rspec-mocks (2.6.0)
rspec-rails (2.6.1)
actionpack (~> 3.0)
activesupport (~> 3.0)
railties (~> 3.0)
rspec (~> 2.6.0)
rspec-mocks (2.8.0)
rspec-rails (2.8.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec (~> 2.8.0)
ruby-debug-base19 (0.11.25)
columnize (>= 0.3.1)
linecache19 (>= 0.5.11)
Expand All @@ -118,25 +121,25 @@ GEM
ruby-debug-base19 (>= 0.11.19)
ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2)
sass (3.1.7)
sass-rails (3.1.1)
sass (3.1.13)
sass-rails (3.1.5)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
sass (>= 3.1.4)
sass (~> 3.1.10)
tilt (~> 1.3.2)
sprockets (2.0.0)
sprockets (2.0.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (!= 1.3.0, ~> 1.1)
sqlite3 (1.3.4)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.5)
therubyracer-heroku (0.8.1.pre3)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.29)
uglifier (1.0.3)
tzinfo (0.3.31)
uglifier (1.2.3)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)

Expand Down
7 changes: 7 additions & 0 deletions app/assets/javascripts/application.mobile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// This is a manifest file that'll be compiled into including all the files listed below.
// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
// be included in the compiled file accessible from http://example.com/assets/application.js
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
// the compiled file.
//
//= require jquery.mobile
3 changes: 1 addition & 2 deletions app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@
* and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
* the top of the compiled file, but it's generally better to create a new file per style scope.
*= require_self
*= require_tree .
*/
*/
7 changes: 7 additions & 0 deletions app/assets/stylesheets/application.mobile.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/*
* This is a manifest file that'll automatically include all the stylesheets available in this directory
* and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
* the top of the compiled file, but it's generally better to create a new file per style scope.
*= require_self
*= require jquery.mobile
*/
4 changes: 4 additions & 0 deletions app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@ class ApplicationController < ActionController::Base
protect_from_forgery
respond_to_mobile_requests :skip_xhr_requests => false

def is_mobile_request?
true
end

end
7 changes: 5 additions & 2 deletions app/views/layouts/application.mobile.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
<title>Mobile Version!</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<%= javascript_include_tag "application" %>
<%= javascript_include_tag "jquery.mobile.min" %>
<%= stylesheet_link_tag "jquery.mobile.min.css" %>
<%= stylesheet_link_tag "application" %>

<%= javascript_include_tag "application.mobile.js" %>
<%= stylesheet_link_tag "application.mobile.css" %>

<%= csrf_meta_tags %>
</head>
<body>
Expand Down
2 changes: 2 additions & 0 deletions config/environments/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
# Generate digests for assets URLs
config.assets.digest = true

config.assets.precompile += %w[application.mobile.js application.mobile.css]

# Defaults to Rails.root.join("public/assets")
# config.assets.manifest = YOUR_PATH

Expand Down
Empty file.
Binary file not shown.
19 changes: 19 additions & 0 deletions public/assets/application-9b92c31432e5e15e322f831acb5bc7e4.js

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions public/assets/jquery-ui.min-4258e47b40673a02bedfda178628bfba.js

Large diffs are not rendered by default.

Binary file not shown.
4 changes: 4 additions & 0 deletions public/assets/jquery.min-17322428695737103f15e8b9db8b5909.js

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
21 changes: 21 additions & 0 deletions public/assets/jquery.mobile-ffac7e3fd8cf93eb2fcaf0760adf236b.js

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
19 changes: 19 additions & 0 deletions public/assets/manifest.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
rails.png: rails-e4b51606cd77fda2615e7439907bfc92.png
application.mobile.js: application.mobile-ffac7e3fd8cf93eb2fcaf0760adf236b.js
application.mobile.css: application.mobile-300590e3cff259d097a2e6e8ba33cd92.css
jquery-mobile/ajax-loader.png: jquery-mobile/ajax-loader-fb9d79ad12c339c1c897402af323e483.png
jquery-mobile/icons-18-black.png: jquery-mobile/icons-18-black-f0e381ebe79f3b9383bdaf5d1d67917e.png
jquery-mobile/icons-18-white.png: jquery-mobile/icons-18-white-48166c3483980f01739cb3cf470afd3e.png
jquery-mobile/icons-36-black.png: jquery-mobile/icons-36-black-ed67e108fb880894cf613b6c129a8848.png
jquery-mobile/icons-36-white.png: jquery-mobile/icons-36-white-e1dfa3968cff344e8e23b6afde176038.png
jquery.mobile.js: jquery.mobile-ffac7e3fd8cf93eb2fcaf0760adf236b.js
jquery.mobile.min.js: jquery.mobile.min-9c67e9f617dff8bd4f7ad091cb4b8807.js
jquery.mobile.css: jquery.mobile-d4c4ece39e2f77a063da2bbeb5956c96.css
jquery.mobile.min.css: jquery.mobile.min-e9dbbb90825a90efb43399a01a20e93b.css
jquery.mobile.structure.css: jquery.mobile.structure-6f87b23309a94a60289843508befb7ee.css
jquery.mobile.structure.min.css: jquery.mobile.structure.min-aa921b723a911f7d74d836e6d2cb0c66.css
jquery-ui.min.js: jquery-ui.min-4258e47b40673a02bedfda178628bfba.js
jquery.min.js: jquery.min-17322428695737103f15e8b9db8b5909.js
application.js: application-9b92c31432e5e15e322f831acb5bc7e4.js
application.css: application-1c9609bc58b1e77c196de29021583379.css
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 5a86f04

Please sign in to comment.