From 953f0cdf97d673506e946cb60da511f70b515330 Mon Sep 17 00:00:00 2001 From: Rick Waldron Date: Wed, 3 Aug 2011 13:19:53 -0400 Subject: [PATCH 1/5] Core Style Conformance updates; jquery.mobile.support.js --- js/jquery.mobile.support.js | 50 ++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/js/jquery.mobile.support.js b/js/jquery.mobile.support.js index 522b547a..a8a790d1 100644 --- a/js/jquery.mobile.support.js +++ b/js/jquery.mobile.support.js @@ -4,21 +4,21 @@ * Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses. */ -(function( $, undefined ) { +(function( $, undefined ) { -var fakeBody = $( "" ).prependTo( "html" ), +var fakeBody = $( "" ).prependTo( "html" ), fbCSS = fakeBody[ 0 ].style, vendors = [ "webkit", "moz", "o" ], webos = "palmGetResource" in window, //only used to rule out scrollTop bb = window.blackberry; //only used to rule out box shadow, as it's filled opaque on BB // thx Modernizr -function propExists( prop ) { +function propExists( prop ) { var uc_prop = prop.charAt( 0 ).toUpperCase() + prop.substr( 1 ), - props = ( prop + " " + vendors.join( uc_prop + " " ) + uc_prop ).split( " " ); + props = ( prop + " " + vendors.join( uc_prop + " " ) + uc_prop ).split( " " ); for ( var v in props ){ - if ( fbCSS[ v ] !== undefined ) { + if ( fbCSS[ v ] !== undefined ) { return true; } } @@ -33,12 +33,12 @@ function baseTagTest() { link, rebase; if ( !base.length ) { - base = fauxEle = $( "", { "href": fauxBase} ).appendTo( "head" ); + base = fauxEle = $( "", { "href": fauxBase }).appendTo( "head" ); } else { href = base.attr( "href" ); } - link = $( "" ).prependTo( fakeBody ); + link = $( "" ).prependTo( fakeBody ); rebase = link[ 0 ].href; base[ 0 ].href = href ? href : location.pathname; @@ -82,40 +82,38 @@ fakeBody.remove(); // $.mobile.ajaxBlacklist is used to override ajaxEnabled on platforms that have known conflicts with hash history updates (BB5, Symbian) // or that generally work better browsing in regular http for full page refreshes (Opera Mini) -// Note: This detection below is used as a last resort. +// Note: This detection below is used as a last resort. // We recommend only using these detection methods when all other more reliable/forward-looking approaches are not possible var nokiaLTE7_3 = (function(){ - + var ua = window.navigator.userAgent; //The following is an attempt to match Nokia browsers that are running Symbian/s60, with webkit, version 7.3 or older - return ua.indexOf( "Nokia" ) > -1 - && ( ua.indexOf( "Symbian/3" ) > -1 || ua.indexOf( "Series60/5" ) > -1 ) - && ua.indexOf( "AppleWebKit" ) > -1 - && ua.match( /(BrowserNG|NokiaBrowser)\/7\.[0-3]/ ); + return ua.indexOf( "Nokia" ) > -1 && + ( ua.indexOf( "Symbian/3" ) > -1 || ua.indexOf( "Series60/5" ) > -1 ) && + ua.indexOf( "AppleWebKit" ) > -1 && + ua.match( /(BrowserNG|NokiaBrowser)\/7\.[0-3]/ ); })(); $.mobile.ajaxBlacklist = - // BlackBerry browsers, pre-webkit - window.blackberry && !window.WebKitPoint - // Opera Mini - || window.operamini && Object.prototype.toString.call( window.operamini ) === "[object OperaMini]" - // Symbian webkits pre 7.3 - || nokiaLTE7_3; + // BlackBerry browsers, pre-webkit + window.blackberry && !window.WebKitPoint || + // Opera Mini + window.operamini && Object.prototype.toString.call( window.operamini ) === "[object OperaMini]" || + // Symbian webkits pre 7.3 + nokiaLTE7_3; // Lastly, this workaround is the only way we've found so far to get pre 7.3 Symbian webkit devices // to render the stylesheets when they're referenced before this script, as we'd recommend doing. // This simply reappends the CSS in place, which for some reason makes it apply -if( nokiaLTE7_3 ){ - $(function(){ - $( "head link[rel=stylesheet]" ).each(function(){ - $( this ).attr( "rel", "alternate stylesheet" ).attr( "rel", "stylesheet" ); - }); - }); +if ( nokiaLTE7_3 ) { + $(function() { + $( "head link[rel=stylesheet]" ).attr( "rel", "alternate stylesheet" ).attr( "rel", "stylesheet" ); + }); } // For ruling out shadows via css -if ( !$.support.boxShadow ){ +if ( !$.support.boxShadow ) { $( "html" ).addClass( "ui-mobile-nosupport-boxshadow" ); } From a362a782fa8c89e6d27e96a531a993cec6f192c9 Mon Sep 17 00:00:00 2001 From: scottjehl Date: Wed, 3 Aug 2011 13:41:12 -0400 Subject: [PATCH 2/5] Changed the collapsible cleanup in our docs JS to use click instead of vclick --- docs/_assets/js/jqm-docs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_assets/js/jqm-docs.js b/docs/_assets/js/jqm-docs.js index 83c744a4..ffe95266 100644 --- a/docs/_assets/js/jqm-docs.js +++ b/docs/_assets/js/jqm-docs.js @@ -29,7 +29,7 @@ $('div').live('pagecreate',function(event){ //collapse page navs after use $(function(){ - $('body').delegate('.content-secondary .ui-collapsible-content', 'vclick', function(){ + $('body').delegate('.content-secondary .ui-collapsible-content', 'click', function(){ $(this).trigger("collapse") }); }); From 6ab7e118c63cf756d3ec2e665f611026877c18a5 Mon Sep 17 00:00:00 2001 From: toddparker Date: Wed, 3 Aug 2011 14:02:10 -0400 Subject: [PATCH 3/5] Beta 2 flag --- docs/_assets/images/version.png | Bin 1212 -> 1598 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/docs/_assets/images/version.png b/docs/_assets/images/version.png index 9554dad978fdb07f0f45c616c8e8fff3543cb154..20263a0003a7276d0c4d4572fcd21e1c092ad1e1 100644 GIT binary patch delta 1376 zcmV-m1)uu73BC-FGk=>i_iE^z-oZ^6>xh&++i@@$l~P@$c~O@9ysI z|L(%?@9zKY!T;>N@a*L7>*W9Iw(aWV@ao+E>9p+X*(VD=BfYVp8w*Ry#PS{Qb3UDZ`2)l?sLX-U;k5@%#yc4IPU zU{KOV3};?S&pr#!J_=`7FKJdO%rgL3ODa`HAxK6*NRv$gAP@il|8~28tN;K2iF8s< zQ01E2?f{P7WllcKEe*=9Z*t^=-&L$GZsNjZz>6Snt5U>g9 ztzP<|95PR)!>PbJe*^=ha31%P8Gm`TIjsc=3;>y>bkC4=GVR#rY9)%m0+53C+l-%j zS%N}7Kwtu>mB#s>#51vR-Ctk>NMUKU`8mMKrDga-Ok7tY!3~hY?$hS|yzv^~22qED z@i;d?3g*pr7f+ng&`SuNv8uofkit(e-r?&lr?^`Q3;U}Ae>*@5v#aJ?fa2bOQ{Vtd zVZj!Ec*>Qfc!C?C^wQf({4=lgZ)46%Csb~L(o2=ouI=I@U3Usy);#b5l$kEClLzYW z>F=FcvL=ob@D{X=Te_~10xv)l#wI3)wTTDcojWKC+yE)u(aY<{m_`cxfLrLRf2Qjn z=jZ3|Um((ke}xc$TWG_=rz871&Qc0fmk9%4;i&yhpsoIe{`m?eyeWhNkecYsx`Zh@ zpoIfaBG#U5wF|dB;)exLEIKe?6Z*X3hXznI*?+FpGpqmrZErfxB7_G}vXMoo0f_8v zJQgg}0GLAX9%=zh;Y5&76M!Pgrv9wIP#b`IDS0aEfBW^PRscn#?Y=_I0E+GG%s)972BFF>Ef<$0bkO^Qx4fjW! ihmZ{L8hD47>@DGk-NuOjJex|NsBeV_QojNjw}yIU6x36DA)I8Wsu;3fHb7wEyU>|KgeO-hZ+G+=t-Z)&JUl|JQTi z*S-JMY}M7(+11I{)zAOZW8l!H@XdD7&BoEpzwpX#;K`2g$Ys&VxA4VX(Z#9J!J5Lp zx8S)~(X?)|uA;)AOQWEfqnwDcm{_BiccYVRl#z;~iAt1+Y@>!hg@SyPen^yhIfZjZ zc5`iZZ(Vk2NfKvdUUp+LXJAlgUP@>1YepJzf+x>N( zS8Tom(CxzUBV^$;nCpd2_5AW_7haZV1W{9CAY}*k^TK&g(Ip4K-jYh$?RDUQLO23{ z*=or{t^x(ys}zFH(kFgLpGK|p=PQ{$t5 zeLP_)@GDje;{!f39k`Sb0~k+;11RBQ Date: Wed, 3 Aug 2011 14:02:24 -0400 Subject: [PATCH 4/5] Updated boilerplates to beta 2 --- docs/pages/multipage-template.html | 6 +++--- docs/pages/page-template.html | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/pages/multipage-template.html b/docs/pages/multipage-template.html index 5e45bc4f..9794899c 100755 --- a/docs/pages/multipage-template.html +++ b/docs/pages/multipage-template.html @@ -5,9 +5,9 @@ Page Title - - - + + + diff --git a/docs/pages/page-template.html b/docs/pages/page-template.html index c1ad8005..8ca290dc 100755 --- a/docs/pages/page-template.html +++ b/docs/pages/page-template.html @@ -5,9 +5,9 @@ Page Title - - - + + + From 584e2931b40b180cf313ee8f89245a0621613cb1 Mon Sep 17 00:00:00 2001 From: toddparker Date: Wed, 3 Aug 2011 14:06:57 -0400 Subject: [PATCH 5/5] Fixed typos --- docs/forms/texts/methods.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/forms/texts/methods.html b/docs/forms/texts/methods.html index 82137412..ba8ef05f 100644 --- a/docs/forms/texts/methods.html +++ b/docs/forms/texts/methods.html @@ -41,14 +41,14 @@
enable enable a disabled text input.

-$('select').selectmenu('enable');			
+$('select').textinput('enable');
disable disable a text input.

-$('select').selectmenu('disable');			
+$('select').textinput('disable');