Permalink
Browse files

Updated gem

Signed-off-by: kosmas58 <kosmas.schuetz@gmx.com>
  • Loading branch information...
1 parent 5376dcb commit cc37cfb7ceb98ced11fc83f32d6b7eadcdb1250f @kosmas58 committed Sep 11, 2011
Showing with 1,232 additions and 379 deletions.
  1. +1 −1 Gemfile
  2. +1 −1 README.md
  3. +5 −0 app/controllers/mobile/docs/pages/dynamic_controller.rb
  4. +1 −1 app/views/layouts/mobile.html.haml
  5. +2 −1 app/views/mobile/docs/_docs.html.haml
  6. +11 −13 app/views/mobile/docs/about/platforms.html.haml
  7. +10 −1 app/views/mobile/docs/api/globalconfig.html.haml
  8. +27 −13 app/views/mobile/docs/forms/forms_sample.html.haml
  9. +4 −2 app/views/mobile/docs/forms/forms_sample_response.html.haml
  10. +19 −0 app/views/mobile/docs/pages/dynamic/animals.html.haml
  11. +23 −0 app/views/mobile/docs/pages/dynamic/colors.html.haml
  12. +20 −0 app/views/mobile/docs/pages/dynamic/index.html.haml
  13. +190 −0 app/views/mobile/docs/pages/dynamic/sample_reuse_page.html.haml
  14. +188 −0 app/views/mobile/docs/pages/dynamic/sample_reuse_page_external.html.haml
  15. +19 −0 app/views/mobile/docs/pages/dynamic/vehicles.html.haml
  16. +2 −0 app/views/mobile/docs/pages/index.html.haml
  17. +8 −6 app/views/mobile/docs/pages/page_anatomy.html.haml
  18. +2 −0 app/views/mobile/docs/pages/page_cache.html.haml
  19. +2 −0 app/views/mobile/docs/pages/page_dialogs.html.haml
  20. +282 −0 app/views/mobile/docs/pages/page_dynamic.html.haml
  21. +2 −0 app/views/mobile/docs/pages/page_links.html.haml
  22. +2 −0 app/views/mobile/docs/pages/page_navmodel.html.haml
  23. +2 −0 app/views/mobile/docs/pages/page_scripting.html.haml
  24. +2 −0 app/views/mobile/docs/pages/page_titles.html.haml
  25. +2 −0 app/views/mobile/docs/pages/page_transitions.html.haml
  26. +2 −0 app/views/mobile/docs/pages/pages_themes.html.haml
  27. +1 −1 app/views/mobile/docs/toolbars/bars_fullscreen.html.haml
  28. BIN public/images/demo/mobile/version.png
  29. +226 −163 public/javascripts/jquery.js
  30. +176 −176 public/javascripts/jquery.min.js
View
@@ -12,7 +12,7 @@ gem "open3", :platforms => :ruby
gem "win32-open3", :platforms => :mswin
gem "manifesto", ">= 0.6.0"
-gem "compass-jquery-plugin", "= 0.3.3.1.pre.5", :require => 'jquery'
+gem "compass-jquery-plugin", "= 0.3.3.1", :require => 'jquery'
# gem "sass"
# for markItUp!
View
@@ -12,7 +12,7 @@ Description
A Sass-based Meta-Framework for Compass that allows you to mix and match any of the following:
-* jquery-rails with jQuery 1.6.2 and jQuery.UI 1.8.16 including themes
+* jquery-rails with jQuery 1.6.3 and jQuery.UI 1.8.16 including themes
* jQuery Tools 1.2.5
* jquery.jstree.js V1.0rc3
* jquery.dynatree.js V1.1.1
@@ -0,0 +1,5 @@
+class Mobile::Docs::Pages::DynamicController < ApplicationController
+ layout 'mobile'
+
+ protect_from_forgery
+end
@@ -6,7 +6,7 @@
%meta{:content => "width=device-width, initial-scale=1", :name => "viewport"}
%title
= @title || 'jQuery Mobile Framework'
- = stylesheet_link_tag :mobile_default, :media => 'screen, projection'
+ = stylesheet_link_tag :mobile_default, :media => 'only all'
= yield :head_stylesheets
= yield :head_scripts_before_jquery
@@ -10,7 +10,7 @@
body { background: #dddddd; }
- .ui-mobile .type-home { background: #e5e5e5 url(/images/demo/mobile/jqm-sitebg.png) top center repeat-x; }
+ .ui-mobile .type-home .ui-content { margin: 0; background: #e5e5e5 url(/images/demo/mobile/jqm-sitebg.png) top center repeat-x; }
.ui-mobile #jqm-homeheader { padding: 40px 10px 0; text-align: center; margin: 0 auto; }
.ui-mobile #jqm-homeheader h1 { margin: 0 0 ; }
.ui-mobile #jqm-homeheader p { margin: .3em 0 0; line-height: 1.3; font-size: .9em; font-weight: bold; color: #666; }
@@ -25,6 +25,7 @@
pre { white-space: pre; white-space: pre-wrap; word-wrap: break-word; }
#jqm-homeheader img { width: 235px; }
+ img { max-width: 100%; }
.ui-header .jqm-home { top:0.65em; }
nav { margin: 0; }
@@ -4,12 +4,12 @@
.type-interior{"data-role" => "page"}
%div{"data-role" => "header", "data-theme" => "f"}
%h1 Supported platforms
- %a.ui-btn-right.jqm-home{"data-direction" => "reverse", "data-icon" => "home", "data-iconpos" => "notext", :href => "/mobile"} Home
+ %a.ui-btn-right.jqm-home{"data-direction" => "reverse", "data-icon" => "home", "data-iconpos" => "notext", :href => "../../"} Home
/ /header
%div{"data-role" => "content"}
.content-primary
- %h2 Supported platforms in Beta 2
- %p At this stage, jQuery Mobile works on the vast majority of all modern desktop, smartphone, tablet, and e-reader platforms. In addition, feature phones and older browsers are also supported because of our progressive enhancement approach. We're very proud of our commitment to universal accessibility through our broad support for all popular platforms.
+ %h2#platforms Platform support in Beta 3
+ %p As of Beta 3, we've pretty much covered our target platforms for 1.0. At this stage, jQuery Mobile works on the vast majority of all modern desktop, smartphone, tablet, and e-reader platforms. In addition, feature phones and older browsers are also supported because of our progressive enhancement approach. We're very proud of our commitment to universal accessibility through our broad support for all popular platforms.
%p
Our
%a{:href => "http://jquerymobile.com/gbs/"} graded support matrix
@@ -24,13 +24,9 @@
\: Tested on the original iPad (3.2 / 4.3), iPad 2 (4.3), original iPhone (3.1), iPhone 3 (3.2), 3GS (4.3), and 4 (4.3 / 5.0 beta)
%li
%strong> Android 2.1-2.3
- \: Tested on the HTC Incredible (2.2), original Droid (2.2), Nook Color (2.2), HTC Aria (2.1), Google Nexus S (2.3)
- = succeed "." do
- %span{:style => "background: yellow; padding: 2px 5px; font-size: 10px;"} NEW
- Functional on 1.5 &amp; 1.6 but performance may be sluggish, tested on Google G1 (1.5)
+ \: Tested on the HTC Incredible (2.2), original Droid (2.2), Nook Color (2.2), HTC Aria (2.1), Google Nexus S (2.3). Functional on 1.5 &amp; 1.6 but performance may be sluggish, tested on Google G1 (1.5)
%li
- %strong Android Honeycomb
- %span{:style => "background: yellow; padding: 2px 5px; font-size: 10px;"} NEW
+ %strong> Android Honeycomb
\- Tested on the Samsung Galaxy Tab 10.1
%li
%strong> Windows Phone 7
@@ -39,14 +35,17 @@
%strong> Blackberry 6.0
\: Tested on the Torch 9800 and Style 9670
%li
+ %strong Blackberry 7
+ %span{:style => "background: yellow; padding: 2px 5px; font-size: 10px;"} NEW
+ \- Tested on Nokia N8 (Symbian^3), C7 (Symbian^3), also works on N97 (Symbian^1)
+ %li
%strong> Blackberry Playbook
\: Tested on PlayBook version 1.0.1 / 1.0.5
%li
%strong> Palm WebOS (1.4-2.0)
\: Tested on the Palm Pixi (1.4), Pre (1.4), Pre 2 (2.0)
%li
- %strong Palm WebOS 3.0
- %span{:style => "background: yellow; padding: 2px 5px; font-size: 10px;"} NEW
+ %strong> Palm WebOS 3.0
\- Tested on HP TouchPad
%li
%strong> Firebox Mobile (Beta)
@@ -86,8 +85,7 @@
%strong Windows Phone 6.5
\- Tested on the HTC
%li
- %strong Nokia Symbian^3
- %span{:style => "background: yellow; padding: 2px 5px; font-size: 10px;"} NEW
+ %strong> Nokia Symbian^3
\- Tested on Nokia N8 (Symbian^3), C7 (Symbian^3), also works on N97 (Symbian^1)
%h3{:style => "display: block; font-size: 15px !important; font-weight: normal; background: #f0f0f0; border-left: 7px solid #FFCC33; padding: 5px 0 5px 8px;"}
%strong
@@ -110,7 +110,7 @@
%code activeBtnClass
= succeed "," do
%em string
- default: "ui-page-active"
+ default: "ui-btn-active"
%dd The class used for "active" button state, from CSS framework.
%dt
%code ajaxEnabled
@@ -131,6 +131,15 @@
default: 'slide'
%dd Set the default transition for page changes that use Ajax. Set to 'none' for no transitions by default.
%dt
+ %code touchOverflowEnabled
+ = succeed "," do
+ %em boolean
+ default: false
+ %dd
+ Enable pages to have self-contained native scrolling and fixed toolbars in devices that support the
+ %code overflow-scrolling: touch;
+ property.
+ %dt
%code defaultDialogTransition
= succeed "," do
%em string
@@ -37,17 +37,9 @@
is respected on forms as well, and will default to the browser's handling of that target when the form submits. Note that unlike anchors, the
%code rel
attribute is not allowed on forms.
- %h2 Non-Ajax handling
+ %h2 Default Ajax form example
%p
- To prevent form submissions from being automatically handled with Ajax, add the
- %code data-ajax="false"
- attribute to the form element. You can also turn of Ajax form handling completely via the
- %code ajaxEnabled
- = succeed "." do
- %a{:href => "/mobile/docs/api/globalconfig"} global config option
- %h2 Simple Ajax form example
- %p
- This page demonstrates automated ajax handling of form submissions. The form below is configured to send regular a
+ This demonstrates automated ajax handling of form submissions. The form below is configured to send regular a
%code get
request to
= succeed "." do
@@ -57,16 +49,38 @@
result pages to be bookmarked by updating the Url hash when the response returns successfully. Also like ordinary form submissions,
%code post
requests do not contain query parameters in the hash, so they are not bookmarkable.
- %form{:action => "/mobile/docs/forms/forms_sample_response", :method => "get"}
+ %form.ui-body.ui-body-a.ui-corner-all{:action => "/mobile/docs/forms/forms_sample_response", :method => "get"}
+ %fieldset
+ %div{"data-role" => "fieldcontain"}
+ %label.select{:for => "shipping"} Shipping method:
+ %select#shipping{:name => "shipping"}
+ %option{:value => "Standard shipping"} Standard: 7 day
+ %option{:value => "Rush shipping"} Rush: 3 days
+ %option{:value => "Express shipping"} Express: next day
+ %option{:value => "Overnight shipping"} Overnight
+ %button{"data-theme" => "b", :name => "submit", :type => "submit", :value => "submit-value"} Submit
+ %h2 Non-Ajax form example
+ %p
+ To prevent form submissions from being automatically handled with Ajax, add the
+ %code data-ajax="false"
+ attribute to the form element. You can also turn of Ajax form handling completely via the
+ %code ajaxEnabled
+ = succeed "." do
+ %a{:href => "/mobile/docs/api/globalconfig"} global config option
+ %p
+ The form below is identical to the one above except for the addition of the
+ %code data-ajax="false"
+ attribute attribute. When the submit button is pressed, it will result in a full page refresh.
+ %form.ui-body.ui-body-a.ui-corner-all{:action => "/mobile/docs/forms/forms_sample_response", "data-ajax" => "false", :method => "get"}
%fieldset
%div{"data-role" => "fieldcontain"}
- %label.select{:for => "shipping"} Choose shipping method:
+ %label.select{:for => "shipping"} Shipping method:
%select#shipping{:name => "shipping"}
%option{:value => "Standard shipping"} Standard: 7 day
%option{:value => "Rush shipping"} Rush: 3 days
%option{:value => "Express shipping"} Express: next day
%option{:value => "Overnight shipping"} Overnight
- %button{"data-theme" => "a", :name => "submit", :type => "submit", :value => "submit-value"} Submit
+ %button{"data-theme" => "b", :name => "submit", :type => "submit", :value => "submit-value"} Submit
/ /content-primary
.content-secondary
.ui-body-b
@@ -11,8 +11,10 @@
%form{:action => "/mobile/docs/forms", :method => "get"}
%h2
You chose:
- %p
- = @shipping
+ .ui-body.ui-body-d.ui-corner-all
+ %p
+ = @shipping
+ %a{"data-icon" => "arrow-l", "data-role" => "button", "data-theme" => "b", :href => "/mobile/docs/forms/forms_sample"} Change shipping method
/ /content-primary
.content-secondary
.ui-body-b
@@ -0,0 +1,19 @@
+!!!
+%html
+ %head
+ %meta{:charset => "utf-8"}
+ %meta{:content => "width=device-width", :name => "viewport"}
+ %title Animals
+ %link{:href => "../../../themes/default/", :rel => "stylesheet"}
+ %script{:src => "../../../js/jquery.js"}
+ %script{:src => "../../../js/"}
+ %body
+ %div{"data-role" => "page"}
+ %div{"data-role" => "header"}
+ %h1 Animals
+ %div{"data-role" => "content"}
+ %p All your favorites from aardvarks to zebras.
+ %ul{"data-inset" => "true", "data-role" => "listview"}
+ %li Pets
+ %li Farm Animals
+ %li Wild Animals
@@ -0,0 +1,23 @@
+!!!
+%html
+ %head
+ %meta{:charset => "utf-8"}
+ %meta{:content => "width=device-width", :name => "viewport"}
+ %title Colors
+ %link{:href => "../../../themes/default/", :rel => "stylesheet"}
+ %script{:src => "../../../js/jquery.js"}
+ %script{:src => "../../../js/"}
+ %body
+ %div{"data-role" => "page"}
+ %div{"data-role" => "header"}
+ %h1 Colors
+ %div{"data-role" => "content"}
+ %p Fresh colors from the magic rainbow.
+ %ul{"data-inset" => "true", "data-role" => "listview"}
+ %li Blue
+ %li Green
+ %li Orange
+ %li Purple
+ %li Red
+ %li Yellow
+ %li Violet
@@ -0,0 +1,20 @@
+!!!
+%html
+ %head
+ %meta{:charset => "utf-8"}
+ %meta{:content => "width=device-width", :name => "viewport"}
+ %title Dynamic Page Samples
+ %link{:href => "../../../themes/default/", :rel => "stylesheet"}
+ %script{:src => "../../../js/jquery.js"}
+ %script{:src => "../../../js/"}
+ %body
+ %div{"data-role" => "page"}
+ %div{"data-role" => "header"}
+ %h1 Categories
+ %div{"data-role" => "content"}
+ %h2 Select a Category Below:
+ %ul{"data-inset" => "true", "data-role" => "listview"}
+ %li
+ %a{:href => "sample-reuse-page.html", :rel => "external"} Re-using a Page with In-Memory Data
+ %li
+ %a{:href => "sample-reuse-page-external.html", :rel => "external"} Re-using a Page With External Data
Oops, something went wrong.

0 comments on commit cc37cfb

Please sign in to comment.