From c1caf47a62611ef00ee6a6d2ee69d289f0e88a60 Mon Sep 17 00:00:00 2001 From: Ferdinand Majerech Date: Tue, 17 Dec 2013 15:19:01 +0100 Subject: [PATCH] Updated the generated docs. --- .../articles/spec_differences.doctree | Bin 13330 -> 13414 bytes doc/doctrees/environment.pickle | Bin 12705 -> 12756 bytes doc/doctrees/index.doctree | Bin 4116 -> 3950 bytes doc/doctrees/tutorials/custom_types.doctree | Bin 48016 -> 47073 bytes .../tutorials/getting_started.doctree | Bin 35171 -> 34013 bytes doc/doctrees/tutorials/yaml_syntax.doctree | Bin 29040 -> 28280 bytes doc/html/.buildinfo | 2 +- .../_sources/tutorials/getting_started.txt | 29 +- doc/html/_static/ajax-loader.gif | Bin 0 -> 673 bytes doc/html/_static/basic.css | 16 +- doc/html/_static/comment-bright.png | Bin 0 -> 3500 bytes doc/html/_static/comment-close.png | Bin 0 -> 3578 bytes doc/html/_static/comment.png | Bin 0 -> 3445 bytes doc/html/_static/doctools.js | 10 +- doc/html/_static/down-pressed.png | Bin 0 -> 368 bytes doc/html/_static/down.png | Bin 0 -> 363 bytes doc/html/_static/file.png | Bin 312 -> 392 bytes doc/html/_static/jquery.js | 4435 +++++++++-------- doc/html/_static/minus.png | Bin 118 -> 199 bytes doc/html/_static/plus.png | Bin 118 -> 199 bytes doc/html/_static/pygments.css | 4 +- doc/html/_static/searchtools.js | 167 +- doc/html/_static/sidebar.js | 3 + doc/html/_static/underscore.js | 959 +++- doc/html/_static/up-pressed.png | Bin 0 -> 372 bytes doc/html/_static/up.png | Bin 0 -> 363 bytes doc/html/_static/websupport.js | 808 +++ doc/html/api/dyaml.constructor.html | 236 +- doc/html/api/dyaml.dumper.html | 87 +- doc/html/api/dyaml.encoding.html | 8 +- doc/html/api/dyaml.exception.html | 10 +- doc/html/api/dyaml.linebreak.html | 8 +- doc/html/api/dyaml.loader.html | 84 +- doc/html/api/dyaml.node.html | 271 +- doc/html/api/dyaml.representer.html | 321 +- doc/html/api/dyaml.resolver.html | 42 +- doc/html/api/dyaml.style.html | 22 +- doc/html/api/index.html | 2 +- doc/html/articles/spec_differences.html | 15 +- doc/html/index.html | 15 +- doc/html/search.html | 17 +- doc/html/searchindex.js | 2 +- doc/html/tutorials/custom_types.html | 15 +- doc/html/tutorials/getting_started.html | 38 +- doc/html/tutorials/yaml_syntax.html | 35 +- 45 files changed, 4761 insertions(+), 2900 deletions(-) create mode 100644 doc/html/_static/ajax-loader.gif create mode 100644 doc/html/_static/comment-bright.png create mode 100644 doc/html/_static/comment-close.png create mode 100644 doc/html/_static/comment.png create mode 100644 doc/html/_static/down-pressed.png create mode 100644 doc/html/_static/down.png create mode 100644 doc/html/_static/up-pressed.png create mode 100644 doc/html/_static/up.png create mode 100644 doc/html/_static/websupport.js diff --git a/doc/doctrees/articles/spec_differences.doctree b/doc/doctrees/articles/spec_differences.doctree index 202761c158e9f487e35a5d4b9beae64fe52f9b93..daa0943a459973929c8a786a1063a7ada6827df2 100644 GIT binary patch delta 506 zcmb7=%}x|S6otD7f+6x7a5W?X2@44`9cET8P24HOko1BCQdUpbbQN}0HMgqc%z`~` zsf7>V3z!fO6`vflPahJ-p)=ITv!SmYkvxS%2qm}BMzqwtnf9R<%{a4hDR%YB}qmK?J%v#p5 zq@`s>TNZYF&)W?96Q&qYs{wWqEQUjIE;AyOWuRzkV6UVDMpCe3J=c~Q_=N0TIFPZ7 zMAR^nLkgeWN@HerA1C36=_*S*go}iycq|+gxEC8G@TIU5Lb=yL_32l|Zru~zx=Jbw8@NKh0oTqo qr^mjR{s$_5%%AY74fyGFT{0TMNa9 z%qvcTc?mqqK7c3jYZ=AoyuZk#i*$u958zdl)+$SHlC8H$|Tl)jf CxqK)9 diff --git a/doc/doctrees/environment.pickle b/doc/doctrees/environment.pickle index 3ed70eaa2e8f75c7c4e6a293b95b35a45a9e833c..34c957ca3cb4d6da46476177e632f9d0cd985a74 100644 GIT binary patch literal 12756 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 b0cN$b6-)Z3LI28DP5n&zcS`?By0iZUri`#Z literal 4116 zcmbtXXLKCZ8I@&8TWraa!4AT9yf&CDA<{zP1P~6viR0i17L)jaAeoG3XWs6cXm)14 zd2dvb4B#Xfl-?UDr1#!?FQoV0d+)uRllx|7SJFzHlXLQGcW2*x<=*?1cSFDJ1a_=k zPfq%Q!)00jY;#|gX~Wqks6U~NRaWw?Hdl)wmo$*jV0EU_*Vi}CJv(UgiV7;u)S}h) zDxFs?P=27eDU}r|8kyd}3OaPxk+dbD z(W)3?yYsjwR50O8=(s0V#Z6K9K=DV7<6hcaFW|Pl`?GuZrc;O z18|G1`8?v&SRWfgYDj{{ML!$LpP$}qCgNcf`>qW#%Cuu<3JBH&aIVd|t`ZZ{svV7j zR%Er?uHUL1s&T*N`n=}oOlrtPMt05h9lkIbNkuzvJVCn>x?_VCl-1H$&~8@9L!}BU zTS`T4BUV6qPeOaEtmwp{J}2o6gB5Jgk`mv~G+41=*|U-6X`jJ1YDmvA=uTqHVuRWF zszGOqAuDDB9wMSUPj7^=TupS2=odikF4f+AApsAWP5`vYglbiBTB@$Am(_J>>Y9U> zU$$C9d+1y-F1Cx)#V)a%4W>ruJb@JMS`}v);!H#AGsIbjs2Z_ABqH~Jw_f+h_yVN9 z|9|s&cc6KXgw98hLi?YL8&=%tH3^n25EP0sU4X1EOlV4HwGT`lKX~*=)us1 zps7pCbWLPz2=B&`OZS->$;x;|m~=>k3y3qUHOk}SLe21f#s2l}(P5x>zl1J@f7XZN zmjFGGSL%jHN7jOgLT+&|bbkatozP_(N!?Y};HDG0yxIv`==i8EwpuHLq$@O>0H zLz#6t8aH^{5Spzk6MBI5QHGCWXep6vd2)&#xJ-#ic{sKn4}}g73?TGaxC+@{ozRR% zUt7C!UG1QwhC%E*Wx58zT$|8?I%svYUhEv92kVrLJPvvY+oA$nMVwE}Lwq5R$V`*( z6hXZc+;Llm!u1y>Eyu}ve*R*aEI4f>WM@uc-a$j~<8}iYa)>X9aWHc` zELG4pv-#6LNq&81+o}V)^_giDn zi-5CY+gfmVs069$el3e@Az;X&kmEsd%2BF|xrFAmE=urxFjB4!Yg4q)D~rYTWHH)7 z{$Y^CY6B04DjtzgqE(@d&1D`n`PU_MeGmB}rTm5taqAc04|zC$Leu*lq-#**Pici3U9h!+7Or zPv3sBK~G_)_8d3Uzn*H)(^$!NRoY%9J>8&ZX#Cmc&JK}Ir)Oei=tj7_Z9L1MXZQAV zxhNHHcg~dQIl%Uogr3{Q_Ia8RHt6v=?oDsV3ZOIKF`qDtszx>xrw7@9)-fA6Qa^kJ zJwMhR^98BEZcXTgU5hVTE2D97i$45fNa%cM@KRWbkjZQ%>tU6>YxbRLEgMDCa3d^8W)`ia*BSJBR+L%!OM1hK!PSfcUvc!nt1K_ZMoMoC z=uHW|xyrV7lws;!L}xGQEePWjm<}QbTV#m$Fzs}|d25|*j+!=(Vx5d5kKV?12&KZQ zT1^E3_Fb2&=424HYI^S0=aACyqgW`hPO!XVZ)x~w_+@@IPY+JFY8A~dLJt}7Pc*AwL^Np4lxDSOvOVVn1)V~ z1{PyKTWvpxO;=c+$`5=93L4IX$XBxu*Ts2twv$Iu5Shq5aCAe>ehSNXJP`L0HmcK- zctyaWhcxMm3p36D0%E4kG4l&)$lEZ z0aWHfw~>#9fxd?JqA|fGCmoY{#$R7zo3h2<)as>gAWW^%6)O8CT=W1>-(rKYYEE20 z-)80fbuH-c;BD7mNfCXQmC}FS~2~C857o#a1yb#>Dm*;#zro&SvP} s68bw@`8j$m{6{)K(iOdT62+|4X`_<P5E0p?`w-2eap diff --git a/doc/doctrees/tutorials/custom_types.doctree b/doc/doctrees/tutorials/custom_types.doctree index a523422d79b460108ef6a5c5bc01621dc8cdaf44..5e270bedd2d3e6d099956f20e9f796cf92635c95 100644 GIT binary patch delta 1715 zcmb7FS#VTE6rDFDA(Lb#xR59)R5mJ<4pGZ;`IHh1i3xo05Y(w>&wD-ddh(W;+x@bX z#JD@b4bnl}a9^qp3Vm(Ofnd!nO8`Tal2CH>pt=zUNBovUi5&zsHM3@Uh z5rl$rxEIk3OyFuJZ6=6dVPIj79PUGG9PU?^Wh`(QP+M5lYH)Z!yFI9kjhqUB#pLi% z-4(G|ukD0(B$&t7Ao zOE|S6@L-qRG}|%pnEF6M0I_M7*hBC*p37#cNQ>%@6lh>$4o_(R6pjZgT6XCBI1(J5 z)M!$KDylu?v0#Y9Qz~FR+F=ZKt9{ZVK|UgRijEG2JqnA{0H)L?lW+(YNf5sX5&?Bd zU0%zh!_Sw8H-IzzYOR0e8<$<~G&KDH3K}E6!>{o{*$HoMaZ;j?c@Zm-I z*IfIKmvoRMwt@w@ux5H0!G6O`jSvX1VHg}J@!=KCU9O6nW1cR*C8%HYFn4%WeWDR< z>7J{ub>KC5_k8=B*Hxf;vjN{^j^*JE9YEI~M`W0BhL059l>6r|Gv1Pw`R=Z_kuhm5 zp}{b`qsgsKLNgB|u&Je*35PT} zrN-vGVR)|^Ka4~%5*7|f=wPmJ7-6$M61nsZa768!YN6Dy9j!)Ua^FH~)BDPr(9AT) z>}J%t)p8goS-egy=MS_?0$&$uP>zkltfHx5C0T2PIl_fGd1j$)U|!+%=GI&A!wYJ^ z)T(|Nj;Yh;|D{fH(df)WMLD*jDhWC&)W8=B4#S6tmd!+-1{8>Dz()uSnkijrrbIFz z9*2)L+QNO*1gjKj5jc+6q}ie-;OqnZL>@fW)AcD@%w>Em5ME;VCty**bts#8 z_)MNW)_LRS2o&@qQ;p6C)6f|6M24Hzm(}pr}35CQn~onuaS^3+w=^w zfK$*~L<3cJ2fjfo4sSD%5$tLe`?iWDb&6+Y=sS6+va0KQWs50+=I{gV$Kgj@dkZU3 zOAGBvP^abT%7zs`Y1_}ZqCQ`VDi6OX9?H2a9cfEPX5yS!oAELgD}b delta 2374 zcmZ`*X>b%p6y8~qkN~>@0!aZ1IS7?lhJaoB|1yEB{Jna!J- zkW{fmR0KQ;4WcM2iWh>AY)BLpMaBD8@W2c2lfw(V(D!g1uRAXC}oChr8f}tZ}!lKn}Rq@`qzoehtR0Dim`jieH`5(&HrZP+ffKF6Z4;RZU#HatNQbI}eh z@Fewpan+2vYLua)#^5Q^d6@}2uydtcpsAP)M@=N*X;jcEMH-bjYhrPD26X|iJWSCL zWSAmHuu}ks=xW^QfjvvGT-n#Nz_@DLnBnL6td2?2^W5qvuH1zPIagyLHwrHZ|KThV zVzfmqac1j`Iq)Li*fFvEB|_#=q_6`o)4*qA{!KTbG)F8*z$^S=i7B9_a8nArro1-MXi6G_xSl>pGE|GvH(D59tX-)%HmylEK$>`Y-&HtOWvDV|7cK>Oity!)7|pPcU{tMYNLgTLjt*b&1D(aQza)LGe8~kk@mJIztYl_}uW1yh z)vW}pZ7>W+ud&tIi@=J4nn>W9Yx_Ude5X`?Hhe=)1yN=)P$|pb;&`s?7wI(U{WsOP z4c`gvFxt|-BlSJsyRB0Cfmd{upZO!&W1@QebnKO5G=8G^UPFVQspH22%HDg`F8HgK#nUp0B4xtrmZ78ScF!z2ENn+m;#+zuJ^g?3HQlF_{)L(#{Ebrl PV<^l&0{SmXH#GTwVwns1 diff --git a/doc/doctrees/tutorials/getting_started.doctree b/doc/doctrees/tutorials/getting_started.doctree index 11a6ec9abefd1513b50e65c7b5b3c2725d2faa50..eb5bfc6125d9a2c7ce25cc18a55c04d1d7cdf9f0 100644 GIT binary patch literal 34013 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 literal 35171 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 diff --git a/doc/doctrees/tutorials/yaml_syntax.doctree b/doc/doctrees/tutorials/yaml_syntax.doctree index 1f2930ee6ed15d060ebc6614a322498c3430faf3..f5e580ff867045c80371aba0a34c39fc15e79c38 100644 GIT binary patch literal 28280 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 literal 29040 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 literal 0 HcmV?d00001 diff --git a/doc/html/_static/basic.css b/doc/html/_static/basic.css index 32630d5..43e8baf 100644 --- a/doc/html/_static/basic.css +++ b/doc/html/_static/basic.css @@ -79,6 +79,14 @@ div.sphinxsidebar input { font-size: 1em; } +div.sphinxsidebar #searchbox input[type="text"] { + width: 170px; +} + +div.sphinxsidebar #searchbox input[type="submit"] { + width: 30px; +} + img { border: 0; } @@ -236,7 +244,6 @@ img.align-center, .figure.align-center, object.align-center { } .align-center { - clear: both; text-align: center; } @@ -440,6 +447,11 @@ dl.glossary dt { font-style: oblique; } +abbr, acronym { + border-bottom: dotted 1px; + cursor: help; +} + /* -- code displays --------------------------------------------------------- */ pre { @@ -525,4 +537,4 @@ span.eqno { #top-link { display: none; } -} +} \ No newline at end of file diff --git a/doc/html/_static/comment-bright.png b/doc/html/_static/comment-bright.png new file mode 100644 index 0000000000000000000000000000000000000000..551517b8c83b76f734ff791f847829a760ad1903 GIT binary patch literal 3500 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 A2LJ#7 literal 0 HcmV?d00001 diff --git a/doc/html/_static/comment.png b/doc/html/_static/comment.png new file mode 100644 index 0000000000000000000000000000000000000000..92feb52b8824c6b0f59b658b1196c61de9162a95 GIT binary patch literal 3445 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 Xn!ZpXD%P(H00000NkvXXu0mjf' + _('Hide Search Matches') + '') - .appendTo($('.sidebar .this-page-menu')); + $('') + .appendTo($('#searchbox')); } }, @@ -213,7 +213,7 @@ var Documentation = { * helper function to hide the search marks again */ hideSearchWords : function() { - $('.sidebar .this-page-menu li.highlight-link').fadeOut(300); + $('#searchbox .highlight-link').fadeOut(300); $('span.highlighted').removeClass('highlighted'); }, diff --git a/doc/html/_static/down-pressed.png b/doc/html/_static/down-pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..6f7ad782782e4f8e39b0c6e15c7344700cdd2527 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6U4S$Y z{B+)352QE?JR*yM+OLB!qm#z$3ZNi+iKnkC`z>}Z23@f-Ava~9&<9T!#}JFtXD=!G zGdl{fK6ro2OGiOl+hKvH6i=D3%%Y^j`yIkRn!8O>@bG)IQR0{Kf+mxNd=_WScA8u_ z3;8(7x2){m9`nt+U(Nab&1G)!{`SPVpDX$w8McLTzAJ39wprG3p4XLq$06M`%}2Yk zRPPsbES*dnYm1wkGL;iioAUB*Or2kz6(-M_r_#Me-`{mj$Z%( literal 0 HcmV?d00001 diff --git a/doc/html/_static/down.png b/doc/html/_static/down.png new file mode 100644 index 0000000000000000000000000000000000000000..3003a88770de3977d47a2ba69893436a2860f9e7 GIT binary patch literal 363 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6U4S$Y z{B+)352QE?JR*yM+OLB!qm#z$3ZNi+iKnkC`z>}xaV3tUZ$qnrLa#kt978NlpS`ru z&)HFc^}^>{UOEce+71h5nn>6&w6A!ieNbu1wh)UGh{8~et^#oZ1# z>T7oM=FZ~xXWnTo{qnXm$ZLOlqGswI_m2{XwVK)IJmBjW{J3-B3x@C=M{ShWt#fYS9M?R;8K$~YwlIqwf>VA7q=YKcwf2DS4Zj5inDKXXB1zl=(YO3ST6~rDq)&z z*o>z)=hxrfG-cDBW0G$!?6{M<$@{_4{m1o%Ub!naEtn|@^frU1tDnm{r-UW|!^@B8 literal 0 HcmV?d00001 diff --git a/doc/html/_static/file.png b/doc/html/_static/file.png index 4d6c7e7768fedd6d181e4eab4f3c32233834d64e..d18082e397e7e54f20721af768c4c2983258f1b4 100644 GIT binary patch delta 376 zcmV-;0f+v$0*C{U8Gi-<001BJ|6u?C00v@9M??Vs0RI60puMM)00009a7bBm000XU z000XU0RWnu7ytkO2XskIMF-Uj4h;tZDYjG`0003MNkl`)4f+1;qh67(fvDEhv1eJ8B5z|D(=6?jwT?@G*xx{!8|7v!a z`RAJ*84Ly&S(Y8pPKRL_o&yj?k!hWIP^Jc2 zYmy`>H54Tx^m@I@E>7_g1VJM~ot$D}kziJH5%|7eGw~f`7O*UGAGHtxw@&0P_ z3IJPcpX_XQxp8@XAxYJ=@cw!9I|0D(cF5_SAR>(4t^u$Ymtmj^o`nO-iXV{!3p~ Wt8{-jMt;Wt0000X>^8d zd5>*+l5TsFZhMn*pU;7TfrgBfiIk#=n5~JKu8Nwknz-1g!py+b#KgqJ#l^+O#>U6T z$Li|p>+9?6?CkCBW}0US|u z008`nFaa53ttH}+!91tw6?<><1lVO|pK|8hc61^ZT|eiCGF9()[^>]*$|#([\w\-]*)$)/, + // Prioritize #id over to avoid XSS via location.hash (#9521) + quickExpr = /^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/, // Check if a string has a non-whitespace character in it rnotwhite = /\S/, @@ -47,9 +47,6 @@ var jQuery = function( selector, context ) { trimLeft = /^\s+/, trimRight = /\s+$/, - // Check for digits - rdigit = /\d/, - // Match a standalone tag rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/, @@ -66,11 +63,12 @@ var jQuery = function( selector, context ) { rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/, // Matches dashed string for camelizing - rdashAlpha = /-([a-z])/ig, + rdashAlpha = /-([a-z]|[0-9])/ig, + rmsPrefix = /^-ms-/, // Used by jQuery.camelCase as callback to replace() fcamelCase = function( all, letter ) { - return letter.toUpperCase(); + return ( letter + "" ).toUpperCase(); }, // Keep a UserAgent string for use with jQuery.browser @@ -139,7 +137,7 @@ jQuery.fn = jQuery.prototype = { // HANDLE: $(html) -> $(array) if ( match[1] ) { context = context instanceof jQuery ? context[0] : context; - doc = (context ? context.ownerDocument || context : document); + doc = ( context ? context.ownerDocument || context : document ); // If a single string is passed in and it's a single tag // just do a createElement and skip the rest @@ -156,7 +154,7 @@ jQuery.fn = jQuery.prototype = { } else { ret = jQuery.buildFragment( [ match[1] ], [ doc ] ); - selector = (ret.cacheable ? jQuery.clone(ret.fragment) : ret.fragment).childNodes; + selector = ( ret.cacheable ? jQuery.clone(ret.fragment) : ret.fragment ).childNodes; } return jQuery.merge( this, selector ); @@ -186,7 +184,7 @@ jQuery.fn = jQuery.prototype = { // HANDLE: $(expr, $(...)) } else if ( !context || context.jquery ) { - return (context || rootjQuery).find( selector ); + return ( context || rootjQuery ).find( selector ); // HANDLE: $(expr, context) // (which is just equivalent to: $(context).find(expr) @@ -200,7 +198,7 @@ jQuery.fn = jQuery.prototype = { return rootjQuery.ready( selector ); } - if (selector.selector !== undefined) { + if ( selector.selector !== undefined ) { this.selector = selector.selector; this.context = selector.context; } @@ -212,7 +210,7 @@ jQuery.fn = jQuery.prototype = { selector: "", // The current version of jQuery being used - jquery: "1.6.2", + jquery: "1.7.2", // The default length of a jQuery object is 0 length: 0, @@ -257,7 +255,7 @@ jQuery.fn = jQuery.prototype = { ret.context = this.context; if ( name === "find" ) { - ret.selector = this.selector + (this.selector ? " " : "") + selector; + ret.selector = this.selector + ( this.selector ? " " : "" ) + selector; } else if ( name ) { ret.selector = this.selector + "." + name + "(" + selector + ")"; } @@ -278,15 +276,16 @@ jQuery.fn = jQuery.prototype = { jQuery.bindReady(); // Add the callback - readyList.done( fn ); + readyList.add( fn ); return this; }, eq: function( i ) { + i = +i; return i === -1 ? this.slice( i ) : - this.slice( i, +i + 1 ); + this.slice( i, i + 1 ); }, first: function() { @@ -433,11 +432,11 @@ jQuery.extend({ } // If there are functions bound, to execute - readyList.resolveWith( document, [ jQuery ] ); + readyList.fireWith( document, [ jQuery ] ); // Trigger any bound ready events if ( jQuery.fn.trigger ) { - jQuery( document ).trigger( "ready" ).unbind( "ready" ); + jQuery( document ).trigger( "ready" ).off( "ready" ); } } }, @@ -447,7 +446,7 @@ jQuery.extend({ return; } - readyList = jQuery._Deferred(); + readyList = jQuery.Callbacks( "once memory" ); // Catch cases where $(document).ready() is called after the // browser event has already occurred. @@ -498,13 +497,12 @@ jQuery.extend({ return jQuery.type(obj) === "array"; }, - // A crude way of determining if an object is a window isWindow: function( obj ) { - return obj && typeof obj === "object" && "setInterval" in obj; + return obj != null && obj == obj.window; }, - isNaN: function( obj ) { - return obj == null || !rdigit.test( obj ) || isNaN( obj ); + isNumeric: function( obj ) { + return !isNaN( parseFloat(obj) ) && isFinite( obj ); }, type: function( obj ) { @@ -521,10 +519,15 @@ jQuery.extend({ return false; } - // Not own constructor property must be Object - if ( obj.constructor && - !hasOwn.call(obj, "constructor") && - !hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) { + try { + // Not own constructor property must be Object + if ( obj.constructor && + !hasOwn.call(obj, "constructor") && + !hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) { + return false; + } + } catch ( e ) { + // IE8,9 Will throw exceptions on certain host objects #9897 return false; } @@ -545,7 +548,7 @@ jQuery.extend({ }, error: function( msg ) { - throw msg; + throw new Error( msg ); }, parseJSON: function( data ) { @@ -567,31 +570,33 @@ jQuery.extend({ .replace( rvalidtokens, "]" ) .replace( rvalidbraces, "")) ) { - return (new Function( "return " + data ))(); + return ( new Function( "return " + data ) )(); } jQuery.error( "Invalid JSON: " + data ); }, // Cross-browser xml parsing - // (xml & tmp used internally) - parseXML: function( data , xml , tmp ) { - - if ( window.DOMParser ) { // Standard - tmp = new DOMParser(); - xml = tmp.parseFromString( data , "text/xml" ); - } else { // IE - xml = new ActiveXObject( "Microsoft.XMLDOM" ); - xml.async = "false"; - xml.loadXML( data ); + parseXML: function( data ) { + if ( typeof data !== "string" || !data ) { + return null; } - - tmp = xml.documentElement; - - if ( ! tmp || ! tmp.nodeName || tmp.nodeName === "parsererror" ) { + var xml, tmp; + try { + if ( window.DOMParser ) { // Standard + tmp = new DOMParser(); + xml = tmp.parseFromString( data , "text/xml" ); + } else { // IE + xml = new ActiveXObject( "Microsoft.XMLDOM" ); + xml.async = "false"; + xml.loadXML( data ); + } + } catch( e ) { + xml = undefined; + } + if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) { jQuery.error( "Invalid XML: " + data ); } - return xml; }, @@ -611,10 +616,10 @@ jQuery.extend({ } }, - // Converts a dashed string to camelCased string; - // Used by both the css and data modules + // Convert dashed to camelCase; used by the css and data modules + // Microsoft forgot to hump their vendor prefix (#9572) camelCase: function( string ) { - return string.replace( rdashAlpha, fcamelCase ); + return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase ); }, nodeName: function( elem, name ) { @@ -683,8 +688,6 @@ jQuery.extend({ if ( array != null ) { // The window, strings (and functions) also have 'length' - // The extra typeof function check is to prevent crashes - // in Safari 2 (See: #3039) // Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930 var type = jQuery.type( array ); @@ -698,15 +701,22 @@ jQuery.extend({ return ret; }, - inArray: function( elem, array ) { + inArray: function( elem, array, i ) { + var len; - if ( indexOf ) { - return indexOf.call( array, elem ); - } + if ( array ) { + if ( indexOf ) { + return indexOf.call( array, elem, i ); + } - for ( var i = 0, length = array.length; i < length; i++ ) { - if ( array[ i ] === elem ) { - return i; + len = array.length; + i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0; + + for ( ; i < len; i++ ) { + // Skip accessing in sparse arrays + if ( i in array && array[ i ] === elem ) { + return i; + } } } @@ -814,35 +824,59 @@ jQuery.extend({ // Mutifunctional method to get and set values to a collection // The value/s can optionally be executed if it's a function - access: function( elems, key, value, exec, fn, pass ) { - var length = elems.length; + access: function( elems, fn, key, value, chainable, emptyGet, pass ) { + var exec, + bulk = key == null, + i = 0, + length = elems.length; - // Setting many attributes - if ( typeof key === "object" ) { - for ( var k in key ) { - jQuery.access( elems, k, key[k], exec, fn, value ); + // Sets many values + if ( key && typeof key === "object" ) { + for ( i in key ) { + jQuery.access( elems, fn, i, key[i], 1, emptyGet, value ); } - return elems; - } + chainable = 1; - // Setting one attribute - if ( value !== undefined ) { + // Sets one value + } else if ( value !== undefined ) { // Optionally, function values get executed if exec is true - exec = !pass && exec && jQuery.isFunction(value); + exec = pass === undefined && jQuery.isFunction( value ); - for ( var i = 0; i < length; i++ ) { - fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass ); + if ( bulk ) { + // Bulk operations only iterate when executing function values + if ( exec ) { + exec = fn; + fn = function( elem, key, value ) { + return exec.call( jQuery( elem ), value ); + }; + + // Otherwise they run against the entire set + } else { + fn.call( elems, value ); + fn = null; + } } - return elems; + if ( fn ) { + for (; i < length; i++ ) { + fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass ); + } + } + + chainable = 1; } - // Getting an attribute - return length ? fn( elems[0], key ) : undefined; + return chainable ? + elems : + + // Gets + bulk ? + fn.call( elems ) : + length ? fn( elems[0], key ) : emptyGet; }, now: function() { - return (new Date()).getTime(); + return ( new Date() ).getTime(); }, // Use of jQuery.browser is frowned upon. @@ -949,188 +983,363 @@ return jQuery; })(); -var // Promise methods - promiseMethods = "done fail isResolved isRejected promise then always pipe".split( " " ), - // Static reference to slice +// String to Object flags format cache +var flagsCache = {}; + +// Convert String-formatted flags into Object-formatted ones and store in cache +function createFlags( flags ) { + var object = flagsCache[ flags ] = {}, + i, length; + flags = flags.split( /\s+/ ); + for ( i = 0, length = flags.length; i < length; i++ ) { + object[ flags[i] ] = true; + } + return object; +} + +/* + * Create a callback list using the following parameters: + * + * flags: an optional list of space-separated flags that will change how + * the callback list behaves + * + * By default a callback list will act like an event callback list and can be + * "fired" multiple times. + * + * Possible flags: + * + * once: will ensure the callback list can only be fired once (like a Deferred) + * + * memory: will keep track of previous values and will call any callback added + * after the list has been fired right away with the latest "memorized" + * values (like a Deferred) + * + * unique: will ensure a callback can only be added once (no duplicate in the list) + * + * stopOnFalse: interrupt callings when a callback returns false + * + */ +jQuery.Callbacks = function( flags ) { + + // Convert flags from String-formatted to Object-formatted + // (we check in cache first) + flags = flags ? ( flagsCache[ flags ] || createFlags( flags ) ) : {}; + + var // Actual callback list + list = [], + // Stack of fire calls for repeatable lists + stack = [], + // Last fire value (for non-forgettable lists) + memory, + // Flag to know if list was already fired + fired, + // Flag to know if list is currently firing + firing, + // First callback to fire (used internally by add and fireWith) + firingStart, + // End of the loop when firing + firingLength, + // Index of currently firing callback (modified by remove if needed) + firingIndex, + // Add one or several callbacks to the list + add = function( args ) { + var i, + length, + elem, + type, + actual; + for ( i = 0, length = args.length; i < length; i++ ) { + elem = args[ i ]; + type = jQuery.type( elem ); + if ( type === "array" ) { + // Inspect recursively + add( elem ); + } else if ( type === "function" ) { + // Add if not in unique mode and callback is not in + if ( !flags.unique || !self.has( elem ) ) { + list.push( elem ); + } + } + } + }, + // Fire callbacks + fire = function( context, args ) { + args = args || []; + memory = !flags.memory || [ context, args ]; + fired = true; + firing = true; + firingIndex = firingStart || 0; + firingStart = 0; + firingLength = list.length; + for ( ; list && firingIndex < firingLength; firingIndex++ ) { + if ( list[ firingIndex ].apply( context, args ) === false && flags.stopOnFalse ) { + memory = true; // Mark as halted + break; + } + } + firing = false; + if ( list ) { + if ( !flags.once ) { + if ( stack && stack.length ) { + memory = stack.shift(); + self.fireWith( memory[ 0 ], memory[ 1 ] ); + } + } else if ( memory === true ) { + self.disable(); + } else { + list = []; + } + } + }, + // Actual Callbacks object + self = { + // Add a callback or a collection of callbacks to the list + add: function() { + if ( list ) { + var length = list.length; + add( arguments ); + // Do we need to add the callbacks to the + // current firing batch? + if ( firing ) { + firingLength = list.length; + // With memory, if we're not firing then + // we should call right away, unless previous + // firing was halted (stopOnFalse) + } else if ( memory && memory !== true ) { + firingStart = length; + fire( memory[ 0 ], memory[ 1 ] ); + } + } + return this; + }, + // Remove a callback from the list + remove: function() { + if ( list ) { + var args = arguments, + argIndex = 0, + argLength = args.length; + for ( ; argIndex < argLength ; argIndex++ ) { + for ( var i = 0; i < list.length; i++ ) { + if ( args[ argIndex ] === list[ i ] ) { + // Handle firingIndex and firingLength + if ( firing ) { + if ( i <= firingLength ) { + firingLength--; + if ( i <= firingIndex ) { + firingIndex--; + } + } + } + // Remove the element + list.splice( i--, 1 ); + // If we have some unicity property then + // we only need to do this once + if ( flags.unique ) { + break; + } + } + } + } + } + return this; + }, + // Control if a given callback is in the list + has: function( fn ) { + if ( list ) { + var i = 0, + length = list.length; + for ( ; i < length; i++ ) { + if ( fn === list[ i ] ) { + return true; + } + } + } + return false; + }, + // Remove all callbacks from the list + empty: function() { + list = []; + return this; + }, + // Have the list do nothing anymore + disable: function() { + list = stack = memory = undefined; + return this; + }, + // Is it disabled? + disabled: function() { + return !list; + }, + // Lock the list in its current state + lock: function() { + stack = undefined; + if ( !memory || memory === true ) { + self.disable(); + } + return this; + }, + // Is it locked? + locked: function() { + return !stack; + }, + // Call all callbacks with the given context and arguments + fireWith: function( context, args ) { + if ( stack ) { + if ( firing ) { + if ( !flags.once ) { + stack.push( [ context, args ] ); + } + } else if ( !( flags.once && memory ) ) { + fire( context, args ); + } + } + return this; + }, + // Call all the callbacks with the given arguments + fire: function() { + self.fireWith( this, arguments ); + return this; + }, + // To know if the callbacks have already been called at least once + fired: function() { + return !!fired; + } + }; + + return self; +}; + + + + +var // Static reference to slice sliceDeferred = [].slice; jQuery.extend({ - // Create a simple deferred (one callbacks list) - _Deferred: function() { - var // callbacks list - callbacks = [], - // stored [ context , args ] - fired, - // to avoid firing when already doing so - firing, - // flag to know if the deferred has been cancelled - cancelled, - // the deferred itself - deferred = { - // done( f1, f2, ...) - done: function() { - if ( !cancelled ) { - var args = arguments, - i, - length, - elem, - type, - _fired; - if ( fired ) { - _fired = fired; - fired = 0; - } - for ( i = 0, length = args.length; i < length; i++ ) { - elem = args[ i ]; - type = jQuery.type( elem ); - if ( type === "array" ) { - deferred.done.apply( deferred, elem ); - } else if ( type === "function" ) { - callbacks.push( elem ); - } - } - if ( _fired ) { - deferred.resolveWith( _fired[ 0 ], _fired[ 1 ] ); - } - } - return this; - }, - - // resolve with given context and args - resolveWith: function( context, args ) { - if ( !cancelled && !fired && !firing ) { - // make sure args are available (#8421) - args = args || []; - firing = 1; - try { - while( callbacks[ 0 ] ) { - callbacks.shift().apply( context, args ); - } - } - finally { - fired = [ context, args ]; - firing = 0; - } - } - return this; - }, - - // resolve with this as context and given arguments - resolve: function() { - deferred.resolveWith( this, arguments ); - return this; - }, - - // Has this deferred been resolved? - isResolved: function() { - return !!( firing || fired ); - }, - - // Cancel - cancel: function() { - cancelled = 1; - callbacks = []; - return this; - } - }; - - return deferred; - }, - - // Full fledged deferred (two callbacks list) Deferred: function( func ) { - var deferred = jQuery._Deferred(), - failDeferred = jQuery._Deferred(), - promise; - // Add errorDeferred methods, then and promise - jQuery.extend( deferred, { - then: function( doneCallbacks, failCallbacks ) { - deferred.done( doneCallbacks ).fail( failCallbacks ); - return this; + var doneList = jQuery.Callbacks( "once memory" ), + failList = jQuery.Callbacks( "once memory" ), + progressList = jQuery.Callbacks( "memory" ), + state = "pending", + lists = { + resolve: doneList, + reject: failList, + notify: progressList }, - always: function() { - return deferred.done.apply( deferred, arguments ).fail.apply( this, arguments ); - }, - fail: failDeferred.done, - rejectWith: failDeferred.resolveWith, - reject: failDeferred.resolve, - isRejected: failDeferred.isResolved, - pipe: function( fnDone, fnFail ) { - return jQuery.Deferred(function( newDefer ) { - jQuery.each( { - done: [ fnDone, "resolve" ], - fail: [ fnFail, "reject" ] - }, function( handler, data ) { - var fn = data[ 0 ], - action = data[ 1 ], - returned; - if ( jQuery.isFunction( fn ) ) { - deferred[ handler ](function() { - returned = fn.apply( this, arguments ); - if ( returned && jQuery.isFunction( returned.promise ) ) { - returned.promise().then( newDefer.resolve, newDefer.reject ); - } else { - newDefer[ action ]( returned ); - } - }); - } else { - deferred[ handler ]( newDefer[ action ] ); + promise = { + done: doneList.add, + fail: failList.add, + progress: progressList.add, + + state: function() { + return state; + }, + + // Deprecated + isResolved: doneList.fired, + isRejected: failList.fired, + + then: function( doneCallbacks, failCallbacks, progressCallbacks ) { + deferred.done( doneCallbacks ).fail( failCallbacks ).progress( progressCallbacks ); + return this; + }, + always: function() { + deferred.done.apply( deferred, arguments ).fail.apply( deferred, arguments ); + return this; + }, + pipe: function( fnDone, fnFail, fnProgress ) { + return jQuery.Deferred(function( newDefer ) { + jQuery.each( { + done: [ fnDone, "resolve" ], + fail: [ fnFail, "reject" ], + progress: [ fnProgress, "notify" ] + }, function( handler, data ) { + var fn = data[ 0 ], + action = data[ 1 ], + returned; + if ( jQuery.isFunction( fn ) ) { + deferred[ handler ](function() { + returned = fn.apply( this, arguments ); + if ( returned && jQuery.isFunction( returned.promise ) ) { + returned.promise().then( newDefer.resolve, newDefer.reject, newDefer.notify ); + } else { + newDefer[ action + "With" ]( this === deferred ? newDefer : this, [ returned ] ); + } + }); + } else { + deferred[ handler ]( newDefer[ action ] ); + } + }); + }).promise(); + }, + // Get a promise for this deferred + // If obj is provided, the promise aspect is added to the object + promise: function( obj ) { + if ( obj == null ) { + obj = promise; + } else { + for ( var key in promise ) { + obj[ key ] = promise[ key ]; } - }); - }).promise(); - }, - // Get a promise for this deferred - // If obj is provided, the promise aspect is added to the object - promise: function( obj ) { - if ( obj == null ) { - if ( promise ) { - return promise; } - promise = obj = {}; + return obj; } - var i = promiseMethods.length; - while( i-- ) { - obj[ promiseMethods[i] ] = deferred[ promiseMethods[i] ]; - } - return obj; - } - }); - // Make sure only one callback list will be used - deferred.done( failDeferred.cancel ).fail( deferred.cancel ); - // Unexpose cancel - delete deferred.cancel; + }, + deferred = promise.promise({}), + key; + + for ( key in lists ) { + deferred[ key ] = lists[ key ].fire; + deferred[ key + "With" ] = lists[ key ].fireWith; + } + + // Handle state + deferred.done( function() { + state = "resolved"; + }, failList.disable, progressList.lock ).fail( function() { + state = "rejected"; + }, doneList.disable, progressList.lock ); + // Call given func if any if ( func ) { func.call( deferred, deferred ); } + + // All done! return deferred; }, // Deferred helper when: function( firstParam ) { - var args = arguments, + var args = sliceDeferred.call( arguments, 0 ), i = 0, length = args.length, + pValues = new Array( length ), count = length, + pCount = length, deferred = length <= 1 && firstParam && jQuery.isFunction( firstParam.promise ) ? firstParam : - jQuery.Deferred(); + jQuery.Deferred(), + promise = deferred.promise(); function resolveFunc( i ) { return function( value ) { args[ i ] = arguments.length > 1 ? sliceDeferred.call( arguments, 0 ) : value; if ( !( --count ) ) { - // Strange bug in FF4: - // Values changed onto the arguments object sometimes end up as undefined values - // outside the $.when method. Cloning the object into a fresh array solves the issue - deferred.resolveWith( deferred, sliceDeferred.call( args, 0 ) ); + deferred.resolveWith( deferred, args ); } }; } + function progressFunc( i ) { + return function( value ) { + pValues[ i ] = arguments.length > 1 ? sliceDeferred.call( arguments, 0 ) : value; + deferred.notifyWith( promise, pValues ); + }; + } if ( length > 1 ) { - for( ; i < length; i++ ) { - if ( args[ i ] && jQuery.isFunction( args[ i ].promise ) ) { - args[ i ].promise().then( resolveFunc(i), deferred.reject ); + for ( ; i < length; i++ ) { + if ( args[ i ] && args[ i ].promise && jQuery.isFunction( args[ i ].promise ) ) { + args[ i ].promise().then( resolveFunc(i), deferred.reject, progressFunc(i) ); } else { --count; } @@ -1141,33 +1350,29 @@ jQuery.extend({ } else if ( deferred !== firstParam ) { deferred.resolveWith( deferred, length ? [ firstParam ] : [] ); } - return deferred.promise(); + return promise; } }); + jQuery.support = (function() { - var div = document.createElement( "div" ), - documentElement = document.documentElement, + var support, all, a, select, opt, input, - marginDiv, - support, fragment, - body, - testElementParent, - testElement, - testElementStyle, tds, events, eventName, i, - isSupported; + isSupported, + div = document.createElement( "div" ), + documentElement = document.documentElement; // Preliminary tests div.setAttribute("className", "t"); @@ -1192,11 +1397,11 @@ jQuery.support = (function() { // Make sure that tbody elements aren't automatically inserted // IE will insert them into empty tables - tbody: !div.getElementsByTagName( "tbody" ).length, + tbody: !div.getElementsByTagName("tbody").length, // Make sure that link elements get serialized correctly by innerHTML // This requires a wrapper element in IE - htmlSerialize: !!div.getElementsByTagName( "link" ).length, + htmlSerialize: !!div.getElementsByTagName("link").length, // Get the style information from getAttribute // (IE uses .cssText instead) @@ -1204,12 +1409,12 @@ jQuery.support = (function() { // Make sure that URLs aren't manipulated // (IE normalizes it by default) - hrefNormalized: ( a.getAttribute( "href" ) === "/a" ), + hrefNormalized: ( a.getAttribute("href") === "/a" ), // Make sure that element opacity exists // (IE uses filter instead) // Use a regex to work around a WebKit issue. See #5145 - opacity: /^0.55$/.test( a.style.opacity ), + opacity: /^0.55/.test( a.style.opacity ), // Verify style float existence // (IE uses styleFloat instead of cssFloat) @@ -1227,6 +1432,13 @@ jQuery.support = (function() { // Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7) getSetAttribute: div.className !== "t", + // Tests for enctype support on a form(#6743) + enctype: !!document.createElement("form").enctype, + + // Makes sure cloning an html5 element does not cause problems + // Where outerHTML is undefined, this still works + html5Clone: document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav>", + // Will be defined later submitBubbles: true, changeBubbles: true, @@ -1235,9 +1447,13 @@ jQuery.support = (function() { noCloneEvent: true, inlineBlockNeedsLayout: false, shrinkWrapBlocks: false, - reliableMarginRight: true + reliableMarginRight: true, + pixelMargin: true }; + // jQuery.boxModel DEPRECATED in 1.3, use jQuery.support.boxModel instead + jQuery.boxModel = support.boxModel = (document.compatMode === "CSS1Compat"); + // Make sure checked status is properly cloned input.checked = true; support.noCloneChecked = input.cloneNode( true ).checked; @@ -1264,7 +1480,7 @@ jQuery.support = (function() { div.cloneNode( true ).fireEvent( "onclick" ); } - // Check if a radio maintains it's value + // Check if a radio maintains its value // after being appended to the DOM input = document.createElement("input"); input.value = "t"; @@ -1272,115 +1488,36 @@ jQuery.support = (function() { support.radioValue = input.value === "t"; input.setAttribute("checked", "checked"); + + // #11217 - WebKit loses check when the name is after the checked attribute + input.setAttribute( "name", "t" ); + div.appendChild( input ); fragment = document.createDocumentFragment(); - fragment.appendChild( div.firstChild ); + fragment.appendChild( div.lastChild ); // WebKit doesn't clone checked state correctly in fragments support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked; - div.innerHTML = ""; - - // Figure out if the W3C box model works as expected - div.style.width = div.style.paddingLeft = "1px"; - - body = document.getElementsByTagName( "body" )[ 0 ]; - // We use our own, invisible, body unless the body is already present - // in which case we use a div (#9239) - testElement = document.createElement( body ? "div" : "body" ); - testElementStyle = { - visibility: "hidden", - width: 0, - height: 0, - border: 0, - margin: 0 - }; - if ( body ) { - jQuery.extend( testElementStyle, { - position: "absolute", - left: -1000, - top: -1000 - }); - } - for ( i in testElementStyle ) { - testElement.style[ i ] = testElementStyle[ i ]; - } - testElement.appendChild( div ); - testElementParent = body || documentElement; - testElementParent.insertBefore( testElement, testElementParent.firstChild ); - // Check if a disconnected checkbox will retain its checked // value of true after appended to the DOM (IE6/7) support.appendChecked = input.checked; - support.boxModel = div.offsetWidth === 2; - - if ( "zoom" in div.style ) { - // Check if natively block-level elements act like inline-block - // elements when setting their display to 'inline' and giving - // them layout - // (IE < 8 does this) - div.style.display = "inline"; - div.style.zoom = 1; - support.inlineBlockNeedsLayout = ( div.offsetWidth === 2 ); - - // Check if elements with layout shrink-wrap their children - // (IE 6 does this) - div.style.display = ""; - div.innerHTML = "
"; - support.shrinkWrapBlocks = ( div.offsetWidth !== 2 ); - } - - div.innerHTML = "
t
"; - tds = div.getElementsByTagName( "td" ); - - // Check if table cells still have offsetWidth/Height when they are set - // to display:none and there are still other visible table cells in a - // table row; if so, offsetWidth/Height are not reliable for use when - // determining if an element has been hidden directly using - // display:none (it is still safe to use offsets if a parent element is - // hidden; don safety goggles and see bug #4512 for more information). - // (only IE 8 fails this test) - isSupported = ( tds[ 0 ].offsetHeight === 0 ); - - tds[ 0 ].style.display = ""; - tds[ 1 ].style.display = "none"; - - // Check if empty table cells still have offsetWidth/Height - // (IE < 8 fail this test) - support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 ); - div.innerHTML = ""; - - // Check if div with explicit width and no margin-right incorrectly - // gets computed margin-right based on width of container. For more - // info see bug #3333 - // Fails in WebKit before Feb 2011 nightlies - // WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right - if ( document.defaultView && document.defaultView.getComputedStyle ) { - marginDiv = document.createElement( "div" ); - marginDiv.style.width = "0"; - marginDiv.style.marginRight = "0"; - div.appendChild( marginDiv ); - support.reliableMarginRight = - ( parseInt( ( document.defaultView.getComputedStyle( marginDiv, null ) || { marginRight: 0 } ).marginRight, 10 ) || 0 ) === 0; - } - - // Remove the body element we added - testElement.innerHTML = ""; - testElementParent.removeChild( testElement ); + fragment.removeChild( input ); + fragment.appendChild( div ); // Technique from Juriy Zaytsev - // http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/ + // http://perfectionkills.com/detecting-event-support-without-browser-sniffing/ // We only care about the case where non-standard event systems // are used, namely in IE. Short-circuiting here helps us to // avoid an eval call (in setAttribute) which can cause CSP // to go haywire. See: https://developer.mozilla.org/en/Security/CSP if ( div.attachEvent ) { - for( i in { + for ( i in { submit: 1, change: 1, focusin: 1 - } ) { + }) { eventName = "on" + i; isSupported = ( eventName in div ); if ( !isSupported ) { @@ -1391,20 +1528,143 @@ jQuery.support = (function() { } } - // Null connected elements to avoid leaks in IE - testElement = fragment = select = opt = body = marginDiv = div = input = null; + fragment.removeChild( div ); + + // Null elements to avoid leaks in IE + fragment = select = opt = div = input = null; + + // Run tests that need a body at doc ready + jQuery(function() { + var container, outer, inner, table, td, offsetSupport, + marginDiv, conMarginTop, style, html, positionTopLeftWidthHeight, + paddingMarginBorderVisibility, paddingMarginBorder, + body = document.getElementsByTagName("body")[0]; + + if ( !body ) { + // Return for frameset docs that don't have a body + return; + } + + conMarginTop = 1; + paddingMarginBorder = "padding:0;margin:0;border:"; + positionTopLeftWidthHeight = "position:absolute;top:0;left:0;width:1px;height:1px;"; + paddingMarginBorderVisibility = paddingMarginBorder + "0;visibility:hidden;"; + style = "style='" + positionTopLeftWidthHeight + paddingMarginBorder + "5px solid #000;"; + html = "
" + + "" + + "
"; + + container = document.createElement("div"); + container.style.cssText = paddingMarginBorderVisibility + "width:0;height:0;position:static;top:0;margin-top:" + conMarginTop + "px"; + body.insertBefore( container, body.firstChild ); + + // Construct the test element + div = document.createElement("div"); + container.appendChild( div ); + + // Check if table cells still have offsetWidth/Height when they are set + // to display:none and there are still other visible table cells in a + // table row; if so, offsetWidth/Height are not reliable for use when + // determining if an element has been hidden directly using + // display:none (it is still safe to use offsets if a parent element is + // hidden; don safety goggles and see bug #4512 for more information). + // (only IE 8 fails this test) + div.innerHTML = "
t
"; + tds = div.getElementsByTagName( "td" ); + isSupported = ( tds[ 0 ].offsetHeight === 0 ); + + tds[ 0 ].style.display = ""; + tds[ 1 ].style.display = "none"; + + // Check if empty table cells still have offsetWidth/Height + // (IE <= 8 fail this test) + support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 ); + + // Check if div with explicit width and no margin-right incorrectly + // gets computed margin-right based on width of container. For more + // info see bug #3333 + // Fails in WebKit before Feb 2011 nightlies + // WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right + if ( window.getComputedStyle ) { + div.innerHTML = ""; + marginDiv = document.createElement( "div" ); + marginDiv.style.width = "0"; + marginDiv.style.marginRight = "0"; + div.style.width = "2px"; + div.appendChild( marginDiv ); + support.reliableMarginRight = + ( parseInt( ( window.getComputedStyle( marginDiv, null ) || { marginRight: 0 } ).marginRight, 10 ) || 0 ) === 0; + } + + if ( typeof div.style.zoom !== "undefined" ) { + // Check if natively block-level elements act like inline-block + // elements when setting their display to 'inline' and giving + // them layout + // (IE < 8 does this) + div.innerHTML = ""; + div.style.width = div.style.padding = "1px"; + div.style.border = 0; + div.style.overflow = "hidden"; + div.style.display = "inline"; + div.style.zoom = 1; + support.inlineBlockNeedsLayout = ( div.offsetWidth === 3 ); + + // Check if elements with layout shrink-wrap their children + // (IE 6 does this) + div.style.display = "block"; + div.style.overflow = "visible"; + div.innerHTML = "
"; + support.shrinkWrapBlocks = ( div.offsetWidth !== 3 ); + } + + div.style.cssText = positionTopLeftWidthHeight + paddingMarginBorderVisibility; + div.innerHTML = html; + + outer = div.firstChild; + inner = outer.firstChild; + td = outer.nextSibling.firstChild.firstChild; + + offsetSupport = { + doesNotAddBorder: ( inner.offsetTop !== 5 ), + doesAddBorderForTableAndCells: ( td.offsetTop === 5 ) + }; + + inner.style.position = "fixed"; + inner.style.top = "20px"; + + // safari subtracts parent border width here which is 5px + offsetSupport.fixedPosition = ( inner.offsetTop === 20 || inner.offsetTop === 15 ); + inner.style.position = inner.style.top = ""; + + outer.style.overflow = "hidden"; + outer.style.position = "relative"; + + offsetSupport.subtractsBorderForOverflowNotVisible = ( inner.offsetTop === -5 ); + offsetSupport.doesNotIncludeMarginInBodyOffset = ( body.offsetTop !== conMarginTop ); + + if ( window.getComputedStyle ) { + div.style.marginTop = "1%"; + support.pixelMargin = ( window.getComputedStyle( div, null ) || { marginTop: 0 } ).marginTop !== "1%"; + } + + if ( typeof container.style.zoom !== "undefined" ) { + container.style.zoom = 1; + } + + body.removeChild( container ); + marginDiv = div = container = null; + + jQuery.extend( support, offsetSupport ); + }); return support; })(); -// Keep track of boxModel -jQuery.boxModel = jQuery.support.boxModel; - var rbrace = /^(?:\{.*\}|\[.*\])$/, - rmultiDash = /([a-z])([A-Z])/g; + rmultiDash = /([A-Z])/g; jQuery.extend({ cache: {}, @@ -1427,7 +1687,6 @@ jQuery.extend({ hasData: function( elem ) { elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ]; - return !!elem && !isEmptyDataObject( elem ); }, @@ -1436,7 +1695,9 @@ jQuery.extend({ return; } - var internalKey = jQuery.expando, getByName = typeof name === "string", thisCache, + var privateCache, thisCache, ret, + internalKey = jQuery.expando, + getByName = typeof name === "string", // We have to handle DOM nodes and JS objects differently because IE6-7 // can't GC object references properly across the DOM-JS boundary @@ -1448,11 +1709,12 @@ jQuery.extend({ // Only defining an ID for JS objects if its cache already exists allows // the code to shortcut on the same path as a DOM node with no cache - id = isNode ? elem[ jQuery.expando ] : elem[ jQuery.expando ] && jQuery.expando; + id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey, + isEvents = name === "events"; // Avoid doing any more work than we need to when trying to get data on an // object that has no data at all - if ( (!id || (pvt && id && !cache[ id ][ internalKey ])) && getByName && data === undefined ) { + if ( (!id || !cache[id] || (!isEvents && !pvt && !cache[id].data)) && getByName && data === undefined ) { return; } @@ -1460,18 +1722,17 @@ jQuery.extend({ // Only DOM nodes need a new unique ID for each element since their data // ends up in the global cache if ( isNode ) { - elem[ jQuery.expando ] = id = ++jQuery.uuid; + elem[ internalKey ] = id = ++jQuery.uuid; } else { - id = jQuery.expando; + id = internalKey; } } if ( !cache[ id ] ) { cache[ id ] = {}; - // TODO: This is a hack for 1.5 ONLY. Avoids exposing jQuery - // metadata on plain JS objects when the object is serialized using - // JSON.stringify + // Avoids exposing jQuery metadata on plain JS objects when the object + // is serialized using JSON.stringify if ( !isNode ) { cache[ id ].toJSON = jQuery.noop; } @@ -1481,40 +1742,53 @@ jQuery.extend({ // shallow copied over onto the existing cache if ( typeof name === "object" || typeof name === "function" ) { if ( pvt ) { - cache[ id ][ internalKey ] = jQuery.extend(cache[ id ][ internalKey ], name); + cache[ id ] = jQuery.extend( cache[ id ], name ); } else { - cache[ id ] = jQuery.extend(cache[ id ], name); + cache[ id ].data = jQuery.extend( cache[ id ].data, name ); } } - thisCache = cache[ id ]; + privateCache = thisCache = cache[ id ]; - // Internal jQuery data is stored in a separate object inside the object's data + // jQuery data() is stored in a separate object inside the object's internal data // cache in order to avoid key collisions between internal data and user-defined - // data - if ( pvt ) { - if ( !thisCache[ internalKey ] ) { - thisCache[ internalKey ] = {}; + // data. + if ( !pvt ) { + if ( !thisCache.data ) { + thisCache.data = {}; } - thisCache = thisCache[ internalKey ]; + thisCache = thisCache.data; } if ( data !== undefined ) { thisCache[ jQuery.camelCase( name ) ] = data; } - // TODO: This is a hack for 1.5 ONLY. It will be removed in 1.6. Users should - // not attempt to inspect the internal events object using jQuery.data, as this - // internal data object is undocumented and subject to change. - if ( name === "events" && !thisCache[name] ) { - return thisCache[ internalKey ] && thisCache[ internalKey ].events; + // Users should not attempt to inspect the internal events object using jQuery.data, + // it is undocumented and subject to change. But does anyone listen? No. + if ( isEvents && !thisCache[ name ] ) { + return privateCache.events; } - return getByName ? - // Check for both converted-to-camel and non-converted data property names - thisCache[ jQuery.camelCase( name ) ] || thisCache[ name ] : - thisCache; + // Check for both converted-to-camel and non-converted data property names + // If a data property was specified + if ( getByName ) { + + // First Try to find as-is property data + ret = thisCache[ name ]; + + // Test for null|undefined property data + if ( ret == null ) { + + // Try to find the camelCased property + ret = thisCache[ jQuery.camelCase( name ) ]; + } + } else { + ret = thisCache; + } + + return ret; }, removeData: function( elem, name, pvt /* Internal Use Only */ ) { @@ -1522,13 +1796,18 @@ jQuery.extend({ return; } - var internalKey = jQuery.expando, isNode = elem.nodeType, + var thisCache, i, l, + + // Reference to internal data cache key + internalKey = jQuery.expando, + + isNode = elem.nodeType, // See jQuery.data for more information cache = isNode ? jQuery.cache : elem, // See jQuery.data for more information - id = isNode ? elem[ jQuery.expando ] : jQuery.expando; + id = isNode ? elem[ internalKey ] : internalKey; // If there is already no cache entry for this object, there is no // purpose in continuing @@ -1537,22 +1816,44 @@ jQuery.extend({ } if ( name ) { - var thisCache = pvt ? cache[ id ][ internalKey ] : cache[ id ]; + + thisCache = pvt ? cache[ id ] : cache[ id ].data; if ( thisCache ) { - delete thisCache[ name ]; + + // Support array or space separated string names for data keys + if ( !jQuery.isArray( name ) ) { + + // try the string as a key before any manipulation + if ( name in thisCache ) { + name = [ name ]; + } else { + + // split the camel cased version by spaces unless a key with the spaces exists + name = jQuery.camelCase( name ); + if ( name in thisCache ) { + name = [ name ]; + } else { + name = name.split( " " ); + } + } + } + + for ( i = 0, l = name.length; i < l; i++ ) { + delete thisCache[ name[i] ]; + } // If there is no data left in the cache, we want to continue // and let the cache object itself get destroyed - if ( !isEmptyDataObject(thisCache) ) { + if ( !( pvt ? isEmptyDataObject : jQuery.isEmptyObject )( thisCache ) ) { return; } } } // See jQuery.data for more information - if ( pvt ) { - delete cache[ id ][ internalKey ]; + if ( !pvt ) { + delete cache[ id ].data; // Don't destroy the parent cache unless the internal data object // had been the only thing left in it @@ -1561,43 +1862,28 @@ jQuery.extend({ } } - var internalCache = cache[ id ][ internalKey ]; - // Browsers that fail expando deletion also refuse to delete expandos on // the window, but it will allow it on all other JS objects; other browsers // don't care - if ( jQuery.support.deleteExpando || cache != window ) { + // Ensure that `cache` is not a window object #10080 + if ( jQuery.support.deleteExpando || !cache.setInterval ) { delete cache[ id ]; } else { cache[ id ] = null; } - // We destroyed the entire user cache at once because it's faster than - // iterating through each key, but we need to continue to persist internal - // data if it existed - if ( internalCache ) { - cache[ id ] = {}; - // TODO: This is a hack for 1.5 ONLY. Avoids exposing jQuery - // metadata on plain JS objects when the object is serialized using - // JSON.stringify - if ( !isNode ) { - cache[ id ].toJSON = jQuery.noop; - } - - cache[ id ][ internalKey ] = internalCache; - - // Otherwise, we need to eliminate the expando on the node to avoid + // We destroyed the cache and need to eliminate the expando on the node to avoid // false lookups in the cache for entries that no longer exist - } else if ( isNode ) { + if ( isNode ) { // IE does not allow us to delete expando properties from nodes, // nor does it have a removeAttribute function on Document nodes; // we must handle all of these cases if ( jQuery.support.deleteExpando ) { - delete elem[ jQuery.expando ]; + delete elem[ internalKey ]; } else if ( elem.removeAttribute ) { - elem.removeAttribute( jQuery.expando ); + elem.removeAttribute( internalKey ); } else { - elem[ jQuery.expando ] = null; + elem[ internalKey ] = null; } } }, @@ -1623,60 +1909,70 @@ jQuery.extend({ jQuery.fn.extend({ data: function( key, value ) { - var data = null; + var parts, part, attr, name, l, + elem = this[0], + i = 0, + data = null; - if ( typeof key === "undefined" ) { + // Gets all values + if ( key === undefined ) { if ( this.length ) { - data = jQuery.data( this[0] ); + data = jQuery.data( elem ); - if ( this[0].nodeType === 1 ) { - var attr = this[0].attributes, name; - for ( var i = 0, l = attr.length; i < l; i++ ) { + if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) { + attr = elem.attributes; + for ( l = attr.length; i < l; i++ ) { name = attr[i].name; if ( name.indexOf( "data-" ) === 0 ) { name = jQuery.camelCase( name.substring(5) ); - dataAttr( this[0], name, data[ name ] ); + dataAttr( elem, name, data[ name ] ); } } + jQuery._data( elem, "parsedAttrs", true ); } } return data; + } - } else if ( typeof key === "object" ) { + // Sets multiple values + if ( typeof key === "object" ) { return this.each(function() { jQuery.data( this, key ); }); } - var parts = key.split("."); + parts = key.split( ".", 2 ); parts[1] = parts[1] ? "." + parts[1] : ""; + part = parts[1] + "!"; - if ( value === undefined ) { - data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]); + return jQuery.access( this, function( value ) { - // Try to fetch any internally stored data first - if ( data === undefined && this.length ) { - data = jQuery.data( this[0], key ); - data = dataAttr( this[0], key, data ); + if ( value === undefined ) { + data = this.triggerHandler( "getData" + part, [ parts[0] ] ); + + // Try to fetch any internally stored data first + if ( data === undefined && elem ) { + data = jQuery.data( elem, key ); + data = dataAttr( elem, key, data ); + } + + return data === undefined && parts[1] ? + this.data( parts[0] ) : + data; } - return data === undefined && parts[1] ? - this.data( parts[0] ) : - data; + parts[1] = value; + this.each(function() { + var self = jQuery( this ); - } else { - return this.each(function() { - var $this = jQuery( this ), - args = [ parts[0], value ]; - - $this.triggerHandler( "setData" + parts[1] + "!", args ); + self.triggerHandler( "setData" + part, parts ); jQuery.data( this, key, value ); - $this.triggerHandler( "changeData" + parts[1] + "!", args ); + self.triggerHandler( "changeData" + part, parts ); }); - } + }, null, value, arguments.length > 1, null, false ); }, removeData: function( key ) { @@ -1690,7 +1986,8 @@ function dataAttr( elem, key, data ) { // If nothing was found internally, try to fetch any // data from the HTML5 data-* attribute if ( data === undefined && elem.nodeType === 1 ) { - var name = "data-" + key.replace( rmultiDash, "$1-$2" ).toLowerCase(); + + var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase(); data = elem.getAttribute( name ); @@ -1699,7 +1996,7 @@ function dataAttr( elem, key, data ) { data = data === "true" ? true : data === "false" ? false : data === "null" ? null : - !jQuery.isNaN( data ) ? parseFloat( data ) : + jQuery.isNumeric( data ) ? +data : rbrace.test( data ) ? jQuery.parseJSON( data ) : data; } catch( e ) {} @@ -1715,11 +2012,14 @@ function dataAttr( elem, key, data ) { return data; } -// TODO: This is a hack for 1.5 ONLY to allow objects with a single toJSON -// property to be considered empty objects; this property always exists in -// order to make sure JSON.stringify does not expose internal metadata +// checks a cache object for emptiness function isEmptyDataObject( obj ) { for ( var name in obj ) { + + // if the public data object is empty, the private is still empty + if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) { + continue; + } if ( name !== "toJSON" ) { return false; } @@ -1735,17 +2035,17 @@ function handleQueueMarkDefer( elem, type, src ) { var deferDataKey = type + "defer", queueDataKey = type + "queue", markDataKey = type + "mark", - defer = jQuery.data( elem, deferDataKey, undefined, true ); + defer = jQuery._data( elem, deferDataKey ); if ( defer && - ( src === "queue" || !jQuery.data( elem, queueDataKey, undefined, true ) ) && - ( src === "mark" || !jQuery.data( elem, markDataKey, undefined, true ) ) ) { + ( src === "queue" || !jQuery._data(elem, queueDataKey) ) && + ( src === "mark" || !jQuery._data(elem, markDataKey) ) ) { // Give room for hard-coded callbacks to fire first // and eventually mark/queue something else on the element setTimeout( function() { - if ( !jQuery.data( elem, queueDataKey, undefined, true ) && - !jQuery.data( elem, markDataKey, undefined, true ) ) { + if ( !jQuery._data( elem, queueDataKey ) && + !jQuery._data( elem, markDataKey ) ) { jQuery.removeData( elem, deferDataKey, true ); - defer.resolve(); + defer.fire(); } }, 0 ); } @@ -1755,8 +2055,8 @@ jQuery.extend({ _mark: function( elem, type ) { if ( elem ) { - type = (type || "fx") + "mark"; - jQuery.data( elem, type, (jQuery.data(elem,type,undefined,true) || 0) + 1, true ); + type = ( type || "fx" ) + "mark"; + jQuery._data( elem, type, (jQuery._data( elem, type ) || 0) + 1 ); } }, @@ -1769,9 +2069,9 @@ jQuery.extend({ if ( elem ) { type = type || "fx"; var key = type + "mark", - count = force ? 0 : ( (jQuery.data( elem, key, undefined, true) || 1 ) - 1 ); + count = force ? 0 : ( (jQuery._data( elem, key ) || 1) - 1 ); if ( count ) { - jQuery.data( elem, key, count, true ); + jQuery._data( elem, key, count ); } else { jQuery.removeData( elem, key, true ); handleQueueMarkDefer( elem, type, "mark" ); @@ -1780,13 +2080,15 @@ jQuery.extend({ }, queue: function( elem, type, data ) { + var q; if ( elem ) { - type = (type || "fx") + "queue"; - var q = jQuery.data( elem, type, undefined, true ); + type = ( type || "fx" ) + "queue"; + q = jQuery._data( elem, type ); + // Speed up dequeue by getting out quickly if this is just a lookup if ( data ) { if ( !q || jQuery.isArray(data) ) { - q = jQuery.data( elem, type, jQuery.makeArray(data), true ); + q = jQuery._data( elem, type, jQuery.makeArray(data) ); } else { q.push( data ); } @@ -1800,7 +2102,7 @@ jQuery.extend({ var queue = jQuery.queue( elem, type ), fn = queue.shift(), - defer; + hooks = {}; // If the fx queue is dequeued, always remove the progress sentinel if ( fn === "inprogress" ) { @@ -1811,16 +2113,17 @@ jQuery.extend({ // Add a progress sentinel to prevent the fx queue from being // automatically dequeued if ( type === "fx" ) { - queue.unshift("inprogress"); + queue.unshift( "inprogress" ); } - fn.call(elem, function() { - jQuery.dequeue(elem, type); - }); + jQuery._data( elem, type + ".run", hooks ); + fn.call( elem, function() { + jQuery.dequeue( elem, type ); + }, hooks ); } if ( !queue.length ) { - jQuery.removeData( elem, type + "queue", true ); + jQuery.removeData( elem, type + "queue " + type + ".run", true ); handleQueueMarkDefer( elem, type, "queue" ); } } @@ -1828,21 +2131,27 @@ jQuery.extend({ jQuery.fn.extend({ queue: function( type, data ) { + var setter = 2; + if ( typeof type !== "string" ) { data = type; type = "fx"; + setter--; } - if ( data === undefined ) { + if ( arguments.length < setter ) { return jQuery.queue( this[0], type ); } - return this.each(function() { - var queue = jQuery.queue( this, type, data ); - if ( type === "fx" && queue[0] !== "inprogress" ) { - jQuery.dequeue( this, type ); - } - }); + return data === undefined ? + this : + this.each(function() { + var queue = jQuery.queue( this, type, data ); + + if ( type === "fx" && queue[0] !== "inprogress" ) { + jQuery.dequeue( this, type ); + } + }); }, dequeue: function( type ) { return this.each(function() { @@ -1852,14 +2161,14 @@ jQuery.fn.extend({ // Based off of the plugin by Clint Helfers, with permission. // http://blindsignals.com/index.php/2009/07/jquery-delay/ delay: function( time, type ) { - time = jQuery.fx ? jQuery.fx.speeds[time] || time : time; + time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time; type = type || "fx"; - return this.queue( type, function() { - var elem = this; - setTimeout(function() { - jQuery.dequeue( elem, type ); - }, time ); + return this.queue( type, function( next, hooks ) { + var timeout = setTimeout( next, time ); + hooks.stop = function() { + clearTimeout( timeout ); + }; }); }, clearQueue: function( type ) { @@ -1890,13 +2199,13 @@ jQuery.fn.extend({ if (( tmp = jQuery.data( elements[ i ], deferDataKey, undefined, true ) || ( jQuery.data( elements[ i ], queueDataKey, undefined, true ) || jQuery.data( elements[ i ], markDataKey, undefined, true ) ) && - jQuery.data( elements[ i ], deferDataKey, jQuery._Deferred(), true ) )) { + jQuery.data( elements[ i ], deferDataKey, jQuery.Callbacks( "once memory" ), true ) )) { count++; - tmp.done( resolve ); + tmp.add( resolve ); } } resolve(); - return defer.promise(); + return defer.promise( object ); } }); @@ -1910,12 +2219,12 @@ var rclass = /[\n\t\r]/g, rfocusable = /^(?:button|input|object|select|textarea)$/i, rclickable = /^a(?:rea)?$/i, rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i, - rinvalidChar = /\:|^on/, - formHook, boolHook; + getSetAttribute = jQuery.support.getSetAttribute, + nodeHook, boolHook, fixSpecified; jQuery.fn.extend({ attr: function( name, value ) { - return jQuery.access( this, name, value, true, jQuery.attr ); + return jQuery.access( this, jQuery.attr, name, value, arguments.length > 1 ); }, removeAttr: function( name ) { @@ -1923,11 +2232,11 @@ jQuery.fn.extend({ jQuery.removeAttr( this, name ); }); }, - + prop: function( name, value ) { - return jQuery.access( this, name, value, true, jQuery.prop ); + return jQuery.access( this, jQuery.prop, name, value, arguments.length > 1 ); }, - + removeProp: function( name ) { name = jQuery.propFix[ name ] || name; return this.each(function() { @@ -1986,7 +2295,7 @@ jQuery.fn.extend({ } if ( (value && typeof value === "string") || value === undefined ) { - classNames = (value || "").split( rspace ); + classNames = ( value || "" ).split( rspace ); for ( i = 0, l = this.length; i < l; i++ ) { elem = this[ i ]; @@ -2047,9 +2356,11 @@ jQuery.fn.extend({ }, hasClass: function( selector ) { - var className = " " + selector + " "; - for ( var i = 0, l = this.length; i < l; i++ ) { - if ( (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) { + var className = " " + selector + " ", + i = 0, + l = this.length; + for ( ; i < l; i++ ) { + if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) { return true; } } @@ -2058,12 +2369,12 @@ jQuery.fn.extend({ }, val: function( value ) { - var hooks, ret, + var hooks, ret, isFunction, elem = this[0]; - + if ( !arguments.length ) { if ( elem ) { - hooks = jQuery.valHooks[ elem.nodeName.toLowerCase() ] || jQuery.valHooks[ elem.type ]; + hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ]; if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) { return ret; @@ -2071,17 +2382,17 @@ jQuery.fn.extend({ ret = elem.value; - return typeof ret === "string" ? + return typeof ret === "string" ? // handle most common string cases - ret.replace(rreturn, "") : + ret.replace(rreturn, "") : // handle cases where value is null/undef or number ret == null ? "" : ret; } - return undefined; + return; } - var isFunction = jQuery.isFunction( value ); + isFunction = jQuery.isFunction( value ); return this.each(function( i ) { var self = jQuery(this), val; @@ -2107,7 +2418,7 @@ jQuery.fn.extend({ }); } - hooks = jQuery.valHooks[ this.nodeName.toLowerCase() ] || jQuery.valHooks[ this.type ]; + hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ]; // If set returns undefined, fall back to normal setting if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) { @@ -2129,7 +2440,7 @@ jQuery.extend({ }, select: { get: function( elem ) { - var value, + var value, i, max, option, index = elem.selectedIndex, values = [], options = elem.options, @@ -2141,8 +2452,10 @@ jQuery.extend({ } // Loop through all the selected options - for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) { - var option = options[ i ]; + i = one ? index : 0; + max = one ? index + 1 : options.length; + for ( ; i < max; i++ ) { + option = options[ i ]; // Don't return options that are disabled or in a disabled optgroup if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) && @@ -2194,18 +2507,14 @@ jQuery.extend({ height: true, offset: true }, - - attrFix: { - // Always normalize to ensure hook usage - tabindex: "tabIndex" - }, - + attr: function( elem, name, value, pass ) { - var nType = elem.nodeType; - + var ret, hooks, notxml, + nType = elem.nodeType; + // don't get/set attributes on text, comment and attribute nodes if ( !elem || nType === 3 || nType === 8 || nType === 2 ) { - return undefined; + return; } if ( pass && name in jQuery.attrFn ) { @@ -2213,39 +2522,24 @@ jQuery.extend({ } // Fallback to prop when attributes are not supported - if ( !("getAttribute" in elem) ) { + if ( typeof elem.getAttribute === "undefined" ) { return jQuery.prop( elem, name, value ); } - var ret, hooks, - notxml = nType !== 1 || !jQuery.isXMLDoc( elem ); + notxml = nType !== 1 || !jQuery.isXMLDoc( elem ); - // Normalize the name if needed + // All attributes are lowercase + // Grab necessary hook if one is defined if ( notxml ) { - name = jQuery.attrFix[ name ] || name; - - hooks = jQuery.attrHooks[ name ]; - - if ( !hooks ) { - // Use boolHook for boolean attributes - if ( rboolean.test( name ) ) { - - hooks = boolHook; - - // Use formHook for forms and if the name contains certain characters - } else if ( formHook && name !== "className" && - (jQuery.nodeName( elem, "form" ) || rinvalidChar.test( name )) ) { - - hooks = formHook; - } - } + name = name.toLowerCase(); + hooks = jQuery.attrHooks[ name ] || ( rboolean.test( name ) ? boolHook : nodeHook ); } if ( value !== undefined ) { if ( value === null ) { jQuery.removeAttr( elem, name ); - return undefined; + return; } else if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value, name )) !== undefined ) { return ret; @@ -2269,22 +2563,33 @@ jQuery.extend({ } }, - removeAttr: function( elem, name ) { - var propName; - if ( elem.nodeType === 1 ) { - name = jQuery.attrFix[ name ] || name; - - if ( jQuery.support.getSetAttribute ) { - // Use removeAttribute in browsers that support it - elem.removeAttribute( name ); - } else { - jQuery.attr( elem, name, "" ); - elem.removeAttributeNode( elem.getAttributeNode( name ) ); - } + removeAttr: function( elem, value ) { + var propName, attrNames, name, l, isBool, + i = 0; - // Set corresponding property to false for boolean attributes - if ( rboolean.test( name ) && (propName = jQuery.propFix[ name ] || name) in elem ) { - elem[ propName ] = false; + if ( value && elem.nodeType === 1 ) { + attrNames = value.toLowerCase().split( rspace ); + l = attrNames.length; + + for ( ; i < l; i++ ) { + name = attrNames[ i ]; + + if ( name ) { + propName = jQuery.propFix[ name ] || name; + isBool = rboolean.test( name ); + + // See #9699 for explanation of this approach (setting first, then removal) + // Do not do this for boolean attributes (see #10870) + if ( !isBool ) { + jQuery.attr( elem, name, "" ); + } + elem.removeAttribute( getSetAttribute ? name : propName ); + + // Set corresponding property to false for boolean attributes + if ( isBool && propName in elem ) { + elem[ propName ] = false; + } + } } } }, @@ -2308,33 +2613,20 @@ jQuery.extend({ } } }, - tabIndex: { - get: function( elem ) { - // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set - // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/ - var attributeNode = elem.getAttributeNode("tabIndex"); - - return attributeNode && attributeNode.specified ? - parseInt( attributeNode.value, 10 ) : - rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ? - 0 : - undefined; - } - }, // Use the value property for back compat - // Use the formHook for button elements in IE6/7 (#1954) + // Use the nodeHook for button elements in IE6/7 (#1954) value: { get: function( elem, name ) { - if ( formHook && jQuery.nodeName( elem, "button" ) ) { - return formHook.get( elem, name ); + if ( nodeHook && jQuery.nodeName( elem, "button" ) ) { + return nodeHook.get( elem, name ); } return name in elem ? elem.value : null; }, set: function( elem, value, name ) { - if ( formHook && jQuery.nodeName( elem, "button" ) ) { - return formHook.set( elem, value, name ); + if ( nodeHook && jQuery.nodeName( elem, "button" ) ) { + return nodeHook.set( elem, value, name ); } // Does not return so that setAttribute is also used elem.value = value; @@ -2356,17 +2648,17 @@ jQuery.extend({ frameborder: "frameBorder", contenteditable: "contentEditable" }, - + prop: function( elem, name, value ) { - var nType = elem.nodeType; + var ret, hooks, notxml, + nType = elem.nodeType; // don't get/set properties on text, comment and attribute nodes if ( !elem || nType === 3 || nType === 8 || nType === 2 ) { - return undefined; + return; } - var ret, hooks, - notxml = nType !== 1 || !jQuery.isXMLDoc( elem ); + notxml = nType !== 1 || !jQuery.isXMLDoc( elem ); if ( notxml ) { // Fix name and attach hooks @@ -2379,11 +2671,11 @@ jQuery.extend({ return ret; } else { - return (elem[ name ] = value); + return ( elem[ name ] = value ); } } else { - if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== undefined ) { + if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) { return ret; } else { @@ -2391,15 +2683,35 @@ jQuery.extend({ } } }, - - propHooks: {} + + propHooks: { + tabIndex: { + get: function( elem ) { + // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set + // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/ + var attributeNode = elem.getAttributeNode("tabindex"); + + return attributeNode && attributeNode.specified ? + parseInt( attributeNode.value, 10 ) : + rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ? + 0 : + undefined; + } + } + } }); +// Add the tabIndex propHook to attrHooks for back-compat (different case is intentional) +jQuery.attrHooks.tabindex = jQuery.propHooks.tabIndex; + // Hook for boolean attributes boolHook = { get: function( elem, name ) { // Align boolean attributes with corresponding properties - return jQuery.prop( elem, name ) ? + // Fall back to attribute presence where some booleans are not supported + var attrNode, + property = jQuery.prop( elem, name ); + return property === true || typeof property !== "boolean" && ( attrNode = elem.getAttributeNode(name) ) && attrNode.nodeValue !== false ? name.toLowerCase() : undefined; }, @@ -2424,32 +2736,38 @@ boolHook = { }; // IE6/7 do not support getting/setting some attributes with get/setAttribute -if ( !jQuery.support.getSetAttribute ) { +if ( !getSetAttribute ) { - // propFix is more comprehensive and contains all fixes - jQuery.attrFix = jQuery.propFix; - - // Use this for any attribute on a form in IE6/7 - formHook = jQuery.attrHooks.name = jQuery.attrHooks.title = jQuery.valHooks.button = { + fixSpecified = { + name: true, + id: true, + coords: true + }; + + // Use this for any attribute in IE6/7 + // This fixes almost every IE6/7 issue + nodeHook = jQuery.valHooks.button = { get: function( elem, name ) { var ret; ret = elem.getAttributeNode( name ); - // Return undefined if nodeValue is empty string - return ret && ret.nodeValue !== "" ? + return ret && ( fixSpecified[ name ] ? ret.nodeValue !== "" : ret.specified ) ? ret.nodeValue : undefined; }, set: function( elem, value, name ) { - // Check form objects in IE (multiple bugs related) - // Only use nodeValue if the attribute node exists on the form + // Set the existing or create a new attribute node var ret = elem.getAttributeNode( name ); - if ( ret ) { - ret.nodeValue = value; - return value; + if ( !ret ) { + ret = document.createAttribute( name ); + elem.setAttributeNode( ret ); } + return ( ret.nodeValue = value + "" ); } }; + // Apply the nodeHook to tabindex + jQuery.attrHooks.tabindex.set = nodeHook.set; + // Set width and height to auto instead of 0 on empty string( Bug #8150 ) // This is for removals jQuery.each([ "width", "height" ], function( i, name ) { @@ -2462,6 +2780,18 @@ if ( !jQuery.support.getSetAttribute ) { } }); }); + + // Set contenteditable to false on removals(#10429) + // Setting to empty string throws an error as an invalid value + jQuery.attrHooks.contenteditable = { + get: nodeHook.get, + set: function( elem, value, name ) { + if ( value === "" ) { + value = "false"; + } + nodeHook.set( elem, value, name ); + } + }; } @@ -2485,7 +2815,7 @@ if ( !jQuery.support.style ) { return elem.style.cssText.toLowerCase() || undefined; }, set: function( elem, value ) { - return (elem.style.cssText = "" + value); + return ( elem.style.cssText = "" + value ); } }; } @@ -2505,10 +2835,16 @@ if ( !jQuery.support.optSelected ) { parent.parentNode.selectedIndex; } } + return null; } }); } +// IE6/7 call enctype encoding +if ( !jQuery.support.enctype ) { + jQuery.propFix.enctype = "encoding"; +} + // Radios and checkboxes getter/setter if ( !jQuery.support.checkOn ) { jQuery.each([ "radio", "checkbox" ], function() { @@ -2524,7 +2860,7 @@ jQuery.each([ "radio", "checkbox" ], function() { jQuery.valHooks[ this ] = jQuery.extend( jQuery.valHooks[ this ], { set: function( elem, value ) { if ( jQuery.isArray( value ) ) { - return (elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0); + return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 ); } } }); @@ -2533,116 +2869,119 @@ jQuery.each([ "radio", "checkbox" ], function() { -var rnamespaces = /\.(.*)$/, - rformElems = /^(?:textarea|input|select)$/i, - rperiod = /\./g, - rspaces = / /g, - rescape = /[^\w\s.|`]/g, - fcleanup = function( nm ) { - return nm.replace(rescape, "\\$&"); +var rformElems = /^(?:textarea|input|select)$/i, + rtypenamespace = /^([^\.]*)?(?:\.(.+))?$/, + rhoverHack = /(?:^|\s)hover(\.\S+)?\b/, + rkeyEvent = /^key/, + rmouseEvent = /^(?:mouse|contextmenu)|click/, + rfocusMorph = /^(?:focusinfocus|focusoutblur)$/, + rquickIs = /^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/, + quickParse = function( selector ) { + var quick = rquickIs.exec( selector ); + if ( quick ) { + // 0 1 2 3 + // [ _, tag, id, class ] + quick[1] = ( quick[1] || "" ).toLowerCase(); + quick[3] = quick[3] && new RegExp( "(?:^|\\s)" + quick[3] + "(?:\\s|$)" ); + } + return quick; + }, + quickIs = function( elem, m ) { + var attrs = elem.attributes || {}; + return ( + (!m[1] || elem.nodeName.toLowerCase() === m[1]) && + (!m[2] || (attrs.id || {}).value === m[2]) && + (!m[3] || m[3].test( (attrs[ "class" ] || {}).value )) + ); + }, + hoverHack = function( events ) { + return jQuery.event.special.hover ? events : events.replace( rhoverHack, "mouseenter$1 mouseleave$1" ); }; /* - * A number of helper functions used for managing events. - * Many of the ideas behind this code originated from - * Dean Edwards' addEvent library. + * Helper functions for managing events -- not part of the public interface. + * Props to Dean Edwards' addEvent library for many of the ideas. */ jQuery.event = { - // Bind an event to an element - // Original by Dean Edwards - add: function( elem, types, handler, data ) { - if ( elem.nodeType === 3 || elem.nodeType === 8 ) { + add: function( elem, types, handler, data, selector ) { + + var elemData, eventHandle, events, + t, tns, type, namespaces, handleObj, + handleObjIn, quick, handlers, special; + + // Don't attach events to noData or text/comment nodes (allow plain objects tho) + if ( elem.nodeType === 3 || elem.nodeType === 8 || !types || !handler || !(elemData = jQuery._data( elem )) ) { return; } - if ( handler === false ) { - handler = returnFalse; - } else if ( !handler ) { - // Fixes bug #7229. Fix recommended by jdalton - return; - } - - var handleObjIn, handleObj; - + // Caller can pass in an object of custom data in lieu of the handler if ( handler.handler ) { handleObjIn = handler; handler = handleObjIn.handler; + selector = handleObjIn.selector; } - // Make sure that the function being executed has a unique ID + // Make sure that the handler has a unique ID, used to find/remove it later if ( !handler.guid ) { handler.guid = jQuery.guid++; } - // Init the element's event structure - var elemData = jQuery._data( elem ); - - // If no elemData is found then we must be trying to bind to one of the - // banned noData elements - if ( !elemData ) { - return; - } - - var events = elemData.events, - eventHandle = elemData.handle; - + // Init the element's event structure and main handler, if this is the first + events = elemData.events; if ( !events ) { elemData.events = events = {}; } - + eventHandle = elemData.handle; if ( !eventHandle ) { elemData.handle = eventHandle = function( e ) { // Discard the second event of a jQuery.event.trigger() and // when an event is called after a page has unloaded return typeof jQuery !== "undefined" && (!e || jQuery.event.triggered !== e.type) ? - jQuery.event.handle.apply( eventHandle.elem, arguments ) : + jQuery.event.dispatch.apply( eventHandle.elem, arguments ) : undefined; }; + // Add elem as a property of the handle fn to prevent a memory leak with IE non-native events + eventHandle.elem = elem; } - // Add elem as a property of the handle function - // This is to prevent a memory leak with non-native events in IE. - eventHandle.elem = elem; - // Handle multiple events separated by a space // jQuery(...).bind("mouseover mouseout", fn); - types = types.split(" "); + types = jQuery.trim( hoverHack(types) ).split( " " ); + for ( t = 0; t < types.length; t++ ) { - var type, i = 0, namespaces; + tns = rtypenamespace.exec( types[t] ) || []; + type = tns[1]; + namespaces = ( tns[2] || "" ).split( "." ).sort(); - while ( (type = types[ i++ ]) ) { - handleObj = handleObjIn ? - jQuery.extend({}, handleObjIn) : - { handler: handler, data: data }; + // If event changes its type, use the special event handlers for the changed type + special = jQuery.event.special[ type ] || {}; - // Namespaced event handlers - if ( type.indexOf(".") > -1 ) { - namespaces = type.split("."); - type = namespaces.shift(); - handleObj.namespace = namespaces.slice(0).sort().join("."); + // If selector defined, determine special event api type, otherwise given type + type = ( selector ? special.delegateType : special.bindType ) || type; - } else { - namespaces = []; - handleObj.namespace = ""; - } + // Update special based on newly reset type + special = jQuery.event.special[ type ] || {}; - handleObj.type = type; - if ( !handleObj.guid ) { - handleObj.guid = handler.guid; - } + // handleObj is passed to all event handlers + handleObj = jQuery.extend({ + type: type, + origType: tns[1], + data: data, + handler: handler, + guid: handler.guid, + selector: selector, + quick: selector && quickParse( selector ), + namespace: namespaces.join(".") + }, handleObjIn ); - // Get the current list of functions bound to this event - var handlers = events[ type ], - special = jQuery.event.special[ type ] || {}; - - // Init the event handler queue + // Init the event handler queue if we're the first + handlers = events[ type ]; if ( !handlers ) { handlers = events[ type ] = []; + handlers.delegateCount = 0; - // Check for a special event handler - // Only use addEventListener/attachEvent if the special - // events handler returns false + // Only use addEventListener/attachEvent if the special events handler returns false if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) { // Bind the global event handler to the element if ( elem.addEventListener ) { @@ -2662,10 +3001,14 @@ jQuery.event = { } } - // Add the function to the element's handler list - handlers.push( handleObj ); + // Add to the element's handler list, delegates in front + if ( selector ) { + handlers.splice( handlers.delegateCount++, 0, handleObj ); + } else { + handlers.push( handleObj ); + } - // Keep track of which events have been used, for event optimization + // Keep track of which events have ever been used, for event optimization jQuery.event.global[ type ] = true; } @@ -2676,129 +3019,80 @@ jQuery.event = { global: {}, // Detach an event or set of events from an element - remove: function( elem, types, handler, pos ) { - // don't do events on text and comment nodes - if ( elem.nodeType === 3 || elem.nodeType === 8 ) { + remove: function( elem, types, handler, selector, mappedTypes ) { + + var elemData = jQuery.hasData( elem ) && jQuery._data( elem ), + t, tns, type, origType, namespaces, origCount, + j, events, special, handle, eventType, handleObj; + + if ( !elemData || !(events = elemData.events) ) { return; } - if ( handler === false ) { - handler = returnFalse; - } + // Once for each type.namespace in types; type may be omitted + types = jQuery.trim( hoverHack( types || "" ) ).split(" "); + for ( t = 0; t < types.length; t++ ) { + tns = rtypenamespace.exec( types[t] ) || []; + type = origType = tns[1]; + namespaces = tns[2]; - var ret, type, fn, j, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType, - elemData = jQuery.hasData( elem ) && jQuery._data( elem ), - events = elemData && elemData.events; - - if ( !elemData || !events ) { - return; - } - - // types is actually an event object here - if ( types && types.type ) { - handler = types.handler; - types = types.type; - } - - // Unbind all events for the element - if ( !types || typeof types === "string" && types.charAt(0) === "." ) { - types = types || ""; - - for ( type in events ) { - jQuery.event.remove( elem, type + types ); - } - - return; - } - - // Handle multiple events separated by a space - // jQuery(...).unbind("mouseover mouseout", fn); - types = types.split(" "); - - while ( (type = types[ i++ ]) ) { - origType = type; - handleObj = null; - all = type.indexOf(".") < 0; - namespaces = []; - - if ( !all ) { - // Namespaced event handlers - namespaces = type.split("."); - type = namespaces.shift(); - - namespace = new RegExp("(^|\\.)" + - jQuery.map( namespaces.slice(0).sort(), fcleanup ).join("\\.(?:.*\\.)?") + "(\\.|$)"); - } - - eventType = events[ type ]; - - if ( !eventType ) { - continue; - } - - if ( !handler ) { - for ( j = 0; j < eventType.length; j++ ) { - handleObj = eventType[ j ]; - - if ( all || namespace.test( handleObj.namespace ) ) { - jQuery.event.remove( elem, origType, handleObj.handler, j ); - eventType.splice( j--, 1 ); - } + // Unbind all events (on this namespace, if provided) for the element + if ( !type ) { + for ( type in events ) { + jQuery.event.remove( elem, type + types[ t ], handler, selector, true ); } - continue; } special = jQuery.event.special[ type ] || {}; + type = ( selector? special.delegateType : special.bindType ) || type; + eventType = events[ type ] || []; + origCount = eventType.length; + namespaces = namespaces ? new RegExp("(^|\\.)" + namespaces.split(".").sort().join("\\.(?:.*\\.)?") + "(\\.|$)") : null; - for ( j = pos || 0; j < eventType.length; j++ ) { + // Remove matching events + for ( j = 0; j < eventType.length; j++ ) { handleObj = eventType[ j ]; - if ( handler.guid === handleObj.guid ) { - // remove the given handler for the given type - if ( all || namespace.test( handleObj.namespace ) ) { - if ( pos == null ) { - eventType.splice( j--, 1 ); - } + if ( ( mappedTypes || origType === handleObj.origType ) && + ( !handler || handler.guid === handleObj.guid ) && + ( !namespaces || namespaces.test( handleObj.namespace ) ) && + ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) { + eventType.splice( j--, 1 ); - if ( special.remove ) { - special.remove.call( elem, handleObj ); - } + if ( handleObj.selector ) { + eventType.delegateCount--; } - - if ( pos != null ) { - break; + if ( special.remove ) { + special.remove.call( elem, handleObj ); } } } - // remove generic event handler if no more handlers exist - if ( eventType.length === 0 || pos != null && eventType.length === 1 ) { + // Remove generic event handler if we removed something and no more handlers exist + // (avoids potential for endless recursion during removal of special event handlers) + if ( eventType.length === 0 && origCount !== eventType.length ) { if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) { jQuery.removeEvent( elem, type, elemData.handle ); } - ret = null; delete events[ type ]; } } // Remove the expando if it's no longer used if ( jQuery.isEmptyObject( events ) ) { - var handle = elemData.handle; + handle = elemData.handle; if ( handle ) { handle.elem = null; } - delete elemData.events; - delete elemData.handle; - - if ( jQuery.isEmptyObject( elemData ) ) { - jQuery.removeData( elem, undefined, true ); - } + // removeData also checks for emptiness and clears the expando if empty + // so use it instead of delete + jQuery.removeData( elem, [ "events", "handle" ], true ); } }, - + // Events that are safe to short-circuit if no handlers are attached. // Native DOM events should not be added, they may have inline handlers. customEvent: { @@ -2808,18 +3102,28 @@ jQuery.event = { }, trigger: function( event, data, elem, onlyHandlers ) { + // Don't do events on text and comment nodes + if ( elem && (elem.nodeType === 3 || elem.nodeType === 8) ) { + return; + } + // Event object or event type var type = event.type || event, namespaces = [], - exclusive; + cache, exclusive, i, cur, old, ontype, special, handle, eventPath, bubbleType; - if ( type.indexOf("!") >= 0 ) { + // focus/blur morphs to focusin/out; ensure we're not firing them right now + if ( rfocusMorph.test( type + jQuery.event.triggered ) ) { + return; + } + + if ( type.indexOf( "!" ) >= 0 ) { // Exclusive events trigger only for the exact event (no namespaces) type = type.slice(0, -1); exclusive = true; } - if ( type.indexOf(".") >= 0 ) { + if ( type.indexOf( "." ) >= 0 ) { // Namespaced trigger; create a regexp to match event type in handle() namespaces = type.split("."); type = namespaces.shift(); @@ -2841,230 +3145,314 @@ jQuery.event = { new jQuery.Event( type ); event.type = type; + event.isTrigger = true; event.exclusive = exclusive; - event.namespace = namespaces.join("."); - event.namespace_re = new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.)?") + "(\\.|$)"); - - // triggerHandler() and global events don't bubble or run the default action - if ( onlyHandlers || !elem ) { - event.preventDefault(); - event.stopPropagation(); - } + event.namespace = namespaces.join( "." ); + event.namespace_re = event.namespace? new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.)?") + "(\\.|$)") : null; + ontype = type.indexOf( ":" ) < 0 ? "on" + type : ""; // Handle a global trigger if ( !elem ) { - // TODO: Stop taunting the data cache; remove global events and always attach to document - jQuery.each( jQuery.cache, function() { - // internalKey variable is just used to make it easier to find - // and potentially change this stuff later; currently it just - // points to jQuery.expando - var internalKey = jQuery.expando, - internalCache = this[ internalKey ]; - if ( internalCache && internalCache.events && internalCache.events[ type ] ) { - jQuery.event.trigger( event, data, internalCache.handle.elem ); - } - }); - return; - } - // Don't do events on text and comment nodes - if ( elem.nodeType === 3 || elem.nodeType === 8 ) { + // TODO: Stop taunting the data cache; remove global events and always attach to document + cache = jQuery.cache; + for ( i in cache ) { + if ( cache[ i ].events && cache[ i ].events[ type ] ) { + jQuery.event.trigger( event, data, cache[ i ].handle.elem, true ); + } + } return; } // Clean up the event in case it is being reused event.result = undefined; - event.target = elem; + if ( !event.target ) { + event.target = elem; + } // Clone any incoming data and prepend the event, creating the handler arg list data = data != null ? jQuery.makeArray( data ) : []; data.unshift( event ); - var cur = elem, - // IE doesn't like method names with a colon (#3533, #8272) - ontype = type.indexOf(":") < 0 ? "on" + type : ""; + // Allow special events to draw outside the lines + special = jQuery.event.special[ type ] || {}; + if ( special.trigger && special.trigger.apply( elem, data ) === false ) { + return; + } - // Fire event on the current element, then bubble up the DOM tree - do { - var handle = jQuery._data( cur, "handle" ); + // Determine event propagation path in advance, per W3C events spec (#9951) + // Bubble up to document, then to window; watch for a global ownerDocument var (#9724) + eventPath = [[ elem, special.bindType || type ]]; + if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) { - event.currentTarget = cur; + bubbleType = special.delegateType || type; + cur = rfocusMorph.test( bubbleType + type ) ? elem : elem.parentNode; + old = null; + for ( ; cur; cur = cur.parentNode ) { + eventPath.push([ cur, bubbleType ]); + old = cur; + } + + // Only add window if we got to document (e.g., not plain obj or detached DOM) + if ( old && old === elem.ownerDocument ) { + eventPath.push([ old.defaultView || old.parentWindow || window, bubbleType ]); + } + } + + // Fire handlers on the event path + for ( i = 0; i < eventPath.length && !event.isPropagationStopped(); i++ ) { + + cur = eventPath[i][0]; + event.type = eventPath[i][1]; + + handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" ); if ( handle ) { handle.apply( cur, data ); } - - // Trigger an inline bound script - if ( ontype && jQuery.acceptData( cur ) && cur[ ontype ] && cur[ ontype ].apply( cur, data ) === false ) { - event.result = false; + // Note that this is a bare JS function and not a jQuery handler + handle = ontype && cur[ ontype ]; + if ( handle && jQuery.acceptData( cur ) && handle.apply( cur, data ) === false ) { event.preventDefault(); } - - // Bubble up to document, then to window - cur = cur.parentNode || cur.ownerDocument || cur === event.target.ownerDocument && window; - } while ( cur && !event.isPropagationStopped() ); + } + event.type = type; // If nobody prevented the default action, do it now - if ( !event.isDefaultPrevented() ) { - var old, - special = jQuery.event.special[ type ] || {}; + if ( !onlyHandlers && !event.isDefaultPrevented() ) { - if ( (!special._default || special._default.call( elem.ownerDocument, event ) === false) && + if ( (!special._default || special._default.apply( elem.ownerDocument, data ) === false) && !(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) { // Call a native DOM method on the target with the same name name as the event. - // Can't use an .isFunction)() check here because IE6/7 fails that test. - // IE<9 dies on focus to hidden element (#1486), may want to revisit a try/catch. - try { - if ( ontype && elem[ type ] ) { - // Don't re-trigger an onFOO event when we call its FOO() method - old = elem[ ontype ]; + // Can't use an .isFunction() check here because IE6/7 fails that test. + // Don't do default actions on window, that's where global variables be (#6170) + // IE<9 dies on focus/blur to hidden element (#1486) + if ( ontype && elem[ type ] && ((type !== "focus" && type !== "blur") || event.target.offsetWidth !== 0) && !jQuery.isWindow( elem ) ) { - if ( old ) { - elem[ ontype ] = null; - } + // Don't re-trigger an onFOO event when we call its FOO() method + old = elem[ ontype ]; - jQuery.event.triggered = type; - elem[ type ](); + if ( old ) { + elem[ ontype ] = null; } - } catch ( ieError ) {} - if ( old ) { - elem[ ontype ] = old; + // Prevent re-triggering of the same event, since we already bubbled it above + jQuery.event.triggered = type; + elem[ type ](); + jQuery.event.triggered = undefined; + + if ( old ) { + elem[ ontype ] = old; + } } - - jQuery.event.triggered = undefined; } } - + return event.result; }, - handle: function( event ) { + dispatch: function( event ) { + + // Make a writable jQuery.Event from the native event object event = jQuery.event.fix( event || window.event ); - // Snapshot the handlers list since a called handler may add/remove events. - var handlers = ((jQuery._data( this, "events" ) || {})[ event.type ] || []).slice(0), + + var handlers = ( (jQuery._data( this, "events" ) || {} )[ event.type ] || []), + delegateCount = handlers.delegateCount, + args = [].slice.call( arguments, 0 ), run_all = !event.exclusive && !event.namespace, - args = Array.prototype.slice.call( arguments, 0 ); + special = jQuery.event.special[ event.type ] || {}, + handlerQueue = [], + i, j, cur, jqcur, ret, selMatch, matched, matches, handleObj, sel, related; - // Use the fix-ed Event rather than the (read-only) native event + // Use the fix-ed jQuery.Event rather than the (read-only) native event args[0] = event; - event.currentTarget = this; + event.delegateTarget = this; - for ( var j = 0, l = handlers.length; j < l; j++ ) { - var handleObj = handlers[ j ]; + // Call the preDispatch hook for the mapped type, and let it bail if desired + if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) { + return; + } - // Triggered event must 1) be non-exclusive and have no namespace, or - // 2) have namespace(s) a subset or equal to those in the bound event. - if ( run_all || event.namespace_re.test( handleObj.namespace ) ) { - // Pass in a reference to the handler function itself - // So that we can later remove it - event.handler = handleObj.handler; - event.data = handleObj.data; - event.handleObj = handleObj; + // Determine handlers that should run if there are delegated events + // Avoid non-left-click bubbling in Firefox (#3861) + if ( delegateCount && !(event.button && event.type === "click") ) { - var ret = handleObj.handler.apply( this, args ); + // Pregenerate a single jQuery object for reuse with .is() + jqcur = jQuery(this); + jqcur.context = this.ownerDocument || this; - if ( ret !== undefined ) { - event.result = ret; - if ( ret === false ) { - event.preventDefault(); - event.stopPropagation(); + for ( cur = event.target; cur != this; cur = cur.parentNode || this ) { + + // Don't process events on disabled elements (#6911, #8165) + if ( cur.disabled !== true ) { + selMatch = {}; + matches = []; + jqcur[0] = cur; + for ( i = 0; i < delegateCount; i++ ) { + handleObj = handlers[ i ]; + sel = handleObj.selector; + + if ( selMatch[ sel ] === undefined ) { + selMatch[ sel ] = ( + handleObj.quick ? quickIs( cur, handleObj.quick ) : jqcur.is( sel ) + ); + } + if ( selMatch[ sel ] ) { + matches.push( handleObj ); + } + } + if ( matches.length ) { + handlerQueue.push({ elem: cur, matches: matches }); } - } - - if ( event.isImmediatePropagationStopped() ) { - break; } } } + + // Add the remaining (directly-bound) handlers + if ( handlers.length > delegateCount ) { + handlerQueue.push({ elem: this, matches: handlers.slice( delegateCount ) }); + } + + // Run delegates first; they may want to stop propagation beneath us + for ( i = 0; i < handlerQueue.length && !event.isPropagationStopped(); i++ ) { + matched = handlerQueue[ i ]; + event.currentTarget = matched.elem; + + for ( j = 0; j < matched.matches.length && !event.isImmediatePropagationStopped(); j++ ) { + handleObj = matched.matches[ j ]; + + // Triggered event must either 1) be non-exclusive and have no namespace, or + // 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace). + if ( run_all || (!event.namespace && !handleObj.namespace) || event.namespace_re && event.namespace_re.test( handleObj.namespace ) ) { + + event.data = handleObj.data; + event.handleObj = handleObj; + + ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler ) + .apply( matched.elem, args ); + + if ( ret !== undefined ) { + event.result = ret; + if ( ret === false ) { + event.preventDefault(); + event.stopPropagation(); + } + } + } + } + } + + // Call the postDispatch hook for the mapped type + if ( special.postDispatch ) { + special.postDispatch.call( this, event ); + } + return event.result; }, - props: "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "), + // Includes some event props shared by KeyEvent and MouseEvent + // *** attrChange attrName relatedNode srcElement are not normalized, non-W3C, deprecated, will be removed in 1.8 *** + props: "attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "), + + fixHooks: {}, + + keyHooks: { + props: "char charCode key keyCode".split(" "), + filter: function( event, original ) { + + // Add which for key events + if ( event.which == null ) { + event.which = original.charCode != null ? original.charCode : original.keyCode; + } + + return event; + } + }, + + mouseHooks: { + props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "), + filter: function( event, original ) { + var eventDoc, doc, body, + button = original.button, + fromElement = original.fromElement; + + // Calculate pageX/Y if missing and clientX/Y available + if ( event.pageX == null && original.clientX != null ) { + eventDoc = event.target.ownerDocument || document; + doc = eventDoc.documentElement; + body = eventDoc.body; + + event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 ); + event.pageY = original.clientY + ( doc && doc.scrollTop || body && body.scrollTop || 0 ) - ( doc && doc.clientTop || body && body.clientTop || 0 ); + } + + // Add relatedTarget, if necessary + if ( !event.relatedTarget && fromElement ) { + event.relatedTarget = fromElement === event.target ? original.toElement : fromElement; + } + + // Add which for click: 1 === left; 2 === middle; 3 === right + // Note: button is not normalized, so don't use it + if ( !event.which && button !== undefined ) { + event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) ); + } + + return event; + } + }, fix: function( event ) { if ( event[ jQuery.expando ] ) { return event; } - // store a copy of the original event object - // and "clone" to set read-only properties - var originalEvent = event; + // Create a writable copy of the event object and normalize some properties + var i, prop, + originalEvent = event, + fixHook = jQuery.event.fixHooks[ event.type ] || {}, + copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props; + event = jQuery.Event( originalEvent ); - for ( var i = this.props.length, prop; i; ) { - prop = this.props[ --i ]; + for ( i = copy.length; i; ) { + prop = copy[ --i ]; event[ prop ] = originalEvent[ prop ]; } - // Fix target property, if necessary + // Fix target property, if necessary (#1925, IE 6/7/8 & Safari2) if ( !event.target ) { - // Fixes #1925 where srcElement might not be defined either - event.target = event.srcElement || document; + event.target = originalEvent.srcElement || document; } - // check if target is a textnode (safari) + // Target should not be a text node (#504, Safari) if ( event.target.nodeType === 3 ) { event.target = event.target.parentNode; } - // Add relatedTarget, if necessary - if ( !event.relatedTarget && event.fromElement ) { - event.relatedTarget = event.fromElement === event.target ? event.toElement : event.fromElement; - } - - // Calculate pageX/Y if missing and clientX/Y available - if ( event.pageX == null && event.clientX != null ) { - var eventDocument = event.target.ownerDocument || document, - doc = eventDocument.documentElement, - body = eventDocument.body; - - event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc && doc.clientLeft || body && body.clientLeft || 0); - event.pageY = event.clientY + (doc && doc.scrollTop || body && body.scrollTop || 0) - (doc && doc.clientTop || body && body.clientTop || 0); - } - - // Add which for key events - if ( event.which == null && (event.charCode != null || event.keyCode != null) ) { - event.which = event.charCode != null ? event.charCode : event.keyCode; - } - - // Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs) - if ( !event.metaKey && event.ctrlKey ) { + // For mouse/key events; add metaKey if it's not there (#3368, IE6/7/8) + if ( event.metaKey === undefined ) { event.metaKey = event.ctrlKey; } - // Add which for click: 1 === left; 2 === middle; 3 === right - // Note: button is not normalized, so don't use it - if ( !event.which && event.button !== undefined ) { - event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) )); - } - - return event; + return fixHook.filter? fixHook.filter( event, originalEvent ) : event; }, - // Deprecated, use jQuery.guid instead - guid: 1E8, - - // Deprecated, use jQuery.proxy instead - proxy: jQuery.proxy, - special: { ready: { // Make sure the ready event is setup - setup: jQuery.bindReady, - teardown: jQuery.noop + setup: jQuery.bindReady }, - live: { - add: function( handleObj ) { - jQuery.event.add( this, - liveConvert( handleObj.origType, handleObj.selector ), - jQuery.extend({}, handleObj, {handler: liveHandler, guid: handleObj.handler.guid}) ); - }, + load: { + // Prevent triggered image.load events from bubbling to window.load + noBubble: true + }, - remove: function( handleObj ) { - jQuery.event.remove( this, liveConvert( handleObj.origType, handleObj.selector ), handleObj ); - } + focus: { + delegateType: "focusin" + }, + blur: { + delegateType: "focusout" }, beforeunload: { @@ -3081,9 +3469,35 @@ jQuery.event = { } } } + }, + + simulate: function( type, elem, event, bubble ) { + // Piggyback on a donor event to simulate a different one. + // Fake originalEvent to avoid donor's stopPropagation, but if the + // simulated event prevents default then we do the same on the donor. + var e = jQuery.extend( + new jQuery.Event(), + event, + { type: type, + isSimulated: true, + originalEvent: {} + } + ); + if ( bubble ) { + jQuery.event.trigger( e, null, elem ); + } else { + jQuery.event.dispatch.call( elem, e ); + } + if ( e.isDefaultPrevented() ) { + event.preventDefault(); + } } }; +// Some plugins are using, but it's undocumented/deprecated and will be removed. +// The 1.7 special event interface should provide all the hooks needed now. +jQuery.event.handle = jQuery.event.dispatch; + jQuery.removeEvent = document.removeEventListener ? function( elem, type, handle ) { if ( elem.removeEventListener ) { @@ -3098,7 +3512,7 @@ jQuery.removeEvent = document.removeEventListener ? jQuery.Event = function( src, props ) { // Allow instantiation without the 'new' keyword - if ( !this.preventDefault ) { + if ( !(this instanceof jQuery.Event) ) { return new jQuery.Event( src, props ); } @@ -3109,8 +3523,8 @@ jQuery.Event = function( src, props ) { // Events bubbling up the document may have been marked as prevented // by a handler lower down the tree; reflect the correct value. - this.isDefaultPrevented = (src.defaultPrevented || src.returnValue === false || - src.getPreventDefault && src.getPreventDefault()) ? returnTrue : returnFalse; + this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false || + src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse; // Event type } else { @@ -3122,9 +3536,8 @@ jQuery.Event = function( src, props ) { jQuery.extend( this, props ); } - // timeStamp is buggy for some events on Firefox(#3843) - // So we won't rely on the native value - this.timeStamp = jQuery.now(); + // Create a timestamp if incoming event doesn't have one + this.timeStamp = src && src.timeStamp || jQuery.now(); // Mark it as fixed this[ jQuery.expando ] = true; @@ -3180,214 +3593,137 @@ jQuery.Event.prototype = { isImmediatePropagationStopped: returnFalse }; -// Checks if an event happened on an element within another element -// Used in jQuery.event.special.mouseenter and mouseleave handlers -var withinElement = function( event ) { - - // Check if mouse(over|out) are still within the same parent element - var related = event.relatedTarget, - inside = false, - eventType = event.type; - - event.type = event.data; - - if ( related !== this ) { - - if ( related ) { - inside = jQuery.contains( this, related ); - } - - if ( !inside ) { - - jQuery.event.handle.apply( this, arguments ); - - event.type = eventType; - } - } -}, - -// In case of event delegation, we only need to rename the event.type, -// liveHandler will take care of the rest. -delegate = function( event ) { - event.type = event.data; - jQuery.event.handle.apply( this, arguments ); -}; - -// Create mouseenter and mouseleave events +// Create mouseenter/leave events using mouseover/out and event-time checks jQuery.each({ mouseenter: "mouseover", mouseleave: "mouseout" }, function( orig, fix ) { jQuery.event.special[ orig ] = { - setup: function( data ) { - jQuery.event.add( this, fix, data && data.selector ? delegate : withinElement, orig ); - }, - teardown: function( data ) { - jQuery.event.remove( this, fix, data && data.selector ? delegate : withinElement ); + delegateType: fix, + bindType: fix, + + handle: function( event ) { + var target = this, + related = event.relatedTarget, + handleObj = event.handleObj, + selector = handleObj.selector, + ret; + + // For mousenter/leave call the handler if related is outside the target. + // NB: No relatedTarget if the mouse left/entered the browser window + if ( !related || (related !== target && !jQuery.contains( target, related )) ) { + event.type = handleObj.origType; + ret = handleObj.handler.apply( this, arguments ); + event.type = fix; + } + return ret; } }; }); -// submit delegation +// IE submit delegation if ( !jQuery.support.submitBubbles ) { jQuery.event.special.submit = { - setup: function( data, namespaces ) { - if ( !jQuery.nodeName( this, "form" ) ) { - jQuery.event.add(this, "click.specialSubmit", function( e ) { - var elem = e.target, - type = elem.type; - - if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) { - trigger( "submit", this, arguments ); - } - }); - - jQuery.event.add(this, "keypress.specialSubmit", function( e ) { - var elem = e.target, - type = elem.type; - - if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) { - trigger( "submit", this, arguments ); - } - }); - - } else { + setup: function() { + // Only need this for delegated form submit events + if ( jQuery.nodeName( this, "form" ) ) { return false; } + + // Lazy-add a submit handler when a descendant form may potentially be submitted + jQuery.event.add( this, "click._submit keypress._submit", function( e ) { + // Node name check avoids a VML-related crash in IE (#9807) + var elem = e.target, + form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined; + if ( form && !form._submit_attached ) { + jQuery.event.add( form, "submit._submit", function( event ) { + event._submit_bubble = true; + }); + form._submit_attached = true; + } + }); + // return undefined since we don't need an event listener + }, + + postDispatch: function( event ) { + // If form was submitted by the user, bubble the event up the tree + if ( event._submit_bubble ) { + delete event._submit_bubble; + if ( this.parentNode && !event.isTrigger ) { + jQuery.event.simulate( "submit", this.parentNode, event, true ); + } + } }, - teardown: function( namespaces ) { - jQuery.event.remove( this, ".specialSubmit" ); + teardown: function() { + // Only need this for delegated form submit events + if ( jQuery.nodeName( this, "form" ) ) { + return false; + } + + // Remove delegated handlers; cleanData eventually reaps submit handlers attached above + jQuery.event.remove( this, "._submit" ); } }; - } -// change delegation, happens here so we have bind. +// IE change delegation and checkbox/radio fix if ( !jQuery.support.changeBubbles ) { - var changeFilters, - - getVal = function( elem ) { - var type = elem.type, val = elem.value; - - if ( type === "radio" || type === "checkbox" ) { - val = elem.checked; - - } else if ( type === "select-multiple" ) { - val = elem.selectedIndex > -1 ? - jQuery.map( elem.options, function( elem ) { - return elem.selected; - }).join("-") : - ""; - - } else if ( jQuery.nodeName( elem, "select" ) ) { - val = elem.selectedIndex; - } - - return val; - }, - - testChange = function testChange( e ) { - var elem = e.target, data, val; - - if ( !rformElems.test( elem.nodeName ) || elem.readOnly ) { - return; - } - - data = jQuery._data( elem, "_change_data" ); - val = getVal(elem); - - // the current data will be also retrieved by beforeactivate - if ( e.type !== "focusout" || elem.type !== "radio" ) { - jQuery._data( elem, "_change_data", val ); - } - - if ( data === undefined || val === data ) { - return; - } - - if ( data != null || val ) { - e.type = "change"; - e.liveFired = undefined; - jQuery.event.trigger( e, arguments[1], elem ); - } - }; - jQuery.event.special.change = { - filters: { - focusout: testChange, - beforedeactivate: testChange, + setup: function() { - click: function( e ) { - var elem = e.target, type = jQuery.nodeName( elem, "input" ) ? elem.type : ""; - - if ( type === "radio" || type === "checkbox" || jQuery.nodeName( elem, "select" ) ) { - testChange.call( this, e ); + if ( rformElems.test( this.nodeName ) ) { + // IE doesn't fire change on a check/radio until blur; trigger it on click + // after a propertychange. Eat the blur-change in special.change.handle. + // This still fires onchange a second time for check/radio after blur. + if ( this.type === "checkbox" || this.type === "radio" ) { + jQuery.event.add( this, "propertychange._change", function( event ) { + if ( event.originalEvent.propertyName === "checked" ) { + this._just_changed = true; + } + }); + jQuery.event.add( this, "click._change", function( event ) { + if ( this._just_changed && !event.isTrigger ) { + this._just_changed = false; + jQuery.event.simulate( "change", this, event, true ); + } + }); } - }, - - // Change has to be called before submit - // Keydown will be called before keypress, which is used in submit-event delegation - keydown: function( e ) { - var elem = e.target, type = jQuery.nodeName( elem, "input" ) ? elem.type : ""; - - if ( (e.keyCode === 13 && !jQuery.nodeName( elem, "textarea" ) ) || - (e.keyCode === 32 && (type === "checkbox" || type === "radio")) || - type === "select-multiple" ) { - testChange.call( this, e ); - } - }, - - // Beforeactivate happens also before the previous element is blurred - // with this event you can't trigger a change event, but you can store - // information - beforeactivate: function( e ) { - var elem = e.target; - jQuery._data( elem, "_change_data", getVal(elem) ); - } - }, - - setup: function( data, namespaces ) { - if ( this.type === "file" ) { return false; } + // Delegated event; lazy-add a change handler on descendant inputs + jQuery.event.add( this, "beforeactivate._change", function( e ) { + var elem = e.target; - for ( var type in changeFilters ) { - jQuery.event.add( this, type + ".specialChange", changeFilters[type] ); - } - - return rformElems.test( this.nodeName ); + if ( rformElems.test( elem.nodeName ) && !elem._change_attached ) { + jQuery.event.add( elem, "change._change", function( event ) { + if ( this.parentNode && !event.isSimulated && !event.isTrigger ) { + jQuery.event.simulate( "change", this.parentNode, event, true ); + } + }); + elem._change_attached = true; + } + }); }, - teardown: function( namespaces ) { - jQuery.event.remove( this, ".specialChange" ); + handle: function( event ) { + var elem = event.target; + + // Swallow native change events from checkbox/radio, we already triggered them above + if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) { + return event.handleObj.handler.apply( this, arguments ); + } + }, + + teardown: function() { + jQuery.event.remove( this, "._change" ); return rformElems.test( this.nodeName ); } }; - - changeFilters = jQuery.event.special.change.filters; - - // Handle when the input is .focus()'d - changeFilters.focus = changeFilters.beforeactivate; -} - -function trigger( type, elem, args ) { - // Piggyback on a donor event to simulate a different one. - // Fake originalEvent to avoid donor's stopPropagation, but if the - // simulated event prevents default then we do the same on the donor. - // Don't pass args or remember liveFired; they apply to the donor event. - var event = jQuery.extend( {}, args[ 0 ] ); - event.type = type; - event.originalEvent = {}; - event.liveFired = undefined; - jQuery.event.handle.call( elem, event ); - if ( event.isDefaultPrevented() ) { - args[ 0 ].preventDefault(); - } } // Create "bubbling" focus and blur events @@ -3395,7 +3731,10 @@ if ( !jQuery.support.focusinBubbles ) { jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) { // Attach a single capturing handler while someone wants focusin/focusout - var attaches = 0; + var attaches = 0, + handler = function( event ) { + jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true ); + }; jQuery.event.special[ fix ] = { setup: function() { @@ -3409,89 +3748,120 @@ if ( !jQuery.support.focusinBubbles ) { } } }; - - function handler( donor ) { - // Donor event is always a native one; fix it and switch its type. - // Let focusin/out handler cancel the donor focus/blur event. - var e = jQuery.event.fix( donor ); - e.type = fix; - e.originalEvent = {}; - jQuery.event.trigger( e, null, e.target ); - if ( e.isDefaultPrevented() ) { - donor.preventDefault(); - } - } }); } -jQuery.each(["bind", "one"], function( i, name ) { - jQuery.fn[ name ] = function( type, data, fn ) { - var handler; +jQuery.fn.extend({ - // Handle object literals - if ( typeof type === "object" ) { - for ( var key in type ) { - this[ name ](key, data, type[key], fn); + on: function( types, selector, data, fn, /*INTERNAL*/ one ) { + var origFn, type; + + // Types can be a map of types/handlers + if ( typeof types === "object" ) { + // ( types-Object, selector, data ) + if ( typeof selector !== "string" ) { // && selector != null + // ( types-Object, data ) + data = data || selector; + selector = undefined; + } + for ( type in types ) { + this.on( type, selector, data, types[ type ], one ); } return this; } - if ( arguments.length === 2 || data === false ) { - fn = data; - data = undefined; + if ( data == null && fn == null ) { + // ( types, fn ) + fn = selector; + data = selector = undefined; + } else if ( fn == null ) { + if ( typeof selector === "string" ) { + // ( types, selector, fn ) + fn = data; + data = undefined; + } else { + // ( types, data, fn ) + fn = data; + data = selector; + selector = undefined; + } + } + if ( fn === false ) { + fn = returnFalse; + } else if ( !fn ) { + return this; } - if ( name === "one" ) { - handler = function( event ) { - jQuery( this ).unbind( event, handler ); - return fn.apply( this, arguments ); + if ( one === 1 ) { + origFn = fn; + fn = function( event ) { + // Can use an empty set, since event contains the info + jQuery().off( event ); + return origFn.apply( this, arguments ); }; - handler.guid = fn.guid || jQuery.guid++; - } else { - handler = fn; + // Use same guid so caller can remove using origFn + fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ ); } - - if ( type === "unload" && name !== "one" ) { - this.one( type, data, fn ); - - } else { - for ( var i = 0, l = this.length; i < l; i++ ) { - jQuery.event.add( this[i], type, handler, data ); + return this.each( function() { + jQuery.event.add( this, types, fn, data, selector ); + }); + }, + one: function( types, selector, data, fn ) { + return this.on( types, selector, data, fn, 1 ); + }, + off: function( types, selector, fn ) { + if ( types && types.preventDefault && types.handleObj ) { + // ( event ) dispatched jQuery.Event + var handleObj = types.handleObj; + jQuery( types.delegateTarget ).off( + handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType, + handleObj.selector, + handleObj.handler + ); + return this; + } + if ( typeof types === "object" ) { + // ( types-object [, selector] ) + for ( var type in types ) { + this.off( type, selector, types[ type ] ); } + return this; } + if ( selector === false || typeof selector === "function" ) { + // ( types [, fn] ) + fn = selector; + selector = undefined; + } + if ( fn === false ) { + fn = returnFalse; + } + return this.each(function() { + jQuery.event.remove( this, types, fn, selector ); + }); + }, + bind: function( types, data, fn ) { + return this.on( types, null, data, fn ); + }, + unbind: function( types, fn ) { + return this.off( types, null, fn ); + }, + + live: function( types, data, fn ) { + jQuery( this.context ).on( types, this.selector, data, fn ); return this; - }; -}); - -jQuery.fn.extend({ - unbind: function( type, fn ) { - // Handle object literals - if ( typeof type === "object" && !type.preventDefault ) { - for ( var key in type ) { - this.unbind(key, type[key]); - } - - } else { - for ( var i = 0, l = this.length; i < l; i++ ) { - jQuery.event.remove( this[i], type, fn ); - } - } - + }, + die: function( types, fn ) { + jQuery( this.context ).off( types, this.selector || "**", fn ); return this; }, delegate: function( selector, types, data, fn ) { - return this.live( types, data, fn, selector ); + return this.on( types, selector, data, fn ); }, - undelegate: function( selector, types, fn ) { - if ( arguments.length === 0 ) { - return this.unbind( "live" ); - - } else { - return this.die( types, null, fn, selector ); - } + // ( namespace ) or ( selector, types [, fn] ) + return arguments.length == 1? this.off( selector, "**" ) : this.off( types, selector, fn ); }, trigger: function( type, data ) { @@ -3499,7 +3869,6 @@ jQuery.fn.extend({ jQuery.event.trigger( type, data, this ); }); }, - triggerHandler: function( type, data ) { if ( this[0] ) { return jQuery.event.trigger( type, data, this[0], true ); @@ -3513,8 +3882,8 @@ jQuery.fn.extend({ i = 0, toggler = function( event ) { // Figure out which function to execute - var lastToggle = ( jQuery.data( this, "lastToggle" + fn.guid ) || 0 ) % i; - jQuery.data( this, "lastToggle" + fn.guid, lastToggle + 1 ); + var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i; + jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 ); // Make sure that clicks stop event.preventDefault(); @@ -3537,178 +3906,9 @@ jQuery.fn.extend({ } }); -var liveMap = { - focus: "focusin", - blur: "focusout", - mouseenter: "mouseover", - mouseleave: "mouseout" -}; - -jQuery.each(["live", "die"], function( i, name ) { - jQuery.fn[ name ] = function( types, data, fn, origSelector /* Internal Use Only */ ) { - var type, i = 0, match, namespaces, preType, - selector = origSelector || this.selector, - context = origSelector ? this : jQuery( this.context ); - - if ( typeof types === "object" && !types.preventDefault ) { - for ( var key in types ) { - context[ name ]( key, data, types[key], selector ); - } - - return this; - } - - if ( name === "die" && !types && - origSelector && origSelector.charAt(0) === "." ) { - - context.unbind( origSelector ); - - return this; - } - - if ( data === false || jQuery.isFunction( data ) ) { - fn = data || returnFalse; - data = undefined; - } - - types = (types || "").split(" "); - - while ( (type = types[ i++ ]) != null ) { - match = rnamespaces.exec( type ); - namespaces = ""; - - if ( match ) { - namespaces = match[0]; - type = type.replace( rnamespaces, "" ); - } - - if ( type === "hover" ) { - types.push( "mouseenter" + namespaces, "mouseleave" + namespaces ); - continue; - } - - preType = type; - - if ( liveMap[ type ] ) { - types.push( liveMap[ type ] + namespaces ); - type = type + namespaces; - - } else { - type = (liveMap[ type ] || type) + namespaces; - } - - if ( name === "live" ) { - // bind live handler - for ( var j = 0, l = context.length; j < l; j++ ) { - jQuery.event.add( context[j], "live." + liveConvert( type, selector ), - { data: data, selector: selector, handler: fn, origType: type, origHandler: fn, preType: preType } ); - } - - } else { - // unbind live handler - context.unbind( "live." + liveConvert( type, selector ), fn ); - } - } - - return this; - }; -}); - -function liveHandler( event ) { - var stop, maxLevel, related, match, handleObj, elem, j, i, l, data, close, namespace, ret, - elems = [], - selectors = [], - events = jQuery._data( this, "events" ); - - // Make sure we avoid non-left-click bubbling in Firefox (#3861) and disabled elements in IE (#6911) - if ( event.liveFired === this || !events || !events.live || event.target.disabled || event.button && event.type === "click" ) { - return; - } - - if ( event.namespace ) { - namespace = new RegExp("(^|\\.)" + event.namespace.split(".").join("\\.(?:.*\\.)?") + "(\\.|$)"); - } - - event.liveFired = this; - - var live = events.live.slice(0); - - for ( j = 0; j < live.length; j++ ) { - handleObj = live[j]; - - if ( handleObj.origType.replace( rnamespaces, "" ) === event.type ) { - selectors.push( handleObj.selector ); - - } else { - live.splice( j--, 1 ); - } - } - - match = jQuery( event.target ).closest( selectors, event.currentTarget ); - - for ( i = 0, l = match.length; i < l; i++ ) { - close = match[i]; - - for ( j = 0; j < live.length; j++ ) { - handleObj = live[j]; - - if ( close.selector === handleObj.selector && (!namespace || namespace.test( handleObj.namespace )) && !close.elem.disabled ) { - elem = close.elem; - related = null; - - // Those two events require additional checking - if ( handleObj.preType === "mouseenter" || handleObj.preType === "mouseleave" ) { - event.type = handleObj.preType; - related = jQuery( event.relatedTarget ).closest( handleObj.selector )[0]; - - // Make sure not to accidentally match a child element with the same selector - if ( related && jQuery.contains( elem, related ) ) { - related = elem; - } - } - - if ( !related || related !== elem ) { - elems.push({ elem: elem, handleObj: handleObj, level: close.level }); - } - } - } - } - - for ( i = 0, l = elems.length; i < l; i++ ) { - match = elems[i]; - - if ( maxLevel && match.level > maxLevel ) { - break; - } - - event.currentTarget = match.elem; - event.data = match.handleObj.data; - event.handleObj = match.handleObj; - - ret = match.handleObj.origHandler.apply( match.elem, arguments ); - - if ( ret === false || event.isPropagationStopped() ) { - maxLevel = match.level; - - if ( ret === false ) { - stop = false; - } - if ( event.isImmediatePropagationStopped() ) { - break; - } - } - } - - return stop; -} - -function liveConvert( type, selector ) { - return (type && type !== "*" ? type + "." : "") + selector.replace(rperiod, "`").replace(rspaces, "&"); -} - jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " + "mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " + - "change select submit keydown keypress keyup error").split(" "), function( i, name ) { + "change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) { // Handle event binding jQuery.fn[ name ] = function( data, fn ) { @@ -3718,13 +3918,21 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl } return arguments.length > 0 ? - this.bind( name, data, fn ) : + this.on( name, null, data, fn ) : this.trigger( name ); }; if ( jQuery.attrFn ) { jQuery.attrFn[ name ] = true; } + + if ( rkeyEvent.test( name ) ) { + jQuery.event.fixHooks[ name ] = jQuery.event.keyHooks; + } + + if ( rmouseEvent.test( name ) ) { + jQuery.event.fixHooks[ name ] = jQuery.event.mouseHooks; + } }); @@ -3738,11 +3946,13 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl (function(){ var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g, + expando = "sizcache" + (Math.random() + '').replace('.', ''), done = 0, toString = Object.prototype.toString, hasDuplicate = false, baseHasDuplicate = true, rBackslash = /\\/g, + rReturn = /\r\n/g, rNonWord = /\W/; // Here we check if the JavaScript engine is using some sort of @@ -3763,7 +3973,7 @@ var Sizzle = function( selector, context, results, seed ) { if ( context.nodeType !== 1 && context.nodeType !== 9 ) { return []; } - + if ( !selector || typeof selector !== "string" ) { return results; } @@ -3773,7 +3983,7 @@ var Sizzle = function( selector, context, results, seed ) { contextXML = Sizzle.isXML( context ), parts = [], soFar = selector; - + // Reset the position of the chunker regexp (start from head) do { chunker.exec( "" ); @@ -3781,9 +3991,9 @@ var Sizzle = function( selector, context, results, seed ) { if ( m ) { soFar = m[3]; - + parts.push( m[1] ); - + if ( m[2] ) { extra = m[3]; break; @@ -3794,7 +4004,7 @@ var Sizzle = function( selector, context, results, seed ) { if ( parts.length > 1 && origPOS.exec( selector ) ) { if ( parts.length === 2 && Expr.relative[ parts[0] ] ) { - set = posProcess( parts[0] + parts[1], context ); + set = posProcess( parts[0] + parts[1], context, seed ); } else { set = Expr.relative[ parts[0] ] ? @@ -3807,8 +4017,8 @@ var Sizzle = function( selector, context, results, seed ) { if ( Expr.relative[ selector ] ) { selector += parts.shift(); } - - set = posProcess( selector, set ); + + set = posProcess( selector, set, seed ); } } @@ -3927,18 +4137,17 @@ Sizzle.matchesSelector = function( node, expr ) { }; Sizzle.find = function( expr, context, isXML ) { - var set; + var set, i, len, match, type, left; if ( !expr ) { return []; } - for ( var i = 0, l = Expr.order.length; i < l; i++ ) { - var match, - type = Expr.order[i]; - + for ( i = 0, len = Expr.order.length; i < len; i++ ) { + type = Expr.order[i]; + if ( (match = Expr.leftMatch[ type ].exec( expr )) ) { - var left = match[1]; + left = match[1]; match.splice( 1, 1 ); if ( left.substr( left.length - 1 ) !== "\\" ) { @@ -3964,17 +4173,18 @@ Sizzle.find = function( expr, context, isXML ) { Sizzle.filter = function( expr, set, inplace, not ) { var match, anyFound, + type, found, item, filter, left, + i, pass, old = expr, result = [], curLoop = set, isXMLFilter = set && set[0] && Sizzle.isXML( set[0] ); while ( expr && set.length ) { - for ( var type in Expr.filter ) { + for ( type in Expr.filter ) { if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) { - var found, item, - filter = Expr.filter[ type ], - left = match[1]; + filter = Expr.filter[ type ]; + left = match[1]; anyFound = false; @@ -4000,10 +4210,10 @@ Sizzle.filter = function( expr, set, inplace, not ) { } if ( match ) { - for ( var i = 0; (item = curLoop[i]) != null; i++ ) { + for ( i = 0; (item = curLoop[i]) != null; i++ ) { if ( item ) { found = filter( item, match, i, curLoop ); - var pass = not ^ !!found; + pass = not ^ found; if ( inplace && found != null ) { if ( pass ) { @@ -4054,7 +4264,46 @@ Sizzle.filter = function( expr, set, inplace, not ) { }; Sizzle.error = function( msg ) { - throw "Syntax error, unrecognized expression: " + msg; + throw new Error( "Syntax error, unrecognized expression: " + msg ); +}; + +/** + * Utility function for retreiving the text value of an array of DOM nodes + * @param {Array|Element} elem + */ +var getText = Sizzle.getText = function( elem ) { + var i, node, + nodeType = elem.nodeType, + ret = ""; + + if ( nodeType ) { + if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) { + // Use textContent || innerText for elements + if ( typeof elem.textContent === 'string' ) { + return elem.textContent; + } else if ( typeof elem.innerText === 'string' ) { + // Replace IE's carriage returns + return elem.innerText.replace( rReturn, '' ); + } else { + // Traverse it's children + for ( elem = elem.firstChild; elem; elem = elem.nextSibling) { + ret += getText( elem ); + } + } + } else if ( nodeType === 3 || nodeType === 4 ) { + return elem.nodeValue; + } + } else { + + // If no nodeType, this is expected to be an array + for ( i = 0; (node = elem[i]); i++ ) { + // Do not traverse comment nodes + if ( node.nodeType !== 8 ) { + ret += getText( node ); + } + } + } + return ret; }; var Expr = Sizzle.selectors = { @@ -4268,7 +4517,7 @@ var Expr = Sizzle.selectors = { ATTR: function( match, curLoop, inplace, result, not, isXML ) { var name = match[1] = match[1].replace( rBackslash, "" ); - + if ( !isXML && Expr.attrMap[name] ) { match[1] = Expr.attrMap[name]; } @@ -4302,7 +4551,7 @@ var Expr = Sizzle.selectors = { } else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) { return true; } - + return match; }, @@ -4312,7 +4561,7 @@ var Expr = Sizzle.selectors = { return match; } }, - + filters: { enabled: function( elem ) { return elem.disabled === false && elem.type !== "hidden"; @@ -4325,14 +4574,14 @@ var Expr = Sizzle.selectors = { checked: function( elem ) { return elem.checked === true; }, - + selected: function( elem ) { // Accessing this property makes selected-by-default // options in Safari work properly if ( elem.parentNode ) { elem.parentNode.selectedIndex; } - + return elem.selected === true; }, @@ -4354,7 +4603,7 @@ var Expr = Sizzle.selectors = { text: function( elem ) { var attr = elem.getAttribute( "type" ), type = elem.type; - // IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc) + // IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc) // use getAttribute instead to test this case return elem.nodeName.toLowerCase() === "input" && "text" === type && ( attr === type || attr === null ); }, @@ -4444,7 +4693,7 @@ var Expr = Sizzle.selectors = { return filter( elem, i, match, array ); } else if ( name === "contains" ) { - return (elem.textContent || elem.innerText || Sizzle.getText([ elem ]) || "").indexOf(match[3]) >= 0; + return (elem.textContent || elem.innerText || getText([ elem ]) || "").indexOf(match[3]) >= 0; } else if ( name === "not" ) { var not = match[3]; @@ -4463,57 +4712,61 @@ var Expr = Sizzle.selectors = { }, CHILD: function( elem, match ) { - var type = match[1], + var first, last, + doneName, parent, cache, + count, diff, + type = match[1], node = elem; switch ( type ) { case "only": case "first": - while ( (node = node.previousSibling) ) { - if ( node.nodeType === 1 ) { - return false; + while ( (node = node.previousSibling) ) { + if ( node.nodeType === 1 ) { + return false; } } - if ( type === "first" ) { - return true; + if ( type === "first" ) { + return true; } node = elem; + /* falls through */ case "last": - while ( (node = node.nextSibling) ) { - if ( node.nodeType === 1 ) { - return false; + while ( (node = node.nextSibling) ) { + if ( node.nodeType === 1 ) { + return false; } } return true; case "nth": - var first = match[2], - last = match[3]; + first = match[2]; + last = match[3]; if ( first === 1 && last === 0 ) { return true; } - - var doneName = match[0], - parent = elem.parentNode; - - if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) { - var count = 0; - + + doneName = match[0]; + parent = elem.parentNode; + + if ( parent && (parent[ expando ] !== doneName || !elem.nodeIndex) ) { + count = 0; + for ( node = parent.firstChild; node; node = node.nextSibling ) { if ( node.nodeType === 1 ) { node.nodeIndex = ++count; } - } + } - parent.sizcache = doneName; + parent[ expando ] = doneName; } - - var diff = elem.nodeIndex - last; + + diff = elem.nodeIndex - last; if ( first === 0 ) { return diff === 0; @@ -4529,9 +4782,9 @@ var Expr = Sizzle.selectors = { }, TAG: function( elem, match ) { - return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match; + return (match === "*" && elem.nodeType === 1) || !!elem.nodeName && elem.nodeName.toLowerCase() === match; }, - + CLASS: function( elem, match ) { return (" " + (elem.className || elem.getAttribute("class")) + " ") .indexOf( match ) > -1; @@ -4539,7 +4792,9 @@ var Expr = Sizzle.selectors = { ATTR: function( elem, match ) { var name = match[1], - result = Expr.attrHandle[ name ] ? + result = Sizzle.attr ? + Sizzle.attr( elem, name ) : + Expr.attrHandle[ name ] ? Expr.attrHandle[ name ]( elem ) : elem[ name ] != null ? elem[ name ] : @@ -4550,6 +4805,8 @@ var Expr = Sizzle.selectors = { return result == null ? type === "!=" : + !type && Sizzle.attr ? + result != null : type === "=" ? value === check : type === "*=" ? @@ -4589,6 +4846,9 @@ for ( var type in Expr.match ) { Expr.match[ type ] = new RegExp( Expr.match[ type ].source + (/(?![^\[]*\])(?![^\(]*\))/.source) ); Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, fescape) ); } +// Expose origPOS +// "global" as in regardless of relation to brackets/parens +Expr.match.globalPOS = origPOS; var makeArray = function( array, results ) { array = Array.prototype.slice.call( array, 0 ); @@ -4597,7 +4857,7 @@ var makeArray = function( array, results ) { results.push.apply( results, array ); return results; } - + return array; }; @@ -4730,26 +4990,6 @@ if ( document.documentElement.compareDocumentPosition ) { }; } -// Utility function for retreiving the text value of an array of DOM nodes -Sizzle.getText = function( elems ) { - var ret = "", elem; - - for ( var i = 0; elems[i]; i++ ) { - elem = elems[i]; - - // Get the text from text nodes and CDATA nodes - if ( elem.nodeType === 3 || elem.nodeType === 4 ) { - ret += elem.nodeValue; - - // Traverse everything else, except comment nodes - } else if ( elem.nodeType !== 8 ) { - ret += Sizzle.getText( elem.childNodes ); - } - } - - return ret; -}; - // Check to see if the browser returns elements by name when // querying by getElementById (and provide a workaround) (function(){ @@ -4849,7 +5089,7 @@ if ( document.querySelectorAll ) { if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) { return; } - + Sizzle = function( query, context, extra, seed ) { context = context || document; @@ -4858,24 +5098,24 @@ if ( document.querySelectorAll ) { if ( !seed && !Sizzle.isXML(context) ) { // See if we find a selector to speed up var match = /^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec( query ); - + if ( match && (context.nodeType === 1 || context.nodeType === 9) ) { // Speed-up: Sizzle("TAG") if ( match[1] ) { return makeArray( context.getElementsByTagName( query ), extra ); - + // Speed-up: Sizzle(".CLASS") } else if ( match[2] && Expr.find.CLASS && context.getElementsByClassName ) { return makeArray( context.getElementsByClassName( match[2] ), extra ); } } - + if ( context.nodeType === 9 ) { // Speed-up: Sizzle("body") // The body element only exists once, optimize finding it if ( query === "body" && context.body ) { return makeArray( [ context.body ], extra ); - + // Speed-up: Sizzle("#ID") } else if ( match && match[3] ) { var elem = context.getElementById( match[3] ); @@ -4888,12 +5128,12 @@ if ( document.querySelectorAll ) { if ( elem.id === match[3] ) { return makeArray( [ elem ], extra ); } - + } else { return makeArray( [], extra ); } } - + try { return makeArray( context.querySelectorAll(query), extra ); } catch(qsaError) {} @@ -4931,7 +5171,7 @@ if ( document.querySelectorAll ) { } } } - + return oldSizzle(query, context, extra, seed); }; @@ -4958,7 +5198,7 @@ if ( document.querySelectorAll ) { // This should fail with an exception // Gecko does not error, returns false instead matches.call( document.documentElement, "[test!='']:sizzle" ); - + } catch( pseudoError ) { pseudoWorks = true; } @@ -4968,7 +5208,7 @@ if ( document.querySelectorAll ) { expr = expr.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']"); if ( !Sizzle.isXML( node ) ) { - try { + try { if ( pseudoWorks || !Expr.match.PSEUDO.test( expr ) && !/!=/.test( expr ) ) { var ret = matches.call( node, expr ); @@ -5005,7 +5245,7 @@ if ( document.querySelectorAll ) { if ( div.getElementsByClassName("e").length === 1 ) { return; } - + Expr.order.splice(1, 0, "CLASS"); Expr.find.CLASS = function( match, context, isXML ) { if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) { @@ -5027,13 +5267,13 @@ function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { elem = elem[dir]; while ( elem ) { - if ( elem.sizcache === doneName ) { + if ( elem[ expando ] === doneName ) { match = checkSet[elem.sizset]; break; } if ( elem.nodeType === 1 && !isXML ){ - elem.sizcache = doneName; + elem[ expando ] = doneName; elem.sizset = i; } @@ -5056,18 +5296,18 @@ function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { if ( elem ) { var match = false; - + elem = elem[dir]; while ( elem ) { - if ( elem.sizcache === doneName ) { + if ( elem[ expando ] === doneName ) { match = checkSet[elem.sizset]; break; } if ( elem.nodeType === 1 ) { if ( !isXML ) { - elem.sizcache = doneName; + elem[ expando ] = doneName; elem.sizset = i; } @@ -5109,13 +5349,13 @@ if ( document.documentElement.contains ) { Sizzle.isXML = function( elem ) { // documentElement is verified for cases where it doesn't yet exist - // (such as loading iframes in IE - #4833) + // (such as loading iframes in IE - #4833) var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement; return documentElement ? documentElement.nodeName !== "HTML" : false; }; -var posProcess = function( selector, context ) { +var posProcess = function( selector, context, seed ) { var match, tmpSet = [], later = "", @@ -5131,13 +5371,16 @@ var posProcess = function( selector, context ) { selector = Expr.relative[selector] ? selector + "*" : selector; for ( var i = 0, l = root.length; i < l; i++ ) { - Sizzle( selector, root[i], tmpSet ); + Sizzle( selector, root[i], tmpSet, seed ); } return Sizzle.filter( later, tmpSet ); }; // EXPOSE +// Override sizzle attribute retrieval +Sizzle.attr = jQuery.attr; +Sizzle.selectors.attrMap = {}; jQuery.find = Sizzle; jQuery.expr = Sizzle.selectors; jQuery.expr[":"] = jQuery.expr.filters; @@ -5156,7 +5399,7 @@ var runtil = /Until$/, rmultiselector = /,/, isSimple = /^.[^:#\[\.,]*$/, slice = Array.prototype.slice, - POS = jQuery.expr.match.POS, + POS = jQuery.expr.match.globalPOS, // methods guaranteed to produce a unique set when starting from a unique set guaranteedUnique = { children: true, @@ -5223,43 +5466,33 @@ jQuery.fn.extend({ }, is: function( selector ) { - return !!selector && ( typeof selector === "string" ? - jQuery.filter( selector, this ).length > 0 : - this.filter( selector ).length > 0 ); + return !!selector && ( + typeof selector === "string" ? + // If this is a positional selector, check membership in the returned set + // so $("p:first").is("p:last") won't return true for a doc with two "p". + POS.test( selector ) ? + jQuery( selector, this.context ).index( this[0] ) >= 0 : + jQuery.filter( selector, this ).length > 0 : + this.filter( selector ).length > 0 ); }, closest: function( selectors, context ) { var ret = [], i, l, cur = this[0]; - - // Array + + // Array (deprecated as of jQuery 1.7) if ( jQuery.isArray( selectors ) ) { - var match, selector, - matches = {}, - level = 1; + var level = 1; - if ( cur && selectors.length ) { - for ( i = 0, l = selectors.length; i < l; i++ ) { - selector = selectors[i]; + while ( cur && cur.ownerDocument && cur !== context ) { + for ( i = 0; i < selectors.length; i++ ) { - if ( !matches[ selector ] ) { - matches[ selector ] = POS.test( selector ) ? - jQuery( selector, context || this.context ) : - selector; + if ( jQuery( cur ).is( selectors[ i ] ) ) { + ret.push({ selector: selectors[ i ], elem: cur, level: level }); } } - while ( cur && cur.ownerDocument && cur !== context ) { - for ( selector in matches ) { - match = matches[ selector ]; - - if ( match.jquery ? match.index( cur ) > -1 : jQuery( cur ).is( match ) ) { - ret.push({ selector: selector, elem: cur, level: level }); - } - } - - cur = cur.parentNode; - level++; - } + cur = cur.parentNode; + level++; } return ret; @@ -5295,12 +5528,17 @@ jQuery.fn.extend({ // Determine the position of an element within // the matched set of elements index: function( elem ) { - if ( !elem || typeof elem === "string" ) { - return jQuery.inArray( this[0], - // If it receives a string, the selector is used - // If it receives nothing, the siblings are used - elem ? jQuery( elem ) : this.parent().children() ); + + // No argument, return index in parent + if ( !elem ) { + return ( this[0] && this[0].parentNode ) ? this.prevAll().length : -1; } + + // index in selector + if ( typeof elem === "string" ) { + return jQuery.inArray( this[0], jQuery( elem ) ); + } + // Locate the position of the desired element return jQuery.inArray( // If it receives a jQuery object, the first element is used @@ -5359,7 +5597,7 @@ jQuery.each({ return jQuery.dir( elem, "previousSibling", until ); }, siblings: function( elem ) { - return jQuery.sibling( elem.parentNode.firstChild, elem ); + return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem ); }, children: function( elem ) { return jQuery.sibling( elem.firstChild ); @@ -5371,12 +5609,7 @@ jQuery.each({ } }, function( name, fn ) { jQuery.fn[ name ] = function( until, selector ) { - var ret = jQuery.map( this, fn, until ), - // The variable 'args' was introduced in - // https://github.com/jquery/jquery/commit/52a0238 - // to work around a bug in Chrome 10 (Dev) and should be removed when the bug is fixed. - // http://code.google.com/p/v8/issues/detail?id=1050 - args = slice.call(arguments); + var ret = jQuery.map( this, fn, until ); if ( !runtil.test( name ) ) { selector = until; @@ -5392,7 +5625,7 @@ jQuery.each({ ret = ret.reverse(); } - return this.pushStack( ret, name, args.join(",") ); + return this.pushStack( ret, name, slice.call( arguments ).join(",") ); }; }); @@ -5461,7 +5694,7 @@ function winnow( elements, qualifier, keep ) { } else if ( qualifier.nodeType ) { return jQuery.grep(elements, function( elem, i ) { - return (elem === qualifier) === keep; + return ( elem === qualifier ) === keep; }); } else if ( typeof qualifier === "string" ) { @@ -5477,20 +5710,38 @@ function winnow( elements, qualifier, keep ) { } return jQuery.grep(elements, function( elem, i ) { - return (jQuery.inArray( elem, qualifier ) >= 0) === keep; + return ( jQuery.inArray( elem, qualifier ) >= 0 ) === keep; }); } -var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g, +function createSafeFragment( document ) { + var list = nodeNames.split( "|" ), + safeFrag = document.createDocumentFragment(); + + if ( safeFrag.createElement ) { + while ( list.length ) { + safeFrag.createElement( + list.pop() + ); + } + } + return safeFrag; +} + +var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" + + "header|hgroup|mark|meter|nav|output|progress|section|summary|time|video", + rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g, rleadingWhitespace = /^\s+/, rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig, rtagName = /<([\w:]+)/, rtbody = /]", "i"), // checked="checked" or checked rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i, rscriptType = /\/(java|ecma)script/i, @@ -5504,7 +5755,8 @@ var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g, col: [ 2, "", "
" ], area: [ 1, "", "" ], _default: [ 0, "", "" ] - }; + }, + safeFragment = createSafeFragment( document ); wrapMap.optgroup = wrapMap.option; wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; @@ -5516,20 +5768,12 @@ if ( !jQuery.support.htmlSerialize ) { } jQuery.fn.extend({ - text: function( text ) { - if ( jQuery.isFunction(text) ) { - return this.each(function(i) { - var self = jQuery( this ); - - self.text( text.call(this, i, self.text()) ); - }); - } - - if ( typeof text !== "object" && text !== undefined ) { - return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) ); - } - - return jQuery.text( this ); + text: function( value ) { + return jQuery.access( this, function( value ) { + return value === undefined ? + jQuery.text( this ) : + this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) ); + }, null, value, arguments.length ); }, wrapAll: function( html ) { @@ -5582,8 +5826,10 @@ jQuery.fn.extend({ }, wrap: function( html ) { - return this.each(function() { - jQuery( this ).wrapAll( html ); + var isFunction = jQuery.isFunction( html ); + + return this.each(function(i) { + jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html ); }); }, @@ -5617,7 +5863,7 @@ jQuery.fn.extend({ this.parentNode.insertBefore( elem, this ); }); } else if ( arguments.length ) { - var set = jQuery(arguments[0]); + var set = jQuery.clean( arguments ); set.push.apply( set, this.toArray() ); return this.pushStack( set, "before", arguments ); } @@ -5630,7 +5876,7 @@ jQuery.fn.extend({ }); } else if ( arguments.length ) { var set = this.pushStack( this, "after", arguments ); - set.push.apply( set, jQuery(arguments[0]).toArray() ); + set.push.apply( set, jQuery.clean(arguments) ); return set; } }, @@ -5679,44 +5925,44 @@ jQuery.fn.extend({ }, html: function( value ) { - if ( value === undefined ) { - return this[0] && this[0].nodeType === 1 ? - this[0].innerHTML.replace(rinlinejQuery, "") : - null; + return jQuery.access( this, function( value ) { + var elem = this[0] || {}, + i = 0, + l = this.length; - // See if we can take a shortcut and just use innerHTML - } else if ( typeof value === "string" && !rnocache.test( value ) && - (jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value )) && - !wrapMap[ (rtagName.exec( value ) || ["", ""])[1].toLowerCase() ] ) { - - value = value.replace(rxhtmlTag, "<$1>"); - - try { - for ( var i = 0, l = this.length; i < l; i++ ) { - // Remove element nodes and prevent memory leaks - if ( this[i].nodeType === 1 ) { - jQuery.cleanData( this[i].getElementsByTagName("*") ); - this[i].innerHTML = value; - } - } - - // If using innerHTML throws an exception, use the fallback method - } catch(e) { - this.empty().append( value ); + if ( value === undefined ) { + return elem.nodeType === 1 ? + elem.innerHTML.replace( rinlinejQuery, "" ) : + null; } - } else if ( jQuery.isFunction( value ) ) { - this.each(function(i){ - var self = jQuery( this ); - self.html( value.call(this, i, self.html()) ); - }); + if ( typeof value === "string" && !rnoInnerhtml.test( value ) && + ( jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value ) ) && + !wrapMap[ ( rtagName.exec( value ) || ["", ""] )[1].toLowerCase() ] ) { - } else { - this.empty().append( value ); - } + value = value.replace( rxhtmlTag, "<$1>" ); - return this; + try { + for (; i < l; i++ ) { + // Remove element nodes and prevent memory leaks + elem = this[i] || {}; + if ( elem.nodeType === 1 ) { + jQuery.cleanData( elem.getElementsByTagName( "*" ) ); + elem.innerHTML = value; + } + } + + elem = 0; + + // If using innerHTML throws an exception, use the fallback method + } catch(e) {} + } + + if ( elem ) { + this.empty().append( value ); + } + }, null, value, arguments.length ); }, replaceWith: function( value ) { @@ -5811,7 +6057,7 @@ jQuery.fn.extend({ // in certain situations (Bug #8070). // Fragments from the fragment cache must always be cloned and never used // in place. - results.cacheable || (l > 1 && i < lastIndex) ? + results.cacheable || ( l > 1 && i < lastIndex ) ? jQuery.clone( fragment, true, true ) : fragment ); @@ -5819,7 +6065,23 @@ jQuery.fn.extend({ } if ( scripts.length ) { - jQuery.each( scripts, evalScript ); + jQuery.each( scripts, function( i, elem ) { + if ( elem.src ) { + jQuery.ajax({ + type: "GET", + global: false, + url: elem.src, + async: false, + dataType: "script" + }); + } else { + jQuery.globalEval( ( elem.text || elem.textContent || elem.innerHTML || "" ).replace( rcleanScript, "/*$0*/" ) ); + } + + if ( elem.parentNode ) { + elem.parentNode.removeChild( elem ); + } + }); } } @@ -5840,27 +6102,26 @@ function cloneCopyEvent( src, dest ) { return; } - var internalKey = jQuery.expando, - oldData = jQuery.data( src ), - curData = jQuery.data( dest, oldData ); + var type, i, l, + oldData = jQuery._data( src ), + curData = jQuery._data( dest, oldData ), + events = oldData.events; - // Switch to use the internal data object, if it exists, for the next - // stage of data copying - if ( (oldData = oldData[ internalKey ]) ) { - var events = oldData.events; - curData = curData[ internalKey ] = jQuery.extend({}, oldData); + if ( events ) { + delete curData.handle; + curData.events = {}; - if ( events ) { - delete curData.handle; - curData.events = {}; - - for ( var type in events ) { - for ( var i = 0, l = events[ type ].length; i < l; i++ ) { - jQuery.event.add( dest, type + ( events[ type ][ i ].namespace ? "." : "" ) + events[ type ][ i ].namespace, events[ type ][ i ], events[ type ][ i ].data ); - } + for ( type in events ) { + for ( i = 0, l = events[ type ].length; i < l; i++ ) { + jQuery.event.add( dest, type, events[ type ][ i ] ); } } } + + // make the cloned public data object a copy from the original + if ( curData.data ) { + curData.data = jQuery.extend( {}, curData.data ); + } } function cloneFixAttributes( src, dest ) { @@ -5914,24 +6175,34 @@ function cloneFixAttributes( src, dest ) { // cloning other types of input fields } else if ( nodeName === "input" || nodeName === "textarea" ) { dest.defaultValue = src.defaultValue; + + // IE blanks contents when cloning scripts + } else if ( nodeName === "script" && dest.text !== src.text ) { + dest.text = src.text; } // Event data gets referenced instead of copied if the expando // gets copied too dest.removeAttribute( jQuery.expando ); + + // Clear flags for bubbling special change/submit events, they must + // be reattached when the newly cloned events are first activated + dest.removeAttribute( "_submit_attached" ); + dest.removeAttribute( "_change_attached" ); } jQuery.buildFragment = function( args, nodes, scripts ) { - var fragment, cacheable, cacheresults, doc; + var fragment, cacheable, cacheresults, doc, + first = args[ 0 ]; - // nodes may contain either an explicit document object, - // a jQuery collection or context object. - // If nodes[0] contains a valid object to assign to doc - if ( nodes && nodes[0] ) { - doc = nodes[0].ownerDocument || nodes[0]; - } + // nodes may contain either an explicit document object, + // a jQuery collection or context object. + // If nodes[0] contains a valid object to assign to doc + if ( nodes && nodes[0] ) { + doc = nodes[0].ownerDocument || nodes[0]; + } - // Ensure that an attr object doesn't incorrectly stand in as a document object + // Ensure that an attr object doesn't incorrectly stand in as a document object // Chrome and Firefox seem to allow this to occur and will throw exception // Fixes #8950 if ( !doc.createDocumentFragment ) { @@ -5942,12 +6213,15 @@ jQuery.buildFragment = function( args, nodes, scripts ) { // Cloning options loses the selected state, so don't cache them // IE 6 doesn't like it when you put or elements in a fragment // Also, WebKit does not clone 'checked' attributes on cloneNode, so don't cache - if ( args.length === 1 && typeof args[0] === "string" && args[0].length < 512 && doc === document && - args[0].charAt(0) === "<" && !rnocache.test( args[0] ) && (jQuery.support.checkClone || !rchecked.test( args[0] )) ) { + // Lastly, IE6,7,8 will not correctly reuse cached fragments that were created from unknown elems #10501 + if ( args.length === 1 && typeof first === "string" && first.length < 512 && doc === document && + first.charAt(0) === "<" && !rnocache.test( first ) && + (jQuery.support.checkClone || !rchecked.test( first )) && + (jQuery.support.html5Clone || !rnoshimcache.test( first )) ) { cacheable = true; - cacheresults = jQuery.fragments[ args[0] ]; + cacheresults = jQuery.fragments[ first ]; if ( cacheresults && cacheresults !== 1 ) { fragment = cacheresults; } @@ -5959,7 +6233,7 @@ jQuery.buildFragment = function( args, nodes, scripts ) { } if ( cacheable ) { - jQuery.fragments[ args[0] ] = cacheresults ? fragment : 1; + jQuery.fragments[ first ] = cacheresults ? fragment : 1; } return { fragment: fragment, cacheable: cacheable }; @@ -5985,7 +6259,7 @@ jQuery.each({ } else { for ( var i = 0, l = insert.length; i < l; i++ ) { - var elems = (i > 0 ? this.clone(true) : this).get(); + var elems = ( i > 0 ? this.clone(true) : this ).get(); jQuery( insert[i] )[ original ]( elems ); ret = ret.concat( elems ); } @@ -5996,10 +6270,10 @@ jQuery.each({ }); function getAll( elem ) { - if ( "getElementsByTagName" in elem ) { + if ( typeof elem.getElementsByTagName !== "undefined" ) { return elem.getElementsByTagName( "*" ); - } else if ( "querySelectorAll" in elem ) { + } else if ( typeof elem.querySelectorAll !== "undefined" ) { return elem.querySelectorAll( "*" ); } else { @@ -6015,19 +6289,33 @@ function fixDefaultChecked( elem ) { } // Finds all inputs and passes them to fixDefaultChecked function findInputs( elem ) { - if ( jQuery.nodeName( elem, "input" ) ) { + var nodeName = ( elem.nodeName || "" ).toLowerCase(); + if ( nodeName === "input" ) { fixDefaultChecked( elem ); - } else if ( "getElementsByTagName" in elem ) { + // Skip scripts, get other children + } else if ( nodeName !== "script" && typeof elem.getElementsByTagName !== "undefined" ) { jQuery.grep( elem.getElementsByTagName("input"), fixDefaultChecked ); } } +// Derived From: http://www.iecss.com/shimprove/javascript/shimprove.1-0-1.js +function shimCloneNode( elem ) { + var div = document.createElement( "div" ); + safeFragment.appendChild( div ); + + div.innerHTML = elem.outerHTML; + return div.firstChild; +} + jQuery.extend({ clone: function( elem, dataAndEvents, deepDataAndEvents ) { - var clone = elem.cloneNode(true), - srcElements, - destElements, - i; + var srcElements, + destElements, + i, + // IE<=8 does not properly clone detached, unknown element nodes + clone = jQuery.support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ? + elem.cloneNode( true ) : + shimCloneNode( elem ); if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) && (elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) { @@ -6039,8 +6327,7 @@ jQuery.extend({ cloneFixAttributes( elem, clone ); - // Using Sizzle here is crazy slow, so we use getElementsByTagName - // instead + // Using Sizzle here is crazy slow, so we use getElementsByTagName instead srcElements = getAll( elem ); destElements = getAll( clone ); @@ -6048,7 +6335,10 @@ jQuery.extend({ // with an element if you are cloning the body and one of the // elements on the page has a name or id of "length" for ( i = 0; srcElements[i]; ++i ) { - cloneFixAttributes( srcElements[i], destElements[i] ); + // Ensure that the destination node is not null; Fixes #9587 + if ( destElements[i] ) { + cloneFixAttributes( srcElements[i], destElements[i] ); + } } } @@ -6073,7 +6363,8 @@ jQuery.extend({ }, clean: function( elems, context, fragment, scripts ) { - var checkScriptType; + var checkScriptType, script, j, + ret = []; context = context || document; @@ -6082,8 +6373,6 @@ jQuery.extend({ context = context.ownerDocument || context[0] && context[0].ownerDocument || document; } - var ret = [], j; - for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) { if ( typeof elem === "number" ) { elem += ""; @@ -6102,10 +6391,21 @@ jQuery.extend({ elem = elem.replace(rxhtmlTag, "<$1>"); // Trim whitespace, otherwise indexOf won't work as expected - var tag = (rtagName.exec( elem ) || ["", ""])[1].toLowerCase(), + var tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase(), wrap = wrapMap[ tag ] || wrapMap._default, depth = wrap[0], - div = context.createElement("div"); + div = context.createElement("div"), + safeChildNodes = safeFragment.childNodes, + remove; + + // Append wrapper element to unknown element safe doc fragment + if ( context === document ) { + // Use the fragment we've already created for this document + safeFragment.appendChild( div ); + } else { + // Use a fragment created with the owner document + createSafeFragment( context ).appendChild( div ); + } // Go to html and back, then peel off extra wrappers div.innerHTML = wrap[1] + elem + wrap[2]; @@ -6141,6 +6441,21 @@ jQuery.extend({ } elem = div.childNodes; + + // Clear elements from DocumentFragment (safeFragment or otherwise) + // to avoid hoarding elements. Fixes #11356 + if ( div ) { + div.parentNode.removeChild( div ); + + // Guard against -1 index exceptions in FF3.6 + if ( safeChildNodes.length > 0 ) { + remove = safeChildNodes[ safeChildNodes.length - 1 ]; + + if ( remove && remove.parentNode ) { + remove.parentNode.removeChild( remove ); + } + } + } } } @@ -6169,16 +6484,17 @@ jQuery.extend({ return !elem.type || rscriptType.test( elem.type ); }; for ( i = 0; ret[i]; i++ ) { - if ( scripts && jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) { - scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] ); + script = ret[i]; + if ( scripts && jQuery.nodeName( script, "script" ) && (!script.type || rscriptType.test( script.type )) ) { + scripts.push( script.parentNode ? script.parentNode.removeChild( script ) : script ); } else { - if ( ret[i].nodeType === 1 ) { - var jsTags = jQuery.grep( ret[i].getElementsByTagName( "script" ), checkScriptType ); + if ( script.nodeType === 1 ) { + var jsTags = jQuery.grep( script.getElementsByTagName( "script" ), checkScriptType ); ret.splice.apply( ret, [i + 1, 0].concat( jsTags ) ); } - fragment.appendChild( ret[i] ); + fragment.appendChild( script ); } } } @@ -6187,7 +6503,9 @@ jQuery.extend({ }, cleanData: function( elems ) { - var data, id, cache = jQuery.cache, internalKey = jQuery.expando, special = jQuery.event.special, + var data, id, + cache = jQuery.cache, + special = jQuery.event.special, deleteExpando = jQuery.support.deleteExpando; for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) { @@ -6198,7 +6516,7 @@ jQuery.extend({ id = elem[ jQuery.expando ]; if ( id ) { - data = cache[ id ] && cache[ id ][ internalKey ]; + data = cache[ id ]; if ( data && data.events ) { for ( var type in data.events ) { @@ -6230,21 +6548,6 @@ jQuery.extend({ } }); -function evalScript( i, elem ) { - if ( elem.src ) { - jQuery.ajax({ - url: elem.src, - async: false, - dataType: "script" - }); - } else { - jQuery.globalEval( ( elem.text || elem.textContent || elem.innerHTML || "" ).replace( rcleanScript, "/*$0*/" ) ); - } - - if ( elem.parentNode ) { - elem.parentNode.removeChild( elem ); - } -} @@ -6252,30 +6555,27 @@ var ralpha = /alpha\([^)]*\)/i, ropacity = /opacity=([^)]*)/, // fixed for IE9, see #8346 rupper = /([A-Z]|^ms)/g, - rnumpx = /^-?\d+(?:px)?$/i, - rnum = /^-?\d/, - rrelNum = /^[+\-]=/, - rrelNumFilter = /[^+\-\.\de]+/g, + rnum = /^[\-+]?(?:\d*\.)?\d+$/i, + rnumnonpx = /^-?(?:\d*\.)?\d+(?!px)[^\d\s]+$/i, + rrelNum = /^([\-+])=([\-+.\de]+)/, + rmargin = /^margin/, cssShow = { position: "absolute", visibility: "hidden", display: "block" }, - cssWidth = [ "Left", "Right" ], - cssHeight = [ "Top", "Bottom" ], + + // order is important! + cssExpand = [ "Top", "Right", "Bottom", "Left" ], + curCSS, getComputedStyle, currentStyle; jQuery.fn.css = function( name, value ) { - // Setting 'undefined' is a no-op - if ( arguments.length === 2 && value === undefined ) { - return this; - } - - return jQuery.access( this, name, value, true, function( elem, name, value ) { + return jQuery.access( this, function( elem, name, value ) { return value !== undefined ? jQuery.style( elem, name, value ) : jQuery.css( elem, name ); - }); + }, name, value, arguments.length > 1 ); }; jQuery.extend({ @@ -6286,7 +6586,7 @@ jQuery.extend({ get: function( elem, computed ) { if ( computed ) { // We should always get a number back from opacity - var ret = curCSS( elem, "opacity", "opacity" ); + var ret = curCSS( elem, "opacity" ); return ret === "" ? "1" : ret; } else { @@ -6332,18 +6632,18 @@ jQuery.extend({ if ( value !== undefined ) { type = typeof value; - // Make sure that NaN and null values aren't set. See: #7116 - if ( type === "number" && isNaN( value ) || value == null ) { - return; - } - // convert relative number strings (+= or -=) to relative numbers. #7345 - if ( type === "string" && rrelNum.test( value ) ) { - value = +value.replace( rrelNumFilter, "" ) + parseFloat( jQuery.css( elem, name ) ); + if ( type === "string" && (ret = rrelNum.exec( value )) ) { + value = ( +( ret[1] + 1) * +ret[2] ) + parseFloat( jQuery.css( elem, name ) ); // Fixes bug #9237 type = "number"; } + // Make sure that NaN and null values aren't set. See: #7116 + if ( value == null || type === "number" && isNaN( value ) ) { + return; + } + // If a number was passed in, add 'px' to the (except for certain CSS properties) if ( type === "number" && !jQuery.cssNumber[ origName ] ) { value += "px"; @@ -6394,154 +6694,87 @@ jQuery.extend({ // A method for quickly swapping in/out CSS properties to get correct calculations swap: function( elem, options, callback ) { - var old = {}; + var old = {}, + ret, name; // Remember the old values, and insert the new ones - for ( var name in options ) { + for ( name in options ) { old[ name ] = elem.style[ name ]; elem.style[ name ] = options[ name ]; } - callback.call( elem ); + ret = callback.call( elem ); // Revert the old values for ( name in options ) { elem.style[ name ] = old[ name ]; } + + return ret; } }); -// DEPRECATED, Use jQuery.css() instead +// DEPRECATED in 1.3, Use jQuery.css() instead jQuery.curCSS = jQuery.css; -jQuery.each(["height", "width"], function( i, name ) { - jQuery.cssHooks[ name ] = { - get: function( elem, computed, extra ) { - var val; - - if ( computed ) { - if ( elem.offsetWidth !== 0 ) { - return getWH( elem, name, extra ); - } else { - jQuery.swap( elem, cssShow, function() { - val = getWH( elem, name, extra ); - }); - } - - return val; - } - }, - - set: function( elem, value ) { - if ( rnumpx.test( value ) ) { - // ignore negative width and height values #1599 - value = parseFloat( value ); - - if ( value >= 0 ) { - return value + "px"; - } - - } else { - return value; - } - } - }; -}); - -if ( !jQuery.support.opacity ) { - jQuery.cssHooks.opacity = { - get: function( elem, computed ) { - // IE uses filters for opacity - return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ? - ( parseFloat( RegExp.$1 ) / 100 ) + "" : - computed ? "1" : ""; - }, - - set: function( elem, value ) { - var style = elem.style, - currentStyle = elem.currentStyle; - - // IE has trouble with opacity if it does not have layout - // Force it by setting the zoom level - style.zoom = 1; - - // Set the alpha filter to set the opacity - var opacity = jQuery.isNaN( value ) ? - "" : - "alpha(opacity=" + value * 100 + ")", - filter = currentStyle && currentStyle.filter || style.filter || ""; - - style.filter = ralpha.test( filter ) ? - filter.replace( ralpha, opacity ) : - filter + " " + opacity; - } - }; -} - -jQuery(function() { - // This hook cannot be added until DOM ready because the support test - // for it is not run until after DOM ready - if ( !jQuery.support.reliableMarginRight ) { - jQuery.cssHooks.marginRight = { - get: function( elem, computed ) { - // WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right - // Work around by temporarily setting element display to inline-block - var ret; - jQuery.swap( elem, { "display": "inline-block" }, function() { - if ( computed ) { - ret = curCSS( elem, "margin-right", "marginRight" ); - } else { - ret = elem.style.marginRight; - } - }); - return ret; - } - }; - } -}); - if ( document.defaultView && document.defaultView.getComputedStyle ) { getComputedStyle = function( elem, name ) { - var ret, defaultView, computedStyle; + var ret, defaultView, computedStyle, width, + style = elem.style; name = name.replace( rupper, "-$1" ).toLowerCase(); - if ( !(defaultView = elem.ownerDocument.defaultView) ) { - return undefined; - } + if ( (defaultView = elem.ownerDocument.defaultView) && + (computedStyle = defaultView.getComputedStyle( elem, null )) ) { - if ( (computedStyle = defaultView.getComputedStyle( elem, null )) ) { ret = computedStyle.getPropertyValue( name ); if ( ret === "" && !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) { ret = jQuery.style( elem, name ); } } + // A tribute to the "awesome hack by Dean Edwards" + // WebKit uses "computed value (percentage if specified)" instead of "used value" for margins + // which is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values + if ( !jQuery.support.pixelMargin && computedStyle && rmargin.test( name ) && rnumnonpx.test( ret ) ) { + width = style.width; + style.width = ret; + ret = computedStyle.width; + style.width = width; + } + return ret; }; } if ( document.documentElement.currentStyle ) { currentStyle = function( elem, name ) { - var left, + var left, rsLeft, uncomputed, ret = elem.currentStyle && elem.currentStyle[ name ], - rsLeft = elem.runtimeStyle && elem.runtimeStyle[ name ], style = elem.style; + // Avoid setting ret to empty string here + // so we don't default to auto + if ( ret == null && style && (uncomputed = style[ name ]) ) { + ret = uncomputed; + } + // From the awesome hack by Dean Edwards // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291 // If we're not dealing with a regular pixel number // but a number that has a weird ending, we need to convert it to pixels - if ( !rnumpx.test( ret ) && rnum.test( ret ) ) { + if ( rnumnonpx.test( ret ) ) { + // Remember the original values left = style.left; + rsLeft = elem.runtimeStyle && elem.runtimeStyle.left; // Put in the new values to get a computed value out if ( rsLeft ) { elem.runtimeStyle.left = elem.currentStyle.left; } - style.left = name === "fontSize" ? "1em" : (ret || 0); + style.left = name === "fontSize" ? "1em" : ret; ret = style.pixelLeft + "px"; // Revert the changed values @@ -6557,59 +6790,149 @@ if ( document.documentElement.currentStyle ) { curCSS = getComputedStyle || currentStyle; -function getWH( elem, name, extra ) { +function getWidthOrHeight( elem, name, extra ) { // Start with offset property var val = name === "width" ? elem.offsetWidth : elem.offsetHeight, - which = name === "width" ? cssWidth : cssHeight; + i = name === "width" ? 1 : 0, + len = 4; if ( val > 0 ) { if ( extra !== "border" ) { - jQuery.each( which, function() { + for ( ; i < len; i += 2 ) { if ( !extra ) { - val -= parseFloat( jQuery.css( elem, "padding" + this ) ) || 0; + val -= parseFloat( jQuery.css( elem, "padding" + cssExpand[ i ] ) ) || 0; } if ( extra === "margin" ) { - val += parseFloat( jQuery.css( elem, extra + this ) ) || 0; + val += parseFloat( jQuery.css( elem, extra + cssExpand[ i ] ) ) || 0; } else { - val -= parseFloat( jQuery.css( elem, "border" + this + "Width" ) ) || 0; + val -= parseFloat( jQuery.css( elem, "border" + cssExpand[ i ] + "Width" ) ) || 0; } - }); + } } return val + "px"; } // Fall back to computed then uncomputed css if necessary - val = curCSS( elem, name, name ); + val = curCSS( elem, name ); if ( val < 0 || val == null ) { - val = elem.style[ name ] || 0; + val = elem.style[ name ]; } + + // Computed unit is not pixels. Stop here and return. + if ( rnumnonpx.test(val) ) { + return val; + } + // Normalize "", auto, and prepare for extra val = parseFloat( val ) || 0; // Add padding, border, margin if ( extra ) { - jQuery.each( which, function() { - val += parseFloat( jQuery.css( elem, "padding" + this ) ) || 0; + for ( ; i < len; i += 2 ) { + val += parseFloat( jQuery.css( elem, "padding" + cssExpand[ i ] ) ) || 0; if ( extra !== "padding" ) { - val += parseFloat( jQuery.css( elem, "border" + this + "Width" ) ) || 0; + val += parseFloat( jQuery.css( elem, "border" + cssExpand[ i ] + "Width" ) ) || 0; } if ( extra === "margin" ) { - val += parseFloat( jQuery.css( elem, extra + this ) ) || 0; + val += parseFloat( jQuery.css( elem, extra + cssExpand[ i ]) ) || 0; } - }); + } } return val + "px"; } +jQuery.each([ "height", "width" ], function( i, name ) { + jQuery.cssHooks[ name ] = { + get: function( elem, computed, extra ) { + if ( computed ) { + if ( elem.offsetWidth !== 0 ) { + return getWidthOrHeight( elem, name, extra ); + } else { + return jQuery.swap( elem, cssShow, function() { + return getWidthOrHeight( elem, name, extra ); + }); + } + } + }, + + set: function( elem, value ) { + return rnum.test( value ) ? + value + "px" : + value; + } + }; +}); + +if ( !jQuery.support.opacity ) { + jQuery.cssHooks.opacity = { + get: function( elem, computed ) { + // IE uses filters for opacity + return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ? + ( parseFloat( RegExp.$1 ) / 100 ) + "" : + computed ? "1" : ""; + }, + + set: function( elem, value ) { + var style = elem.style, + currentStyle = elem.currentStyle, + opacity = jQuery.isNumeric( value ) ? "alpha(opacity=" + value * 100 + ")" : "", + filter = currentStyle && currentStyle.filter || style.filter || ""; + + // IE has trouble with opacity if it does not have layout + // Force it by setting the zoom level + style.zoom = 1; + + // if setting opacity to 1, and no other filters exist - attempt to remove filter attribute #6652 + if ( value >= 1 && jQuery.trim( filter.replace( ralpha, "" ) ) === "" ) { + + // Setting style.filter to null, "" & " " still leave "filter:" in the cssText + // if "filter:" is present at all, clearType is disabled, we want to avoid this + // style.removeAttribute is IE Only, but so apparently is this code path... + style.removeAttribute( "filter" ); + + // if there there is no filter style applied in a css rule, we are done + if ( currentStyle && !currentStyle.filter ) { + return; + } + } + + // otherwise, set new filter values + style.filter = ralpha.test( filter ) ? + filter.replace( ralpha, opacity ) : + filter + " " + opacity; + } + }; +} + +jQuery(function() { + // This hook cannot be added until DOM ready because the support test + // for it is not run until after DOM ready + if ( !jQuery.support.reliableMarginRight ) { + jQuery.cssHooks.marginRight = { + get: function( elem, computed ) { + // WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right + // Work around by temporarily setting element display to inline-block + return jQuery.swap( elem, { "display": "inline-block" }, function() { + if ( computed ) { + return curCSS( elem, "margin-right" ); + } else { + return elem.style.marginRight; + } + }); + } + }; + } +}); + if ( jQuery.expr && jQuery.expr.filters ) { jQuery.expr.filters.hidden = function( elem ) { var width = elem.offsetWidth, height = elem.offsetHeight; - return (width === 0 && height === 0) || (!jQuery.support.reliableHiddenOffsets && (elem.style.display || jQuery.css( elem, "display" )) === "none"); + return ( width === 0 && height === 0 ) || (!jQuery.support.reliableHiddenOffsets && ((elem.style && elem.style.display) || jQuery.css( elem, "display" )) === "none"); }; jQuery.expr.filters.visible = function( elem ) { @@ -6617,6 +6940,31 @@ if ( jQuery.expr && jQuery.expr.filters ) { }; } +// These hooks are used by animate to expand properties +jQuery.each({ + margin: "", + padding: "", + border: "Width" +}, function( prefix, suffix ) { + + jQuery.cssHooks[ prefix + suffix ] = { + expand: function( value ) { + var i, + + // assumes a single number if not a string + parts = typeof value === "string" ? value.split(" ") : [ value ], + expanded = {}; + + for ( i = 0; i < 4; i++ ) { + expanded[ prefix + cssExpand[ i ] + suffix ] = + parts[ i ] || parts[ i - 2 ] || parts[ 0 ]; + } + + return expanded; + } + }; +}); + @@ -6625,9 +6973,9 @@ var r20 = /%20/g, rCRLF = /\r?\n/g, rhash = /#.*$/, rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL - rinput = /^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i, + rinput = /^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i, // #7653, #8125, #8152: local protocol detection - rlocalProtocol = /^(?:about|app|app\-storage|.+\-extension|file|widget):$/, + rlocalProtocol = /^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/, rnoContent = /^(?:GET|HEAD)$/, rprotocol = /^\/\//, rquery = /\?/, @@ -6662,7 +7010,10 @@ var r20 = /%20/g, ajaxLocation, // Document location segments - ajaxLocParts; + ajaxLocParts, + + // Avoid comment-prolog char sequence (#10098); must appease lint and evade compression + allTypes = ["*/"] + ["*"]; // #8138, IE may throw an exception when accessing // a field from window.location if document.domain has been set @@ -6699,7 +7050,7 @@ function addToPrefiltersOrTransports( structure ) { placeBefore; // For each dataType in the dataTypeExpression - for(; i < length; i++ ) { + for ( ; i < length; i++ ) { dataType = dataTypes[ i ]; // We control if we're asked to add before // any existing element @@ -6730,7 +7081,7 @@ function inspectPrefiltersOrTransports( structure, options, originalOptions, jqX executeOnly = ( structure === prefilters ), selection; - for(; i < length && ( executeOnly || !selection ); i++ ) { + for ( ; i < length && ( executeOnly || !selection ); i++ ) { selection = list[ i ]( options, originalOptions, jqXHR ); // If we got redirected to another dataType // we try there if executing only and not done already @@ -6755,6 +7106,22 @@ function inspectPrefiltersOrTransports( structure, options, originalOptions, jqX return selection; } +// A special extend for ajax options +// that takes "flat" options (not to be deep extended) +// Fixes #9887 +function ajaxExtend( target, src ) { + var key, deep, + flatOptions = jQuery.ajaxSettings.flatOptions || {}; + for ( key in src ) { + if ( src[ key ] !== undefined ) { + ( flatOptions[ key ] ? target : ( deep || ( deep = {} ) ) )[ key ] = src[ key ]; + } + } + if ( deep ) { + jQuery.extend( true, target, deep ); + } +} + jQuery.fn.extend({ load: function( url, params, callback ) { if ( typeof url !== "string" && _load ) { @@ -6862,7 +7229,7 @@ jQuery.fn.extend({ // Attach a bunch of functions for handling common AJAX events jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split( " " ), function( i, o ){ jQuery.fn[ o ] = function( f ){ - return this.bind( o, f ); + return this.on( o, f ); }; }); @@ -6898,23 +7265,16 @@ jQuery.extend({ // Creates a full fledged settings object into target // with both ajaxSettings and settings fields. // If target is omitted, writes into ajaxSettings. - ajaxSetup: function ( target, settings ) { - if ( !settings ) { - // Only one parameter, we extend ajaxSettings - settings = target; - target = jQuery.extend( true, jQuery.ajaxSettings, settings ); + ajaxSetup: function( target, settings ) { + if ( settings ) { + // Building a settings object + ajaxExtend( target, jQuery.ajaxSettings ); } else { - // target was provided, we extend into it - jQuery.extend( true, target, jQuery.ajaxSettings, settings ); - } - // Flatten fields we don't want deep extended - for( var field in { context: 1, url: 1 } ) { - if ( field in settings ) { - target[ field ] = settings[ field ]; - } else if( field in jQuery.ajaxSettings ) { - target[ field ] = jQuery.ajaxSettings[ field ]; - } + // Extending ajaxSettings + settings = target; + target = jQuery.ajaxSettings; } + ajaxExtend( target, settings ); return target; }, @@ -6923,7 +7283,7 @@ jQuery.extend({ isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ), global: true, type: "GET", - contentType: "application/x-www-form-urlencoded", + contentType: "application/x-www-form-urlencoded; charset=UTF-8", processData: true, async: true, /* @@ -6942,7 +7302,7 @@ jQuery.extend({ html: "text/html", text: "text/plain", json: "application/json, text/javascript", - "*": "*/*" + "*": allTypes }, contents: { @@ -6972,6 +7332,15 @@ jQuery.extend({ // Parse text as xml "text xml": jQuery.parseXML + }, + + // For options that shouldn't be deep extended: + // you can add your own custom options here if + // and when you create one that shouldn't be + // deep extended (see ajaxExtend) + flatOptions: { + context: true, + url: true } }, @@ -7002,7 +7371,7 @@ jQuery.extend({ jQuery( callbackContext ) : jQuery.event, // Deferreds deferred = jQuery.Deferred(), - completeDeferred = jQuery._Deferred(), + completeDeferred = jQuery.Callbacks( "once memory" ), // Status-dependent callbacks statusCode = s.statusCode || {}, // ifModified key @@ -7082,7 +7451,7 @@ jQuery.extend({ // Callback for when everything is done // It is defined here because jslint complains if it is declared // at the end of the function (which would be more logical and readable) - function done( status, statusText, responses, headers ) { + function done( status, nativeStatusText, responses, headers ) { // Called once if ( state === 2 ) { @@ -7105,11 +7474,12 @@ jQuery.extend({ responseHeadersString = headers || ""; // Set readyState - jqXHR.readyState = status ? 4 : 0; + jqXHR.readyState = status > 0 ? 4 : 0; var isSuccess, success, error, + statusText = nativeStatusText, response = responses ? ajaxHandleResponses( s, jqXHR, responses ) : undefined, lastModified, etag; @@ -7151,7 +7521,7 @@ jQuery.extend({ // We extract error from statusText // then normalize statusText and status for non-aborts error = statusText; - if( !statusText || status ) { + if ( !statusText || status ) { statusText = "error"; if ( status < 0 ) { status = 0; @@ -7161,7 +7531,7 @@ jQuery.extend({ // Set data for the fake xhr object jqXHR.status = status; - jqXHR.statusText = statusText; + jqXHR.statusText = "" + ( nativeStatusText || statusText ); // Success/Error if ( isSuccess ) { @@ -7180,10 +7550,10 @@ jQuery.extend({ } // Complete - completeDeferred.resolveWith( callbackContext, [ jqXHR, statusText ] ); + completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] ); if ( fireGlobals ) { - globalEventContext.trigger( "ajaxComplete", [ jqXHR, s] ); + globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] ); // Handle the global AJAX counter if ( !( --jQuery.active ) ) { jQuery.event.trigger( "ajaxStop" ); @@ -7195,14 +7565,14 @@ jQuery.extend({ deferred.promise( jqXHR ); jqXHR.success = jqXHR.done; jqXHR.error = jqXHR.fail; - jqXHR.complete = completeDeferred.done; + jqXHR.complete = completeDeferred.add; // Status-dependent callbacks jqXHR.statusCode = function( map ) { if ( map ) { var tmp; if ( state < 2 ) { - for( tmp in map ) { + for ( tmp in map ) { statusCode[ tmp ] = [ statusCode[tmp], map[tmp] ]; } } else { @@ -7239,7 +7609,7 @@ jQuery.extend({ // Apply prefilters inspectPrefiltersOrTransports( prefilters, s, options, jqXHR ); - // If request was aborted inside a prefiler, stop there + // If request was aborted inside a prefilter, stop there if ( state === 2 ) { return false; } @@ -7264,6 +7634,8 @@ jQuery.extend({ // If data is available, append data to url if ( s.data ) { s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.data; + // #9682: remove data so that it's not used in an eventual retry + delete s.data; } // Get ifModifiedKey before adding the anti-cache parameter @@ -7277,7 +7649,7 @@ jQuery.extend({ ret = s.url.replace( rts, "$1_=" + ts ); // if nothing was replaced, add timestamp to the end - s.url = ret + ( (ret === s.url ) ? ( rquery.test( s.url ) ? "&" : "?" ) + "_=" + ts : "" ); + s.url = ret + ( ( ret === s.url ) ? ( rquery.test( s.url ) ? "&" : "?" ) + "_=" + ts : "" ); } } @@ -7301,7 +7673,7 @@ jQuery.extend({ jqXHR.setRequestHeader( "Accept", s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ? - s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", */*; q=0.01" : "" ) : + s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) : s.accepts[ "*" ] ); @@ -7347,11 +7719,11 @@ jQuery.extend({ transport.send( requestHeaders, done ); } catch (e) { // Propagate exception as error if not done - if ( status < 2 ) { + if ( state < 2 ) { done( -1, e ); // Simply rethrow otherwise } else { - jQuery.error( e ); + throw e; } } } @@ -7410,11 +7782,11 @@ function buildParams( prefix, obj, traditional, add ) { // a server error. Possible fixes are to modify rack's // deserialization algorithm or to provide an option or flag // to force array serialization to be shallow. - buildParams( prefix + "[" + ( typeof v === "object" || jQuery.isArray(v) ? i : "" ) + "]", v, traditional, add ); + buildParams( prefix + "[" + ( typeof v === "object" ? i : "" ) + "]", v, traditional, add ); } }); - } else if ( !traditional && obj != null && typeof obj === "object" ) { + } else if ( !traditional && jQuery.type( obj ) === "object" ) { // Serialize object item. for ( var name in obj ) { buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add ); @@ -7455,7 +7827,7 @@ function ajaxHandleResponses( s, jqXHR, responses ) { firstDataType; // Fill responseXXX fields - for( type in responseFields ) { + for ( type in responseFields ) { if ( type in responses ) { jqXHR[ responseFields[type] ] = responses[ type ]; } @@ -7534,13 +7906,13 @@ function ajaxConvert( s, response ) { conv2; // For each dataType in the chain - for( i = 1; i < length; i++ ) { + for ( i = 1; i < length; i++ ) { // Create converters map // with lowercased keys if ( i === 1 ) { - for( key in s.converters ) { - if( typeof key === "string" ) { + for ( key in s.converters ) { + if ( typeof key === "string" ) { converters[ key.toLowerCase() ] = s.converters[ key ]; } } @@ -7551,7 +7923,7 @@ function ajaxConvert( s, response ) { current = dataTypes[ i ]; // If current is auto dataType, update it to prev - if( current === "*" ) { + if ( current === "*" ) { current = prev; // If no auto and dataTypes are actually different } else if ( prev !== "*" && prev !== current ) { @@ -7563,7 +7935,7 @@ function ajaxConvert( s, response ) { // If there is no direct converter, search transitively if ( !conv ) { conv2 = undefined; - for( conv1 in converters ) { + for ( conv1 in converters ) { tmp = conv1.split( " " ); if ( tmp[ 0 ] === prev || tmp[ 0 ] === "*" ) { conv2 = converters[ tmp[1] + " " + current ]; @@ -7610,8 +7982,7 @@ jQuery.ajaxSetup({ // Detect, normalize options and install callbacks for jsonp requests jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) { - var inspectData = s.contentType === "application/x-www-form-urlencoded" && - ( typeof s.data === "string" ); + var inspectData = ( typeof s.data === "string" ) && /^application\/x\-www\-form\-urlencoded/.test( s.contentType ); if ( s.dataTypes[ 0 ] === "jsonp" || s.jsonp !== false && ( jsre.test( s.url ) || @@ -7912,7 +8283,13 @@ if ( jQuery.support.ajax ) { if ( xml && xml.documentElement /* #4958 */ ) { responses.xml = xml; } - responses.text = xhr.responseText; + + // When requesting binary data, IE6-9 will throw an exception + // on any attempt to access responseText (#11426) + try { + responses.text = xhr.responseText; + } catch( _ ) { + } // Firefox throws an exception when accessing // statusText for faulty cross-domain requests @@ -7995,21 +8372,18 @@ var elemdisplay = {}, // opacity animations [ "opacity" ] ], - fxNow, - requestAnimationFrame = window.webkitRequestAnimationFrame || - window.mozRequestAnimationFrame || - window.oRequestAnimationFrame; + fxNow; jQuery.fn.extend({ show: function( speed, easing, callback ) { var elem, display; if ( speed || speed === 0 ) { - return this.animate( genFx("show", 3), speed, easing, callback); + return this.animate( genFx("show", 3), speed, easing, callback ); } else { for ( var i = 0, j = this.length; i < j; i++ ) { - elem = this[i]; + elem = this[ i ]; if ( elem.style ) { display = elem.style.display; @@ -8023,8 +8397,9 @@ jQuery.fn.extend({ // Set elements which have been overridden with display: none // in a stylesheet to whatever the default browser style is // for such an element - if ( display === "" && jQuery.css( elem, "display" ) === "none" ) { - jQuery._data(elem, "olddisplay", defaultDisplay(elem.nodeName)); + if ( (display === "" && jQuery.css(elem, "display") === "none") || + !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) { + jQuery._data( elem, "olddisplay", defaultDisplay(elem.nodeName) ); } } } @@ -8032,13 +8407,13 @@ jQuery.fn.extend({ // Set the display of most of the elements in a second loop // to avoid the constant reflow for ( i = 0; i < j; i++ ) { - elem = this[i]; + elem = this[ i ]; if ( elem.style ) { display = elem.style.display; if ( display === "" || display === "none" ) { - elem.style.display = jQuery._data(elem, "olddisplay") || ""; + elem.style.display = jQuery._data( elem, "olddisplay" ) || ""; } } } @@ -8052,12 +8427,17 @@ jQuery.fn.extend({ return this.animate( genFx("hide", 3), speed, easing, callback); } else { - for ( var i = 0, j = this.length; i < j; i++ ) { - if ( this[i].style ) { - var display = jQuery.css( this[i], "display" ); + var elem, display, + i = 0, + j = this.length; - if ( display !== "none" && !jQuery._data( this[i], "olddisplay" ) ) { - jQuery._data( this[i], "olddisplay", display ); + for ( ; i < j; i++ ) { + elem = this[i]; + if ( elem.style ) { + display = jQuery.css( elem, "display" ); + + if ( display !== "none" && !jQuery._data( elem, "olddisplay" ) ) { + jQuery._data( elem, "olddisplay", display ); } } } @@ -8102,7 +8482,7 @@ jQuery.fn.extend({ }, animate: function( prop, speed, easing, callback ) { - var optall = jQuery.speed(speed, easing, callback); + var optall = jQuery.speed( speed, easing, callback ); if ( jQuery.isEmptyObject( prop ) ) { return this.each( optall.complete, [ false ] ); @@ -8111,7 +8491,7 @@ jQuery.fn.extend({ // Do not change referenced properties as per-property easing will be lost prop = jQuery.extend( {}, prop ); - return this[ optall.queue === false ? "each" : "queue" ](function() { + function doAnimation() { // XXX 'this' does not always have a nodeName when running the // test suite @@ -8122,24 +8502,37 @@ jQuery.fn.extend({ var opt = jQuery.extend( {}, optall ), isElement = this.nodeType === 1, hidden = isElement && jQuery(this).is(":hidden"), - name, val, p, - display, e, - parts, start, end, unit; + name, val, p, e, hooks, replace, + parts, start, end, unit, + method; // will store per property easing and be used to determine when an animation is complete opt.animatedProperties = {}; + // first pass over propertys to expand / normalize for ( p in prop ) { - - // property name normalization name = jQuery.camelCase( p ); if ( p !== name ) { prop[ name ] = prop[ p ]; delete prop[ p ]; } - val = prop[ name ]; + if ( ( hooks = jQuery.cssHooks[ name ] ) && "expand" in hooks ) { + replace = hooks.expand( prop[ name ] ); + delete prop[ name ]; + // not quite $.extend, this wont overwrite keys already present. + // also - reusing 'p' from above because we have the correct "name" + for ( p in replace ) { + if ( ! ( p in prop ) ) { + prop[ p ] = replace[ p ]; + } + } + } + } + + for ( name in prop ) { + val = prop[ name ]; // easing resolution: per property > opt.specialEasing > opt.easing > 'swing' (default) if ( jQuery.isArray( val ) ) { opt.animatedProperties[ name ] = val[ 1 ]; @@ -8160,25 +8553,17 @@ jQuery.fn.extend({ opt.overflow = [ this.style.overflow, this.style.overflowX, this.style.overflowY ]; // Set display property to inline-block for height/width - // animations on inline elements that are having width/height - // animated + // animations on inline elements that are having width/height animated if ( jQuery.css( this, "display" ) === "inline" && jQuery.css( this, "float" ) === "none" ) { - if ( !jQuery.support.inlineBlockNeedsLayout ) { + + // inline-level elements accept inline-block; + // block-level elements need to be inline with layout + if ( !jQuery.support.inlineBlockNeedsLayout || defaultDisplay( this.nodeName ) === "inline" ) { this.style.display = "inline-block"; } else { - display = defaultDisplay( this.nodeName ); - - // inline-level elements accept inline-block; - // block-level elements need to be inline with layout - if ( display === "inline" ) { - this.style.display = "inline-block"; - - } else { - this.style.display = "inline"; - this.style.zoom = 1; - } + this.style.zoom = 1; } } } @@ -8192,8 +8577,17 @@ jQuery.fn.extend({ e = new jQuery.fx( this, opt, p ); val = prop[ p ]; - if ( rfxtypes.test(val) ) { - e[ val === "toggle" ? hidden ? "show" : "hide" : val ](); + if ( rfxtypes.test( val ) ) { + + // Tracks whether to show or hide based on private + // data attached to the element + method = jQuery._data( this, "toggle" + p ) || ( val === "toggle" ? hidden ? "show" : "hide" : 0 ); + if ( method ) { + jQuery._data( this, "toggle" + p, method === "show" ? "hide" : "show" ); + e[ method ](); + } else { + e[ val ](); + } } else { parts = rfxnum.exec( val ); @@ -8206,7 +8600,7 @@ jQuery.fn.extend({ // We need to compute starting value if ( unit !== "px" ) { jQuery.style( this, p, (end || 1) + unit); - start = ((end || 1) / e.cur()) * start; + start = ( (end || 1) / e.cur() ) * start; jQuery.style( this, p, start + unit); } @@ -8225,39 +8619,71 @@ jQuery.fn.extend({ // For JS strict compliance return true; - }); - }, - - stop: function( clearQueue, gotoEnd ) { - if ( clearQueue ) { - this.queue([]); } - this.each(function() { - var timers = jQuery.timers, - i = timers.length; + return optall.queue === false ? + this.each( doAnimation ) : + this.queue( optall.queue, doAnimation ); + }, + + stop: function( type, clearQueue, gotoEnd ) { + if ( typeof type !== "string" ) { + gotoEnd = clearQueue; + clearQueue = type; + type = undefined; + } + if ( clearQueue && type !== false ) { + this.queue( type || "fx", [] ); + } + + return this.each(function() { + var index, + hadTimers = false, + timers = jQuery.timers, + data = jQuery._data( this ); + // clear marker counters if we know they won't be if ( !gotoEnd ) { jQuery._unmark( true, this ); } - while ( i-- ) { - if ( timers[i].elem === this ) { - if (gotoEnd) { - // force the next step to be the last - timers[i](true); - } - timers.splice(i, 1); + function stopQueue( elem, data, index ) { + var hooks = data[ index ]; + jQuery.removeData( elem, index, true ); + hooks.stop( gotoEnd ); + } + + if ( type == null ) { + for ( index in data ) { + if ( data[ index ] && data[ index ].stop && index.indexOf(".run") === index.length - 4 ) { + stopQueue( this, data, index ); + } + } + } else if ( data[ index = type + ".run" ] && data[ index ].stop ){ + stopQueue( this, data, index ); + } + + for ( index = timers.length; index--; ) { + if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) { + if ( gotoEnd ) { + + // force the next step to be the last + timers[ index ]( true ); + } else { + timers[ index ].saveState(); + } + hadTimers = true; + timers.splice( index, 1 ); } } + + // start the next in the queue if the last step wasn't forced + // timers currently will call their complete callbacks, which will dequeue + // but only if they were gotoEnd + if ( !( gotoEnd && hadTimers ) ) { + jQuery.dequeue( this, type ); + } }); - - // start the next in the queue if the last step wasn't forced - if ( !gotoEnd ) { - this.dequeue(); - } - - return this; } }); @@ -8276,7 +8702,7 @@ function clearFxNow() { function genFx( type, num ) { var obj = {}; - jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() { + jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice( 0, num )), function() { obj[ this ] = type; }); @@ -8285,9 +8711,9 @@ function genFx( type, num ) { // Generate shortcuts for custom animations jQuery.each({ - slideDown: genFx("show", 1), - slideUp: genFx("hide", 1), - slideToggle: genFx("toggle", 1), + slideDown: genFx( "show", 1 ), + slideUp: genFx( "hide", 1 ), + slideToggle: genFx( "toggle", 1 ), fadeIn: { opacity: "show" }, fadeOut: { opacity: "hide" }, fadeToggle: { opacity: "toggle" } @@ -8299,25 +8725,31 @@ jQuery.each({ jQuery.extend({ speed: function( speed, easing, fn ) { - var opt = speed && typeof speed === "object" ? jQuery.extend({}, speed) : { + var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : { complete: fn || !fn && easing || jQuery.isFunction( speed ) && speed, duration: speed, - easing: fn && easing || easing && !jQuery.isFunction(easing) && easing + easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing }; opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration : - opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[opt.duration] : jQuery.fx.speeds._default; + opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default; + + // normalize opt.queue - true/undefined/null -> "fx" + if ( opt.queue == null || opt.queue === true ) { + opt.queue = "fx"; + } // Queueing opt.old = opt.complete; + opt.complete = function( noUnmark ) { if ( jQuery.isFunction( opt.old ) ) { opt.old.call( this ); } - if ( opt.queue !== false ) { - jQuery.dequeue( this ); + if ( opt.queue ) { + jQuery.dequeue( this, opt.queue ); } else if ( noUnmark !== false ) { jQuery._unmark( this ); } @@ -8327,11 +8759,11 @@ jQuery.extend({ }, easing: { - linear: function( p, n, firstNum, diff ) { - return firstNum + diff * p; + linear: function( p ) { + return p; }, - swing: function( p, n, firstNum, diff ) { - return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum; + swing: function( p ) { + return ( -Math.cos( p*Math.PI ) / 2 ) + 0.5; } }, @@ -8354,12 +8786,12 @@ jQuery.fx.prototype = { this.options.step.call( this.elem, this.now, this ); } - (jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this ); + ( jQuery.fx.step[ this.prop ] || jQuery.fx.step._default )( this ); }, // Get the current size cur: function() { - if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) ) { + if ( this.elem[ this.prop ] != null && (!this.elem.style || this.elem.style[ this.prop ] == null) ) { return this.elem[ this.prop ]; } @@ -8374,50 +8806,51 @@ jQuery.fx.prototype = { // Start an animation from one number to another custom: function( from, to, unit ) { var self = this, - fx = jQuery.fx, - raf; + fx = jQuery.fx; this.startTime = fxNow || createFxNow(); - this.start = from; this.end = to; - this.unit = unit || this.unit || ( jQuery.cssNumber[ this.prop ] ? "" : "px" ); - this.now = this.start; + this.now = this.start = from; this.pos = this.state = 0; + this.unit = unit || this.unit || ( jQuery.cssNumber[ this.prop ] ? "" : "px" ); function t( gotoEnd ) { - return self.step(gotoEnd); + return self.step( gotoEnd ); } + t.queue = this.options.queue; t.elem = this.elem; + t.saveState = function() { + if ( jQuery._data( self.elem, "fxshow" + self.prop ) === undefined ) { + if ( self.options.hide ) { + jQuery._data( self.elem, "fxshow" + self.prop, self.start ); + } else if ( self.options.show ) { + jQuery._data( self.elem, "fxshow" + self.prop, self.end ); + } + } + }; if ( t() && jQuery.timers.push(t) && !timerId ) { - // Use requestAnimationFrame instead of setInterval if available - if ( requestAnimationFrame ) { - timerId = true; - raf = function() { - // When timerId gets set to null at any point, this stops - if ( timerId ) { - requestAnimationFrame( raf ); - fx.tick(); - } - }; - requestAnimationFrame( raf ); - } else { - timerId = setInterval( fx.tick, fx.interval ); - } + timerId = setInterval( fx.tick, fx.interval ); } }, // Simple 'show' function show: function() { + var dataShow = jQuery._data( this.elem, "fxshow" + this.prop ); + // Remember where we started, so that we can go back to it later - this.options.orig[this.prop] = jQuery.style( this.elem, this.prop ); + this.options.orig[ this.prop ] = dataShow || jQuery.style( this.elem, this.prop ); this.options.show = true; // Begin the animation - // Make sure that we start at a small width/height to avoid any - // flash of content - this.custom(this.prop === "width" || this.prop === "height" ? 1 : 0, this.cur()); + // Make sure that we start at a small width/height to avoid any flash of content + if ( dataShow !== undefined ) { + // This show is picking up where a previous hide or show left off + this.custom( this.cur(), dataShow ); + } else { + this.custom( this.prop === "width" || this.prop === "height" ? 1 : 0, this.cur() ); + } // Start by showing the element jQuery( this.elem ).show(); @@ -8426,20 +8859,20 @@ jQuery.fx.prototype = { // Simple 'hide' function hide: function() { // Remember where we started, so that we can go back to it later - this.options.orig[this.prop] = jQuery.style( this.elem, this.prop ); + this.options.orig[ this.prop ] = jQuery._data( this.elem, "fxshow" + this.prop ) || jQuery.style( this.elem, this.prop ); this.options.hide = true; // Begin the animation - this.custom(this.cur(), 0); + this.custom( this.cur(), 0 ); }, // Each step of an animation step: function( gotoEnd ) { - var t = fxNow || createFxNow(), + var p, n, complete, + t = fxNow || createFxNow(), done = true, elem = this.elem, - options = this.options, - i, n; + options = this.options; if ( gotoEnd || t >= options.duration + this.startTime ) { this.now = this.end; @@ -8448,8 +8881,8 @@ jQuery.fx.prototype = { options.animatedProperties[ this.prop ] = true; - for ( i in options.animatedProperties ) { - if ( options.animatedProperties[i] !== true ) { + for ( p in options.animatedProperties ) { + if ( options.animatedProperties[ p ] !== true ) { done = false; } } @@ -8458,25 +8891,36 @@ jQuery.fx.prototype = { // Reset the overflow if ( options.overflow != null && !jQuery.support.shrinkWrapBlocks ) { - jQuery.each( [ "", "X", "Y" ], function (index, value) { - elem.style[ "overflow" + value ] = options.overflow[index]; + jQuery.each( [ "", "X", "Y" ], function( index, value ) { + elem.style[ "overflow" + value ] = options.overflow[ index ]; }); } // Hide the element if the "hide" operation was done if ( options.hide ) { - jQuery(elem).hide(); + jQuery( elem ).hide(); } // Reset the properties, if the item has been hidden or shown if ( options.hide || options.show ) { - for ( var p in options.animatedProperties ) { - jQuery.style( elem, p, options.orig[p] ); + for ( p in options.animatedProperties ) { + jQuery.style( elem, p, options.orig[ p ] ); + jQuery.removeData( elem, "fxshow" + p, true ); + // Toggle data is no longer needed + jQuery.removeData( elem, "toggle" + p, true ); } } // Execute the complete function - options.complete.call( elem ); + // in the event that the complete function throws an exception + // we must ensure it won't be called twice. #5684 + + complete = options.complete; + if ( complete ) { + + options.complete = false; + complete.call( elem ); + } } return false; @@ -8490,8 +8934,8 @@ jQuery.fx.prototype = { this.state = n / options.duration; // Perform the easing function, defaults to swing - this.pos = jQuery.easing[ options.animatedProperties[ this.prop ] ]( this.state, n, 0, 1, options.duration ); - this.now = this.start + ((this.end - this.start) * this.pos); + this.pos = jQuery.easing[ options.animatedProperties[this.prop] ]( this.state, n, 0, 1, options.duration ); + this.now = this.start + ( (this.end - this.start) * this.pos ); } // Perform the next step of the animation this.update(); @@ -8503,9 +8947,15 @@ jQuery.fx.prototype = { jQuery.extend( jQuery.fx, { tick: function() { - for ( var timers = jQuery.timers, i = 0 ; i < timers.length ; ++i ) { - if ( !timers[i]() ) { - timers.splice(i--, 1); + var timer, + timers = jQuery.timers, + i = 0; + + for ( ; i < timers.length; i++ ) { + timer = timers[ i ]; + // Checks the timer has not already been removed + if ( !timer() && timers[ i ] === timer ) { + timers.splice( i--, 1 ); } } @@ -8535,7 +8985,7 @@ jQuery.extend( jQuery.fx, { _default: function( fx ) { if ( fx.elem.style && fx.elem.style[ fx.prop ] != null ) { - fx.elem.style[ fx.prop ] = (fx.prop === "width" || fx.prop === "height" ? Math.max(0, fx.now) : fx.now) + fx.unit; + fx.elem.style[ fx.prop ] = fx.now + fx.unit; } else { fx.elem[ fx.prop ] = fx.now; } @@ -8543,6 +8993,16 @@ jQuery.extend( jQuery.fx, { } }); +// Ensure props that can't be negative don't go there on undershoot easing +jQuery.each( fxAttrs.concat.apply( [], fxAttrs ), function( i, prop ) { + // exclude marginTop, marginLeft, marginBottom and marginRight from this list + if ( prop.indexOf( "margin" ) ) { + jQuery.fx.step[ prop ] = function( fx ) { + jQuery.style( fx.elem, prop, Math.max(0, fx.now) + fx.unit ); + }; + } +}); + if ( jQuery.expr && jQuery.expr.filters ) { jQuery.expr.filters.animated = function( elem ) { return jQuery.grep(jQuery.timers, function( fn ) { @@ -8559,7 +9019,6 @@ function defaultDisplay( nodeName ) { var body = document.body, elem = jQuery( "<" + nodeName + ">" ).appendTo( body ), display = elem.css( "display" ); - elem.remove(); // If the simple way fails, @@ -8578,7 +9037,7 @@ function defaultDisplay( nodeName ) { // document to it; WebKit & Firefox won't allow reusing the iframe document. if ( !iframeDoc || !iframe.createElement ) { iframeDoc = ( iframe.contentWindow || iframe.contentDocument ).document; - iframeDoc.write( ( document.compatMode === "CSS1Compat" ? "" : "" ) + "" ); + iframeDoc.write( ( jQuery.support.boxModel ? "" : "" ) + "" ); iframeDoc.close(); } @@ -8587,7 +9046,6 @@ function defaultDisplay( nodeName ) { iframeDoc.body.appendChild( elem ); display = jQuery.css( elem, "display" ); - body.removeChild( iframe ); } @@ -8601,41 +9059,23 @@ function defaultDisplay( nodeName ) { -var rtable = /^t(?:able|d|h)$/i, +var getOffset, + rtable = /^t(?:able|d|h)$/i, rroot = /^(?:body|html)$/i; if ( "getBoundingClientRect" in document.documentElement ) { - jQuery.fn.offset = function( options ) { - var elem = this[0], box; - - if ( options ) { - return this.each(function( i ) { - jQuery.offset.setOffset( this, options, i ); - }); - } - - if ( !elem || !elem.ownerDocument ) { - return null; - } - - if ( elem === elem.ownerDocument.body ) { - return jQuery.offset.bodyOffset( elem ); - } - + getOffset = function( elem, doc, docElem, box ) { try { box = elem.getBoundingClientRect(); } catch(e) {} - var doc = elem.ownerDocument, - docElem = doc.documentElement; - // Make sure we're not dealing with a disconnected DOM node if ( !box || !jQuery.contains( docElem, elem ) ) { return box ? { top: box.top, left: box.left } : { top: 0, left: 0 }; } var body = doc.body, - win = getWindow(doc), + win = getWindow( doc ), clientTop = docElem.clientTop || body.clientTop || 0, clientLeft = docElem.clientLeft || body.clientLeft || 0, scrollTop = win.pageYOffset || jQuery.support.boxModel && docElem.scrollTop || body.scrollTop, @@ -8647,30 +9087,10 @@ if ( "getBoundingClientRect" in document.documentElement ) { }; } else { - jQuery.fn.offset = function( options ) { - var elem = this[0]; - - if ( options ) { - return this.each(function( i ) { - jQuery.offset.setOffset( this, options, i ); - }); - } - - if ( !elem || !elem.ownerDocument ) { - return null; - } - - if ( elem === elem.ownerDocument.body ) { - return jQuery.offset.bodyOffset( elem ); - } - - jQuery.offset.initialize(); - + getOffset = function( elem, doc, docElem ) { var computedStyle, offsetParent = elem.offsetParent, prevOffsetParent = elem, - doc = elem.ownerDocument, - docElem = doc.documentElement, body = doc.body, defaultView = doc.defaultView, prevComputedStyle = defaultView ? defaultView.getComputedStyle( elem, null ) : elem.currentStyle, @@ -8678,7 +9098,7 @@ if ( "getBoundingClientRect" in document.documentElement ) { left = elem.offsetLeft; while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) { - if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) { + if ( jQuery.support.fixedPosition && prevComputedStyle.position === "fixed" ) { break; } @@ -8690,7 +9110,7 @@ if ( "getBoundingClientRect" in document.documentElement ) { top += elem.offsetTop; left += elem.offsetLeft; - if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && rtable.test(elem.nodeName)) ) { + if ( jQuery.support.doesNotAddBorder && !(jQuery.support.doesAddBorderForTableAndCells && rtable.test(elem.nodeName)) ) { top += parseFloat( computedStyle.borderTopWidth ) || 0; left += parseFloat( computedStyle.borderLeftWidth ) || 0; } @@ -8699,7 +9119,7 @@ if ( "getBoundingClientRect" in document.documentElement ) { offsetParent = elem.offsetParent; } - if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) { + if ( jQuery.support.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) { top += parseFloat( computedStyle.borderTopWidth ) || 0; left += parseFloat( computedStyle.borderLeftWidth ) || 0; } @@ -8712,7 +9132,7 @@ if ( "getBoundingClientRect" in document.documentElement ) { left += body.offsetLeft; } - if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) { + if ( jQuery.support.fixedPosition && prevComputedStyle.position === "fixed" ) { top += Math.max( docElem.scrollTop, body.scrollTop ); left += Math.max( docElem.scrollLeft, body.scrollLeft ); } @@ -8721,47 +9141,36 @@ if ( "getBoundingClientRect" in document.documentElement ) { }; } +jQuery.fn.offset = function( options ) { + if ( arguments.length ) { + return options === undefined ? + this : + this.each(function( i ) { + jQuery.offset.setOffset( this, options, i ); + }); + } + + var elem = this[0], + doc = elem && elem.ownerDocument; + + if ( !doc ) { + return null; + } + + if ( elem === doc.body ) { + return jQuery.offset.bodyOffset( elem ); + } + + return getOffset( elem, doc, doc.documentElement ); +}; + jQuery.offset = { - initialize: function() { - var body = document.body, container = document.createElement("div"), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat( jQuery.css(body, "marginTop") ) || 0, - html = "
"; - - jQuery.extend( container.style, { position: "absolute", top: 0, left: 0, margin: 0, border: 0, width: "1px", height: "1px", visibility: "hidden" } ); - - container.innerHTML = html; - body.insertBefore( container, body.firstChild ); - innerDiv = container.firstChild; - checkDiv = innerDiv.firstChild; - td = innerDiv.nextSibling.firstChild.firstChild; - - this.doesNotAddBorder = (checkDiv.offsetTop !== 5); - this.doesAddBorderForTableAndCells = (td.offsetTop === 5); - - checkDiv.style.position = "fixed"; - checkDiv.style.top = "20px"; - - // safari subtracts parent border width here which is 5px - this.supportsFixedPosition = (checkDiv.offsetTop === 20 || checkDiv.offsetTop === 15); - checkDiv.style.position = checkDiv.style.top = ""; - - innerDiv.style.overflow = "hidden"; - innerDiv.style.position = "relative"; - - this.subtractsBorderForOverflowNotVisible = (checkDiv.offsetTop === -5); - - this.doesNotIncludeMarginInBodyOffset = (body.offsetTop !== bodyMarginTop); - - body.removeChild( container ); - jQuery.offset.initialize = jQuery.noop; - }, bodyOffset: function( body ) { var top = body.offsetTop, left = body.offsetLeft; - jQuery.offset.initialize(); - - if ( jQuery.offset.doesNotIncludeMarginInBodyOffset ) { + if ( jQuery.support.doesNotIncludeMarginInBodyOffset ) { top += parseFloat( jQuery.css(body, "marginTop") ) || 0; left += parseFloat( jQuery.css(body, "marginLeft") ) || 0; } @@ -8781,7 +9190,7 @@ jQuery.offset = { curOffset = curElem.offset(), curCSSTop = jQuery.css( elem, "top" ), curCSSLeft = jQuery.css( elem, "left" ), - calculatePosition = (position === "absolute" || position === "fixed") && jQuery.inArray("auto", [curCSSTop, curCSSLeft]) > -1, + calculatePosition = ( position === "absolute" || position === "fixed" ) && jQuery.inArray("auto", [curCSSTop, curCSSLeft]) > -1, props = {}, curPosition = {}, curTop, curLeft; // need to be able to calculate position if either top or left is auto and position is either absolute or fixed @@ -8798,11 +9207,11 @@ jQuery.offset = { options = options.call( elem, i, curOffset ); } - if (options.top != null) { - props.top = (options.top - curOffset.top) + curTop; + if ( options.top != null ) { + props.top = ( options.top - curOffset.top ) + curTop; } - if (options.left != null) { - props.left = (options.left - curOffset.left) + curLeft; + if ( options.left != null ) { + props.left = ( options.left - curOffset.left ) + curLeft; } if ( "using" in options ) { @@ -8815,6 +9224,7 @@ jQuery.offset = { jQuery.fn.extend({ + position: function() { if ( !this[0] ) { return null; @@ -8859,42 +9269,30 @@ jQuery.fn.extend({ // Create scrollLeft and scrollTop methods -jQuery.each( ["Left", "Top"], function( i, name ) { - var method = "scroll" + name; +jQuery.each( {scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function( method, prop ) { + var top = /Y/.test( prop ); jQuery.fn[ method ] = function( val ) { - var elem, win; + return jQuery.access( this, function( elem, method, val ) { + var win = getWindow( elem ); - if ( val === undefined ) { - elem = this[ 0 ]; - - if ( !elem ) { - return null; + if ( val === undefined ) { + return win ? (prop in win) ? win[ prop ] : + jQuery.support.boxModel && win.document.documentElement[ method ] || + win.document.body[ method ] : + elem[ method ]; } - win = getWindow( elem ); - - // Return the scroll offset - return win ? ("pageXOffset" in win) ? win[ i ? "pageYOffset" : "pageXOffset" ] : - jQuery.support.boxModel && win.document.documentElement[ method ] || - win.document.body[ method ] : - elem[ method ]; - } - - // Set the scroll offset - return this.each(function() { - win = getWindow( this ); - if ( win ) { win.scrollTo( - !i ? val : jQuery( win ).scrollLeft(), - i ? val : jQuery( win ).scrollTop() + !top ? val : jQuery( win ).scrollLeft(), + top ? val : jQuery( win ).scrollTop() ); } else { - this[ method ] = val; + elem[ method ] = val; } - }); + }, method, val, arguments.length, null ); }; }); @@ -8910,72 +9308,97 @@ function getWindow( elem ) { // Create width, height, innerHeight, innerWidth, outerHeight and outerWidth methods -jQuery.each([ "Height", "Width" ], function( i, name ) { - - var type = name.toLowerCase(); +jQuery.each( { Height: "height", Width: "width" }, function( name, type ) { + var clientProp = "client" + name, + scrollProp = "scroll" + name, + offsetProp = "offset" + name; // innerHeight and innerWidth jQuery.fn[ "inner" + name ] = function() { var elem = this[0]; - return elem && elem.style ? + return elem ? + elem.style ? parseFloat( jQuery.css( elem, type, "padding" ) ) : + this[ type ]() : null; }; // outerHeight and outerWidth jQuery.fn[ "outer" + name ] = function( margin ) { var elem = this[0]; - return elem && elem.style ? + return elem ? + elem.style ? parseFloat( jQuery.css( elem, type, margin ? "margin" : "border" ) ) : + this[ type ]() : null; }; - jQuery.fn[ type ] = function( size ) { - // Get window width or height - var elem = this[0]; - if ( !elem ) { - return size == null ? null : this; - } + jQuery.fn[ type ] = function( value ) { + return jQuery.access( this, function( elem, type, value ) { + var doc, docElemProp, orig, ret; - if ( jQuery.isFunction( size ) ) { - return this.each(function( i ) { - var self = jQuery( this ); - self[ type ]( size.call( this, i, self[ type ]() ) ); - }); - } + if ( jQuery.isWindow( elem ) ) { + // 3rd condition allows Nokia support, as it supports the docElem prop but not CSS1Compat + doc = elem.document; + docElemProp = doc.documentElement[ clientProp ]; + return jQuery.support.boxModel && docElemProp || + doc.body && doc.body[ clientProp ] || docElemProp; + } - if ( jQuery.isWindow( elem ) ) { - // Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode - // 3rd condition allows Nokia support, as it supports the docElem prop but not CSS1Compat - var docElemProp = elem.document.documentElement[ "client" + name ]; - return elem.document.compatMode === "CSS1Compat" && docElemProp || - elem.document.body[ "client" + name ] || docElemProp; + // Get document width or height + if ( elem.nodeType === 9 ) { + // Either scroll[Width/Height] or offset[Width/Height], whichever is greater + doc = elem.documentElement; - // Get document width or height - } else if ( elem.nodeType === 9 ) { - // Either scroll[Width/Height] or offset[Width/Height], whichever is greater - return Math.max( - elem.documentElement["client" + name], - elem.body["scroll" + name], elem.documentElement["scroll" + name], - elem.body["offset" + name], elem.documentElement["offset" + name] - ); + // when a window > document, IE6 reports a offset[Width/Height] > client[Width/Height] + // so we can't use max, as it'll choose the incorrect offset[Width/Height] + // instead we use the correct client[Width/Height] + // support:IE6 + if ( doc[ clientProp ] >= doc[ scrollProp ] ) { + return doc[ clientProp ]; + } - // Get or set width or height on the element - } else if ( size === undefined ) { - var orig = jQuery.css( elem, type ), + return Math.max( + elem.body[ scrollProp ], doc[ scrollProp ], + elem.body[ offsetProp ], doc[ offsetProp ] + ); + } + + // Get width or height on the element + if ( value === undefined ) { + orig = jQuery.css( elem, type ); ret = parseFloat( orig ); + return jQuery.isNumeric( ret ) ? ret : orig; + } - return jQuery.isNaN( ret ) ? orig : ret; - - // Set the width or height on the element (default to pixels if value is unitless) - } else { - return this.css( type, typeof size === "string" ? size : size + "px" ); - } + // Set the width or height on the element + jQuery( elem ).css( type, value ); + }, type, value, arguments.length, null ); }; - }); + + // Expose jQuery to the global object window.jQuery = window.$ = jQuery; -})(window); + +// Expose jQuery as an AMD module, but only for AMD loaders that +// understand the issues with loading multiple versions of jQuery +// in a page that all might call define(). The loader will indicate +// they have special allowances for multiple jQuery versions by +// specifying define.amd.jQuery = true. Register as a named module, +// since jQuery can be concatenated with other files that may use define, +// but not use a proper concatenation script that understands anonymous +// AMD modules. A named AMD is safest and most robust way to register. +// Lowercase jquery is used because AMD module names are derived from +// file names, and jQuery is normally delivered in a lowercase file name. +// Do this after creating the global so that if an AMD module wants to call +// noConflict to hide this version of jQuery, it will work. +if ( typeof define === "function" && define.amd && define.amd.jQuery ) { + define( "jquery", [], function () { return jQuery; } ); +} + + + +})( window ); diff --git a/doc/html/_static/minus.png b/doc/html/_static/minus.png index bce9f779b45c1e474deca9a5f9e874bfd199b41f..da1c5620d10c047525a467a425abe9ff5269cfc2 100644 GIT binary patch delta 181 zcmXRr&NxA`o{52hLG9dwLLkLi;1OBOz`!jG!i)^F=12eq*-JcqUD>a*a|m!V+N`s9 z3KZffag8W(&d<$F%`0K}c4pdspjeQni(`nyV(FCY15|7D01(Yb6sIkr~k*|j;xQ5&xyQ6)2uJlbR0`fOi0*K d{$5VbnBju0eCX!rK0ToE44$rjF6*2UngEKoK!X4P delta 99 zcmX@kST;d2mYIQpVO~+Y2$13l@Ck9%)YLq4=FGcy?>>C^AfDhG1r%5Hba4!+xYc{g zkdJ|ZdL6GdVguxwighiHZFoh7V610u_K77(8A5T-G@yGywny C;3SR! diff --git a/doc/html/_static/plus.png b/doc/html/_static/plus.png index 4c677f139df529fbb84ad12ba59ec7e1f918f0c4..b3cb37425ea68b39ffa7b2e5fb69161275a87541 100644 GIT binary patch delta 181 zcmXRr&NxA`o{52hLG9dwLLkLi;1OBOz`!jG!i)^F=12eq*-JcqUD>a*a|m!5GUr%w z0EIY8Tq8=H^K)}k^GX=Lotd^DC>G@D;us=vIoYQ884q*ZfkOulELgOtDfHd_{q^79 z-A#59-nwOri*RC+0t?6Lgo7qB=j^J!XgD4HsQ>u*!%GF<_SgSk@q(`-vtakcodKdi d9fy>C^AfDhG1r%5Hba4!+xYc{g zkdJ|ZdL6Gg&%3xwighiHXfBh9|Q+*lz -1) { - match = objects[prefix][name]; - descr = objnames[match[1]] + _(', in ') + titles[match[0]]; - // XXX the generated anchors are not generally correct - // XXX there may be custom prefixes - result = [filenames[match[0]], fullname, '#'+fullname, descr]; - switch (match[2]) { - case 1: objectResults.push(result); break; - case 0: importantResults.push(result); break; - case 2: unimportantResults.push(result); break; - } - } - } - } + for (var i = 0; i < objectterms.length; i++) { + var others = [].concat(objectterms.slice(0,i), + objectterms.slice(i+1, objectterms.length)) + var results = this.performObjectSearch(objectterms[i], others); + // Assume first word is most likely to be the object, + // other words more likely to be in description. + // Therefore put matches for earlier words first. + // (Results are eventually used in reverse order). + objectResults = results[0].concat(objectResults); + importantResults = results[1].concat(importantResults); + unimportantResults = results[2].concat(unimportantResults); } - // sort results descending - objectResults.sort(function(a, b) { - return (a[1] > b[1]) ? -1 : ((a[1] < b[1]) ? 1 : 0); - }); - - importantResults.sort(function(a, b) { - return (a[1] > b[1]) ? -1 : ((a[1] < b[1]) ? 1 : 0); - }); - - unimportantResults.sort(function(a, b) { - return (a[1] > b[1]) ? -1 : ((a[1] < b[1]) ? 1 : 0); - }); - - // perform the search on the required terms for (var i = 0; i < searchterms.length; i++) { var word = searchterms[i]; @@ -480,16 +462,18 @@ var Search = { displayNextItem(); }); } else if (DOCUMENTATION_OPTIONS.HAS_SOURCE) { - $.get(DOCUMENTATION_OPTIONS.URL_ROOT + '_sources/' + - item[0] + '.txt', function(data) { - if (data != '') { - listItem.append($.makeSearchSummary(data, searchterms, hlterms)); - Search.output.append(listItem); - } - listItem.slideDown(5, function() { - displayNextItem(); - }); - }, "text"); + $.ajax({url: DOCUMENTATION_OPTIONS.URL_ROOT + '_sources/' + item[0] + '.txt', + dataType: "text", + complete: function(jqxhr, textstatus) { + var data = jqxhr.responseText; + if (data !== '') { + listItem.append($.makeSearchSummary(data, searchterms, hlterms)); + } + Search.output.append(listItem); + listItem.slideDown(5, function() { + displayNextItem(); + }); + }}); } else { // no source available, just display title Search.output.append(listItem); @@ -510,9 +494,74 @@ var Search = { } } displayNextItem(); + }, + + performObjectSearch : function(object, otherterms) { + var filenames = this._index.filenames; + var objects = this._index.objects; + var objnames = this._index.objnames; + var titles = this._index.titles; + + var importantResults = []; + var objectResults = []; + var unimportantResults = []; + + for (var prefix in objects) { + for (var name in objects[prefix]) { + var fullname = (prefix ? prefix + '.' : '') + name; + if (fullname.toLowerCase().indexOf(object) > -1) { + var match = objects[prefix][name]; + var objname = objnames[match[1]][2]; + var title = titles[match[0]]; + // If more than one term searched for, we require other words to be + // found in the name/title/description + if (otherterms.length > 0) { + var haystack = (prefix + ' ' + name + ' ' + + objname + ' ' + title).toLowerCase(); + var allfound = true; + for (var i = 0; i < otherterms.length; i++) { + if (haystack.indexOf(otherterms[i]) == -1) { + allfound = false; + break; + } + } + if (!allfound) { + continue; + } + } + var descr = objname + _(', in ') + title; + anchor = match[3]; + if (anchor == '') + anchor = fullname; + else if (anchor == '-') + anchor = objnames[match[1]][1] + '-' + fullname; + result = [filenames[match[0]], fullname, '#'+anchor, descr]; + switch (match[2]) { + case 1: objectResults.push(result); break; + case 0: importantResults.push(result); break; + case 2: unimportantResults.push(result); break; + } + } + } + } + + // sort results descending + objectResults.sort(function(a, b) { + return (a[1] > b[1]) ? -1 : ((a[1] < b[1]) ? 1 : 0); + }); + + importantResults.sort(function(a, b) { + return (a[1] > b[1]) ? -1 : ((a[1] < b[1]) ? 1 : 0); + }); + + unimportantResults.sort(function(a, b) { + return (a[1] > b[1]) ? -1 : ((a[1] < b[1]) ? 1 : 0); + }); + + return [importantResults, objectResults, unimportantResults] } } $(document).ready(function() { Search.init(); -}); +}); \ No newline at end of file diff --git a/doc/html/_static/sidebar.js b/doc/html/_static/sidebar.js index e9ef491..a45e192 100644 --- a/doc/html/_static/sidebar.js +++ b/doc/html/_static/sidebar.js @@ -29,6 +29,9 @@ $(function() { var sidebar = $('.sphinxsidebar'); var sidebarwrapper = $('.sphinxsidebarwrapper'); + // for some reason, the document has no sidebar; do not run into errors + if (!sidebar.length) return; + // original margin-left of the bodywrapper and width of the sidebar // with the sidebar expanded var bw_margin_expanded = bodywrapper.css('margin-left'); diff --git a/doc/html/_static/underscore.js b/doc/html/_static/underscore.js index eaba008..a12f0d9 100644 --- a/doc/html/_static/underscore.js +++ b/doc/html/_static/underscore.js @@ -1,10 +1,7 @@ -// Underscore.js 1.1.6 -// (c) 2011 Jeremy Ashkenas, DocumentCloud Inc. -// Underscore is freely distributable under the MIT license. -// Portions of Underscore are inspired or borrowed from Prototype, -// Oliver Steele's Functional, and John Resig's Micro-Templating. -// For all details and documentation: -// http://documentcloud.github.com/underscore +// Underscore.js 1.4.4 +// http://underscorejs.org +// (c) 2009-2013 Jeremy Ashkenas, DocumentCloud Inc. +// Underscore may be freely distributed under the MIT license. (function() { @@ -24,8 +21,9 @@ var ArrayProto = Array.prototype, ObjProto = Object.prototype, FuncProto = Function.prototype; // Create quick reference variables for speed access to core prototypes. - var slice = ArrayProto.slice, - unshift = ArrayProto.unshift, + var push = ArrayProto.push, + slice = ArrayProto.slice, + concat = ArrayProto.concat, toString = ObjProto.toString, hasOwnProperty = ObjProto.hasOwnProperty; @@ -46,38 +44,45 @@ nativeBind = FuncProto.bind; // Create a safe reference to the Underscore object for use below. - var _ = function(obj) { return new wrapper(obj); }; + var _ = function(obj) { + if (obj instanceof _) return obj; + if (!(this instanceof _)) return new _(obj); + this._wrapped = obj; + }; - // Export the Underscore object for **CommonJS**, with backwards-compatibility - // for the old `require()` API. If we're not in CommonJS, add `_` to the - // global object. - if (typeof module !== 'undefined' && module.exports) { - module.exports = _; - _._ = _; + // Export the Underscore object for **Node.js**, with + // backwards-compatibility for the old `require()` API. If we're in + // the browser, add `_` as a global object via a string identifier, + // for Closure Compiler "advanced" mode. + if (typeof exports !== 'undefined') { + if (typeof module !== 'undefined' && module.exports) { + exports = module.exports = _; + } + exports._ = _; } else { root._ = _; } // Current version. - _.VERSION = '1.1.6'; + _.VERSION = '1.4.4'; // Collection Functions // -------------------- // The cornerstone, an `each` implementation, aka `forEach`. - // Handles objects implementing `forEach`, arrays, and raw objects. + // Handles objects with the built-in `forEach`, arrays, and raw objects. // Delegates to **ECMAScript 5**'s native `forEach` if available. var each = _.each = _.forEach = function(obj, iterator, context) { if (obj == null) return; if (nativeForEach && obj.forEach === nativeForEach) { obj.forEach(iterator, context); - } else if (_.isNumber(obj.length)) { + } else if (obj.length === +obj.length) { for (var i = 0, l = obj.length; i < l; i++) { if (iterator.call(context, obj[i], i, obj) === breaker) return; } } else { for (var key in obj) { - if (hasOwnProperty.call(obj, key)) { + if (_.has(obj, key)) { if (iterator.call(context, obj[key], key, obj) === breaker) return; } } @@ -86,7 +91,7 @@ // Return the results of applying the iterator to each element. // Delegates to **ECMAScript 5**'s native `map` if available. - _.map = function(obj, iterator, context) { + _.map = _.collect = function(obj, iterator, context) { var results = []; if (obj == null) return results; if (nativeMap && obj.map === nativeMap) return obj.map(iterator, context); @@ -96,37 +101,54 @@ return results; }; + var reduceError = 'Reduce of empty array with no initial value'; + // **Reduce** builds up a single result from a list of values, aka `inject`, // or `foldl`. Delegates to **ECMAScript 5**'s native `reduce` if available. _.reduce = _.foldl = _.inject = function(obj, iterator, memo, context) { - var initial = memo !== void 0; + var initial = arguments.length > 2; if (obj == null) obj = []; if (nativeReduce && obj.reduce === nativeReduce) { if (context) iterator = _.bind(iterator, context); return initial ? obj.reduce(iterator, memo) : obj.reduce(iterator); } each(obj, function(value, index, list) { - if (!initial && index === 0) { + if (!initial) { memo = value; initial = true; } else { memo = iterator.call(context, memo, value, index, list); } }); - if (!initial) throw new TypeError("Reduce of empty array with no initial value"); + if (!initial) throw new TypeError(reduceError); return memo; }; // The right-associative version of reduce, also known as `foldr`. // Delegates to **ECMAScript 5**'s native `reduceRight` if available. _.reduceRight = _.foldr = function(obj, iterator, memo, context) { + var initial = arguments.length > 2; if (obj == null) obj = []; if (nativeReduceRight && obj.reduceRight === nativeReduceRight) { if (context) iterator = _.bind(iterator, context); - return memo !== void 0 ? obj.reduceRight(iterator, memo) : obj.reduceRight(iterator); + return initial ? obj.reduceRight(iterator, memo) : obj.reduceRight(iterator); } - var reversed = (_.isArray(obj) ? obj.slice() : _.toArray(obj)).reverse(); - return _.reduce(reversed, iterator, memo, context); + var length = obj.length; + if (length !== +length) { + var keys = _.keys(obj); + length = keys.length; + } + each(obj, function(value, index, list) { + index = keys ? keys[--length] : --length; + if (!initial) { + memo = obj[index]; + initial = true; + } else { + memo = iterator.call(context, memo, obj[index], index, list); + } + }); + if (!initial) throw new TypeError(reduceError); + return memo; }; // Return the first value which passes a truth test. Aliased as `detect`. @@ -156,25 +178,23 @@ // Return all the elements for which a truth test fails. _.reject = function(obj, iterator, context) { - var results = []; - if (obj == null) return results; - each(obj, function(value, index, list) { - if (!iterator.call(context, value, index, list)) results[results.length] = value; - }); - return results; + return _.filter(obj, function(value, index, list) { + return !iterator.call(context, value, index, list); + }, context); }; // Determine whether all of the elements match a truth test. // Delegates to **ECMAScript 5**'s native `every` if available. // Aliased as `all`. _.every = _.all = function(obj, iterator, context) { + iterator || (iterator = _.identity); var result = true; if (obj == null) return result; if (nativeEvery && obj.every === nativeEvery) return obj.every(iterator, context); each(obj, function(value, index, list) { if (!(result = result && iterator.call(context, value, index, list))) return breaker; }); - return result; + return !!result; }; // Determine if at least one element in the object matches a truth test. @@ -186,28 +206,27 @@ if (obj == null) return result; if (nativeSome && obj.some === nativeSome) return obj.some(iterator, context); each(obj, function(value, index, list) { - if (result = iterator.call(context, value, index, list)) return breaker; + if (result || (result = iterator.call(context, value, index, list))) return breaker; }); - return result; + return !!result; }; - // Determine if a given value is included in the array or object using `===`. - // Aliased as `contains`. - _.include = _.contains = function(obj, target) { - var found = false; - if (obj == null) return found; + // Determine if the array or object contains a given value (using `===`). + // Aliased as `include`. + _.contains = _.include = function(obj, target) { + if (obj == null) return false; if (nativeIndexOf && obj.indexOf === nativeIndexOf) return obj.indexOf(target) != -1; - any(obj, function(value) { - if (found = value === target) return true; + return any(obj, function(value) { + return value === target; }); - return found; }; // Invoke a method (with arguments) on every item in a collection. _.invoke = function(obj, method) { var args = slice.call(arguments, 2); + var isFunc = _.isFunction(method); return _.map(obj, function(value) { - return (method.call ? method || value : value[method]).apply(value, args); + return (isFunc ? method : value[method]).apply(value, args); }); }; @@ -216,10 +235,33 @@ return _.map(obj, function(value){ return value[key]; }); }; + // Convenience version of a common use case of `filter`: selecting only objects + // containing specific `key:value` pairs. + _.where = function(obj, attrs, first) { + if (_.isEmpty(attrs)) return first ? null : []; + return _[first ? 'find' : 'filter'](obj, function(value) { + for (var key in attrs) { + if (attrs[key] !== value[key]) return false; + } + return true; + }); + }; + + // Convenience version of a common use case of `find`: getting the first object + // containing specific `key:value` pairs. + _.findWhere = function(obj, attrs) { + return _.where(obj, attrs, true); + }; + // Return the maximum element or (element-based computation). + // Can't optimize arrays of integers longer than 65,535 elements. + // See: https://bugs.webkit.org/show_bug.cgi?id=80797 _.max = function(obj, iterator, context) { - if (!iterator && _.isArray(obj)) return Math.max.apply(Math, obj); - var result = {computed : -Infinity}; + if (!iterator && _.isArray(obj) && obj[0] === +obj[0] && obj.length < 65535) { + return Math.max.apply(Math, obj); + } + if (!iterator && _.isEmpty(obj)) return -Infinity; + var result = {computed : -Infinity, value: -Infinity}; each(obj, function(value, index, list) { var computed = iterator ? iterator.call(context, value, index, list) : value; computed >= result.computed && (result = {value : value, computed : computed}); @@ -229,8 +271,11 @@ // Return the minimum element (or element-based computation). _.min = function(obj, iterator, context) { - if (!iterator && _.isArray(obj)) return Math.min.apply(Math, obj); - var result = {computed : Infinity}; + if (!iterator && _.isArray(obj) && obj[0] === +obj[0] && obj.length < 65535) { + return Math.min.apply(Math, obj); + } + if (!iterator && _.isEmpty(obj)) return Infinity; + var result = {computed : Infinity, value: Infinity}; each(obj, function(value, index, list) { var computed = iterator ? iterator.call(context, value, index, list) : value; computed < result.computed && (result = {value : value, computed : computed}); @@ -238,101 +283,195 @@ return result.value; }; + // Shuffle an array. + _.shuffle = function(obj) { + var rand; + var index = 0; + var shuffled = []; + each(obj, function(value) { + rand = _.random(index++); + shuffled[index - 1] = shuffled[rand]; + shuffled[rand] = value; + }); + return shuffled; + }; + + // An internal function to generate lookup iterators. + var lookupIterator = function(value) { + return _.isFunction(value) ? value : function(obj){ return obj[value]; }; + }; + // Sort the object's values by a criterion produced by an iterator. - _.sortBy = function(obj, iterator, context) { + _.sortBy = function(obj, value, context) { + var iterator = lookupIterator(value); return _.pluck(_.map(obj, function(value, index, list) { return { value : value, + index : index, criteria : iterator.call(context, value, index, list) }; }).sort(function(left, right) { - var a = left.criteria, b = right.criteria; - return a < b ? -1 : a > b ? 1 : 0; + var a = left.criteria; + var b = right.criteria; + if (a !== b) { + if (a > b || a === void 0) return 1; + if (a < b || b === void 0) return -1; + } + return left.index < right.index ? -1 : 1; }), 'value'); }; - // Use a comparator function to figure out at what index an object should - // be inserted so as to maintain order. Uses binary search. - _.sortedIndex = function(array, obj, iterator) { - iterator || (iterator = _.identity); + // An internal function used for aggregate "group by" operations. + var group = function(obj, value, context, behavior) { + var result = {}; + var iterator = lookupIterator(value || _.identity); + each(obj, function(value, index) { + var key = iterator.call(context, value, index, obj); + behavior(result, key, value); + }); + return result; + }; + + // Groups the object's values by a criterion. Pass either a string attribute + // to group by, or a function that returns the criterion. + _.groupBy = function(obj, value, context) { + return group(obj, value, context, function(result, key, value) { + (_.has(result, key) ? result[key] : (result[key] = [])).push(value); + }); + }; + + // Counts instances of an object that group by a certain criterion. Pass + // either a string attribute to count by, or a function that returns the + // criterion. + _.countBy = function(obj, value, context) { + return group(obj, value, context, function(result, key) { + if (!_.has(result, key)) result[key] = 0; + result[key]++; + }); + }; + + // Use a comparator function to figure out the smallest index at which + // an object should be inserted so as to maintain order. Uses binary search. + _.sortedIndex = function(array, obj, iterator, context) { + iterator = iterator == null ? _.identity : lookupIterator(iterator); + var value = iterator.call(context, obj); var low = 0, high = array.length; while (low < high) { - var mid = (low + high) >> 1; - iterator(array[mid]) < iterator(obj) ? low = mid + 1 : high = mid; + var mid = (low + high) >>> 1; + iterator.call(context, array[mid]) < value ? low = mid + 1 : high = mid; } return low; }; // Safely convert anything iterable into a real, live array. - _.toArray = function(iterable) { - if (!iterable) return []; - if (iterable.toArray) return iterable.toArray(); - if (_.isArray(iterable)) return iterable; - if (_.isArguments(iterable)) return slice.call(iterable); - return _.values(iterable); + _.toArray = function(obj) { + if (!obj) return []; + if (_.isArray(obj)) return slice.call(obj); + if (obj.length === +obj.length) return _.map(obj, _.identity); + return _.values(obj); }; // Return the number of elements in an object. _.size = function(obj) { - return _.toArray(obj).length; + if (obj == null) return 0; + return (obj.length === +obj.length) ? obj.length : _.keys(obj).length; }; // Array Functions // --------------- // Get the first element of an array. Passing **n** will return the first N - // values in the array. Aliased as `head`. The **guard** check allows it to work - // with `_.map`. - _.first = _.head = function(array, n, guard) { + // values in the array. Aliased as `head` and `take`. The **guard** check + // allows it to work with `_.map`. + _.first = _.head = _.take = function(array, n, guard) { + if (array == null) return void 0; return (n != null) && !guard ? slice.call(array, 0, n) : array[0]; }; - // Returns everything but the first entry of the array. Aliased as `tail`. - // Especially useful on the arguments object. Passing an **index** will return - // the rest of the values in the array from that index onward. The **guard** - // check allows it to work with `_.map`. - _.rest = _.tail = function(array, index, guard) { - return slice.call(array, (index == null) || guard ? 1 : index); + // Returns everything but the last entry of the array. Especially useful on + // the arguments object. Passing **n** will return all the values in + // the array, excluding the last N. The **guard** check allows it to work with + // `_.map`. + _.initial = function(array, n, guard) { + return slice.call(array, 0, array.length - ((n == null) || guard ? 1 : n)); }; - // Get the last element of an array. - _.last = function(array) { - return array[array.length - 1]; + // Get the last element of an array. Passing **n** will return the last N + // values in the array. The **guard** check allows it to work with `_.map`. + _.last = function(array, n, guard) { + if (array == null) return void 0; + if ((n != null) && !guard) { + return slice.call(array, Math.max(array.length - n, 0)); + } else { + return array[array.length - 1]; + } + }; + + // Returns everything but the first entry of the array. Aliased as `tail` and `drop`. + // Especially useful on the arguments object. Passing an **n** will return + // the rest N values in the array. The **guard** + // check allows it to work with `_.map`. + _.rest = _.tail = _.drop = function(array, n, guard) { + return slice.call(array, (n == null) || guard ? 1 : n); }; // Trim out all falsy values from an array. _.compact = function(array) { - return _.filter(array, function(value){ return !!value; }); + return _.filter(array, _.identity); + }; + + // Internal implementation of a recursive `flatten` function. + var flatten = function(input, shallow, output) { + each(input, function(value) { + if (_.isArray(value)) { + shallow ? push.apply(output, value) : flatten(value, shallow, output); + } else { + output.push(value); + } + }); + return output; }; // Return a completely flattened version of an array. - _.flatten = function(array) { - return _.reduce(array, function(memo, value) { - if (_.isArray(value)) return memo.concat(_.flatten(value)); - memo[memo.length] = value; - return memo; - }, []); + _.flatten = function(array, shallow) { + return flatten(array, shallow, []); }; // Return a version of the array that does not contain the specified value(s). _.without = function(array) { - var values = slice.call(arguments, 1); - return _.filter(array, function(value){ return !_.include(values, value); }); + return _.difference(array, slice.call(arguments, 1)); }; // Produce a duplicate-free version of the array. If the array has already // been sorted, you have the option of using a faster algorithm. // Aliased as `unique`. - _.uniq = _.unique = function(array, isSorted) { - return _.reduce(array, function(memo, el, i) { - if (0 == i || (isSorted === true ? _.last(memo) != el : !_.include(memo, el))) memo[memo.length] = el; - return memo; - }, []); + _.uniq = _.unique = function(array, isSorted, iterator, context) { + if (_.isFunction(isSorted)) { + context = iterator; + iterator = isSorted; + isSorted = false; + } + var initial = iterator ? _.map(array, iterator, context) : array; + var results = []; + var seen = []; + each(initial, function(value, index) { + if (isSorted ? (!index || seen[seen.length - 1] !== value) : !_.contains(seen, value)) { + seen.push(value); + results.push(array[index]); + } + }); + return results; + }; + + // Produce an array that contains the union: each distinct element from all of + // the passed-in arrays. + _.union = function() { + return _.uniq(concat.apply(ArrayProto, arguments)); }; // Produce an array that contains every item shared between all the // passed-in arrays. - _.intersect = function(array) { + _.intersection = function(array) { var rest = slice.call(arguments, 1); return _.filter(_.uniq(array), function(item) { return _.every(rest, function(other) { @@ -341,16 +480,41 @@ }); }; + // Take the difference between one array and a number of other arrays. + // Only the elements present in just the first array will remain. + _.difference = function(array) { + var rest = concat.apply(ArrayProto, slice.call(arguments, 1)); + return _.filter(array, function(value){ return !_.contains(rest, value); }); + }; + // Zip together multiple lists into a single array -- elements that share // an index go together. _.zip = function() { var args = slice.call(arguments); var length = _.max(_.pluck(args, 'length')); var results = new Array(length); - for (var i = 0; i < length; i++) results[i] = _.pluck(args, "" + i); + for (var i = 0; i < length; i++) { + results[i] = _.pluck(args, "" + i); + } return results; }; + // Converts lists into objects. Pass either a single array of `[key, value]` + // pairs, or two parallel arrays of the same length -- one of keys, and one of + // the corresponding values. + _.object = function(list, values) { + if (list == null) return {}; + var result = {}; + for (var i = 0, l = list.length; i < l; i++) { + if (values) { + result[list[i]] = values[i]; + } else { + result[list[i][0]] = list[i][1]; + } + } + return result; + }; + // If the browser doesn't supply us with indexOf (I'm looking at you, **MSIE**), // we need this function. Return the position of the first occurrence of an // item in an array, or -1 if the item is not included in the array. @@ -359,22 +523,28 @@ // for **isSorted** to use binary search. _.indexOf = function(array, item, isSorted) { if (array == null) return -1; - var i, l; + var i = 0, l = array.length; if (isSorted) { - i = _.sortedIndex(array, item); - return array[i] === item ? i : -1; + if (typeof isSorted == 'number') { + i = (isSorted < 0 ? Math.max(0, l + isSorted) : isSorted); + } else { + i = _.sortedIndex(array, item); + return array[i] === item ? i : -1; + } } - if (nativeIndexOf && array.indexOf === nativeIndexOf) return array.indexOf(item); - for (i = 0, l = array.length; i < l; i++) if (array[i] === item) return i; + if (nativeIndexOf && array.indexOf === nativeIndexOf) return array.indexOf(item, isSorted); + for (; i < l; i++) if (array[i] === item) return i; return -1; }; - // Delegates to **ECMAScript 5**'s native `lastIndexOf` if available. - _.lastIndexOf = function(array, item) { + _.lastIndexOf = function(array, item, from) { if (array == null) return -1; - if (nativeLastIndexOf && array.lastIndexOf === nativeLastIndexOf) return array.lastIndexOf(item); - var i = array.length; + var hasIndex = from != null; + if (nativeLastIndexOf && array.lastIndexOf === nativeLastIndexOf) { + return hasIndex ? array.lastIndexOf(item, from) : array.lastIndexOf(item); + } + var i = (hasIndex ? from : array.length); while (i--) if (array[i] === item) return i; return -1; }; @@ -405,14 +575,22 @@ // ------------------ // Create a function bound to a given object (assigning `this`, and arguments, - // optionally). Binding with arguments is also known as `curry`. - // Delegates to **ECMAScript 5**'s native `Function.bind` if available. - // We check for `func.bind` first, to fail fast when `func` is undefined. - _.bind = function(func, obj) { + // optionally). Delegates to **ECMAScript 5**'s native `Function.bind` if + // available. + _.bind = function(func, context) { if (func.bind === nativeBind && nativeBind) return nativeBind.apply(func, slice.call(arguments, 1)); var args = slice.call(arguments, 2); return function() { - return func.apply(obj, args.concat(slice.call(arguments))); + return func.apply(context, args.concat(slice.call(arguments))); + }; + }; + + // Partially apply a function by creating a version that has had some of its + // arguments pre-filled, without changing its dynamic `this` context. + _.partial = function(func) { + var args = slice.call(arguments, 1); + return function() { + return func.apply(this, args.concat(slice.call(arguments))); }; }; @@ -420,7 +598,7 @@ // all callbacks defined on an object belong to it. _.bindAll = function(obj) { var funcs = slice.call(arguments, 1); - if (funcs.length == 0) funcs = _.functions(obj); + if (funcs.length === 0) funcs = _.functions(obj); each(funcs, function(f) { obj[f] = _.bind(obj[f], obj); }); return obj; }; @@ -431,7 +609,7 @@ hasher || (hasher = _.identity); return function() { var key = hasher.apply(this, arguments); - return hasOwnProperty.call(memo, key) ? memo[key] : (memo[key] = func.apply(this, arguments)); + return _.has(memo, key) ? memo[key] : (memo[key] = func.apply(this, arguments)); }; }; @@ -439,7 +617,7 @@ // it with the arguments supplied. _.delay = function(func, wait) { var args = slice.call(arguments, 2); - return setTimeout(function(){ return func.apply(func, args); }, wait); + return setTimeout(function(){ return func.apply(null, args); }, wait); }; // Defers a function, scheduling it to run after the current call stack has @@ -448,31 +626,51 @@ return _.delay.apply(_, [func, 1].concat(slice.call(arguments, 1))); }; - // Internal function used to implement `_.throttle` and `_.debounce`. - var limit = function(func, wait, debounce) { - var timeout; - return function() { - var context = this, args = arguments; - var throttler = function() { - timeout = null; - func.apply(context, args); - }; - if (debounce) clearTimeout(timeout); - if (debounce || !timeout) timeout = setTimeout(throttler, wait); - }; - }; - // Returns a function, that, when invoked, will only be triggered at most once // during a given window of time. _.throttle = function(func, wait) { - return limit(func, wait, false); + var context, args, timeout, result; + var previous = 0; + var later = function() { + previous = new Date; + timeout = null; + result = func.apply(context, args); + }; + return function() { + var now = new Date; + var remaining = wait - (now - previous); + context = this; + args = arguments; + if (remaining <= 0) { + clearTimeout(timeout); + timeout = null; + previous = now; + result = func.apply(context, args); + } else if (!timeout) { + timeout = setTimeout(later, remaining); + } + return result; + }; }; // Returns a function, that, as long as it continues to be invoked, will not // be triggered. The function will be called after it stops being called for - // N milliseconds. - _.debounce = function(func, wait) { - return limit(func, wait, true); + // N milliseconds. If `immediate` is passed, trigger the function on the + // leading edge, instead of the trailing. + _.debounce = function(func, wait, immediate) { + var timeout, result; + return function() { + var context = this, args = arguments; + var later = function() { + timeout = null; + if (!immediate) result = func.apply(context, args); + }; + var callNow = immediate && !timeout; + clearTimeout(timeout); + timeout = setTimeout(later, wait); + if (callNow) result = func.apply(context, args); + return result; + }; }; // Returns a function that will be executed at most one time, no matter how @@ -482,7 +680,9 @@ return function() { if (ran) return memo; ran = true; - return memo = func.apply(this, arguments); + memo = func.apply(this, arguments); + func = null; + return memo; }; }; @@ -491,7 +691,8 @@ // conditionally execute the original function. _.wrap = function(func, wrapper) { return function() { - var args = [func].concat(slice.call(arguments)); + var args = [func]; + push.apply(args, arguments); return wrapper.apply(this, args); }; }; @@ -499,10 +700,10 @@ // Returns a function that is the composition of a list of functions, each // consuming the return value of the function that follows. _.compose = function() { - var funcs = slice.call(arguments); + var funcs = arguments; return function() { - var args = slice.call(arguments); - for (var i=funcs.length-1; i >= 0; i--) { + var args = arguments; + for (var i = funcs.length - 1; i >= 0; i--) { args = [funcs[i].apply(this, args)]; } return args[0]; @@ -511,12 +712,14 @@ // Returns a function that will only be executed after being called N times. _.after = function(times, func) { + if (times <= 0) return func(); return function() { - if (--times < 1) { return func.apply(this, arguments); } + if (--times < 1) { + return func.apply(this, arguments); + } }; }; - // Object Functions // ---------------- @@ -525,36 +728,80 @@ _.keys = nativeKeys || function(obj) { if (obj !== Object(obj)) throw new TypeError('Invalid object'); var keys = []; - for (var key in obj) if (hasOwnProperty.call(obj, key)) keys[keys.length] = key; + for (var key in obj) if (_.has(obj, key)) keys[keys.length] = key; return keys; }; // Retrieve the values of an object's properties. _.values = function(obj) { - return _.map(obj, _.identity); + var values = []; + for (var key in obj) if (_.has(obj, key)) values.push(obj[key]); + return values; + }; + + // Convert an object into a list of `[key, value]` pairs. + _.pairs = function(obj) { + var pairs = []; + for (var key in obj) if (_.has(obj, key)) pairs.push([key, obj[key]]); + return pairs; + }; + + // Invert the keys and values of an object. The values must be serializable. + _.invert = function(obj) { + var result = {}; + for (var key in obj) if (_.has(obj, key)) result[obj[key]] = key; + return result; }; // Return a sorted list of the function names available on the object. // Aliased as `methods` _.functions = _.methods = function(obj) { - return _.filter(_.keys(obj), function(key){ return _.isFunction(obj[key]); }).sort(); + var names = []; + for (var key in obj) { + if (_.isFunction(obj[key])) names.push(key); + } + return names.sort(); }; // Extend a given object with all the properties in passed-in object(s). _.extend = function(obj) { each(slice.call(arguments, 1), function(source) { - for (var prop in source) { - if (source[prop] !== void 0) obj[prop] = source[prop]; + if (source) { + for (var prop in source) { + obj[prop] = source[prop]; + } } }); return obj; }; + // Return a copy of the object only containing the whitelisted properties. + _.pick = function(obj) { + var copy = {}; + var keys = concat.apply(ArrayProto, slice.call(arguments, 1)); + each(keys, function(key) { + if (key in obj) copy[key] = obj[key]; + }); + return copy; + }; + + // Return a copy of the object without the blacklisted properties. + _.omit = function(obj) { + var copy = {}; + var keys = concat.apply(ArrayProto, slice.call(arguments, 1)); + for (var key in obj) { + if (!_.contains(keys, key)) copy[key] = obj[key]; + } + return copy; + }; + // Fill in a given object with default properties. _.defaults = function(obj) { each(slice.call(arguments, 1), function(source) { - for (var prop in source) { - if (obj[prop] == null) obj[prop] = source[prop]; + if (source) { + for (var prop in source) { + if (obj[prop] == null) obj[prop] = source[prop]; + } } }); return obj; @@ -562,6 +809,7 @@ // Create a (shallow-cloned) duplicate of an object. _.clone = function(obj) { + if (!_.isObject(obj)) return obj; return _.isArray(obj) ? obj.slice() : _.extend({}, obj); }; @@ -573,102 +821,162 @@ return obj; }; - // Perform a deep comparison to check if two objects are equal. - _.isEqual = function(a, b) { - // Check object identity. - if (a === b) return true; - // Different types? - var atype = typeof(a), btype = typeof(b); - if (atype != btype) return false; - // Basic equality test (watch out for coercions). - if (a == b) return true; - // One is falsy and the other truthy. - if ((!a && b) || (a && !b)) return false; + // Internal recursive comparison function for `isEqual`. + var eq = function(a, b, aStack, bStack) { + // Identical objects are equal. `0 === -0`, but they aren't identical. + // See the Harmony `egal` proposal: http://wiki.ecmascript.org/doku.php?id=harmony:egal. + if (a === b) return a !== 0 || 1 / a == 1 / b; + // A strict comparison is necessary because `null == undefined`. + if (a == null || b == null) return a === b; // Unwrap any wrapped objects. - if (a._chain) a = a._wrapped; - if (b._chain) b = b._wrapped; - // One of them implements an isEqual()? - if (a.isEqual) return a.isEqual(b); - // Check dates' integer values. - if (_.isDate(a) && _.isDate(b)) return a.getTime() === b.getTime(); - // Both are NaN? - if (_.isNaN(a) && _.isNaN(b)) return false; - // Compare regular expressions. - if (_.isRegExp(a) && _.isRegExp(b)) - return a.source === b.source && - a.global === b.global && - a.ignoreCase === b.ignoreCase && - a.multiline === b.multiline; - // If a is not an object by this point, we can't handle it. - if (atype !== 'object') return false; - // Check for different array lengths before comparing contents. - if (a.length && (a.length !== b.length)) return false; - // Nothing else worked, deep compare the contents. - var aKeys = _.keys(a), bKeys = _.keys(b); - // Different object sizes? - if (aKeys.length != bKeys.length) return false; - // Recursive comparison of contents. - for (var key in a) if (!(key in b) || !_.isEqual(a[key], b[key])) return false; - return true; + if (a instanceof _) a = a._wrapped; + if (b instanceof _) b = b._wrapped; + // Compare `[[Class]]` names. + var className = toString.call(a); + if (className != toString.call(b)) return false; + switch (className) { + // Strings, numbers, dates, and booleans are compared by value. + case '[object String]': + // Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is + // equivalent to `new String("5")`. + return a == String(b); + case '[object Number]': + // `NaN`s are equivalent, but non-reflexive. An `egal` comparison is performed for + // other numeric values. + return a != +a ? b != +b : (a == 0 ? 1 / a == 1 / b : a == +b); + case '[object Date]': + case '[object Boolean]': + // Coerce dates and booleans to numeric primitive values. Dates are compared by their + // millisecond representations. Note that invalid dates with millisecond representations + // of `NaN` are not equivalent. + return +a == +b; + // RegExps are compared by their source patterns and flags. + case '[object RegExp]': + return a.source == b.source && + a.global == b.global && + a.multiline == b.multiline && + a.ignoreCase == b.ignoreCase; + } + if (typeof a != 'object' || typeof b != 'object') return false; + // Assume equality for cyclic structures. The algorithm for detecting cyclic + // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`. + var length = aStack.length; + while (length--) { + // Linear search. Performance is inversely proportional to the number of + // unique nested structures. + if (aStack[length] == a) return bStack[length] == b; + } + // Add the first object to the stack of traversed objects. + aStack.push(a); + bStack.push(b); + var size = 0, result = true; + // Recursively compare objects and arrays. + if (className == '[object Array]') { + // Compare array lengths to determine if a deep comparison is necessary. + size = a.length; + result = size == b.length; + if (result) { + // Deep compare the contents, ignoring non-numeric properties. + while (size--) { + if (!(result = eq(a[size], b[size], aStack, bStack))) break; + } + } + } else { + // Objects with different constructors are not equivalent, but `Object`s + // from different frames are. + var aCtor = a.constructor, bCtor = b.constructor; + if (aCtor !== bCtor && !(_.isFunction(aCtor) && (aCtor instanceof aCtor) && + _.isFunction(bCtor) && (bCtor instanceof bCtor))) { + return false; + } + // Deep compare objects. + for (var key in a) { + if (_.has(a, key)) { + // Count the expected number of properties. + size++; + // Deep compare each member. + if (!(result = _.has(b, key) && eq(a[key], b[key], aStack, bStack))) break; + } + } + // Ensure that both objects contain the same number of properties. + if (result) { + for (key in b) { + if (_.has(b, key) && !(size--)) break; + } + result = !size; + } + } + // Remove the first object from the stack of traversed objects. + aStack.pop(); + bStack.pop(); + return result; }; - // Is a given array or object empty? + // Perform a deep comparison to check if two objects are equal. + _.isEqual = function(a, b) { + return eq(a, b, [], []); + }; + + // Is a given array, string, or object empty? + // An "empty" object has no enumerable own-properties. _.isEmpty = function(obj) { + if (obj == null) return true; if (_.isArray(obj) || _.isString(obj)) return obj.length === 0; - for (var key in obj) if (hasOwnProperty.call(obj, key)) return false; + for (var key in obj) if (_.has(obj, key)) return false; return true; }; // Is a given value a DOM element? _.isElement = function(obj) { - return !!(obj && obj.nodeType == 1); + return !!(obj && obj.nodeType === 1); }; // Is a given value an array? // Delegates to ECMA5's native Array.isArray _.isArray = nativeIsArray || function(obj) { - return toString.call(obj) === '[object Array]'; + return toString.call(obj) == '[object Array]'; }; - // Is a given variable an arguments object? - _.isArguments = function(obj) { - return !!(obj && hasOwnProperty.call(obj, 'callee')); + // Is a given variable an object? + _.isObject = function(obj) { + return obj === Object(obj); }; - // Is a given value a function? - _.isFunction = function(obj) { - return !!(obj && obj.constructor && obj.call && obj.apply); + // Add some isType methods: isArguments, isFunction, isString, isNumber, isDate, isRegExp. + each(['Arguments', 'Function', 'String', 'Number', 'Date', 'RegExp'], function(name) { + _['is' + name] = function(obj) { + return toString.call(obj) == '[object ' + name + ']'; + }; + }); + + // Define a fallback version of the method in browsers (ahem, IE), where + // there isn't any inspectable "Arguments" type. + if (!_.isArguments(arguments)) { + _.isArguments = function(obj) { + return !!(obj && _.has(obj, 'callee')); + }; + } + + // Optimize `isFunction` if appropriate. + if (typeof (/./) !== 'function') { + _.isFunction = function(obj) { + return typeof obj === 'function'; + }; + } + + // Is a given object a finite number? + _.isFinite = function(obj) { + return isFinite(obj) && !isNaN(parseFloat(obj)); }; - // Is a given value a string? - _.isString = function(obj) { - return !!(obj === '' || (obj && obj.charCodeAt && obj.substr)); - }; - - // Is a given value a number? - _.isNumber = function(obj) { - return !!(obj === 0 || (obj && obj.toExponential && obj.toFixed)); - }; - - // Is the given value `NaN`? `NaN` happens to be the only value in JavaScript - // that does not equal itself. + // Is the given value `NaN`? (NaN is the only number which does not equal itself). _.isNaN = function(obj) { - return obj !== obj; + return _.isNumber(obj) && obj != +obj; }; // Is a given value a boolean? _.isBoolean = function(obj) { - return obj === true || obj === false; - }; - - // Is a given value a date? - _.isDate = function(obj) { - return !!(obj && obj.getTimezoneOffset && obj.setUTCFullYear); - }; - - // Is the given value a regular expression? - _.isRegExp = function(obj) { - return !!(obj && obj.test && obj.exec && (obj.ignoreCase || obj.ignoreCase === false)); + return obj === true || obj === false || toString.call(obj) == '[object Boolean]'; }; // Is a given value equal to null? @@ -681,6 +989,12 @@ return obj === void 0; }; + // Shortcut function for checking if an object has a given property directly + // on itself (in other words, not on a prototype). + _.has = function(obj, key) { + return hasOwnProperty.call(obj, key); + }; + // Utility Functions // ----------------- @@ -697,15 +1011,67 @@ }; // Run a function **n** times. - _.times = function (n, iterator, context) { - for (var i = 0; i < n; i++) iterator.call(context, i); + _.times = function(n, iterator, context) { + var accum = Array(n); + for (var i = 0; i < n; i++) accum[i] = iterator.call(context, i); + return accum; }; - // Add your own custom functions to the Underscore object, ensuring that - // they're correctly added to the OOP wrapper as well. + // Return a random integer between min and max (inclusive). + _.random = function(min, max) { + if (max == null) { + max = min; + min = 0; + } + return min + Math.floor(Math.random() * (max - min + 1)); + }; + + // List of HTML entities for escaping. + var entityMap = { + escape: { + '&': '&', + '<': '<', + '>': '>', + '"': '"', + "'": ''', + '/': '/' + } + }; + entityMap.unescape = _.invert(entityMap.escape); + + // Regexes containing the keys and values listed immediately above. + var entityRegexes = { + escape: new RegExp('[' + _.keys(entityMap.escape).join('') + ']', 'g'), + unescape: new RegExp('(' + _.keys(entityMap.unescape).join('|') + ')', 'g') + }; + + // Functions for escaping and unescaping strings to/from HTML interpolation. + _.each(['escape', 'unescape'], function(method) { + _[method] = function(string) { + if (string == null) return ''; + return ('' + string).replace(entityRegexes[method], function(match) { + return entityMap[method][match]; + }); + }; + }); + + // If the value of the named property is a function then invoke it; + // otherwise, return it. + _.result = function(object, property) { + if (object == null) return null; + var value = object[property]; + return _.isFunction(value) ? value.call(object) : value; + }; + + // Add your own custom functions to the Underscore object. _.mixin = function(obj) { each(_.functions(obj), function(name){ - addToWrapper(name, _[name] = obj[name]); + var func = _[name] = obj[name]; + _.prototype[name] = function() { + var args = [this._wrapped]; + push.apply(args, arguments); + return result.call(this, func.apply(_, args)); + }; }); }; @@ -713,7 +1079,7 @@ // Useful for temporary DOM ids. var idCounter = 0; _.uniqueId = function(prefix) { - var id = idCounter++; + var id = ++idCounter + ''; return prefix ? prefix + id : id; }; @@ -721,56 +1087,103 @@ // following template settings to use alternative delimiters. _.templateSettings = { evaluate : /<%([\s\S]+?)%>/g, - interpolate : /<%=([\s\S]+?)%>/g + interpolate : /<%=([\s\S]+?)%>/g, + escape : /<%-([\s\S]+?)%>/g }; + // When customizing `templateSettings`, if you don't want to define an + // interpolation, evaluation or escaping regex, we need one that is + // guaranteed not to match. + var noMatch = /(.)^/; + + // Certain characters need to be escaped so that they can be put into a + // string literal. + var escapes = { + "'": "'", + '\\': '\\', + '\r': 'r', + '\n': 'n', + '\t': 't', + '\u2028': 'u2028', + '\u2029': 'u2029' + }; + + var escaper = /\\|'|\r|\n|\t|\u2028|\u2029/g; + // JavaScript micro-templating, similar to John Resig's implementation. // Underscore templating handles arbitrary delimiters, preserves whitespace, // and correctly escapes quotes within interpolated code. - _.template = function(str, data) { - var c = _.templateSettings; - var tmpl = 'var __p=[],print=function(){__p.push.apply(__p,arguments);};' + - 'with(obj||{}){__p.push(\'' + - str.replace(/\\/g, '\\\\') - .replace(/'/g, "\\'") - .replace(c.interpolate, function(match, code) { - return "'," + code.replace(/\\'/g, "'") + ",'"; - }) - .replace(c.evaluate || null, function(match, code) { - return "');" + code.replace(/\\'/g, "'") - .replace(/[\r\n\t]/g, ' ') + "__p.push('"; - }) - .replace(/\r/g, '\\r') - .replace(/\n/g, '\\n') - .replace(/\t/g, '\\t') - + "');}return __p.join('');"; - var func = new Function('obj', tmpl); - return data ? func(data) : func; + _.template = function(text, data, settings) { + var render; + settings = _.defaults({}, settings, _.templateSettings); + + // Combine delimiters into one regular expression via alternation. + var matcher = new RegExp([ + (settings.escape || noMatch).source, + (settings.interpolate || noMatch).source, + (settings.evaluate || noMatch).source + ].join('|') + '|$', 'g'); + + // Compile the template source, escaping string literals appropriately. + var index = 0; + var source = "__p+='"; + text.replace(matcher, function(match, escape, interpolate, evaluate, offset) { + source += text.slice(index, offset) + .replace(escaper, function(match) { return '\\' + escapes[match]; }); + + if (escape) { + source += "'+\n((__t=(" + escape + "))==null?'':_.escape(__t))+\n'"; + } + if (interpolate) { + source += "'+\n((__t=(" + interpolate + "))==null?'':__t)+\n'"; + } + if (evaluate) { + source += "';\n" + evaluate + "\n__p+='"; + } + index = offset + match.length; + return match; + }); + source += "';\n"; + + // If a variable is not specified, place data values in local scope. + if (!settings.variable) source = 'with(obj||{}){\n' + source + '}\n'; + + source = "var __t,__p='',__j=Array.prototype.join," + + "print=function(){__p+=__j.call(arguments,'');};\n" + + source + "return __p;\n"; + + try { + render = new Function(settings.variable || 'obj', '_', source); + } catch (e) { + e.source = source; + throw e; + } + + if (data) return render(data, _); + var template = function(data) { + return render.call(this, data, _); + }; + + // Provide the compiled function source as a convenience for precompilation. + template.source = 'function(' + (settings.variable || 'obj') + '){\n' + source + '}'; + + return template; }; - // The OOP Wrapper - // --------------- + // Add a "chain" function, which will delegate to the wrapper. + _.chain = function(obj) { + return _(obj).chain(); + }; + // OOP + // --------------- // If Underscore is called as a function, it returns a wrapped object that // can be used OO-style. This wrapper holds altered versions of all the // underscore functions. Wrapped objects may be chained. - var wrapper = function(obj) { this._wrapped = obj; }; - - // Expose `wrapper.prototype` as `_.prototype` - _.prototype = wrapper.prototype; // Helper function to continue chaining intermediate results. - var result = function(obj, chain) { - return chain ? _(obj).chain() : obj; - }; - - // A method to easily add functions to the OOP wrapper. - var addToWrapper = function(name, func) { - wrapper.prototype[name] = function() { - var args = slice.call(arguments); - unshift.call(args, this._wrapped); - return result(func.apply(_, args), this._chain); - }; + var result = function(obj) { + return this._chain ? _(obj).chain() : obj; }; // Add all of the Underscore functions to the wrapper object. @@ -779,29 +1192,35 @@ // Add all mutator Array functions to the wrapper. each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) { var method = ArrayProto[name]; - wrapper.prototype[name] = function() { - method.apply(this._wrapped, arguments); - return result(this._wrapped, this._chain); + _.prototype[name] = function() { + var obj = this._wrapped; + method.apply(obj, arguments); + if ((name == 'shift' || name == 'splice') && obj.length === 0) delete obj[0]; + return result.call(this, obj); }; }); // Add all accessor Array functions to the wrapper. each(['concat', 'join', 'slice'], function(name) { var method = ArrayProto[name]; - wrapper.prototype[name] = function() { - return result(method.apply(this._wrapped, arguments), this._chain); + _.prototype[name] = function() { + return result.call(this, method.apply(this._wrapped, arguments)); }; }); - // Start chaining a wrapped Underscore object. - wrapper.prototype.chain = function() { - this._chain = true; - return this; - }; + _.extend(_.prototype, { - // Extracts the result from a wrapped and chained object. - wrapper.prototype.value = function() { - return this._wrapped; - }; + // Start chaining a wrapped Underscore object. + chain: function() { + this._chain = true; + return this; + }, -})(); + // Extracts the result from a wrapped and chained object. + value: function() { + return this._wrapped; + } + + }); + +}).call(this); diff --git a/doc/html/_static/up-pressed.png b/doc/html/_static/up-pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..8bd587afee2fe38989383ff82010147ea56b93dd GIT binary patch literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6U4S$Y z{B+)352QE?JR*yM+OLB!qm#z$3ZNi+iKnkC`z>}Z1|5lxjZvvUp)Z~;jv*GO&raT- z#pEb(tbY1#Ey4dH;Y+=wAPPMA->(Ug=YM6W%tgKtA zI`O=0Laf#Y-Y4f~`^K_)D_mvj{B=4?=t!I41ZLNlI~j_4kE*^nvF$)|>mH^X%(>6c z8XimFvvIAOoRJf!>6jzIa5w(S%7lxdZ{*qJxhxpj6S#UB!oTuMX^Z^6%)IfT_v-!3 z=PEaM_iSh6_`s$!$NaEMP6gw}xaYa3wv(2tRq1T=+jv*GO&raUx z$K)u`w*Tuor>1}ySNCesuPuG-8#b%jw0sn-5fpk^!623V@1GR6+<`78?&Rhov&jx6 z*R7KttIVGJ=8yH~|HhI(uB&NIpYp$LXT}M`Z)D=?%dxpN#UiKM#HZsJK4DUm#Y3a5!dMF634rTxz_l%hvABb z(=Pc<$5*Xj@eE$@$89c0_oa>Y5;`&;INvn7C-9xQbH92`*_(~*lcvS}m5Z2pGdgKc z>;tJC%=6B^QS*>ubT+QGD)v`9z&&Y`y-xHu*7vDC$|9@xfdY)d)78&qol`;+01iQm A<^TWy literal 0 HcmV?d00001 diff --git a/doc/html/_static/websupport.js b/doc/html/_static/websupport.js new file mode 100644 index 0000000..e9bd1b8 --- /dev/null +++ b/doc/html/_static/websupport.js @@ -0,0 +1,808 @@ +/* + * websupport.js + * ~~~~~~~~~~~~~ + * + * sphinx.websupport utilties for all documentation. + * + * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS. + * :license: BSD, see LICENSE for details. + * + */ + +(function($) { + $.fn.autogrow = function() { + return this.each(function() { + var textarea = this; + + $.fn.autogrow.resize(textarea); + + $(textarea) + .focus(function() { + textarea.interval = setInterval(function() { + $.fn.autogrow.resize(textarea); + }, 500); + }) + .blur(function() { + clearInterval(textarea.interval); + }); + }); + }; + + $.fn.autogrow.resize = function(textarea) { + var lineHeight = parseInt($(textarea).css('line-height'), 10); + var lines = textarea.value.split('\n'); + var columns = textarea.cols; + var lineCount = 0; + $.each(lines, function() { + lineCount += Math.ceil(this.length / columns) || 1; + }); + var height = lineHeight * (lineCount + 1); + $(textarea).css('height', height); + }; +})(jQuery); + +(function($) { + var comp, by; + + function init() { + initEvents(); + initComparator(); + } + + function initEvents() { + $('a.comment-close').live("click", function(event) { + event.preventDefault(); + hide($(this).attr('id').substring(2)); + }); + $('a.vote').live("click", function(event) { + event.preventDefault(); + handleVote($(this)); + }); + $('a.reply').live("click", function(event) { + event.preventDefault(); + openReply($(this).attr('id').substring(2)); + }); + $('a.close-reply').live("click", function(event) { + event.preventDefault(); + closeReply($(this).attr('id').substring(2)); + }); + $('a.sort-option').live("click", function(event) { + event.preventDefault(); + handleReSort($(this)); + }); + $('a.show-proposal').live("click", function(event) { + event.preventDefault(); + showProposal($(this).attr('id').substring(2)); + }); + $('a.hide-proposal').live("click", function(event) { + event.preventDefault(); + hideProposal($(this).attr('id').substring(2)); + }); + $('a.show-propose-change').live("click", function(event) { + event.preventDefault(); + showProposeChange($(this).attr('id').substring(2)); + }); + $('a.hide-propose-change').live("click", function(event) { + event.preventDefault(); + hideProposeChange($(this).attr('id').substring(2)); + }); + $('a.accept-comment').live("click", function(event) { + event.preventDefault(); + acceptComment($(this).attr('id').substring(2)); + }); + $('a.delete-comment').live("click", function(event) { + event.preventDefault(); + deleteComment($(this).attr('id').substring(2)); + }); + $('a.comment-markup').live("click", function(event) { + event.preventDefault(); + toggleCommentMarkupBox($(this).attr('id').substring(2)); + }); + } + + /** + * Set comp, which is a comparator function used for sorting and + * inserting comments into the list. + */ + function setComparator() { + // If the first three letters are "asc", sort in ascending order + // and remove the prefix. + if (by.substring(0,3) == 'asc') { + var i = by.substring(3); + comp = function(a, b) { return a[i] - b[i]; }; + } else { + // Otherwise sort in descending order. + comp = function(a, b) { return b[by] - a[by]; }; + } + + // Reset link styles and format the selected sort option. + $('a.sel').attr('href', '#').removeClass('sel'); + $('a.by' + by).removeAttr('href').addClass('sel'); + } + + /** + * Create a comp function. If the user has preferences stored in + * the sortBy cookie, use those, otherwise use the default. + */ + function initComparator() { + by = 'rating'; // Default to sort by rating. + // If the sortBy cookie is set, use that instead. + if (document.cookie.length > 0) { + var start = document.cookie.indexOf('sortBy='); + if (start != -1) { + start = start + 7; + var end = document.cookie.indexOf(";", start); + if (end == -1) { + end = document.cookie.length; + by = unescape(document.cookie.substring(start, end)); + } + } + } + setComparator(); + } + + /** + * Show a comment div. + */ + function show(id) { + $('#ao' + id).hide(); + $('#ah' + id).show(); + var context = $.extend({id: id}, opts); + var popup = $(renderTemplate(popupTemplate, context)).hide(); + popup.find('textarea[name="proposal"]').hide(); + popup.find('a.by' + by).addClass('sel'); + var form = popup.find('#cf' + id); + form.submit(function(event) { + event.preventDefault(); + addComment(form); + }); + $('#s' + id).after(popup); + popup.slideDown('fast', function() { + getComments(id); + }); + } + + /** + * Hide a comment div. + */ + function hide(id) { + $('#ah' + id).hide(); + $('#ao' + id).show(); + var div = $('#sc' + id); + div.slideUp('fast', function() { + div.remove(); + }); + } + + /** + * Perform an ajax request to get comments for a node + * and insert the comments into the comments tree. + */ + function getComments(id) { + $.ajax({ + type: 'GET', + url: opts.getCommentsURL, + data: {node: id}, + success: function(data, textStatus, request) { + var ul = $('#cl' + id); + var speed = 100; + $('#cf' + id) + .find('textarea[name="proposal"]') + .data('source', data.source); + + if (data.comments.length === 0) { + ul.html('
  • No comments yet.
  • '); + ul.data('empty', true); + } else { + // If there are comments, sort them and put them in the list. + var comments = sortComments(data.comments); + speed = data.comments.length * 100; + appendComments(comments, ul); + ul.data('empty', false); + } + $('#cn' + id).slideUp(speed + 200); + ul.slideDown(speed); + }, + error: function(request, textStatus, error) { + showError('Oops, there was a problem retrieving the comments.'); + }, + dataType: 'json' + }); + } + + /** + * Add a comment via ajax and insert the comment into the comment tree. + */ + function addComment(form) { + var node_id = form.find('input[name="node"]').val(); + var parent_id = form.find('input[name="parent"]').val(); + var text = form.find('textarea[name="comment"]').val(); + var proposal = form.find('textarea[name="proposal"]').val(); + + if (text == '') { + showError('Please enter a comment.'); + return; + } + + // Disable the form that is being submitted. + form.find('textarea,input').attr('disabled', 'disabled'); + + // Send the comment to the server. + $.ajax({ + type: "POST", + url: opts.addCommentURL, + dataType: 'json', + data: { + node: node_id, + parent: parent_id, + text: text, + proposal: proposal + }, + success: function(data, textStatus, error) { + // Reset the form. + if (node_id) { + hideProposeChange(node_id); + } + form.find('textarea') + .val('') + .add(form.find('input')) + .removeAttr('disabled'); + var ul = $('#cl' + (node_id || parent_id)); + if (ul.data('empty')) { + $(ul).empty(); + ul.data('empty', false); + } + insertComment(data.comment); + var ao = $('#ao' + node_id); + ao.find('img').attr({'src': opts.commentBrightImage}); + if (node_id) { + // if this was a "root" comment, remove the commenting box + // (the user can get it back by reopening the comment popup) + $('#ca' + node_id).slideUp(); + } + }, + error: function(request, textStatus, error) { + form.find('textarea,input').removeAttr('disabled'); + showError('Oops, there was a problem adding the comment.'); + } + }); + } + + /** + * Recursively append comments to the main comment list and children + * lists, creating the comment tree. + */ + function appendComments(comments, ul) { + $.each(comments, function() { + var div = createCommentDiv(this); + ul.append($(document.createElement('li')).html(div)); + appendComments(this.children, div.find('ul.comment-children')); + // To avoid stagnating data, don't store the comments children in data. + this.children = null; + div.data('comment', this); + }); + } + + /** + * After adding a new comment, it must be inserted in the correct + * location in the comment tree. + */ + function insertComment(comment) { + var div = createCommentDiv(comment); + + // To avoid stagnating data, don't store the comments children in data. + comment.children = null; + div.data('comment', comment); + + var ul = $('#cl' + (comment.node || comment.parent)); + var siblings = getChildren(ul); + + var li = $(document.createElement('li')); + li.hide(); + + // Determine where in the parents children list to insert this comment. + for(i=0; i < siblings.length; i++) { + if (comp(comment, siblings[i]) <= 0) { + $('#cd' + siblings[i].id) + .parent() + .before(li.html(div)); + li.slideDown('fast'); + return; + } + } + + // If we get here, this comment rates lower than all the others, + // or it is the only comment in the list. + ul.append(li.html(div)); + li.slideDown('fast'); + } + + function acceptComment(id) { + $.ajax({ + type: 'POST', + url: opts.acceptCommentURL, + data: {id: id}, + success: function(data, textStatus, request) { + $('#cm' + id).fadeOut('fast'); + $('#cd' + id).removeClass('moderate'); + }, + error: function(request, textStatus, error) { + showError('Oops, there was a problem accepting the comment.'); + } + }); + } + + function deleteComment(id) { + $.ajax({ + type: 'POST', + url: opts.deleteCommentURL, + data: {id: id}, + success: function(data, textStatus, request) { + var div = $('#cd' + id); + if (data == 'delete') { + // Moderator mode: remove the comment and all children immediately + div.slideUp('fast', function() { + div.remove(); + }); + return; + } + // User mode: only mark the comment as deleted + div + .find('span.user-id:first') + .text('[deleted]').end() + .find('div.comment-text:first') + .text('[deleted]').end() + .find('#cm' + id + ', #dc' + id + ', #ac' + id + ', #rc' + id + + ', #sp' + id + ', #hp' + id + ', #cr' + id + ', #rl' + id) + .remove(); + var comment = div.data('comment'); + comment.username = '[deleted]'; + comment.text = '[deleted]'; + div.data('comment', comment); + }, + error: function(request, textStatus, error) { + showError('Oops, there was a problem deleting the comment.'); + } + }); + } + + function showProposal(id) { + $('#sp' + id).hide(); + $('#hp' + id).show(); + $('#pr' + id).slideDown('fast'); + } + + function hideProposal(id) { + $('#hp' + id).hide(); + $('#sp' + id).show(); + $('#pr' + id).slideUp('fast'); + } + + function showProposeChange(id) { + $('#pc' + id).hide(); + $('#hc' + id).show(); + var textarea = $('#pt' + id); + textarea.val(textarea.data('source')); + $.fn.autogrow.resize(textarea[0]); + textarea.slideDown('fast'); + } + + function hideProposeChange(id) { + $('#hc' + id).hide(); + $('#pc' + id).show(); + var textarea = $('#pt' + id); + textarea.val('').removeAttr('disabled'); + textarea.slideUp('fast'); + } + + function toggleCommentMarkupBox(id) { + $('#mb' + id).toggle(); + } + + /** Handle when the user clicks on a sort by link. */ + function handleReSort(link) { + var classes = link.attr('class').split(/\s+/); + for (var i=0; iThank you! Your comment will show up ' + + 'once it is has been approved by a moderator.'); + } + // Prettify the comment rating. + comment.pretty_rating = comment.rating + ' point' + + (comment.rating == 1 ? '' : 's'); + // Make a class (for displaying not yet moderated comments differently) + comment.css_class = comment.displayed ? '' : ' moderate'; + // Create a div for this comment. + var context = $.extend({}, opts, comment); + var div = $(renderTemplate(commentTemplate, context)); + + // If the user has voted on this comment, highlight the correct arrow. + if (comment.vote) { + var direction = (comment.vote == 1) ? 'u' : 'd'; + div.find('#' + direction + 'v' + comment.id).hide(); + div.find('#' + direction + 'u' + comment.id).show(); + } + + if (opts.moderator || comment.text != '[deleted]') { + div.find('a.reply').show(); + if (comment.proposal_diff) + div.find('#sp' + comment.id).show(); + if (opts.moderator && !comment.displayed) + div.find('#cm' + comment.id).show(); + if (opts.moderator || (opts.username == comment.username)) + div.find('#dc' + comment.id).show(); + } + return div; + } + + /** + * A simple template renderer. Placeholders such as <%id%> are replaced + * by context['id'] with items being escaped. Placeholders such as <#id#> + * are not escaped. + */ + function renderTemplate(template, context) { + var esc = $(document.createElement('div')); + + function handle(ph, escape) { + var cur = context; + $.each(ph.split('.'), function() { + cur = cur[this]; + }); + return escape ? esc.text(cur || "").html() : cur; + } + + return template.replace(/<([%#])([\w\.]*)\1>/g, function() { + return handle(arguments[2], arguments[1] == '%' ? true : false); + }); + } + + /** Flash an error message briefly. */ + function showError(message) { + $(document.createElement('div')).attr({'class': 'popup-error'}) + .append($(document.createElement('div')) + .attr({'class': 'error-message'}).text(message)) + .appendTo('body') + .fadeIn("slow") + .delay(2000) + .fadeOut("slow"); + } + + /** Add a link the user uses to open the comments popup. */ + $.fn.comment = function() { + return this.each(function() { + var id = $(this).attr('id').substring(1); + var count = COMMENT_METADATA[id]; + var title = count + ' comment' + (count == 1 ? '' : 's'); + var image = count > 0 ? opts.commentBrightImage : opts.commentImage; + var addcls = count == 0 ? ' nocomment' : ''; + $(this) + .append( + $(document.createElement('a')).attr({ + href: '#', + 'class': 'sphinx-comment-open' + addcls, + id: 'ao' + id + }) + .append($(document.createElement('img')).attr({ + src: image, + alt: 'comment', + title: title + })) + .click(function(event) { + event.preventDefault(); + show($(this).attr('id').substring(2)); + }) + ) + .append( + $(document.createElement('a')).attr({ + href: '#', + 'class': 'sphinx-comment-close hidden', + id: 'ah' + id + }) + .append($(document.createElement('img')).attr({ + src: opts.closeCommentImage, + alt: 'close', + title: 'close' + })) + .click(function(event) { + event.preventDefault(); + hide($(this).attr('id').substring(2)); + }) + ); + }); + }; + + var opts = { + processVoteURL: '/_process_vote', + addCommentURL: '/_add_comment', + getCommentsURL: '/_get_comments', + acceptCommentURL: '/_accept_comment', + deleteCommentURL: '/_delete_comment', + commentImage: '/static/_static/comment.png', + closeCommentImage: '/static/_static/comment-close.png', + loadingImage: '/static/_static/ajax-loader.gif', + commentBrightImage: '/static/_static/comment-bright.png', + upArrow: '/static/_static/up.png', + downArrow: '/static/_static/down.png', + upArrowPressed: '/static/_static/up-pressed.png', + downArrowPressed: '/static/_static/down-pressed.png', + voting: false, + moderator: false + }; + + if (typeof COMMENT_OPTIONS != "undefined") { + opts = jQuery.extend(opts, COMMENT_OPTIONS); + } + + var popupTemplate = '\ +
    \ +

    \ + Sort by:\ + best rated\ + newest\ + oldest\ +

    \ +
    Comments
    \ +
    \ + loading comments...
    \ +
      \ +
      \ +

      Add a comment\ + (markup):

      \ +
      \ + reStructured text markup: *emph*, **strong**, \ + ``code``, \ + code blocks: :: and an indented block after blank line
      \ +
      \ + \ +

      \ + \ + Propose a change ▹\ + \ + \ + Propose a change ▿\ + \ +

      \ + \ + \ + \ + \ +
      \ +
      \ +
      '; + + var commentTemplate = '\ +
      \ +
      \ +
      \ + \ + \ + \ + \ + \ + \ +
      \ +
      \ + \ + \ + \ + \ + \ + \ +
      \ +
      \ +
      \ +

      \ + <%username%>\ + <%pretty_rating%>\ + <%time.delta%>\ +

      \ +
      <#text#>
      \ +

      \ + \ + reply ▿\ + proposal ▹\ + proposal ▿\ + \ + \ +

      \ +
      \
      +<#proposal_diff#>\
      +        
      \ +
        \ +
        \ +
        \ +
        \ + '; + + var replyTemplate = '\ +
      • \ +
        \ +
        \ + \ + \ + \ + \ + \ +
        \ +
        \ +
      • '; + + $(document).ready(function() { + init(); + }); +})(jQuery); + +$(document).ready(function() { + // add comment anchors for all paragraphs that are commentable + $('.sphinx-has-comment').comment(); + + // highlight search words in search results + $("div.context").each(function() { + var params = $.getQueryParameters(); + var terms = (params.q) ? params.q[0].split(/\s+/) : []; + var result = $(this); + $.each(terms, function() { + result.highlightText(this.toLowerCase(), 'highlighted'); + }); + }); + + // directly open comment window if requested + var anchor = document.location.hash; + if (anchor.substring(0, 9) == '#comment-') { + $('#ao' + anchor.substring(9)).click(); + document.location.hash = '#s' + anchor.substring(9); + } +}); diff --git a/doc/html/api/dyaml.constructor.html b/doc/html/api/dyaml.constructor.html index afcd9bd..31b8c88 100644 --- a/doc/html/api/dyaml.constructor.html +++ b/doc/html/api/dyaml.constructor.html @@ -44,13 +44,13 @@ nodes. This can be used to implement custom data types. A tutorial can be found here.

        -
        class ConstructorException: dyaml.exception.YAMLException; +
        class ConstructorException: dyaml.exception.YAMLException;

        Exception thrown at constructor errors.

        Can be thrown by custom constructor functions.

        -
        this(string msg, Mark start, Mark end, string file = __FILE__, int line = __LINE__); +
        @safe this(string msg, Mark start, Mark end, string file = __FILE__, int line = __LINE__);

        Construct a ConstructorException.

        @@ -65,7 +65,7 @@
        -
        class Constructor; +
        class Constructor;

        Constructs YAML values.

        @@ -84,7 +84,7 @@ If a tag is detected with no known constructor function, it is considered an error.

        -
        this(const(bool) defaultConstructors = true); +
        nothrow @safe this(const Flag!"useDefaultConstructors" defaultConstructors = Yes.useDefaultConstructors);

        Construct a Constructor.

        @@ -92,23 +92,23 @@ defaultConstructors to disable constructor functions for these.

        -Parameters:
        +Parameters:
        const(bool) defaultConstructors
        Flag!"useDefaultConstructors" defaultConstructors Use constructors for default YAML tags?
        -
        void addConstructorScalar(T)(in string tag, T function(ref Node) ctor); +
        nothrow @safe void addConstructorScalar(T)(const string tag, T function(ref Node) ctor);

        Add a constructor function from scalar.

        -

        The function must take a reference to Node to construct from. - The node contains a string for scalars, Node[] for sequences and - Node.Pair[] for mappings. +

        The function must take a reference to Node to construct from. + The node contains a string for scalars, for sequences and + for mappings.
        Any exception thrown by this function will be caught by D:YAML and - its message will be added to a YAMLException that will also tell the - user which type failed to construct, and position in the file. + its message will be added to a that will also tell + the user which type failed to construct, and position in the file.

        @@ -129,53 +129,53 @@ values - it is not const for compatibility reasons.

        -Parameters:
        +Parameters:
        tag
        - +
        string tag Tag for the function to handle.
        ctor
        T function(ref Node) ctor Constructor function.

        Example:
        -

         import std.string;
        +
        import std.string;
         
        - import yaml;
        +import dyaml.all;
         
        - struct MyStruct
        - {
        -     int x, y, z;
        +struct MyStruct
        +{
        +    int x, y, z;
         
        -     //Any D:YAML type must have a custom opCmp operator.
        -     //This is used for ordering in mappings.
        -     const int opCmp(ref const MyStruct s)
        -     {
        -         if(x != s.x){return x - s.x;}
        -         if(y != s.y){return y - s.y;}
        -         if(z != s.z){return z - s.z;}
        -         return 0;
        -     }
        - }
        +    //Any D:YAML type must have a custom opCmp operator.
        +    //This is used for ordering in mappings.
        +    const int opCmp(ref const MyStruct s)
        +    {
        +        if(x != s.x){return x - s.x;}
        +        if(y != s.y){return y - s.y;}
        +        if(z != s.z){return z - s.z;}
        +        return 0;
        +    }
        +}
         
        - MyStruct constructMyStructScalar(ref Node node)
        - {
        -     //Guaranteed to be string as we construct from scalar.
        -     //!mystruct x:y:z
        -     auto parts = node.as!string().split(":");
        -     //If this throws, the D:YAML will handle it and throw a YAMLException.
        -     return MyStruct(to!int(parts[0]), to!int(parts[1]), to!int(parts[2]));
        - }
        +MyStruct constructMyStructScalar(ref Node node)
        +{
        +    //Guaranteed to be string as we construct from scalar.
        +    //!mystruct x:y:z
        +    auto parts = node.as!string().split(":");
        +    //If this throws, the D:YAML will handle it and throw a YAMLException.
        +    return MyStruct(to!int(parts[0]), to!int(parts[1]), to!int(parts[2]));
        +}
         
        - void main()
        - {
        -     auto loader = Loader("file.yaml");
        -     auto constructor = new Constructor;
        -     constructor.addConstructorScalar("!mystruct", &constructMyStructScalar);
        -     loader.constructor = constructor;
        -     Node node = loader.load();
        - }
        +void main()
        +{
        +    auto loader = Loader("file.yaml");
        +    auto constructor = new Constructor;
        +    constructor.addConstructorScalar("!mystruct", &constructMyStructScalar);
        +    loader.constructor = constructor;
        +    Node node = loader.load();
        +}
         

        -
        void addConstructorSequence(T)(in string tag, T function(ref Node) ctor); +
        nothrow @safe void addConstructorSequence(T)(const string tag, T function(ref Node) ctor);

        Add a constructor function from sequence.

        @@ -183,45 +183,45 @@

        Example:
        -

         import std.string;
        +
        import std.string;
         
        - import yaml;
        +import dyaml.all;
         
        - struct MyStruct
        - {
        -     int x, y, z;
        +struct MyStruct
        +{
        +    int x, y, z;
         
        -     //Any D:YAML type must have a custom opCmp operator.
        -     //This is used for ordering in mappings.
        -     const int opCmp(ref const MyStruct s)
        -     {
        -         if(x != s.x){return x - s.x;}
        -         if(y != s.y){return y - s.y;}
        -         if(z != s.z){return z - s.z;}
        -         return 0;
        -     }
        - }
        +    //Any D:YAML type must have a custom opCmp operator.
        +    //This is used for ordering in mappings.
        +    const int opCmp(ref const MyStruct s)
        +    {
        +        if(x != s.x){return x - s.x;}
        +        if(y != s.y){return y - s.y;}
        +        if(z != s.z){return z - s.z;}
        +        return 0;
        +    }
        +}
         
        - MyStruct constructMyStructSequence(ref Node node)
        - {
        -     //node is guaranteed to be sequence.
        -     //!mystruct [x, y, z]
        -     return MyStruct(node[0].as!int, node[1].as!int, node[2].as!int);
        - }
        +MyStruct constructMyStructSequence(ref Node node)
        +{
        +    //node is guaranteed to be sequence.
        +    //!mystruct [x, y, z]
        +    return MyStruct(node[0].as!int, node[1].as!int, node[2].as!int);
        +}
         
        - void main()
        - {
        -     auto loader = Loader("file.yaml");
        -     auto constructor = new Constructor;
        -     constructor.addConstructorSequence("!mystruct", &constructMyStructSequence);
        -     loader.constructor = constructor;
        -     Node node = loader.load();
        - }
        +void main()
        +{
        +    auto loader = Loader("file.yaml");
        +    auto constructor = new Constructor;
        +    constructor.addConstructorSequence("!mystruct", &constructMyStructSequence);
        +    loader.constructor = constructor;
        +    Node node = loader.load();
        +}
         

        -
        void addConstructorMapping(T)(in string tag, T function(ref Node) ctor); +
        nothrow @safe void addConstructorMapping(T)(const string tag, T function(ref Node) ctor);

        Add a constructor function from a mapping.

        @@ -229,112 +229,112 @@

        Example:
        -

         import std.string;
        +
        import std.string;
         
        - import yaml;
        +import dyaml.all;
         
        - struct MyStruct
        - {
        -     int x, y, z;
        +struct MyStruct
        +{
        +    int x, y, z;
         
        -     //Any D:YAML type must have a custom opCmp operator.
        -     //This is used for ordering in mappings.
        -     const int opCmp(ref const MyStruct s)
        -     {
        -         if(x != s.x){return x - s.x;}
        -         if(y != s.y){return y - s.y;}
        -         if(z != s.z){return z - s.z;}
        -         return 0;
        -     }
        - }
        +    //Any D:YAML type must have a custom opCmp operator.
        +    //This is used for ordering in mappings.
        +    const int opCmp(ref const MyStruct s)
        +    {
        +        if(x != s.x){return x - s.x;}
        +        if(y != s.y){return y - s.y;}
        +        if(z != s.z){return z - s.z;}
        +        return 0;
        +    }
        +}
         
        - MyStruct constructMyStructMapping(ref Node node)
        - {
        -     //node is guaranteed to be mapping.
        -     //!mystruct {"x": x, "y": y, "z": z}
        -     return MyStruct(node["x"].as!int, node["y"].as!int, node["z"].as!int);
        - }
        +MyStruct constructMyStructMapping(ref Node node)
        +{
        +    //node is guaranteed to be mapping.
        +    //!mystruct {"x": x, "y": y, "z": z}
        +    return MyStruct(node["x"].as!int, node["y"].as!int, node["z"].as!int);
        +}
         
        - void main()
        - {
        -     auto loader = Loader("file.yaml");
        -     auto constructor = new Constructor;
        -     constructor.addConstructorMapping("!mystruct", &constructMyStructMapping);
        -     loader.constructor = constructor;
        -     Node node = loader.load();
        - }
        +void main()
        +{
        +    auto loader = Loader("file.yaml");
        +    auto constructor = new Constructor;
        +    constructor.addConstructorMapping("!mystruct", &constructMyStructMapping);
        +    loader.constructor = constructor;
        +    Node node = loader.load();
        +}
         

        -
        YAMLNull constructNull(ref Node node); +
        YAMLNull constructNull(ref Node node);

        Construct a null node.

        -
        YAMLMerge constructMerge(ref Node node); +
        YAMLMerge constructMerge(ref Node node);

        Construct a merge node - a node that merges another node into a mapping.

        -
        bool constructBool(ref Node node); +
        bool constructBool(ref Node node);

        Construct a boolean node.

        -
        long constructLong(ref Node node); +
        long constructLong(ref Node node);

        Construct an integer (long) node.

        -
        real constructReal(ref Node node); +
        real constructReal(ref Node node);

        Construct a floating point (real) node.

        -
        ubyte[] constructBinary(ref Node node); +
        ubyte[] constructBinary(ref Node node);

        Construct a binary (base64) node.

        -
        SysTime constructTimestamp(ref Node node); +
        SysTime constructTimestamp(ref Node node);

        Construct a timestamp (SysTime) node.

        -
        string constructString(ref Node node); +
        string constructString(ref Node node);

        Construct a string node.

        -
        Pair[] getPairs(string type, Node[] nodes); +
        Node.Pair[] getPairs(string type, Node[] nodes);

        Convert a sequence of single-element mappings into a sequence of pairs.

        -
        Pair[] constructOrderedMap(ref Node node); +
        Node.Pair[] constructOrderedMap(ref Node node);

        Construct an ordered map (ordered sequence of key:value pairs without duplicates) node.

        -
        Pair[] constructPairs(ref Node node); +
        Node.Pair[] constructPairs(ref Node node);

        Construct a pairs (ordered sequence of key: value pairs allowing duplicates) node.

        -
        Node[] constructSet(ref Node node); +
        Node[] constructSet(ref Node node);

        Construct a set node.

        -
        Node[] constructSequence(ref Node node); +
        Node[] constructSequence(ref Node node);

        Construct a sequence (array) node.

        -
        Pair[] constructMap(ref Node node); +
        Node.Pair[] constructMap(ref Node node);

        Construct an unordered map (unordered set of key:value pairs without duplicates) node.

        diff --git a/doc/html/api/dyaml.dumper.html b/doc/html/api/dyaml.dumper.html index 3155cc6..1e55e2a 100644 --- a/doc/html/api/dyaml.dumper.html +++ b/doc/html/api/dyaml.dumper.html @@ -44,7 +44,7 @@

        Code based on PyYAML.

        -
        struct Dumper; +
        struct Dumper;

        Dumps YAML documents to files or streams.

        @@ -56,43 +56,46 @@

        Examples:
        Write to a file: -
         auto node = Node([1, 2, 3, 4, 5]);
        - Dumper("file.yaml").dump(node);
        +
        auto node = Node([1, 2, 3, 4, 5]);
        +Dumper("file.yaml").dump(node);
         
        +
        Write multiple YAML documents to a file: -
         auto node1 = Node([1, 2, 3, 4, 5]);
        - auto node2 = Node("This document contains only one string");
        - Dumper("file.yaml").dump(node1, node2);
        +
        auto node1 = Node([1, 2, 3, 4, 5]);
        +auto node2 = Node("This document contains only one string");
        +Dumper("file.yaml").dump(node1, node2);
         
        - //Or with an array:
        - //Dumper("file.yaml").dump([node1, node2]);
        +//Or with an array:
        +//Dumper("file.yaml").dump([node1, node2]);
         
         
         
        +
        Write to memory: -
         import std.stream;
        - auto stream = new MemoryStream();
        - auto node = Node([1, 2, 3, 4, 5]);
        - Dumper(stream).dump(node);
        +
        import std.stream;
        +auto stream = new MemoryStream();
        +auto node = Node([1, 2, 3, 4, 5]);
        +Dumper(stream).dump(node);
         
        +
        Use a custom representer/resolver to support custom data types and/or implicit tags: -
         auto node = Node([1, 2, 3, 4, 5]);
        - auto representer = new Representer();
        - auto resolver = new Resolver();
        +
        auto node = Node([1, 2, 3, 4, 5]);
        +auto representer = new Representer();
        +auto resolver = new Resolver();
         
        - //Add representer functions / resolver expressions here...
        +//Add representer functions / resolver expressions here...
         
        - auto dumper = Dumper("file.yaml");
        - dumper.representer = representer;
        - dumper.resolver = resolver;
        - dumper.dump(node);
        +auto dumper = Dumper("file.yaml");
        +dumper.representer = representer;
        +dumper.resolver = resolver;
        +dumper.dump(node);
         
        -
        this(string filename); +
        @trusted this(string filename);

        Construct a Dumper writing to a file.

        @@ -102,67 +105,67 @@ Throws:
        YAMLException if the file can not be dumped to (e.g. cannot be opened).
        -
        this(Stream stream); +
        @safe this(Stream stream);

        Construct a Dumper writing to a stream. This is useful to e.g. write to memory.

        -
        @property void name(string name); +
        pure nothrow @property @safe void name(string name);

        Set stream name. Used in debugging messages.

        -
        @property void resolver(Resolver resolver); +
        @property @trusted void resolver(Resolver resolver);

        Specify custom Resolver to use.

        -
        @property void representer(Representer representer); +
        @property @trusted void representer(Representer representer);

        Specify custom Representer to use.

        -
        @property void canonical(bool canonical); +
        pure nothrow @property @safe void canonical(bool canonical);

        Write scalars in canonical form?

        -
        @property void indent(uint indent); +
        pure nothrow @property @safe void indent(uint indent);

        Set indentation width. 2 by default. Must not be zero.

        -
        @property void textWidth(uint width); +
        pure nothrow @property @safe void textWidth(uint width);

        Set preferred text width.

        -
        @property void lineBreak(LineBreak lineBreak); +
        pure nothrow @property @safe void lineBreak(LineBreak lineBreak);

        Set line break to use. Unix by default.

        -
        @property void encoding(Encoding encoding); +
        pure nothrow @property @safe void encoding(Encoding encoding);

        Set character encoding to use. UTF-8 by default.

        -
        @property void explicitStart(bool explicit); +
        pure nothrow @property @safe void explicitStart(bool explicit);

        Always explicitly write document start?

        -
        @property void explicitEnd(bool explicit); +
        pure nothrow @property @safe void explicitEnd(bool explicit);

        Always explicitly write document end?

        -
        @property void YAMLVersion(string YAMLVersion); +
        pure nothrow @property @safe void YAMLVersion(string YAMLVersion);

        Specify YAML version string. "1.1" by default.

        -
        @property void tagDirectives(string[string] tags); +
        pure @property @trusted void tagDirectives(string[string] tags);

        Specify tag directives.

        @@ -189,18 +192,18 @@ Tag directives (keys are handles, values are prefixes).

        Example:
        -

         Dumper dumper = Dumper("file.yaml");
        - string[string] directives;
        - directives["!short!"] = "tag:long.org,2011:";
        - //This will emit tags starting with "tag:long.org,2011"
        - //with a "!short!" prefix instead.
        - dumper.tagDirectives(directives);
        - dumper.dump(Node("foo"));
        +
        Dumper dumper = Dumper("file.yaml");
        +string[string] directives;
        +directives["!short!"] = "tag:long.org,2011:";
        +//This will emit tags starting with "tag:long.org,2011"
        +//with a "!short!" prefix instead.
        +dumper.tagDirectives(directives);
        +dumper.dump(Node("foo"));
         

        -
        void dump(Node[] documents...); +
        @trusted void dump(Node[] documents...);

        Dump one or more YAML documents to the file/stream.

        diff --git a/doc/html/api/dyaml.encoding.html b/doc/html/api/dyaml.encoding.html index 0cd6b18..d3c5aaa 100644 --- a/doc/html/api/dyaml.encoding.html +++ b/doc/html/api/dyaml.encoding.html @@ -41,19 +41,19 @@

        dyaml.encoding


        -
        enum Encoding; +
        enum Encoding: ubyte;

        Text encodings supported by D:YAML.

        -
        UTF_8
        +
        UTF_8

        Unicode UTF-8

        -
        UTF_16
        +
        UTF_16

        Unicode UTF-16

        -
        UTF_32
        +
        UTF_32

        Unicode UTF-32

        diff --git a/doc/html/api/dyaml.exception.html b/doc/html/api/dyaml.exception.html index 079091a..f074f53 100644 --- a/doc/html/api/dyaml.exception.html +++ b/doc/html/api/dyaml.exception.html @@ -42,27 +42,27 @@

        Exceptions thrown by D:YAML and exception related code.

        -
        class YAMLException: object.Exception; +
        class YAMLException: object.Exception;

        Base class for all exceptions thrown by D:YAML.

        -
        this(string msg, string file = __FILE__, int line = __LINE__); +
        pure nothrow @trusted this(string msg, string file = __FILE__, int line = __LINE__);

        Construct a YAMLException with specified message and position where it was thrown.

        -
        struct Mark; +
        struct Mark;

        Position in a YAML stream, used for error messages.

        -
        this(const(uint) line, const(uint) column); +
        pure nothrow @safe this(const uint line, const uint column);

        Construct a Mark with specified line and column in the file.

        -
        const string toString(); +
        const pure @trusted string toString();

        Get a string representation of the mark.

        diff --git a/doc/html/api/dyaml.linebreak.html b/doc/html/api/dyaml.linebreak.html index 21fbe8c..0674985 100644 --- a/doc/html/api/dyaml.linebreak.html +++ b/doc/html/api/dyaml.linebreak.html @@ -41,19 +41,19 @@

        dyaml.linebreak


        -
        enum LineBreak; +
        enum LineBreak: int;

        Enumerates platform specific line breaks.

        -
        Unix
        +
        Unix

        Unix line break ("\n").

        -
        Windows
        +
        Windows

        Windows line break ("\r\n").

        -
        Macintosh
        +
        Macintosh

        Macintosh line break ("\r").

        diff --git a/doc/html/api/dyaml.loader.html b/doc/html/api/dyaml.loader.html index 560bbbd..44fad99 100644 --- a/doc/html/api/dyaml.loader.html +++ b/doc/html/api/dyaml.loader.html @@ -42,7 +42,7 @@

        Class used to load YAML documents.

        -
        struct Loader; +
        struct Loader;

        Loads YAML documents from files or streams.

        @@ -51,54 +51,58 @@

        Examples:
        Load single YAML document from a file: -
         auto rootNode = Loader("file.yaml").load();
        - ...
        +
        auto rootNode = Loader("file.yaml").load();
        +...
         
        +
        Load all YAML documents from a file: -
         auto nodes = Loader("file.yaml").loadAll();
        - ...
        +
        auto nodes = Loader("file.yaml").loadAll();
        +...
         
        +
        Iterate over YAML documents in a file, lazily loading them: -
         auto loader = Loader("file.yaml");
        +
        auto loader = Loader("file.yaml");
         
        - foreach(ref node; loader)
        - {
        -     ...
        - }
        +foreach(ref node; loader)
        +{
        +    ...
        +}
         
        +
        Load YAML from memory: -
         import std.stream;
        - import std.stdio;
        +
        import std.stream;
        +import std.stdio;
         
        - string yaml_input = "red:   '#ff0000'\n"
        -                     "green: '#00ff00'\n"
        -                     "blue:  '#0000ff'";
        +string yaml_input = "red:   '#ff0000'\n"
        +                    "green: '#00ff00'\n"
        +                    "blue:  '#0000ff'";
         
        - auto colors = Loader(new MemoryStream(cast(char[])yaml_input)).load();
        +auto colors = Loader.fromString(yaml_input).load();
         
        - foreach(string color, string value; colors)
        - {
        -     writeln(color, " is ", value, " in HTML/CSS");
        - }
        +foreach(string color, string value; colors)
        +{
        +    writeln(color, " is ", value, " in HTML/CSS");
        +}
         
        +
        Use a custom constructor/resolver to support custom data types and/or implicit tags: -
         auto constructor = new Constructor();
        - auto resolver = new Resolver();
        +
        auto constructor = new Constructor();
        +auto resolver = new Resolver();
         
        - //Add constructor functions / resolver expressions here...
        +//Add constructor functions / resolver expressions here...
         
        - auto loader = Loader("file.yaml");
        - loader.constructor = constructor;
        - loader.resolver = resolver;
        - auto rootNode = loader.load(node);
        +auto loader = Loader("file.yaml");
        +loader.constructor = constructor;
        +loader.resolver = resolver;
        +auto rootNode = loader.load(node);
         
        -
        this(string filename); +
        @trusted this(string filename);

        Construct a Loader to load YAML from a file.

        @@ -108,7 +112,17 @@ Throws:
        YAMLException if the file could not be opened or read.
        -
        this(Stream stream); +
        static Loader fromString(string data); +
        +

        Construct a Loader to load YAML from a string. +

        +Parameters:
        + +
        string dataString to load YAML from.
        +Returns:
        Loader loading YAML from given string.
        + +
        +
        @safe this(Stream stream);

        Construct a Loader to load YAML from a stream.

        @@ -118,22 +132,22 @@ Throws:
        YAMLException if stream could not be read.
        -
        @property void name(string name); +
        pure nothrow @property @safe void name(string name);

        Set stream name. Used in debugging messages.

        -
        @property void resolver(Resolver resolver); +
        pure nothrow @property @safe void resolver(Resolver resolver);

        Specify custom Resolver to use.

        -
        @property void constructor(Constructor constructor); +
        pure nothrow @property @safe void constructor(Constructor constructor);

        Specify custom Constructor to use.

        -
        Node load(); +
        @safe Node load();

        Load single YAML document.

        @@ -150,7 +164,7 @@ or on a YAML parsing error.
        -
        Node[] loadAll(); +
        @safe Node[] loadAll();

        Load all YAML documents.

        @@ -169,7 +183,7 @@ Throws:
        YAMLException on a parsing error.
        -
        int opApply(int delegate(ref Node) dg); +
        @trusted int opApply(int delegate(ref Node) dg);

        Foreach over YAML documents.

        diff --git a/doc/html/api/dyaml.node.html b/doc/html/api/dyaml.node.html index 30a17a6..002b0f3 100644 --- a/doc/html/api/dyaml.node.html +++ b/doc/html/api/dyaml.node.html @@ -43,23 +43,23 @@

        Node of a YAML document. Used to read YAML data once it's loaded, and to prepare data to emit.

        -
        class NodeException: dyaml.exception.YAMLException; +
        class NodeException: dyaml.exception.YAMLException;

        Exception thrown at node related errors.

        -
        struct YAMLNull; +
        struct YAMLNull;

        Null YAML type. Used in nodes with null values.

        -
        const string toString(); +
        const pure nothrow @safe string toString();

        Used for string conversion.

        -
        struct Node; +
        struct Node;

        YAML node.

        @@ -67,39 +67,50 @@ sequence or mapping of nodes. You can get data from a Node directly or iterate over it if it's a collection.

        -
        struct Pair; +
        struct Pair;

        Key-value pair of YAML nodes, used in mappings.

        -
        Node key; +
        Node key;

        Key node.

        -
        Node value; +
        Node value;

        Value node.

        -
        this(K, V)(K key, V value); +
        @safe this(K, V)(K key, V value);

        Construct a Pair from two values. Will be converted to Nodes if needed.

        -
        const bool opEquals(ref const Pair rhs); +
        const @safe bool opEquals(ref const Pair rhs);

        Equality test with another Pair.

        +
        +
        nothrow @safe void opAssign(Pair rhs); +
        +

        Assignment (shallow copy) by value.

        + +
        +
        nothrow @safe void opAssign(ref Pair rhs); +
        +

        Assignment (shallow copy) by reference.

        +
        -
        this(T)(T value, in string tag = null); +
        @trusted this(T)(T value, const string tag = null) if (isSomeString!T || !isArray!T && !isAssociativeArray!T);

        Construct a Node from a value.

        -

        Any type except of Node can be stored in a Node, but default YAML +

        Any type except for Node can be stored in a Node, but default YAML types (integers, floats, strings, timestamps, etc.) will be stored - more efficiently. + more efficiently. To create a node representing a null value, + construct it from YAMLNull.

        @@ -109,9 +120,9 @@ otherwise emitting will fail.

        -Parameters:
        +Parameters:
        value
        - +
        T value Value to store in the node.
        tag
        string tag Overrides tag of the node when emitted, regardless of tag determined by Representer. Representer uses this to determine YAML data type when a D data type @@ -121,7 +132,7 @@
        -
        this(T)(T[] array, in string tag = null); +
        @safe this(T)(T[] array, const string tag = null) if (!isSomeString!(T[]));

        Construct a node from an array.

        @@ -130,9 +141,9 @@ those nodes are stored.

        -Parameters:
        +Parameters:
        array
        - +
        T[] array Values to store in the node.
        tag
        string tag Overrides tag of the node when emitted, regardless of tag determined by Representer. Representer uses this to determine YAML data type when a D data type @@ -143,15 +154,15 @@ must be in full form, e.g. "tag:yaml.org,2002:set", not a shortcut, like "!!set".
        -Examples:
         //Will be emitted as a sequence (default for arrays)
        - auto seq = Node([1, 2, 3, 4, 5]);
        - //Will be emitted as a set (overriden tag)
        - auto set = Node([1, 2, 3, 4, 5], "tag:yaml.org,2002:set");
        +Examples:
        //Will be emitted as a sequence (default for arrays)
        +auto seq = Node([1, 2, 3, 4, 5]);
        +//Will be emitted as a set (overriden tag)
        +auto set = Node([1, 2, 3, 4, 5], "tag:yaml.org,2002:set");
         
        -
        this(K, V)(V[K] array, in string tag = null); +
        @safe this(K, V)(V[K] array, const string tag = null);

        Construct a node from an associative array.

        @@ -159,9 +170,9 @@ Otherwise they are converted to nodes and then stored.

        -Parameters:
        +Parameters:
        array
        - +
        V[K] array Values to store in the node.
        tag
        string tag Overrides tag of the node when emitted, regardless of tag determined by Representer. Representer uses this to determine YAML data type when a D data type @@ -173,17 +184,17 @@ in full form, e.g. "tag:yaml.org,2002:omap", not a shortcut, like "!!omap".
        -Examples:
         //Will be emitted as an unordered mapping (default for mappings)
        - auto map   = Node([1 : "a", 2 : "b"]);
        - //Will be emitted as an ordered map (overriden tag)
        - auto omap  = Node([1 : "a", 2 : "b"], "tag:yaml.org,2002:omap");
        - //Will be emitted as pairs (overriden tag)
        - auto pairs = Node([1 : "a", 2 : "b"], "tag:yaml.org,2002:pairs");
        +Examples:
        //Will be emitted as an unordered mapping (default for mappings)
        +auto map   = Node([1 : "a", 2 : "b"]);
        +//Will be emitted as an ordered map (overriden tag)
        +auto omap  = Node([1 : "a", 2 : "b"], "tag:yaml.org,2002:omap");
        +//Will be emitted as pairs (overriden tag)
        +auto pairs = Node([1 : "a", 2 : "b"], "tag:yaml.org,2002:pairs");
         
        -
        this(K, V)(K[] keys, V[] values, in string tag = null); +
        @safe this(K, V)(K[] keys, V[] values, const string tag = null) if (!(isSomeString!(K[]) || isSomeString!(V[])));

        Construct a node from arrays of keys and values.

        @@ -203,11 +214,11 @@ Otherwise they are converted to nodes and then stored.

        -Parameters:
        +Parameters:
        keys
        - + - +
        K[] keys Keys of the mapping, from first to last pair.
        values
        V[] values Values of the mapping, from first to last pair.
        tag
        string tag Overrides tag of the node when emitted, regardless of tag determined by Representer. Representer uses this to determine YAML data type when a D data type @@ -219,47 +230,52 @@ in full form, e.g. "tag:yaml.org,2002:omap", not a shortcut, like "!!omap".
        -Examples:
         //Will be emitted as an unordered mapping (default for mappings)
        - auto map   = Node([1, 2], ["a", "b"]);
        - //Will be emitted as an ordered map (overriden tag)
        - auto omap  = Node([1, 2], ["a", "b"], "tag:yaml.org,2002:omap");
        - //Will be emitted as pairs (overriden tag)
        - auto pairs = Node([1, 2], ["a", "b"], "tag:yaml.org,2002:pairs");
        +Examples:
        //Will be emitted as an unordered mapping (default for mappings)
        +auto map   = Node([1, 2], ["a", "b"]);
        +//Will be emitted as an ordered map (overriden tag)
        +auto omap  = Node([1, 2], ["a", "b"], "tag:yaml.org,2002:omap");
        +//Will be emitted as pairs (overriden tag)
        +auto pairs = Node([1, 2], ["a", "b"], "tag:yaml.org,2002:pairs");
         
        -
        const @property bool isValid(); +
        const pure nothrow @property @safe bool isValid();

        Is this node valid (initialized)?

        -
        const @property bool isScalar(); +
        const nothrow @property @safe bool isScalar();

        Is this node a scalar value?

        -
        const @property bool isSequence(); +
        const nothrow @property @safe bool isSequence();

        Is this node a sequence?

        -
        const @property bool isMapping(); +
        const nothrow @property @safe bool isMapping();

        Is this node a mapping?

        -
        const @property bool isUserType(); +
        const nothrow @property @safe bool isUserType();

        Is this node a user defined type?

        -
        const @property string tag(); +
        const nothrow @property @safe bool isNull(); +
        +

        Is this node null?

        + +
        +
        const nothrow @property @safe string tag();

        Return tag of the node.

        -
        const bool opEquals(T)(ref const T rhs); +
        const @safe bool opEquals(T)(auto ref const T rhs);

        Equality test.

        @@ -267,34 +283,40 @@ This might be quite expensive if testing entire documents.
        - If T is not Node, convert the node to T and test equality with that. + If T is not Node, get a value if type T from the node and test + equality with that. +
        + + To test equality with a null YAML value, use YAMLNull.

        -Examples:
         auto node = Node(42);
        +Examples:
        auto node = Node(42);
         
        - assert(node == 42);
        - assert(node == "42");
        - assert(node != "43");
        +assert(node == 42);
        +assert(node != "42");
        +assert(node != "43");
         
        -Parameters:
        +Parameters:
        rhs
        T rhs Variable to test equality with.
        Returns:
        true if equal, false otherwise.
        -
        alias as; +
        alias as = get(T, Flag stringConversion = Yes.stringConversion)() if (!is(T == const));

        Shortcut for get().

        -
        T get(T)(); +
        @trusted T get(T, Flag!"stringConversion" stringConversion = Yes.stringConversion)() if (!is(T == const));

        Get the value of the node as specified type.

        If the specifed type does not match type in the node, - conversion is attempted. + conversion is attempted. The stringConversion template + parameter can be used to disable conversion from non-string + types to strings.
        Numeric values are range checked, throwing if out of range of @@ -305,6 +327,10 @@ Binary values are decoded and stored as ubyte[].
        + To get a null value, use get!YAMLNull . This is to + prevent getting null values for types such as strings or classes. +
        +
        Mapping default values:
        @@ -318,11 +344,11 @@

        Examples:
        Automatic type conversion: -
         auto node = Node(42);
        +
        auto node = Node(42);
         
        - assert(node.as!int == 42);
        - assert(node.as!string == "42");
        - assert(node.as!double == 42.0);
        +assert(node.as!int == 42);
        +assert(node.as!string == "42");
        +assert(node.as!double == 42.0);
         
        @@ -333,7 +359,12 @@ the value is out of range of requested type.
        -
        const @property size_t length(); +
        const @trusted T get(T, Flag!"stringConversion" stringConversion = Yes.stringConversion)() if (is(T == const)); +
        +

        Ditto.

        + +
        +
        const @property @safe size_t length();

        If this is a collection, return its length.

        @@ -346,7 +377,7 @@ Throws:
        NodeException if this is not a sequence nor a mapping.
        -
        Node opIndex(T)(T index); +
        @trusted Node opIndex(T)(T index);

        Get the element at specified index.

        @@ -356,11 +387,13 @@
        If the node is a mapping, return the value corresponding to the first - key equal to index, even after conversion. I.e; node["12"] will - return value of the first key that equals "12", even if it's an integer. + key equal to index. +
        + + To get element at a null index, use YAMLNull for index.

        -Parameters:
        +Parameters:
        index
        T index Index to use.
        Returns:
        Value corresponding to the index. @@ -371,7 +404,57 @@ not a collection.
        -
        void opIndexAssign(K, V)(V value, K index); +
        const @safe bool contains(T)(T rhs); +
        +

        Determine if a collection contains specified value. +

        +

        If the node is a sequence, check if it contains the specified value. + If it's a mapping, check if it has a value that matches specified value. +
        + + To check for a null value, use YAMLNull for rhs. + +

        +Parameters:
        + +
        T rhsItem to look for.
        +Returns:
        true if rhs was found, false otherwise. + +
        +Throws:
        NodeException if the node is not a collection.
        + +
        +
        const @safe bool containsKey(T)(T rhs); +
        +

        Determine if a collection contains specified key. +

        +

        If the node is a mapping, check if it has a key + that matches specified key. +
        + + To check for a null key, use YAMLNull for rhs. + +

        +Parameters:
        + +
        T rhsItem to look for.
        +Returns:
        true if rhs was found, false otherwise. + +
        +Throws:
        NodeException if the node is not a mapping.
        + +
        +
        nothrow @safe void opAssign(Node rhs); +
        +

        Assignment (shallow copy) by value.

        + +
        +
        nothrow @trusted void opAssign(ref Node rhs); +
        +

        Assignment (shallow copy) by reference.

        + +
        +
        @safe void opIndexAssign(K, V)(V value, K index);

        Set element at specified index in a collection.

        @@ -389,16 +472,19 @@ pair is added to the mapping. In sequences the index must be in range. This ensures behavior siilar to D arrays and associative arrays. +
        + + To set element at a null index, use YAMLNull for index.

        -Parameters:
        +Parameters:
        index
        K index Index of the value to set.
        Throws:
        NodeException if the node is not a collection, index is out of range or if a non-integral index is used on a sequence node.
        -
        int opApply(T)(int delegate(ref T) dg); +
        @trusted int opApply(T)(int delegate(ref T) dg);

        Foreach over a sequence, getting each element as T.

        @@ -410,7 +496,7 @@ element could not be converted to specified type.
        -
        int opApply(K, V)(int delegate(ref K, ref V) dg); +
        @trusted int opApply(K, V)(int delegate(ref K, ref V) dg);

        Foreach over a mapping, getting each key/value as K/V.

        @@ -422,7 +508,7 @@ element could not be converted to specified type.
        -
        void add(T)(T value); +
        @safe void add(T)(T value);

        Add an element to a sequence.

        @@ -439,12 +525,12 @@ emitted.

        -Parameters:
        +Parameters:
        value
        T value Value to add to the sequence.
        -
        void add(K, V)(K key, V value); +
        @safe void add(K, V)(K key, V value);

        Add a key-value pair to a mapping.

        @@ -461,33 +547,54 @@ invalid YAML with "!!map" and "!!omap" tags.

        -Parameters:
        +Parameters:
        key
        - +
        K key Key to add.
        value
        V value Value to add.
        -
        void remove(T)(T value); +
        @trusted Node* opBinaryRight(string op, K)(K key) if (op == "in"); +
        +

        Determine whether a key is in a mapping, and access its value. +

        +

        This method can only be called on mapping nodes. + +

        +Parameters:
        + +
        K keyKey to search for.
        +Returns:
        A pointer to the value (as a Node) corresponding to key, + or null if not found. + +
        +

        Note:
        +Any modification to the node can invalidate the returned + pointer. + +

        +See Also:
        contains
        + +
        +
        @trusted void remove(T)(T rhs);

        Remove first (if any) occurence of a value in a collection.

        This method can only be called on collection nodes.
        - If the node is a sequence, the first node matching value (including - conversion, so e.g. "42" matches 42) is removed. + If the node is a sequence, the first node matching value is removed. If the node is a mapping, the first key-value pair where value matches specified value is removed.

        -Parameters:
        +Parameters:
        value
        T rhs Value to remove.
        Throws:
        NodeException if the node is not a collection.
        -
        void removeAt(T)(T index); +
        @trusted void removeAt(T)(T index);

        Remove element at the specified index of a collection.

        @@ -498,7 +605,7 @@
        If the node is a mapping, remove the first key-value pair where - key matches index (including conversion, so e.g. "42" matches 42). + key matches index.
        If the node is a mapping and no key matches index, nothing is removed @@ -506,14 +613,14 @@ and associative arrays.

        -Parameters:
        +Parameters:
        index
        T index Index to remove at.
        Throws:
        NodeException if the node is not a collection, index is out of range or if a non-integral index is used on a sequence node.
        -
        const const int opCmp(ref const Node node); +
        const @safe int opCmp(ref const Node node);

        Compare with another node.

        diff --git a/doc/html/api/dyaml.representer.html b/doc/html/api/dyaml.representer.html index a871453..a07a0dc 100644 --- a/doc/html/api/dyaml.representer.html +++ b/doc/html/api/dyaml.representer.html @@ -45,12 +45,12 @@

        Code based on PyYAML.

        -
        class RepresenterException: dyaml.exception.YAMLException; +
        class RepresenterException: dyaml.exception.YAMLException;

        Exception thrown on Representer errors.

        -
        class Representer; +
        class Representer;

        Represents YAML nodes as scalar, sequence and mapping nodes ready for output.

        @@ -59,11 +59,11 @@ It can also override default node formatting styles for output.

        -
        this(bool useDefaultRepresenters = true); +
        pure @safe this(const Flag!"useDefaultRepresenters" useDefaultRepresenters = Yes.useDefaultRepresenters);

        Construct a Representer.

        -Parameters:
        +Parameters:
        bool useDefaultRepresenters
        Flag!"useDefaultRepresenters" useDefaultRepresenters Use default representer functions for default YAML types? This can be disabled to use custom representer @@ -71,17 +71,17 @@
        -
        @property void defaultScalarStyle(ScalarStyle style); +
        pure nothrow @property @safe void defaultScalarStyle(ScalarStyle style);

        Set default style for scalars. If style is ScalarStyle.Invalid, the style is chosen automatically.

        -
        @property void defaultCollectionStyle(CollectionStyle style); +
        pure nothrow @property @safe void defaultCollectionStyle(CollectionStyle style);

        Set default style for collections. If style is CollectionStyle.Invalid, the style is chosen automatically.

        -
        void addRepresenter(T)(Node function(ref Node, Representer) representer); +
        pure @trusted void addRepresenter(T)(Node function(ref Node, Representer) representer);

        Add a function to represent nodes with a specific data type.

        @@ -107,108 +107,109 @@ values - it is not const for compatibility reasons.

        -Parameters:
        +Parameters:
        representer
        Node function(ref Node, Representer) representer Representer function to add.
        Examples:
        Representing a simple struct: -
         import std.string;
        +
        import std.string;
         
        - import yaml;
        +import dyaml.all;
         
        - struct MyStruct
        - {
        -     int x, y, z;
        +struct MyStruct
        +{
        +    int x, y, z;
         
        -     //Any D:YAML type must have a custom opCmp operator.
        -     //This is used for ordering in mappings.
        -     const int opCmp(ref const MyStruct s)
        -     {
        -         if(x != s.x){return x - s.x;}
        -         if(y != s.y){return y - s.y;}
        -         if(z != s.z){return z - s.z;}
        -         return 0;
        -     }
        - }
        +    //Any D:YAML type must have a custom opCmp operator.
        +    //This is used for ordering in mappings.
        +    const int opCmp(ref const MyStruct s)
        +    {
        +        if(x != s.x){return x - s.x;}
        +        if(y != s.y){return y - s.y;}
        +        if(z != s.z){return z - s.z;}
        +        return 0;
        +    }
        +}
         
        - Node representMyStruct(ref Node node, Representer representer)
        - {
        -     //The node is guaranteed to be MyStruct as we add representer for MyStruct.
        -     auto value = node.as!MyStruct;
        -     //Using custom scalar format, x:y:z.
        -     auto scalar = format(value.x, ":", value.y, ":", value.z);
        -     //Representing as a scalar, with custom tag to specify this data type.
        -     return representer.representScalar("!mystruct.tag", scalar);
        - }
        +Node representMyStruct(ref Node node, Representer representer)
        +{
        +    //The node is guaranteed to be MyStruct as we add representer for MyStruct.
        +    auto value = node.as!MyStruct;
        +    //Using custom scalar format, x:y:z.
        +    auto scalar = format("%s:%s:%s", value.x, value.y, value.z);
        +    //Representing as a scalar, with custom tag to specify this data type.
        +    return representer.representScalar("!mystruct.tag", scalar);
        +}
         
        - void main()
        - {
        -     auto dumper = Dumper("file.yaml");
        -     auto representer = new Representer;
        -     representer.addRepresenter!MyStruct(&representMyStruct);
        -     dumper.representer = representer;
        -     dumper.dump(Node(MyStruct(1,2,3)));
        - }
        +void main()
        +{
        +    auto dumper = Dumper("file.yaml");
        +    auto representer = new Representer;
        +    representer.addRepresenter!MyStruct(&representMyStruct);
        +    dumper.representer = representer;
        +    dumper.dump(Node(MyStruct(1,2,3)));
        +}
         
        +
        Representing a class: -
         import std.string;
        +
        import std.string;
         
        - import yaml;
        +import dyaml.all;
         
        - class MyClass
        - {
        -     int x, y, z;
        +class MyClass
        +{
        +    int x, y, z;
         
        -     this(int x, int y, int z)
        -     {
        -         this.x = x;
        -         this.y = y;
        -         this.z = z;
        -     }
        +    this(int x, int y, int z)
        +    {
        +        this.x = x;
        +        this.y = y;
        +        this.z = z;
        +    }
         
        -     //Any D:YAML type must have a custom opCmp operator.
        -     //This is used for ordering in mappings.
        -     override int opCmp(Object o)
        -     {
        -         MyClass s = cast(MyClass)o;
        -         if(s is null){return -1;}
        -         if(x != s.x){return x - s.x;}
        -         if(y != s.y){return y - s.y;}
        -         if(z != s.z){return z - s.z;}
        -         return 0;
        -     }
        +    //Any D:YAML type must have a custom opCmp operator.
        +    //This is used for ordering in mappings.
        +    override int opCmp(Object o)
        +    {
        +        MyClass s = cast(MyClass)o;
        +        if(s is null){return -1;}
        +        if(x != s.x){return x - s.x;}
        +        if(y != s.y){return y - s.y;}
        +        if(z != s.z){return z - s.z;}
        +        return 0;
        +    }
         
        -     ///Useful for Node.as!string .
        -     override string toString()
        -     {
        -         return format("MyClass("), x, ", ", y, ", ", z, "");
        -     }
        - }
        +    ///Useful for Node.as!string .
        +    override string toString()
        +    {
        +        return format("MyClass(%s, %s, %s)", x, y, z);
        +    }
        +}
         
        - //Same as representMyStruct.
        - Node representMyClass(ref Node node, Representer representer)
        - {
        -     //The node is guaranteed to be MyClass as we add representer for MyClass.
        -     auto value = node.as!MyClass;
        -     //Using custom scalar format, x:y:z.
        -     auto scalar = format(value.x, ":", value.y, ":", value.z);
        -     //Representing as a scalar, with custom tag to specify this data type.
        -     return representer.representScalar("!myclass.tag", scalar);
        - }
        +//Same as representMyStruct.
        +Node representMyClass(ref Node node, Representer representer)
        +{
        +    //The node is guaranteed to be MyClass as we add representer for MyClass.
        +    auto value = node.as!MyClass;
        +    //Using custom scalar format, x:y:z.
        +    auto scalar = format("%s:%s:%s", value.x, value.y, value.z);
        +    //Representing as a scalar, with custom tag to specify this data type.
        +    return representer.representScalar("!myclass.tag", scalar);
        +}
         
        - void main()
        - {
        -     auto dumper = Dumper("file.yaml");
        -     auto representer = new Representer;
        -     representer.addRepresenter!MyClass(&representMyClass);
        -     dumper.representer = representer;
        -     dumper.dump(Node(new MyClass(1,2,3)));
        - }
        +void main()
        +{
        +    auto dumper = Dumper("file.yaml");
        +    auto representer = new Representer;
        +    representer.addRepresenter!MyClass(&representMyClass);
        +    dumper.representer = representer;
        +    dumper.dump(Node(new MyClass(1,2,3)));
        +}
         
        -
        Node representScalar(string tag, string scalar, ScalarStyle style = (ScalarStyle).Invalid); +
        @safe Node representScalar(string tag, string scalar, ScalarStyle style = ScalarStyle.Invalid);

        Represent a scalar with specified tag.

        @@ -227,32 +228,32 @@

        Example:
        -

         struct MyStruct
        - {
        -     int x, y, z;
        +
        struct MyStruct
        +{
        +    int x, y, z;
         
        -     //Any D:YAML type must have a custom opCmp operator.
        -     //This is used for ordering in mappings.
        -     const int opCmp(ref const MyStruct s)
        -     {
        -         if(x != s.x){return x - s.x;}
        -         if(y != s.y){return y - s.y;}
        -         if(z != s.z){return z - s.z;}
        -         return 0;
        -     }
        - }
        +    //Any D:YAML type must have a custom opCmp operator.
        +    //This is used for ordering in mappings.
        +    const int opCmp(ref const MyStruct s)
        +    {
        +        if(x != s.x){return x - s.x;}
        +        if(y != s.y){return y - s.y;}
        +        if(z != s.z){return z - s.z;}
        +        return 0;
        +    }
        +}
         
        - Node representMyStruct(ref Node node, Representer representer)
        - {
        -     auto value = node.as!MyStruct;
        -     auto scalar = format(value.x, ":", value.y, ":", value.z);
        -     return representer.representScalar("!mystruct.tag", scalar);
        - }
        +Node representMyStruct(ref Node node, Representer representer)
        +{
        +    auto value = node.as!MyStruct;
        +    auto scalar = format("%s:%s:%s", value.x, value.y, value.z);
        +    return representer.representScalar("!mystruct.tag", scalar);
        +}
         

        -
        Node representSequence(string tag, Node[] sequence, CollectionStyle style = (CollectionStyle).Invalid); +
        @trusted Node representSequence(string tag, Node[] sequence, CollectionStyle style = CollectionStyle.Invalid);

        Represent a sequence with specified tag, representing children first.

        @@ -274,34 +275,34 @@

        Example:
        -

         struct MyStruct
        - {
        -     int x, y, z;
        +
        struct MyStruct
        +{
        +    int x, y, z;
         
        -     //Any D:YAML type must have a custom opCmp operator.
        -     //This is used for ordering in mappings.
        -     const int opCmp(ref const MyStruct s)
        -     {
        -         if(x != s.x){return x - s.x;}
        -         if(y != s.y){return y - s.y;}
        -         if(z != s.z){return z - s.z;}
        -         return 0;
        -     }
        - }
        +    //Any D:YAML type must have a custom opCmp operator.
        +    //This is used for ordering in mappings.
        +    const int opCmp(ref const MyStruct s)
        +    {
        +        if(x != s.x){return x - s.x;}
        +        if(y != s.y){return y - s.y;}
        +        if(z != s.z){return z - s.z;}
        +        return 0;
        +    }
        +}
         
        - Node representMyStruct(ref Node node, Representer representer)
        - {
        -     auto value = node.as!MyStruct;
        -     auto nodes = [Node(value.x), Node(value.y), Node(value.z)];
        -     //use flow style
        -     return representer.representSequence("!mystruct.tag", nodes,
        -                                          CollectionStyle.Flow);
        - }
        +Node representMyStruct(ref Node node, Representer representer)
        +{
        +    auto value = node.as!MyStruct;
        +    auto nodes = [Node(value.x), Node(value.y), Node(value.z)];
        +    //use flow style
        +    return representer.representSequence("!mystruct.tag", nodes,
        +                                         CollectionStyle.Flow);
        +}
         

        -
        Node representMapping(string tag, Pair[] pairs, CollectionStyle style = (CollectionStyle).Invalid); +
        @trusted Node representMapping(string tag, Node.Pair[] pairs, CollectionStyle style = CollectionStyle.Invalid);

        Represent a mapping with specified tag, representing children first.

        @@ -310,7 +311,7 @@

        Parameters:
        - + - + - + - + - + - + - + - + - + - + - + @@ -325,13 +328,13 @@ Some of these might change in the future (especially !!map and !!set).

      • previous |
      • -
      • D:YAML v0.4 documentation »
      • +
      • D:YAML 0.4 documentation »
      • \ No newline at end of file
        string tag Tag of the mapping.
        Pair[] pairs
        Node.Pair[] pairs Key-value pairs of the mapping.
        CollectionStyle style Style of the mapping. If invalid, default style will be used. @@ -323,76 +324,76 @@

        Example:
        -

         struct MyStruct
        - {
        -     int x, y, z;
        +
        struct MyStruct
        +{
        +    int x, y, z;
         
        -     //Any D:YAML type must have a custom opCmp operator.
        -     //This is used for ordering in mappings.
        -     const int opCmp(ref const MyStruct s)
        -     {
        -         if(x != s.x){return x - s.x;}
        -         if(y != s.y){return y - s.y;}
        -         if(z != s.z){return z - s.z;}
        -         return 0;
        -     }
        - }
        +    //Any D:YAML type must have a custom opCmp operator.
        +    //This is used for ordering in mappings.
        +    const int opCmp(ref const MyStruct s)
        +    {
        +        if(x != s.x){return x - s.x;}
        +        if(y != s.y){return y - s.y;}
        +        if(z != s.z){return z - s.z;}
        +        return 0;
        +    }
        +}
         
        - Node representMyStruct(ref Node node, Representer representer)
        - {
        -     auto value = node.as!MyStruct;
        -     auto pairs = [Node.Pair("x", value.x),
        -                   Node.Pair("y", value.y),
        -                   Node.Pair("z", value.z)];
        -     return representer.representMapping("!mystruct.tag", pairs);
        - }
        +Node representMyStruct(ref Node node, Representer representer)
        +{
        +    auto value = node.as!MyStruct;
        +    auto pairs = [Node.Pair("x", value.x),
        +                  Node.Pair("y", value.y),
        +                  Node.Pair("z", value.z)];
        +    return representer.representMapping("!mystruct.tag", pairs);
        +}
         

        -
        Node representNull(ref Node node, Representer representer); +
        @safe Node representNull(ref Node node, Representer representer);

        Represent a null node as a null YAML value.

        -
        Node representString(ref Node node, Representer representer); +
        @safe Node representString(ref Node node, Representer representer);

        Represent a string node as a string scalar.

        -
        Node representBytes(ref Node node, Representer representer); +
        @system Node representBytes(ref Node node, Representer representer);

        Represent a bytes node as a binary scalar.

        -
        Node representBool(ref Node node, Representer representer); +
        @safe Node representBool(ref Node node, Representer representer);

        Represent a bool node as a bool scalar.

        -
        Node representLong(ref Node node, Representer representer); +
        @system Node representLong(ref Node node, Representer representer);

        Represent a long node as an integer scalar.

        -
        Node representReal(ref Node node, Representer representer); +
        @system Node representReal(ref Node node, Representer representer);

        Represent a real node as a floating point scalar.

        -
        Node representSysTime(ref Node node, Representer representer); +
        @system Node representSysTime(ref Node node, Representer representer);

        Represent a SysTime node as a timestamp.

        -
        Node representNodes(ref Node node, Representer representer); +
        @safe Node representNodes(ref Node node, Representer representer);

        Represent a sequence node as sequence/set.

        -
        Node representPairs(ref Node node, Representer representer); +
        @system Node representPairs(ref Node node, Representer representer);

        Represent a mapping node as map/ordered map/pairs.

        diff --git a/doc/html/api/dyaml.resolver.html b/doc/html/api/dyaml.resolver.html index 16c337f..9cc6c57 100644 --- a/doc/html/api/dyaml.resolver.html +++ b/doc/html/api/dyaml.resolver.html @@ -47,13 +47,13 @@

        Code based on PyYAML.

        -
        class Resolver; +
        class Resolver;

        Resolves YAML tags (data types).

        Can be used to implicitly resolve custom data types of scalar values.

        -
        this(bool defaultImplicitResolvers = true); +
        @safe this(Flag!"useDefaultImplicitResolvers" defaultImplicitResolvers = Yes.useDefaultImplicitResolvers);

        Construct a Resolver.

        @@ -61,12 +61,12 @@ you can use defaultImplicitResolvers to disable default resolvers.

        -Parameters:
        +Parameters:
        bool defaultImplicitResolvers
        Flag!"useDefaultImplicitResolvers" defaultImplicitResolvers Use default YAML implicit resolvers?
        -
        void addImplicitResolver(string tag, Regex!(char) regexp, string first); +
        pure @safe void addImplicitResolver(string tag, Regex!char regexp, string first);

        Add an implicit scalar resolver.

        @@ -83,44 +83,44 @@

        Parameters:
        - +
        string tag Tag to resolve to.
        Regex!(char) regexp
        Regex!char regexp Regular expression the scalar must match to have this tag.
        string first String of possible starting characters of the scalar.
        Examples:
        Resolve scalars starting with 'A' to !tag : -
         import std.regex;
        +
        import std.regex;
         
        - import yaml;
        +import dyaml.all;
         
        - void main()
        - {
        -     auto loader = Loader("file.txt");
        -     auto resolver = new Resolver();
        -     resolver.addImplicitResolver("!tag", std.regex.regex("A.*"), "A");
        -     loader.resolver = resolver;
        +void main()
        +{
        +    auto loader = Loader("file.txt");
        +    auto resolver = new Resolver();
        +    resolver.addImplicitResolver("!tag", std.regex.regex("A.*"), "A");
        +    loader.resolver = resolver;
         
        -     //Note that we have no constructor from tag "!tag", so we can't
        -     //actually load anything that resolves to this tag.
        -     //See Constructor API documentation and tutorial for more information.
        +    //Note that we have no constructor from tag "!tag", so we can't
        +    //actually load anything that resolves to this tag.
        +    //See Constructor API documentation and tutorial for more information.
         
        -     auto node = loader.load();
        - }
        +    auto node = loader.load();
        +}
         
        -
        package const @property Tag defaultScalarTag(); +
        package const pure nothrow @property @safe Tag defaultScalarTag();

        Return default scalar tag.

        -
        package const @property Tag defaultSequenceTag(); +
        package const pure nothrow @property @safe Tag defaultSequenceTag();

        Return default sequence tag.

        -
        package const @property Tag defaultMappingTag(); +
        package const pure nothrow @property @safe Tag defaultMappingTag();

        Return default mapping tag.

        diff --git a/doc/html/api/dyaml.style.html b/doc/html/api/dyaml.style.html index 4861cb7..1e5d129 100644 --- a/doc/html/api/dyaml.style.html +++ b/doc/html/api/dyaml.style.html @@ -42,49 +42,49 @@

        YAML node formatting styles.

        -
        enum ScalarStyle; +
        enum ScalarStyle: ubyte;

        Scalar styles.

        -
        Invalid
        +
        Invalid

        Invalid (uninitialized) style

        -
        Literal
        +
        Literal

        | (Literal block style)

        -
        Folded
        +
        Folded

        > (Folded block style)

        -
        Plain
        +
        Plain

        Plain scalar

        -
        SingleQuoted
        +
        SingleQuoted

        Single quoted scalar

        -
        DoubleQuoted
        +
        DoubleQuoted

        Double quoted scalar

        -
        enum CollectionStyle; +
        enum CollectionStyle: ubyte;

        Collection styles.

        -
        Invalid
        +
        Invalid

        Invalid (uninitialized) style

        -
        Block
        +
        Block

        Block style.

        -
        Flow
        +
        Flow

        Flow style.

        diff --git a/doc/html/api/index.html b/doc/html/api/index.html index 3f32fb6..5345189 100644 --- a/doc/html/api/index.html +++ b/doc/html/api/index.html @@ -39,7 +39,7 @@

        D:YAML 0.4 API documentation

        - +

        This is the complete API documentation for D:YAML. It describes all classes, diff --git a/doc/html/articles/spec_differences.html b/doc/html/articles/spec_differences.html index 110f01b..7112244 100644 --- a/doc/html/articles/spec_differences.html +++ b/doc/html/articles/spec_differences.html @@ -3,13 +3,16 @@ + - Differences between D:YAML and the YAML specification — D:YAML v0.4 documentation + Differences between D:YAML and the YAML specification — D:YAML 0.4 documentation + + - + @@ -32,7 +35,7 @@

      • previous
      • -
      • D:YAML v0.4 documentation »
      • +
      • D:YAML 0.4 documentation »
      • @@ -133,13 +136,13 @@ struct appears in Phobos.

      • previous
      • -
      • D:YAML v0.4 documentation »
      • +
      • D:YAML 0.4 documentation »
      • \ No newline at end of file diff --git a/doc/html/index.html b/doc/html/index.html index 2ff7fae..9c0e294 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -3,13 +3,16 @@ + - Welcome to D:YAML documentation! — D:YAML v0.4 documentation + Welcome to D:YAML documentation! — D:YAML 0.4 documentation + + - + @@ -32,7 +35,7 @@
      • next
      • -
      • D:YAML v0.4 documentation »
      • +
      • D:YAML 0.4 documentation »
      • @@ -99,13 +102,13 @@
      • next
      • -
      • D:YAML v0.4 documentation »
      • +
      • D:YAML 0.4 documentation »
      • \ No newline at end of file diff --git a/doc/html/search.html b/doc/html/search.html index f8eaf10..78dd1fc 100644 --- a/doc/html/search.html +++ b/doc/html/search.html @@ -3,13 +3,16 @@ + - Search — D:YAML v0.4 documentation + Search — D:YAML 0.4 documentation + + - + + + @@ -34,7 +39,7 @@ @@ -82,13 +87,13 @@ \ No newline at end of file diff --git a/doc/html/searchindex.js b/doc/html/searchindex.js index bed5587..1fc8bae 100644 --- a/doc/html/searchindex.js +++ b/doc/html/searchindex.js @@ -1 +1 @@ -Search.setIndex({objects:{},terms:{represent:[2,3],all:[1,3,4],code:[0,1,3,4],representmap:3,scalar:[0,1,2,3,4],follow:[3,4],decid:3,"const":3,show:[0,3],readabl:0,specif:[0,1,2],representsequ:3,program:4,digit:[3,4],sourc:[3,4],everi:3,string:[0,3,4],fals:3,"void":[3,4],phobo:1,failur:3,veri:1,implicitli:[0,3],tri:1,gender:0,list:[0,1,2],iter:4,"try":[3,4],item:0,refer:[0,3],slower:0,past:4,fold:0,second:[0,4],design:0,pass:3,download:4,rrr:3,even:[1,4],index:4,what:3,appear:1,compar:3,cast:3,section:3,current:4,version:4,"new":3,method:[3,4],dyaml:[1,4],never:1,here:4,ggg:3,ldyaml:4,depend:[0,3],modifi:4,sinc:3,valu:[0,1,3,4],convert:[0,3,4],male:0,loos:1,datetim:0,omap:0,chang:[0,1,3],commonli:4,modul:4,unix:4,subnod:4,instal:4,articl:[0,2],regex:3,from:3,would:[3,4],doubl:0,two:[0,1],next:[3,4],few:1,call:[3,4],msg:3,type:[0,1,2,3,4],tell:4,more:[0,4],sort:3,main:[3,4],python:0,phone:0,known:[1,2,4],hold:3,must:3,addrepresent:3,word:4,alia:[0,1],work:1,itself:3,can:[0,1,3,4],learn:4,purpos:3,root:[3,4],overrid:3,want:3,stream:[0,1],process:3,templat:3,topic:3,tag:[0,1,3,2],tab:1,serial:[0,3],addconstructorxxx:3,cours:3,multipl:[0,1],newlin:0,quot:[0,1],getting_start:4,how:[3,4],foreach:[3,4],answer:[0,4],instead:0,simpl:[0,3,4],css:3,map:[0,1,2,3,4],mar:4,clone:0,variant:1,befor:3,ff0000:3,uint:3,mai:1,end:[0,1],data:[0,1,2,3,4],welcom:[2,4],ani:[0,3,4],stdio:4,explicit:[0,3],correspond:3,ambigu:1,caus:1,inform:[0,4],green:[0,3],allow:[0,1],first:[0,2,3,4],order:[1,4],over:4,move:4,orang:3,becaus:1,yamlexcept:[3,4],hierarchi:0,still:[0,1],paramet:3,write:4,style:[0,4],precondit:3,yaml:[0,1,2,3,4],window:4,complex:[0,3],therefor:[1,3],might:[0,1,3,4],alter:3,them:[0,1,3,4],good:3,"return":[3,4],thei:[0,1,3,4],handl:[1,3],auto:3,now:[1,3,4],introduct:[0,4],name:0,separ:0,each:[0,3],found:[3,4],went:3,complet:3,mean:1,compil:[3,4],unequ:1,idea:4,"static":3,expect:[3,4],our:[3,4],happen:3,extract:4,out:[0,3],space:0,content:[1,3,4],rel:4,"0123456789abcdefabcdef":3,ref:3,red:[0,3],difficulti:1,advanc:0,"0123456789abcdef":3,mystruct:3,reason:3,base:[0,3],dictionari:0,put:3,org:[1,3],"byte":1,thrown:[3,4],pyyaml:[0,1],indent:[0,1],could:[3,4],keep:4,length:3,yamlcoloninflowcontext:1,confus:1,assign:0,radeon:0,oper:[0,3,4],rang:3,onc:[0,1],arrai:[0,1,3,4],sometim:3,restrict:1,unlik:0,alreadi:[3,4],done:3,construct:[0,3],stabl:4,miss:3,addconstructormap:3,size:0,differ:[1,2,3,4],seq:0,script:4,associ:[0,1,4],addimplicitresolv:3,system:[0,4],messag:3,gpu:0,white:3,conveni:0,"final":[3,4],store:[0,3],adher:1,consol:4,option:[0,4],especi:0,ishexdigit:3,specifi:[0,3,4],pars:[0,3,4],somewhat:0,exactli:4,than:1,serv:4,remov:0,structur:[0,1],charact:[0,1,3],project:[2,4],str:[0,3],were:3,argument:3,packag:[3,4],have:[0,3,4],tabl:0,need:[0,1,3,4],"null":0,lib:4,alias:[0,1,2],constructcolormap:3,note:[3,4],also:[0,3,4],read:[0,3,4],take:3,which:[0,1,3,4],brace:0,channel:3,uppercas:3,compat:3,begin:[0,1],normal:4,previou:3,most:[0,3,4],detect:3,pair:[0,3],"class":[1,3],don:[1,3,4],later:3,flow:[0,1],doe:[0,1,4],bracket:0,cortex:0,fact:0,ldc:4,cdc:4,alphanumer:1,syntax:[0,2],identifi:[0,3],find:[3,4],onli:[3,4],explicitli:[0,3],just:[3,4],explain:4,should:[1,3,4],conclus:4,meant:4,std:[3,4],get:[2,3,4],express:3,cannot:[1,4],report:3,whether:3,common:0,contain:[0,1,3,4],where:[0,3],wiki:1,set:[0,2,3,4],dump:[3,4],"float":[0,3],see:[0,1,3],result:3,fail:1,close:1,athlon:0,representscalar:3,wikipedia:0,written:4,between:[0,1,2],powervr:0,"import":4,signatur:3,accord:1,kei:[0,1,4],both:3,last:0,howev:[0,3],equal:3,comment:[0,4],etc:3,tutori:[2,3,4],context:[0,1],load:[1,3,4],point:4,color:[0,3],hyphen:0,loader:[3,4],colon:0,path:4,respect:3,addconstructorscalar:3,rgb:3,empti:0,implicit:[0,3],json:0,basic:4,xxx:[3,4],anywher:0,assert:3,togeth:3,input:[3,4],"catch":3,multi:0,ident:3,look:4,plain:[0,1,3],ffff00:3,easier:0,defin:0,ain:0,error:4,anchor:[0,1,2],readi:3,non:[0,3],archiv:4,tediou:3,ascii:[1,3],dumper:[3,4],disabl:3,clearli:1,make:3,same:[0,1,3,4],check:[3,4],binari:0,instanc:[1,3,4],timestamp:0,android:0,document:[0,1,2,3,4],difficult:0,http:1,nest:0,blue:[0,3],user:[0,3],implement:[1,3],markup:0,well:3,person:0,exampl:[3,4],command:4,thi:[0,1,3,4],everyth:3,left:0,explan:4,systim:0,newest:4,execut:4,less:1,paragraph:0,gdc:4,human:0,yet:4,languag:[0,4],struct:[1,3,4],libdyaml:4,interptet:1,except:[3,4],constructcolorscalar:3,add:[3,4],other:[1,4],els:0,match:3,build:4,real:0,format:[0,3,4],preserv:[0,4],know:[3,4],world:4,recurs:[0,1],linux:[0,4],tolow:3,like:3,success:3,arbitrari:3,resolv:[0,2,3],integ:[0,3,4],arthur:0,api:[2,3,4],singl:[0,1],output:[3,4],unnecessari:1,right:1,suppli:3,some:[0,1,3,4],guarante:3,ubyt:[0,3],librari:4,representcolor:3,lead:1,though:4,per:3,unord:1,condit:3,duplic:3,either:[0,3,4],object:3,run:4,acronym:0,usag:4,immut:3,rrggbb:3,unicod:1,chapter:0,comparison:3,about:[1,4],rare:1,usedefaultrepresent:3,page:0,regular:3,constructor:[2,3],produc:4,block:0,subset:0,within:1,encod:1,automat:4,bbb:3,bsd:0,mark:[0,1],your:[2,3,4],wai:[1,3],support:[0,1,3],question:0,"long":0,custom:[0,2,3],writeln:[3,4],start:[0,2,3,4],"function":3,form:3,continu:0,link:4,line:0,opcmp:3,"throw":[3,4],dmd:4,consist:0,possibl:[0,1,3,4],"default":[0,3],displai:4,until:0,directori:[3,4],problem:1,similar:[0,4],featur:[0,1],creat:[0,3,4],"int":[0,3,4],cover:4,dure:3,parser:[0,4],doesn:4,repres:[0,3,4],"char":3,exist:4,file:[1,3,4],yamlnul:0,isdigit:3,dent:0,simplest:4,probabl:0,hex:3,when:[3,4],detail:[0,1],invalid:3,field:3,valid:1,bool:0,futur:[0,1],test:3,you:[0,3,4],node:[0,3,4],resolut:[0,3],sequenc:[0,2,3,4],consid:1,debian:0,reduc:0,longer:3,home:4,rule:1,hello:4,ignor:1,far:3,escap:0,cpu:0},objtypes:{},titles:["YAML syntax","Differences between D:YAML and the YAML specification","Welcome to D:YAML documentation!","Custom YAML data types","Getting started"],objnames:{},filenames:["tutorials/yaml_syntax","articles/spec_differences","index","tutorials/custom_types","tutorials/getting_started"]}) \ No newline at end of file +Search.setIndex({objects:{},terms:{represent:[2,3],all:[1,3,4],code:[0,1,3,4],representmap:3,scalar:[0,1,2,3,4],follow:[3,4],decid:3,"const":3,show:[0,3],readabl:0,specif:[0,1,2],representsequ:3,program:4,digit:[3,4],sourc:[3,4],everi:3,string:[0,3,4],fals:3,"void":[3,4],phobo:1,failur:3,veri:1,implicitli:[0,3],tri:1,gender:0,list:[0,1,2],iter:4,"try":[3,4],item:0,refer:[0,3],slower:0,past:4,fold:0,second:[0,4],design:0,pass:3,download:4,rrr:3,even:[1,4],index:4,what:3,appear:1,compar:3,cast:3,section:3,current:4,version:4,"new":3,method:[3,4],dyaml:[1,4],never:1,here:4,ggg:3,ldyaml:4,depend:[0,3],modifi:4,sinc:3,valu:[0,1,3,4],convert:[0,3,4],male:0,loos:1,datetim:0,omap:0,chang:[0,1,3],commonli:4,modul:4,unix:4,subnod:4,instal:4,articl:[0,2],regex:3,from:3,would:[3,4],doubl:0,two:[0,1],next:[3,4],few:1,call:[3,4],msg:3,type:[0,1,2,3,4],tell:4,more:[0,4],sort:3,main:[3,4],python:0,phone:0,known:[1,2,4],hold:3,must:3,addrepresent:3,word:4,alia:[0,1],work:1,itself:3,can:[0,1,3,4],learn:4,purpos:3,root:[3,4],overrid:3,want:3,stream:[0,1],process:3,templat:3,topic:3,tag:[0,1,3,2],tab:1,serial:[0,3],addconstructorxxx:3,cours:3,multipl:[0,1],newlin:0,quot:[0,1],getting_start:4,how:[3,4],foreach:[3,4],subdirectori:4,answer:[0,4],instead:0,simpl:[0,3,4],css:3,map:[0,1,2,3,4],mar:4,clone:0,variant:1,befor:3,ff0000:3,uint:3,mai:1,end:[0,1],data:[0,1,2,3,4],welcom:[2,4],ani:[0,3,4],stdio:4,explicit:[0,3],correspond:3,ambigu:1,caus:1,inform:[0,4],green:[0,3],allow:[0,1],first:[0,2,3,4],order:[1,4],over:4,move:4,orang:3,becaus:1,yamlexcept:[3,4],hierarchi:0,still:[0,1],paramet:3,write:4,style:[0,4],precondit:3,yaml:[0,1,2,3,4],window:4,complex:[0,3],therefor:[1,3],might:[0,1,3,4],alter:3,them:[0,1,3,4],good:3,"return":[3,4],thei:[0,1,3,4],handl:[1,3],auto:3,now:[1,3,4],introduct:[0,4],name:0,separ:0,each:[0,3],found:[3,4],went:3,complet:3,mean:1,compil:[3,4],unequ:1,idea:4,"static":3,expect:[3,4],our:[3,4],happen:3,extract:4,out:[0,3],space:0,content:[1,3,4],rel:4,"0123456789abcdefabcdef":3,ref:3,red:[0,3],difficulti:1,advanc:0,"0123456789abcdef":3,mystruct:3,reason:3,base:[0,3],dictionari:0,put:3,org:[1,3],"byte":1,thrown:[3,4],pyyaml:[0,1],indent:[0,1],could:[3,4],keep:4,length:3,yamlcoloninflowcontext:1,confus:1,assign:0,radeon:0,oper:[0,3,4],rang:3,onc:[0,1],arrai:[0,1,3,4],sometim:3,restrict:1,unlik:0,alreadi:[3,4],done:3,construct:[0,3],stabl:4,miss:3,addconstructormap:3,size:0,differ:[1,2,3,4],seq:0,script:4,associ:[0,1,4],addimplicitresolv:3,system:[0,4],messag:3,gpu:0,white:3,conveni:0,"final":[3,4],store:[0,3],adher:1,consol:4,option:[0,4],especi:0,ishexdigit:3,specifi:[0,3,4],pars:[0,3,4],somewhat:0,exactli:4,than:1,serv:4,remov:0,structur:[0,1],charact:[0,1,3],project:[2,4],str:[0,3],were:3,argument:3,packag:[3,4],have:[0,3,4],tabl:0,need:[0,1,3,4],"null":0,lib:4,alias:[0,1,2],constructcolormap:3,note:[3,4],also:[0,3,4],read:[0,3,4],take:3,which:[0,1,3,4],brace:0,channel:3,uppercas:3,compat:3,begin:[0,1],normal:4,previou:3,most:[0,3,4],detect:3,pair:[0,3],"class":[1,3],don:[1,3,4],later:3,flow:[0,1],doe:[0,1,4],bracket:0,cortex:0,fact:0,ldc:4,cdc:4,alphanumer:1,syntax:[0,2],identifi:[0,3],find:[3,4],onli:[3,4],explicitli:[0,3],just:[3,4],explain:4,should:[1,3,4],conclus:4,meant:4,std:[3,4],get:[2,3,4],express:3,cannot:[1,4],report:3,whether:3,common:0,contain:[0,1,3,4],where:[0,3],wiki:1,set:[0,2,3,4],dump:[3,4],"float":[0,3],see:[0,1,3],result:3,fail:1,close:1,athlon:0,representscalar:3,wikipedia:0,written:4,between:[0,1,2],powervr:0,"import":4,signatur:3,accord:1,kei:[0,1,4],both:3,last:0,howev:[0,3],equal:3,comment:[0,4],etc:3,tutori:[2,3,4],context:[0,1],load:[1,3,4],point:4,color:[0,3],hyphen:0,loader:[3,4],colon:0,path:4,respect:3,addconstructorscalar:3,rgb:3,empti:0,implicit:[0,3],json:0,basic:4,xxx:[3,4],anywher:0,assert:3,togeth:3,input:[3,4],"catch":3,multi:0,ident:3,look:4,plain:[0,1,3],ffff00:3,easier:0,defin:0,ain:0,error:4,anchor:[0,1,2],readi:3,non:[0,3],archiv:4,tediou:3,ascii:[1,3],dumper:[3,4],disabl:3,clearli:1,make:3,same:[0,1,3,4],check:[3,4],binari:0,instanc:[1,3,4],timestamp:0,android:0,document:[0,1,2,3,4],difficult:0,http:1,nest:0,blue:[0,3],user:[0,3],implement:[1,3],markup:0,well:3,person:0,exampl:[3,4],command:4,thi:[0,1,3,4],everyth:3,left:0,explan:4,systim:0,newest:4,execut:4,less:1,paragraph:0,gdc:4,human:0,yet:4,languag:[0,4],struct:[1,3,4],libdyaml:4,interptet:1,except:[3,4],constructcolorscalar:3,add:[3,4],other:[1,4],els:0,match:3,build:4,real:0,format:[0,3,4],preserv:[0,4],know:[3,4],world:4,recurs:[0,1],linux:[0,4],tolow:3,like:3,success:3,arbitrari:3,resolv:[0,2,3],integ:[0,3,4],arthur:0,api:[2,3,4],singl:[0,1],output:[3,4],unnecessari:1,right:1,suppli:3,some:[0,1,3,4],guarante:3,ubyt:[0,3],librari:4,representcolor:3,lead:1,though:4,per:3,unord:1,condit:3,duplic:3,either:[0,3,4],object:3,run:4,acronym:0,usag:4,immut:3,rrggbb:3,unicod:1,chapter:0,comparison:3,about:[1,4],rare:1,usedefaultrepresent:3,page:0,regular:3,constructor:[2,3],produc:4,block:0,subset:0,within:1,encod:1,automat:4,bbb:3,bsd:0,mark:[0,1],your:[2,3,4],wai:[1,3],support:[0,1,3],question:0,"long":0,custom:[0,2,3],writeln:[3,4],start:[0,2,3,4],"function":3,form:3,continu:0,link:4,line:0,opcmp:3,"throw":[3,4],dmd:4,consist:0,possibl:[0,1,3,4],"default":[0,3],displai:4,until:0,directori:[3,4],problem:1,similar:[0,4],featur:[0,1],creat:[0,3,4],"int":[0,3,4],cover:4,dure:3,parser:[0,4],doesn:4,repres:[0,3,4],"char":3,exist:4,file:[1,3,4],yamlnul:0,isdigit:3,dent:0,simplest:4,probabl:0,hex:3,when:[3,4],detail:[0,1],invalid:3,field:3,valid:1,bool:0,futur:[0,1],test:3,you:[0,3,4],node:[0,3,4],resolut:[0,3],sequenc:[0,2,3,4],consid:1,debian:0,reduc:0,longer:3,home:4,rule:1,hello:4,ignor:1,far:3,escap:0,cpu:0},objtypes:{},titles:["YAML syntax","Differences between D:YAML and the YAML specification","Welcome to D:YAML documentation!","Custom YAML data types","Getting started"],objnames:{},filenames:["tutorials/yaml_syntax","articles/spec_differences","index","tutorials/custom_types","tutorials/getting_started"]}) \ No newline at end of file diff --git a/doc/html/tutorials/custom_types.html b/doc/html/tutorials/custom_types.html index b12d879..19908b5 100644 --- a/doc/html/tutorials/custom_types.html +++ b/doc/html/tutorials/custom_types.html @@ -3,13 +3,16 @@ + - Custom YAML data types — D:YAML v0.4 documentation + Custom YAML data types — D:YAML 0.4 documentation + + - + @@ -36,7 +39,7 @@
      • previous |
      • -
      • D:YAML v0.4 documentation »
      • +
      • D:YAML 0.4 documentation »
      • @@ -369,13 +372,13 @@ directory of the D:YAML package.

      • previous |
      • -
      • D:YAML v0.4 documentation »
      • +
      • D:YAML 0.4 documentation »
      • \ No newline at end of file diff --git a/doc/html/tutorials/getting_started.html b/doc/html/tutorials/getting_started.html index a13bf7b..9d451f7 100644 --- a/doc/html/tutorials/getting_started.html +++ b/doc/html/tutorials/getting_started.html @@ -3,13 +3,16 @@ + - Getting started — D:YAML v0.4 documentation + Getting started — D:YAML 0.4 documentation + + - + @@ -36,7 +39,7 @@
      • previous |
      • -
      • D:YAML v0.4 documentation »
      • +
      • D:YAML 0.4 documentation »
      • @@ -103,7 +106,7 @@ To do this on Unix/Linux, use the following command:

        Now we need to parse it. Create a file called main.d. Paste following code into the file:

        import std.stdio;
        -import yaml;
        +import dyaml.all;
         
         void main()
         {
        @@ -124,8 +127,8 @@ into the file:

        Explanation of the code

        -

        First, we import the yaml module. This is the only D:YAML module you need to -import - it automatically imports all needed modules.

        +

        First, we import the dyaml.all module. This is the only D:YAML module you +need to import - it automatically imports all needed modules.

        Next we load the file using the Loader.load() method. Loader is a struct used for parsing YAML documents. The load() method loads the file as one YAML document, or throws YAMLException, D:YAML exception type, if the @@ -161,19 +164,20 @@ formatted differently. Comments are not preserved, either.

        Compiling

        To compile your project, DMD needs to know which directories contain the imported modules and the library. You also need to tell it to link with D:YAML. -The import directory should be the D:YAML package directory. You can specify it -using the -I option of DMD. The library directory should point to the -compiled library. On Unix/Linux you can specify it using the -L-L option, -and link with D:YAML using the -L-l option. On Windows, the import directory -is used as the library directory. To link with the library on Windows, just add -the path to it relative to the current directory.

        +The import directory should be the source subdirectory of the D:YAML +directory. You can specify it using the -I option of DMD. The library +directory should point to the compiled library. On Unix/Linux you can specify +it using the -L-L option, and link with D:YAML using the -L-l option. +On Windows, the import directory is used as the library directory. To link with +the library on Windows, just add the path to it relative to the current +directory.

        For example, if you extracted and compiled D:YAML in /home/xxx/dyaml, your project is in /home/xxx/dyaml-project, and you are currently in that directory, compile the project with the following command on Unix/Linux:

        -
        dmd -I../dyaml -L-L../dyaml -L-ldyaml main.d
        +
        dmd -I../dyaml/source -L-L../dyaml -L-ldyaml main.d

        And the following on Windows:

        -
        dmd -I../dyaml ../dyaml/libdyaml.lib main.d
        +
        dmd -I../dyaml/source ../dyaml/libdyaml.lib main.d

        This will produce an executable called main or main.exe in your directory. When you run it, it should produce the following output:

        @@ -231,13 +235,13 @@ example in the example/getting_st
      • previous |
      • -
      • D:YAML v0.4 documentation »
      • +
      • D:YAML 0.4 documentation »
      • \ No newline at end of file diff --git a/doc/html/tutorials/yaml_syntax.html b/doc/html/tutorials/yaml_syntax.html index 007c037..1bf5403 100644 --- a/doc/html/tutorials/yaml_syntax.html +++ b/doc/html/tutorials/yaml_syntax.html @@ -3,13 +3,16 @@ + - YAML syntax — D:YAML v0.4 documentation + YAML syntax — D:YAML 0.4 documentation + + - + @@ -36,7 +39,7 @@
      • previous |
      • -
      • D:YAML v0.4 documentation »
      • +
      • D:YAML 0.4 documentation »
      • @@ -253,36 +256,36 @@ Some of these might change in the future (especially !!map and !!set).

        YAML tag
        YAML tag D type
        !!null
        !!null yaml.YAMLNull
        !!bool
        !!bool bool
        !!int
        !!int long
        !!float
        !!float real
        !!binary
        !!binary ubyte[]
        !!timestamp
        !!timestamp datetime.SysTime
        !!map, !!omap, !!pairs
        !!map, !!omap, !!pairs Node.Pair[]
        !!seq, !!set
        !!seq, !!set Node[]
        !!str
        !!str string