- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_3_9, updated. RELEASE_3_3_9RC1-2-g08a6fd9
by Marc Delisle 03 Jan '11

03 Jan '11

The branch, MAINT_3_3_9 has been updated via 08a6fd9c12f1520518b044d87e2a4da189649580 (commit) via 97716f5a5a8b2ac24d2965e6b8faf6b747616d85 (commit) from eaac45dfda2daa345edc5165b30bedea5a3f18a0 (commit) - Log ----------------------------------------------------------------- commit 08a6fd9c12f1520518b044d87e2a4da189649580 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 3 07:04:37 2011 -0500 3.3.9 commit 97716f5a5a8b2ac24d2965e6b8faf6b747616d85 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 3 06:53:58 2011 -0500 3.3.9 release ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- Documentation.html | 4 ++-- README | 6 +++--- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 988feaf..a15b8fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ -3.3.9.0 (not yet released) +3.3.9.0 (2011-01-03) - bug [doc] Fix references to MySQL doc - patch #3101490 Default function for TIMESTAMP, thanks to jirand - jirand - bug #3103853 [js] Double quotes were not escaped in generated js diff --git a/Documentation.html b/Documentation.html index d22b518..0a5cf58 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.9-rc1 - Documentation</title> + <title>phpMyAdmin 3.3.9 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.9-rc1 + 3.3.9 Documentation </h1> </div> diff --git a/README b/README index c0dce7f..182b036 100644 --- a/README +++ b/README @@ -5,12 +5,12 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.9-rc1 - ----------------- + Version 3.3.9 + ------------- http://www.phpmyadmin.net/ Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> - Copyright (C) 2001-2010 Marc Delisle <marc_at_infomarc.info> + Copyright (C) 2001-2011 Marc Delisle <marc_at_infomarc.info> Olivier Müller <om_at_omnis.ch> Robin Johnson <robbat2_at_users.sourceforge.net> Alexander M. Turek <me_at_derrabus.de> diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 30f8b88..7e6460d 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.9-rc1'); + $this->set('PMA_VERSION', '3.3.9'); /** * @deprecated */ diff --git a/translators.html b/translators.html index 46f6116..6d2f096 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.9-rc1 - Official translators</title> + <title>phpMyAdmin 3.3.9 - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -19,7 +19,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.9-rc1 + 3.3.9 official translators list </h1> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 2d6e01f08a0b3ca9881d947413333b04e0c3f410
by Michal Čihař 02 Jan '11

02 Jan '11

The branch, master has been updated via 2d6e01f08a0b3ca9881d947413333b04e0c3f410 (commit) via 738e882698b7ffdae28079381078e8222ba1d885 (commit) via 72c9424fb1955b507435847d9e73487aac106b47 (commit) via e77637cee59ace1ddf3435571a8ebd90d368a43e (commit) via 1b1f0d2cc0accceb730c5bda31d292b8067c3f11 (commit) via 558c56e4529d3409c1a11df84b8b992d4fb172ca (commit) via 775768f0006f7fa0e6c92a81cb1364e3bb2cc16f (commit) via b516290e2d1cbf5a10c08b2ba8ff4e311d66620e (commit) via 7e0a7cac27a8fb86203eca39470ac4749378b19a (commit) via 21be370df7414849411bd58b08a7d6a96897aa6e (commit) via bdabae5f632f414fdcb1e47888e09e4c334e00c1 (commit) via dbfe7bf14b2194f3c62a99303519705987205ff0 (commit) via 2940728405d73781b44ad54cec59fc3e41446c2d (commit) via 46b419415e372e45ba94332218bbc9734c76963a (commit) via ade1894d1f5768175c1d526efda5ce5def76497a (commit) via b7a0d41ea2dd633958741acd1396aad4f6516599 (commit) via 1c3fc60dbefaef162d06b3f6acb24b9344176ca7 (commit) via 1e0afd96f7446149a2fa137fdf0761ba7e15a736 (commit) via b45db7c268d45d4563fce51aec434c7665e00114 (commit) via fadaa471432975b9b5e365cb2ed2bd24e022df6d (commit) via 46fe2dff35187f9015067193db2f6d53d23170cf (commit) via 57aeefda7e6bb6d6d62584c2df62be07a39db1a9 (commit) via ea4e4503d30d967ed4bb95c190268b005783c527 (commit) via c355b8dccb9cc67928a19cc10d970e772a3f7233 (commit) via 131eb05db36724370d1ffe4739e48c14cfa84be8 (commit) via a46805811590becc11af2e47b664d0ec73c24694 (commit) via 882a458f28e31d4a31f9432f40b2e474f25b9009 (commit) via b9bdf74db16b428f5e42192f4abc6cc66a447214 (commit) via e5832e92371365d1cf98966c35e21efda3d7b6a9 (commit) via 51236661507817630150123a7551488cc72fa8de (commit) via 57168dc557b437bd91b3a70f602ddad050e410c5 (commit) from ae38d7acd5c13d62c1fa47916daebc4f76402dde (commit) - Log ----------------------------------------------------------------- commit 2d6e01f08a0b3ca9881d947413333b04e0c3f410 Author: Michal Čihař <michal(a)cihar.com> Date: Sun Jan 2 20:45:00 2011 +0100 Update generated files. commit 738e882698b7ffdae28079381078e8222ba1d885 Author: Michal Čihař <michal(a)cihar.com> Date: Sun Jan 2 20:43:42 2011 +0100 Merge branch 'master', remote branch 'pootle/master' commit 72c9424fb1955b507435847d9e73487aac106b47 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sun Jan 2 11:53:52 2011 +0200 Translation update done using Pootle. commit e77637cee59ace1ddf3435571a8ebd90d368a43e Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sun Jan 2 11:53:46 2011 +0200 Translation update done using Pootle. commit 1b1f0d2cc0accceb730c5bda31d292b8067c3f11 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sun Jan 2 11:53:30 2011 +0200 Translation update done using Pootle. commit 558c56e4529d3409c1a11df84b8b992d4fb172ca Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat Jan 1 23:40:55 2011 +0200 Translation update done using Pootle. commit 775768f0006f7fa0e6c92a81cb1364e3bb2cc16f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat Jan 1 23:34:54 2011 +0200 Translation update done using Pootle. commit b516290e2d1cbf5a10c08b2ba8ff4e311d66620e Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat Jan 1 23:33:57 2011 +0200 Translation update done using Pootle. commit 7e0a7cac27a8fb86203eca39470ac4749378b19a Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat Jan 1 23:30:27 2011 +0200 Translation update done using Pootle. commit 21be370df7414849411bd58b08a7d6a96897aa6e Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat Jan 1 23:25:24 2011 +0200 Translation update done using Pootle. commit bdabae5f632f414fdcb1e47888e09e4c334e00c1 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat Jan 1 23:08:39 2011 +0200 Translation update done using Pootle. commit dbfe7bf14b2194f3c62a99303519705987205ff0 Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 23:04:24 2011 +0200 Translation update done using Pootle. commit 2940728405d73781b44ad54cec59fc3e41446c2d Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 23:04:10 2011 +0200 Translation update done using Pootle. commit 46b419415e372e45ba94332218bbc9734c76963a Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 23:03:55 2011 +0200 Translation update done using Pootle. commit ade1894d1f5768175c1d526efda5ce5def76497a Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 23:03:27 2011 +0200 Translation update done using Pootle. commit b7a0d41ea2dd633958741acd1396aad4f6516599 Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 23:02:59 2011 +0200 Translation update done using Pootle. commit 1c3fc60dbefaef162d06b3f6acb24b9344176ca7 Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 23:02:28 2011 +0200 Translation update done using Pootle. commit 1e0afd96f7446149a2fa137fdf0761ba7e15a736 Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 23:01:44 2011 +0200 Translation update done using Pootle. commit b45db7c268d45d4563fce51aec434c7665e00114 Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 23:01:40 2011 +0200 Translation update done using Pootle. commit fadaa471432975b9b5e365cb2ed2bd24e022df6d Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 23:01:27 2011 +0200 Translation update done using Pootle. commit 46fe2dff35187f9015067193db2f6d53d23170cf Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 23:01:17 2011 +0200 Translation update done using Pootle. commit 57aeefda7e6bb6d6d62584c2df62be07a39db1a9 Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 23:01:14 2011 +0200 Translation update done using Pootle. commit ea4e4503d30d967ed4bb95c190268b005783c527 Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 23:01:00 2011 +0200 Translation update done using Pootle. commit c355b8dccb9cc67928a19cc10d970e772a3f7233 Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 23:00:20 2011 +0200 Translation update done using Pootle. commit 131eb05db36724370d1ffe4739e48c14cfa84be8 Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 23:00:16 2011 +0200 Translation update done using Pootle. commit a46805811590becc11af2e47b664d0ec73c24694 Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 23:00:11 2011 +0200 Translation update done using Pootle. commit 882a458f28e31d4a31f9432f40b2e474f25b9009 Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 23:00:08 2011 +0200 Translation update done using Pootle. commit b9bdf74db16b428f5e42192f4abc6cc66a447214 Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 23:00:05 2011 +0200 Translation update done using Pootle. commit e5832e92371365d1cf98966c35e21efda3d7b6a9 Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 22:59:48 2011 +0200 Translation update done using Pootle. commit 51236661507817630150123a7551488cc72fa8de Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 22:59:31 2011 +0200 Translation update done using Pootle. commit 57168dc557b437bd91b3a70f602ddad050e410c5 Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 22:59:11 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: output/ca/docs.css | 42 ----------------- output/cs/docs.css | 42 ----------------- output/de/docs.css | 42 ----------------- output/el/docs.css | 42 ----------------- {orig-docs => output/en_GB}/INSTALL | 0 output/en_GB/README | 2 +- output/en_GB/docs.css | 42 ----------------- output/en_GB/index.html | 1 + output/es/docs.css | 42 ----------------- output/fi/docs.css | 42 ----------------- output/fr/docs.css | 42 ----------------- output/gl/docs.css | 42 ----------------- output/hu/docs.css | 42 ----------------- output/hy/docs.css | 42 ----------------- output/it/docs.css | 42 ----------------- output/ja/docs.css | 42 ----------------- output/ka/docs.css | 42 ----------------- output/lt/docs.css | 42 ----------------- output/mn/docs.css | 42 ----------------- output/nb/docs.css | 42 ----------------- output/nl/docs.css | 42 ----------------- output/pl/docs.css | 42 ----------------- output/pt_BR/docs.css | 42 ----------------- output/ro/docs.css | 42 ----------------- output/sk/docs.css | 42 ----------------- output/sl/INSTALL | 6 ++ output/sl/README | 37 ++++++++------- output/{en_GB => sl}/TODO | 4 +- output/sl/docs.css | 42 ----------------- output/sv/docs.css | 42 ----------------- output/tr/docs.css | 42 ----------------- output/zh_CN/docs.css | 42 ----------------- output/zh_TW/docs.css | 42 ----------------- po/en_GB.po | 7 +-- po/sl.po | 87 ++++++++++++++--------------------- po/tr.po | 26 +++++++++- 36 files changed, 88 insertions(+), 1216 deletions(-) copy {orig-docs => output/en_GB}/INSTALL (100%) create mode 100644 output/sl/INSTALL copy output/{en_GB => sl}/TODO (73%) diff --git a/output/ca/docs.css b/output/ca/docs.css index 1d0f08d..96574d9 100644 --- a/output/ca/docs.css +++ b/output/ca/docs.css @@ -59,10 +59,6 @@ ul#footer { border: none; } -#footer li.logo { - padding: 0.5em; -} - #footer a { color: #c19e66; } @@ -155,31 +151,6 @@ p { margin: 1em; } -table { - margin: 1em; - border: none; -} - -table tr,table td,table th { - border: none; -} - -table.translators { - text-align: center; - display: table; margin-left: auto; margin-right: auto; - border-collapse: collapse; -} - -table.translators th { - color: #000000; - background-color: #d3dce3; -} - -table.translators td, table.translators th { - border: 1px solid #000000; - padding: 5px; -} - ul, dl, ol { margin: 1em; max-width: 70em; @@ -207,10 +178,6 @@ li pre { margin: 1em 0 1em 0; } -pre.wrap { - white-space: normal; -} - dt { font-weight: bold; margin-left: 2em; @@ -225,10 +192,6 @@ dd { font-family: monospace; } -dt.configrule { - font-weight: bold; -} - .important { color: #bb0000; background-color: #ffeeee; @@ -248,8 +211,3 @@ p.footnote { p.footnote:first-line { margin-left: -2%; } - -/* Block to mark separate translation string */ -div.l10n { - display: inline; -} diff --git a/output/cs/docs.css b/output/cs/docs.css index 1d0f08d..96574d9 100644 --- a/output/cs/docs.css +++ b/output/cs/docs.css @@ -59,10 +59,6 @@ ul#footer { border: none; } -#footer li.logo { - padding: 0.5em; -} - #footer a { color: #c19e66; } @@ -155,31 +151,6 @@ p { margin: 1em; } -table { - margin: 1em; - border: none; -} - -table tr,table td,table th { - border: none; -} - -table.translators { - text-align: center; - display: table; margin-left: auto; margin-right: auto; - border-collapse: collapse; -} - -table.translators th { - color: #000000; - background-color: #d3dce3; -} - -table.translators td, table.translators th { - border: 1px solid #000000; - padding: 5px; -} - ul, dl, ol { margin: 1em; max-width: 70em; @@ -207,10 +178,6 @@ li pre { margin: 1em 0 1em 0; } -pre.wrap { - white-space: normal; -} - dt { font-weight: bold; margin-left: 2em; @@ -225,10 +192,6 @@ dd { font-family: monospace; } -dt.configrule { - font-weight: bold; -} - .important { color: #bb0000; background-color: #ffeeee; @@ -248,8 +211,3 @@ p.footnote { p.footnote:first-line { margin-left: -2%; } - -/* Block to mark separate translation string */ -div.l10n { - display: inline; -} diff --git a/output/de/docs.css b/output/de/docs.css index 1d0f08d..96574d9 100644 --- a/output/de/docs.css +++ b/output/de/docs.css @@ -59,10 +59,6 @@ ul#footer { border: none; } -#footer li.logo { - padding: 0.5em; -} - #footer a { color: #c19e66; } @@ -155,31 +151,6 @@ p { margin: 1em; } -table { - margin: 1em; - border: none; -} - -table tr,table td,table th { - border: none; -} - -table.translators { - text-align: center; - display: table; margin-left: auto; margin-right: auto; - border-collapse: collapse; -} - -table.translators th { - color: #000000; - background-color: #d3dce3; -} - -table.translators td, table.translators th { - border: 1px solid #000000; - padding: 5px; -} - ul, dl, ol { margin: 1em; max-width: 70em; @@ -207,10 +178,6 @@ li pre { margin: 1em 0 1em 0; } -pre.wrap { - white-space: normal; -} - dt { font-weight: bold; margin-left: 2em; @@ -225,10 +192,6 @@ dd { font-family: monospace; } -dt.configrule { - font-weight: bold; -} - .important { color: #bb0000; background-color: #ffeeee; @@ -248,8 +211,3 @@ p.footnote { p.footnote:first-line { margin-left: -2%; } - -/* Block to mark separate translation string */ -div.l10n { - display: inline; -} diff --git a/output/el/docs.css b/output/el/docs.css index 1d0f08d..96574d9 100644 --- a/output/el/docs.css +++ b/output/el/docs.css @@ -59,10 +59,6 @@ ul#footer { border: none; } -#footer li.logo { - padding: 0.5em; -} - #footer a { color: #c19e66; } @@ -155,31 +151,6 @@ p { margin: 1em; } -table { - margin: 1em; - border: none; -} - -table tr,table td,table th { - border: none; -} - -table.translators { - text-align: center; - display: table; margin-left: auto; margin-right: auto; - border-collapse: collapse; -} - -table.translators th { - color: #000000; - background-color: #d3dce3; -} - -table.translators td, table.translators th { - border: 1px solid #000000; - padding: 5px; -} - ul, dl, ol { margin: 1em; max-width: 70em; @@ -207,10 +178,6 @@ li pre { margin: 1em 0 1em 0; } -pre.wrap { - white-space: normal; -} - dt { font-weight: bold; margin-left: 2em; @@ -225,10 +192,6 @@ dd { font-family: monospace; } -dt.configrule { - font-weight: bold; -} - .important { color: #bb0000; background-color: #ffeeee; @@ -248,8 +211,3 @@ p.footnote { p.footnote:first-line { margin-left: -2%; } - -/* Block to mark separate translation string */ -div.l10n { - display: inline; -} diff --git a/orig-docs/INSTALL b/output/en_GB/INSTALL similarity index 100% copy from orig-docs/INSTALL copy to output/en_GB/INSTALL diff --git a/output/en_GB/README b/output/en_GB/README index 83a4398..d9477b9 100644 --- a/output/en_GB/README +++ b/output/en_GB/README @@ -56,7 +56,7 @@ For a summary of features, please see the Documentation.txt/.html file. Download -------- -You can get the newest version at http://www.phpmyadmin.net/. +You can get the newest version at http://www.phpmyadmin.net/ More Information ---------------- diff --git a/output/en_GB/docs.css b/output/en_GB/docs.css index 1d0f08d..96574d9 100644 --- a/output/en_GB/docs.css +++ b/output/en_GB/docs.css @@ -59,10 +59,6 @@ ul#footer { border: none; } -#footer li.logo { - padding: 0.5em; -} - #footer a { color: #c19e66; } @@ -155,31 +151,6 @@ p { margin: 1em; } -table { - margin: 1em; - border: none; -} - -table tr,table td,table th { - border: none; -} - -table.translators { - text-align: center; - display: table; margin-left: auto; margin-right: auto; - border-collapse: collapse; -} - -table.translators th { - color: #000000; - background-color: #d3dce3; -} - -table.translators td, table.translators th { - border: 1px solid #000000; - padding: 5px; -} - ul, dl, ol { margin: 1em; max-width: 70em; @@ -207,10 +178,6 @@ li pre { margin: 1em 0 1em 0; } -pre.wrap { - white-space: normal; -} - dt { font-weight: bold; margin-left: 2em; @@ -225,10 +192,6 @@ dd { font-family: monospace; } -dt.configrule { - font-weight: bold; -} - .important { color: #bb0000; background-color: #ffeeee; @@ -248,8 +211,3 @@ p.footnote { p.footnote:first-line { margin-left: -2%; } - -/* Block to mark separate translation string */ -div.l10n { - display: inline; -} diff --git a/output/en_GB/index.html b/output/en_GB/index.html index b08086e..2bcc6ae 100644 --- a/output/en_GB/index.html +++ b/output/en_GB/index.html @@ -11,6 +11,7 @@ <p>Documents translated to English (United Kingdom):</p> <ul> <li><a href="Documentation.html">Main documentation</a></li> +<li><a href="INSTALL">INSTALL</a></li> <li><a href="README">README</a></li> <li><a href="TODO">TODO</a></li> </ul> diff --git a/output/es/docs.css b/output/es/docs.css index 1d0f08d..96574d9 100644 --- a/output/es/docs.css +++ b/output/es/docs.css @@ -59,10 +59,6 @@ ul#footer { border: none; } -#footer li.logo { - padding: 0.5em; -} - #footer a { color: #c19e66; } @@ -155,31 +151,6 @@ p { margin: 1em; } -table { - margin: 1em; - border: none; -} - -table tr,table td,table th { - border: none; -} - -table.translators { - text-align: center; - display: table; margin-left: auto; margin-right: auto; - border-collapse: collapse; -} - -table.translators th { - color: #000000; - background-color: #d3dce3; -} - -table.translators td, table.translators th { - border: 1px solid #000000; - padding: 5px; -} - ul, dl, ol { margin: 1em; max-width: 70em; @@ -207,10 +178,6 @@ li pre { margin: 1em 0 1em 0; } -pre.wrap { - white-space: normal; -} - dt { font-weight: bold; margin-left: 2em; @@ -225,10 +192,6 @@ dd { font-family: monospace; } -dt.configrule { - font-weight: bold; -} - .important { color: #bb0000; background-color: #ffeeee; @@ -248,8 +211,3 @@ p.footnote { p.footnote:first-line { margin-left: -2%; } - -/* Block to mark separate translation string */ -div.l10n { - display: inline; -} diff --git a/output/fi/docs.css b/output/fi/docs.css index 1d0f08d..96574d9 100644 --- a/output/fi/docs.css +++ b/output/fi/docs.css @@ -59,10 +59,6 @@ ul#footer { border: none; } -#footer li.logo { - padding: 0.5em; -} - #footer a { color: #c19e66; } @@ -155,31 +151,6 @@ p { margin: 1em; } -table { - margin: 1em; - border: none; -} - -table tr,table td,table th { - border: none; -} - -table.translators { - text-align: center; - display: table; margin-left: auto; margin-right: auto; - border-collapse: collapse; -} - -table.translators th { - color: #000000; - background-color: #d3dce3; -} - -table.translators td, table.translators th { - border: 1px solid #000000; - padding: 5px; -} - ul, dl, ol { margin: 1em; max-width: 70em; @@ -207,10 +178,6 @@ li pre { margin: 1em 0 1em 0; } -pre.wrap { - white-space: normal; -} - dt { font-weight: bold; margin-left: 2em; @@ -225,10 +192,6 @@ dd { font-family: monospace; } -dt.configrule { - font-weight: bold; -} - .important { color: #bb0000; background-color: #ffeeee; @@ -248,8 +211,3 @@ p.footnote { p.footnote:first-line { margin-left: -2%; } - -/* Block to mark separate translation string */ -div.l10n { - display: inline; -} diff --git a/output/fr/docs.css b/output/fr/docs.css index 1d0f08d..96574d9 100644 --- a/output/fr/docs.css +++ b/output/fr/docs.css @@ -59,10 +59,6 @@ ul#footer { border: none; } -#footer li.logo { - padding: 0.5em; -} - #footer a { color: #c19e66; } @@ -155,31 +151,6 @@ p { margin: 1em; } -table { - margin: 1em; - border: none; -} - -table tr,table td,table th { - border: none; -} - -table.translators { - text-align: center; - display: table; margin-left: auto; margin-right: auto; - border-collapse: collapse; -} - -table.translators th { - color: #000000; - background-color: #d3dce3; -} - -table.translators td, table.translators th { - border: 1px solid #000000; - padding: 5px; -} - ul, dl, ol { margin: 1em; max-width: 70em; @@ -207,10 +178,6 @@ li pre { margin: 1em 0 1em 0; } -pre.wrap { - white-space: normal; -} - dt { font-weight: bold; margin-left: 2em; @@ -225,10 +192,6 @@ dd { font-family: monospace; } -dt.configrule { - font-weight: bold; -} - .important { color: #bb0000; background-color: #ffeeee; @@ -248,8 +211,3 @@ p.footnote { p.footnote:first-line { margin-left: -2%; } - -/* Block to mark separate translation string */ -div.l10n { - display: inline; -} diff --git a/output/gl/docs.css b/output/gl/docs.css index 1d0f08d..96574d9 100644 --- a/output/gl/docs.css +++ b/output/gl/docs.css @@ -59,10 +59,6 @@ ul#footer { border: none; } -#footer li.logo { - padding: 0.5em; -} - #footer a { color: #c19e66; } @@ -155,31 +151,6 @@ p { margin: 1em; } -table { - margin: 1em; - border: none; -} - -table tr,table td,table th { - border: none; -} - -table.translators { - text-align: center; - display: table; margin-left: auto; margin-right: auto; - border-collapse: collapse; -} - -table.translators th { - color: #000000; - background-color: #d3dce3; -} - -table.translators td, table.translators th { - border: 1px solid #000000; - padding: 5px; -} - ul, dl, ol { margin: 1em; max-width: 70em; @@ -207,10 +178,6 @@ li pre { margin: 1em 0 1em 0; } -pre.wrap { - white-space: normal; -} - dt { font-weight: bold; margin-left: 2em; @@ -225,10 +192,6 @@ dd { font-family: monospace; } -dt.configrule { - font-weight: bold; -} - .important { color: #bb0000; background-color: #ffeeee; @@ -248,8 +211,3 @@ p.footnote { p.footnote:first-line { margin-left: -2%; } - -/* Block to mark separate translation string */ -div.l10n { - display: inline; -} diff --git a/output/hu/docs.css b/output/hu/docs.css index 1d0f08d..96574d9 100644 --- a/output/hu/docs.css +++ b/output/hu/docs.css @@ -59,10 +59,6 @@ ul#footer { border: none; } -#footer li.logo { - padding: 0.5em; -} - #footer a { color: #c19e66; } @@ -155,31 +151,6 @@ p { margin: 1em; } -table { - margin: 1em; - border: none; -} - -table tr,table td,table th { - border: none; -} - -table.translators { - text-align: center; - display: table; margin-left: auto; margin-right: auto; - border-collapse: collapse; -} - -table.translators th { - color: #000000; - background-color: #d3dce3; -} - -table.translators td, table.translators th { - border: 1px solid #000000; - padding: 5px; -} - ul, dl, ol { margin: 1em; max-width: 70em; @@ -207,10 +178,6 @@ li pre { margin: 1em 0 1em 0; } -pre.wrap { - white-space: normal; -} - dt { font-weight: bold; margin-left: 2em; @@ -225,10 +192,6 @@ dd { font-family: monospace; } -dt.configrule { - font-weight: bold; -} - .important { color: #bb0000; background-color: #ffeeee; @@ -248,8 +211,3 @@ p.footnote { p.footnote:first-line { margin-left: -2%; } - -/* Block to mark separate translation string */ -div.l10n { - display: inline; -} diff --git a/output/hy/docs.css b/output/hy/docs.css index 1d0f08d..96574d9 100644 --- a/output/hy/docs.css +++ b/output/hy/docs.css @@ -59,10 +59,6 @@ ul#footer { border: none; } -#footer li.logo { - padding: 0.5em; -} - #footer a { color: #c19e66; } @@ -155,31 +151,6 @@ p { margin: 1em; } -table { - margin: 1em; - border: none; -} - -table tr,table td,table th { - border: none; -} - -table.translators { - text-align: center; - display: table; margin-left: auto; margin-right: auto; - border-collapse: collapse; -} - -table.translators th { - color: #000000; - background-color: #d3dce3; -} - -table.translators td, table.translators th { - border: 1px solid #000000; - padding: 5px; -} - ul, dl, ol { margin: 1em; max-width: 70em; @@ -207,10 +178,6 @@ li pre { margin: 1em 0 1em 0; } -pre.wrap { - white-space: normal; -} - dt { font-weight: bold; margin-left: 2em; @@ -225,10 +192,6 @@ dd { font-family: monospace; } -dt.configrule { - font-weight: bold; -} - .important { color: #bb0000; background-color: #ffeeee; @@ -248,8 +211,3 @@ p.footnote { p.footnote:first-line { margin-left: -2%; } - -/* Block to mark separate translation string */ -div.l10n { - display: inline; -} diff --git a/output/it/docs.css b/output/it/docs.css index 1d0f08d..96574d9 100644 --- a/output/it/docs.css +++ b/output/it/docs.css @@ -59,10 +59,6 @@ ul#footer { border: none; } -#footer li.logo { - padding: 0.5em; -} - #footer a { color: #c19e66; } @@ -155,31 +151,6 @@ p { margin: 1em; } -table { - margin: 1em; - border: none; -} - -table tr,table td,table th { - border: none; -} - -table.translators { - text-align: center; - display: table; margin-left: auto; margin-right: auto; - border-collapse: collapse; -} - -table.translators th { - color: #000000; - background-color: #d3dce3; -} - -table.translators td, table.translators th { - border: 1px solid #000000; - padding: 5px; -} - ul, dl, ol { margin: 1em; max-width: 70em; @@ -207,10 +178,6 @@ li pre { margin: 1em 0 1em 0; } -pre.wrap { - white-space: normal; -} - dt { font-weight: bold; margin-left: 2em; @@ -225,10 +192,6 @@ dd { font-family: monospace; } -dt.configrule { - font-weight: bold; -} - .important { color: #bb0000; background-color: #ffeeee; @@ -248,8 +211,3 @@ p.footnote { p.footnote:first-line { margin-left: -2%; } - -/* Block to mark separate translation string */ -div.l10n { - display: inline; -} diff --git a/output/ja/docs.css b/output/ja/docs.css index 1d0f08d..96574d9 100644 --- a/output/ja/docs.css +++ b/output/ja/docs.css @@ -59,10 +59,6 @@ ul#footer { border: none; } -#footer li.logo { - padding: 0.5em; -} - #footer a { color: #c19e66; } @@ -155,31 +151,6 @@ p { margin: 1em; } -table { - margin: 1em; - border: none; -} - -table tr,table td,table th { - border: none; -} - -table.translators { - text-align: center; - display: table; margin-left: auto; margin-right: auto; - border-collapse: collapse; -} - -table.translators th { - color: #000000; - background-color: #d3dce3; -} - -table.translators td, table.translators th { - border: 1px solid #000000; - padding: 5px; -} - ul, dl, ol { margin: 1em; max-width: 70em; @@ -207,10 +178,6 @@ li pre { margin: 1em 0 1em 0; } -pre.wrap { - white-space: normal; -} - dt { font-weight: bold; margin-left: 2em; @@ -225,10 +192,6 @@ dd { font-family: monospace; } -dt.configrule { - font-weight: bold; -} - .important { color: #bb0000; background-color: #ffeeee; @@ -248,8 +211,3 @@ p.footnote { p.footnote:first-line { margin-left: -2%; } - -/* Block to mark separate translation string */ -div.l10n { - display: inline; -} diff --git a/output/ka/docs.css b/output/ka/docs.css index 1d0f08d..96574d9 100644 --- a/output/ka/docs.css +++ b/output/ka/docs.css @@ -59,10 +59,6 @@ ul#footer { border: none; } -#footer li.logo { - padding: 0.5em; -} - #footer a { color: #c19e66; } @@ -155,31 +151,6 @@ p { margin: 1em; } -table { - margin: 1em; - border: none; -} - -table tr,table td,table th { - border: none; -} - -table.translators { - text-align: center; - display: table; margin-left: auto; margin-right: auto; - border-collapse: collapse; -} - -table.translators th { - color: #000000; - background-color: #d3dce3; -} - -table.translators td, table.translators th { - border: 1px solid #000000; - padding: 5px; -} - ul, dl, ol { margin: 1em; max-width: 70em; @@ -207,10 +178,6 @@ li pre { margin: 1em 0 1em 0; } -pre.wrap { - white-space: normal; -} - dt { font-weight: bold; margin-left: 2em; @@ -225,10 +192,6 @@ dd { font-family: monospace; } -dt.configrule { - font-weight: bold; -} - .important { color: #bb0000; background-color: #ffeeee; @@ -248,8 +211,3 @@ p.footnote { p.footnote:first-line { margin-left: -2%; } - -/* Block to mark separate translation string */ -div.l10n { - display: inline; -} diff --git a/output/lt/docs.css b/output/lt/docs.css index 1d0f08d..96574d9 100644 --- a/output/lt/docs.css +++ b/output/lt/docs.css @@ -59,10 +59,6 @@ ul#footer { border: none; } -#footer li.logo { - padding: 0.5em; -} - #footer a { color: #c19e66; } @@ -155,31 +151,6 @@ p { margin: 1em; } -table { - margin: 1em; - border: none; -} - -table tr,table td,table th { - border: none; -} - -table.translators { - text-align: center; - display: table; margin-left: auto; margin-right: auto; - border-collapse: collapse; -} - -table.translators th { - color: #000000; - background-color: #d3dce3; -} - -table.translators td, table.translators th { - border: 1px solid #000000; - padding: 5px; -} - ul, dl, ol { margin: 1em; max-width: 70em; @@ -207,10 +178,6 @@ li pre { margin: 1em 0 1em 0; } -pre.wrap { - white-space: normal; -} - dt { font-weight: bold; margin-left: 2em; @@ -225,10 +192,6 @@ dd { font-family: monospace; } -dt.configrule { - font-weight: bold; -} - .important { color: #bb0000; background-color: #ffeeee; @@ -248,8 +211,3 @@ p.footnote { p.footnote:first-line { margin-left: -2%; } - -/* Block to mark separate translation string */ -div.l10n { - display: inline; -} diff --git a/output/mn/docs.css b/output/mn/docs.css index 1d0f08d..96574d9 100644 --- a/output/mn/docs.css +++ b/output/mn/docs.css @@ -59,10 +59,6 @@ ul#footer { border: none; } -#footer li.logo { - padding: 0.5em; -} - #footer a { color: #c19e66; } @@ -155,31 +151,6 @@ p { margin: 1em; } -table { - margin: 1em; - border: none; -} - -table tr,table td,table th { - border: none; -} - -table.translators { - text-align: center; - display: table; margin-left: auto; margin-right: auto; - border-collapse: collapse; -} - -table.translators th { - color: #000000; - background-color: #d3dce3; -} - -table.translators td, table.translators th { - border: 1px solid #000000; - padding: 5px; -} - ul, dl, ol { margin: 1em; max-width: 70em; @@ -207,10 +178,6 @@ li pre { margin: 1em 0 1em 0; } -pre.wrap { - white-space: normal; -} - dt { font-weight: bold; margin-left: 2em; @@ -225,10 +192,6 @@ dd { font-family: monospace; } -dt.configrule { - font-weight: bold; -} - .important { color: #bb0000; background-color: #ffeeee; @@ -248,8 +211,3 @@ p.footnote { p.footnote:first-line { margin-left: -2%; } - -/* Block to mark separate translation string */ -div.l10n { - display: inline; -} diff --git a/output/nb/docs.css b/output/nb/docs.css index 1d0f08d..96574d9 100644 --- a/output/nb/docs.css +++ b/output/nb/docs.css @@ -59,10 +59,6 @@ ul#footer { border: none; } -#footer li.logo { - padding: 0.5em; -} - #footer a { color: #c19e66; } @@ -155,31 +151,6 @@ p { margin: 1em; } -table { - margin: 1em; - border: none; -} - -table tr,table td,table th { - border: none; -} - -table.translators { - text-align: center; - display: table; margin-left: auto; margin-right: auto; - border-collapse: collapse; -} - -table.translators th { - color: #000000; - background-color: #d3dce3; -} - -table.translators td, table.translators th { - border: 1px solid #000000; - padding: 5px; -} - ul, dl, ol { margin: 1em; max-width: 70em; @@ -207,10 +178,6 @@ li pre { margin: 1em 0 1em 0; } -pre.wrap { - white-space: normal; -} - dt { font-weight: bold; margin-left: 2em; @@ -225,10 +192,6 @@ dd { font-family: monospace; } -dt.configrule { - font-weight: bold; -} - .important { color: #bb0000; background-color: #ffeeee; @@ -248,8 +211,3 @@ p.footnote { p.footnote:first-line { margin-left: -2%; } - -/* Block to mark separate translation string */ -div.l10n { - display: inline; -} diff --git a/output/nl/docs.css b/output/nl/docs.css index 1d0f08d..96574d9 100644 --- a/output/nl/docs.css +++ b/output/nl/docs.css @@ -59,10 +59,6 @@ ul#footer { border: none; } -#footer li.logo { - padding: 0.5em; -} - #footer a { color: #c19e66; } @@ -155,31 +151,6 @@ p { margin: 1em; } -table { - margin: 1em; - border: none; -} - -table tr,table td,table th { - border: none; -} - -table.translators { - text-align: center; - display: table; margin-left: auto; margin-right: auto; - border-collapse: collapse; -} - -table.translators th { - color: #000000; - background-color: #d3dce3; -} - -table.translators td, table.translators th { - border: 1px solid #000000; - padding: 5px; -} - ul, dl, ol { margin: 1em; max-width: 70em; @@ -207,10 +178,6 @@ li pre { margin: 1em 0 1em 0; } -pre.wrap { - white-space: normal; -} - dt { font-weight: bold; margin-left: 2em; @@ -225,10 +192,6 @@ dd { font-family: monospace; } -dt.configrule { - font-weight: bold; -} - .important { color: #bb0000; background-color: #ffeeee; @@ -248,8 +211,3 @@ p.footnote { p.footnote:first-line { margin-left: -2%; } - -/* Block to mark separate translation string */ -div.l10n { - display: inline; -} diff --git a/output/pl/docs.css b/output/pl/docs.css index 1d0f08d..96574d9 100644 --- a/output/pl/docs.css +++ b/output/pl/docs.css @@ -59,10 +59,6 @@ ul#footer { border: none; } -#footer li.logo { - padding: 0.5em; -} - #footer a { color: #c19e66; } @@ -155,31 +151,6 @@ p { margin: 1em; } -table { - margin: 1em; - border: none; -} - -table tr,table td,table th { - border: none; -} - -table.translators { - text-align: center; - display: table; margin-left: auto; margin-right: auto; - border-collapse: collapse; -} - -table.translators th { - color: #000000; - background-color: #d3dce3; -} - -table.translators td, table.translators th { - border: 1px solid #000000; - padding: 5px; -} - ul, dl, ol { margin: 1em; max-width: 70em; @@ -207,10 +178,6 @@ li pre { margin: 1em 0 1em 0; } -pre.wrap { - white-space: normal; -} - dt { font-weight: bold; margin-left: 2em; @@ -225,10 +192,6 @@ dd { font-family: monospace; } -dt.configrule { - font-weight: bold; -} - .important { color: #bb0000; background-color: #ffeeee; @@ -248,8 +211,3 @@ p.footnote { p.footnote:first-line { margin-left: -2%; } - -/* Block to mark separate translation string */ -div.l10n { - display: inline; -} diff --git a/output/pt_BR/docs.css b/output/pt_BR/docs.css index 1d0f08d..96574d9 100644 --- a/output/pt_BR/docs.css +++ b/output/pt_BR/docs.css @@ -59,10 +59,6 @@ ul#footer { border: none; } -#footer li.logo { - padding: 0.5em; -} - #footer a { color: #c19e66; } @@ -155,31 +151,6 @@ p { margin: 1em; } -table { - margin: 1em; - border: none; -} - -table tr,table td,table th { - border: none; -} - -table.translators { - text-align: center; - display: table; margin-left: auto; margin-right: auto; - border-collapse: collapse; -} - -table.translators th { - color: #000000; - background-color: #d3dce3; -} - -table.translators td, table.translators th { - border: 1px solid #000000; - padding: 5px; -} - ul, dl, ol { margin: 1em; max-width: 70em; @@ -207,10 +178,6 @@ li pre { margin: 1em 0 1em 0; } -pre.wrap { - white-space: normal; -} - dt { font-weight: bold; margin-left: 2em; @@ -225,10 +192,6 @@ dd { font-family: monospace; } -dt.configrule { - font-weight: bold; -} - .important { color: #bb0000; background-color: #ffeeee; @@ -248,8 +211,3 @@ p.footnote { p.footnote:first-line { margin-left: -2%; } - -/* Block to mark separate translation string */ -div.l10n { - display: inline; -} diff --git a/output/ro/docs.css b/output/ro/docs.css index 1d0f08d..96574d9 100644 --- a/output/ro/docs.css +++ b/output/ro/docs.css @@ -59,10 +59,6 @@ ul#footer { border: none; } -#footer li.logo { - padding: 0.5em; -} - #footer a { color: #c19e66; } @@ -155,31 +151,6 @@ p { margin: 1em; } -table { - margin: 1em; - border: none; -} - -table tr,table td,table th { - border: none; -} - -table.translators { - text-align: center; - display: table; margin-left: auto; margin-right: auto; - border-collapse: collapse; -} - -table.translators th { - color: #000000; - background-color: #d3dce3; -} - -table.translators td, table.translators th { - border: 1px solid #000000; - padding: 5px; -} - ul, dl, ol { margin: 1em; max-width: 70em; @@ -207,10 +178,6 @@ li pre { margin: 1em 0 1em 0; } -pre.wrap { - white-space: normal; -} - dt { font-weight: bold; margin-left: 2em; @@ -225,10 +192,6 @@ dd { font-family: monospace; } -dt.configrule { - font-weight: bold; -} - .important { color: #bb0000; background-color: #ffeeee; @@ -248,8 +211,3 @@ p.footnote { p.footnote:first-line { margin-left: -2%; } - -/* Block to mark separate translation string */ -div.l10n { - display: inline; -} diff --git a/output/sk/docs.css b/output/sk/docs.css index 1d0f08d..96574d9 100644 --- a/output/sk/docs.css +++ b/output/sk/docs.css @@ -59,10 +59,6 @@ ul#footer { border: none; } -#footer li.logo { - padding: 0.5em; -} - #footer a { color: #c19e66; } @@ -155,31 +151,6 @@ p { margin: 1em; } -table { - margin: 1em; - border: none; -} - -table tr,table td,table th { - border: none; -} - -table.translators { - text-align: center; - display: table; margin-left: auto; margin-right: auto; - border-collapse: collapse; -} - -table.translators th { - color: #000000; - background-color: #d3dce3; -} - -table.translators td, table.translators th { - border: 1px solid #000000; - padding: 5px; -} - ul, dl, ol { margin: 1em; max-width: 70em; @@ -207,10 +178,6 @@ li pre { margin: 1em 0 1em 0; } -pre.wrap { - white-space: normal; -} - dt { font-weight: bold; margin-left: 2em; @@ -225,10 +192,6 @@ dd { font-family: monospace; } -dt.configrule { - font-weight: bold; -} - .important { color: #bb0000; background-color: #ffeeee; @@ -248,8 +211,3 @@ p.footnote { p.footnote:first-line { margin-left: -2%; } - -/* Block to mark separate translation string */ -div.l10n { - display: inline; -} diff --git a/output/sl/INSTALL b/output/sl/INSTALL new file mode 100644 index 0000000..c8b152a --- /dev/null +++ b/output/sl/INSTALL @@ -0,0 +1,6 @@ +phpMyAdmin - Namestitev +======================= + +Prosimo, oglejte si datoteko Documentation.txt ali Documentation.html. + + diff --git a/output/sl/README b/output/sl/README index 9cb57bc..3ff7cf3 100644 --- a/output/sl/README +++ b/output/sl/README @@ -1,7 +1,7 @@ -phpMyAdmin - Readme -=================== +phpMyAdmin - Beri me +==================== -Version 3.4.0-beta1 +Različica 3.4.0-beta1 A set of PHP-scripts to manage MySQL over the web. @@ -47,8 +47,8 @@ Zahteve * MySQL 5.0 ali novejši * spletni brskalnik (očitno!) -Summary -------- +Povzetek +-------- phpMyAdmin is intended to handle the administration of MySQL over the web. For a summary of features, please see the Documentation.txt/.html file. @@ -56,31 +56,32 @@ For a summary of features, please see the Documentation.txt/.html file. Prenesi ------- -You can get the newest version at http://www.phpmyadmin.net/. +Najnovejšo različico lahko dobite na http://www.phpmyadmin.net/. -More Information ----------------- +Več informacij +--------------- -Please see the Documentation.txt/.html file. +Prosimo, oglejte si datoteko Documentation.txt/.html. -Support +Podpora ------- See reference about support forums under http://www.phpmyadmin.net/ -Enjoy! ------- +Uživajte! +---------- -The phpMyAdmin Devel team +Skupina razvijalcev phpMyAdmin PS: -Please, don't send us emails with question like "How do I compile PHP with -MySQL-support". We just don't have the time to be your free help desk. +Prosimo, ne pošiljajte nam e-sporočil z vprašanji, kot je "Kako prevedem PHP +s podporo MySQL". Preprosto nimamo časa, da bi bili vaša brezplačna pomoč +uporabnikom. -Please send your questions to the appropriate mailing lists / forums. -Before contacting us, please read the Documentation.html (esp. the FAQ -part). +Prosimo, naslovite vaša vprašanja na primerne poštne sezname / +forume. Preden stopite v stik z nami, prosimo, preberite Documentation.html +(še posebej del FAQ). diff --git a/output/en_GB/TODO b/output/sl/TODO similarity index 73% copy from output/en_GB/TODO copy to output/sl/TODO index 7e96527..81f156b 100644 --- a/output/en_GB/TODO +++ b/output/sl/TODO @@ -1,5 +1,5 @@ -phpMyAdmin - Todo -================= +phpMyAdmin - Seznam opravil +=========================== We are currently using the Sourceforge Tracker as Todo list: diff --git a/output/sl/docs.css b/output/sl/docs.css index 1d0f08d..96574d9 100644 --- a/output/sl/docs.css +++ b/output/sl/docs.css @@ -59,10 +59,6 @@ ul#footer { border: none; } -#footer li.logo { - padding: 0.5em; -} - #footer a { color: #c19e66; } @@ -155,31 +151,6 @@ p { margin: 1em; } -table { - margin: 1em; - border: none; -} - -table tr,table td,table th { - border: none; -} - -table.translators { - text-align: center; - display: table; margin-left: auto; margin-right: auto; - border-collapse: collapse; -} - -table.translators th { - color: #000000; - background-color: #d3dce3; -} - -table.translators td, table.translators th { - border: 1px solid #000000; - padding: 5px; -} - ul, dl, ol { margin: 1em; max-width: 70em; @@ -207,10 +178,6 @@ li pre { margin: 1em 0 1em 0; } -pre.wrap { - white-space: normal; -} - dt { font-weight: bold; margin-left: 2em; @@ -225,10 +192,6 @@ dd { font-family: monospace; } -dt.configrule { - font-weight: bold; -} - .important { color: #bb0000; background-color: #ffeeee; @@ -248,8 +211,3 @@ p.footnote { p.footnote:first-line { margin-left: -2%; } - -/* Block to mark separate translation string */ -div.l10n { - display: inline; -} diff --git a/output/sv/docs.css b/output/sv/docs.css index 1d0f08d..96574d9 100644 --- a/output/sv/docs.css +++ b/output/sv/docs.css @@ -59,10 +59,6 @@ ul#footer { border: none; } -#footer li.logo { - padding: 0.5em; -} - #footer a { color: #c19e66; } @@ -155,31 +151,6 @@ p { margin: 1em; } -table { - margin: 1em; - border: none; -} - -table tr,table td,table th { - border: none; -} - -table.translators { - text-align: center; - display: table; margin-left: auto; margin-right: auto; - border-collapse: collapse; -} - -table.translators th { - color: #000000; - background-color: #d3dce3; -} - -table.translators td, table.translators th { - border: 1px solid #000000; - padding: 5px; -} - ul, dl, ol { margin: 1em; max-width: 70em; @@ -207,10 +178,6 @@ li pre { margin: 1em 0 1em 0; } -pre.wrap { - white-space: normal; -} - dt { font-weight: bold; margin-left: 2em; @@ -225,10 +192,6 @@ dd { font-family: monospace; } -dt.configrule { - font-weight: bold; -} - .important { color: #bb0000; background-color: #ffeeee; @@ -248,8 +211,3 @@ p.footnote { p.footnote:first-line { margin-left: -2%; } - -/* Block to mark separate translation string */ -div.l10n { - display: inline; -} diff --git a/output/tr/docs.css b/output/tr/docs.css index 1d0f08d..96574d9 100644 --- a/output/tr/docs.css +++ b/output/tr/docs.css @@ -59,10 +59,6 @@ ul#footer { border: none; } -#footer li.logo { - padding: 0.5em; -} - #footer a { color: #c19e66; } @@ -155,31 +151,6 @@ p { margin: 1em; } -table { - margin: 1em; - border: none; -} - -table tr,table td,table th { - border: none; -} - -table.translators { - text-align: center; - display: table; margin-left: auto; margin-right: auto; - border-collapse: collapse; -} - -table.translators th { - color: #000000; - background-color: #d3dce3; -} - -table.translators td, table.translators th { - border: 1px solid #000000; - padding: 5px; -} - ul, dl, ol { margin: 1em; max-width: 70em; @@ -207,10 +178,6 @@ li pre { margin: 1em 0 1em 0; } -pre.wrap { - white-space: normal; -} - dt { font-weight: bold; margin-left: 2em; @@ -225,10 +192,6 @@ dd { font-family: monospace; } -dt.configrule { - font-weight: bold; -} - .important { color: #bb0000; background-color: #ffeeee; @@ -248,8 +211,3 @@ p.footnote { p.footnote:first-line { margin-left: -2%; } - -/* Block to mark separate translation string */ -div.l10n { - display: inline; -} diff --git a/output/zh_CN/docs.css b/output/zh_CN/docs.css index 1d0f08d..96574d9 100644 --- a/output/zh_CN/docs.css +++ b/output/zh_CN/docs.css @@ -59,10 +59,6 @@ ul#footer { border: none; } -#footer li.logo { - padding: 0.5em; -} - #footer a { color: #c19e66; } @@ -155,31 +151,6 @@ p { margin: 1em; } -table { - margin: 1em; - border: none; -} - -table tr,table td,table th { - border: none; -} - -table.translators { - text-align: center; - display: table; margin-left: auto; margin-right: auto; - border-collapse: collapse; -} - -table.translators th { - color: #000000; - background-color: #d3dce3; -} - -table.translators td, table.translators th { - border: 1px solid #000000; - padding: 5px; -} - ul, dl, ol { margin: 1em; max-width: 70em; @@ -207,10 +178,6 @@ li pre { margin: 1em 0 1em 0; } -pre.wrap { - white-space: normal; -} - dt { font-weight: bold; margin-left: 2em; @@ -225,10 +192,6 @@ dd { font-family: monospace; } -dt.configrule { - font-weight: bold; -} - .important { color: #bb0000; background-color: #ffeeee; @@ -248,8 +211,3 @@ p.footnote { p.footnote:first-line { margin-left: -2%; } - -/* Block to mark separate translation string */ -div.l10n { - display: inline; -} diff --git a/output/zh_TW/docs.css b/output/zh_TW/docs.css index 1d0f08d..96574d9 100644 --- a/output/zh_TW/docs.css +++ b/output/zh_TW/docs.css @@ -59,10 +59,6 @@ ul#footer { border: none; } -#footer li.logo { - padding: 0.5em; -} - #footer a { color: #c19e66; } @@ -155,31 +151,6 @@ p { margin: 1em; } -table { - margin: 1em; - border: none; -} - -table tr,table td,table th { - border: none; -} - -table.translators { - text-align: center; - display: table; margin-left: auto; margin-right: auto; - border-collapse: collapse; -} - -table.translators th { - color: #000000; - background-color: #d3dce3; -} - -table.translators td, table.translators th { - border: 1px solid #000000; - padding: 5px; -} - ul, dl, ol { margin: 1em; max-width: 70em; @@ -207,10 +178,6 @@ li pre { margin: 1em 0 1em 0; } -pre.wrap { - white-space: normal; -} - dt { font-weight: bold; margin-left: 2em; @@ -225,10 +192,6 @@ dd { font-family: monospace; } -dt.configrule { - font-weight: bold; -} - .important { color: #bb0000; background-color: #ffeeee; @@ -248,8 +211,3 @@ p.footnote { p.footnote:first-line { margin-left: -2%; } - -/* Block to mark separate translation string */ -div.l10n { - display: inline; -} diff --git a/po/en_GB.po b/po/en_GB.po index 2b820fe..fd0f5a6 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-31 15:54+0100\n" -"PO-Revision-Date: 2011-01-01 10:52+0200\n" +"PO-Revision-Date: 2011-01-02 11:53+0200\n" "Last-Translator: Robert Readman <robert_readman(a)hotmail.com>\n" "Language-Team: none\n" "Language: en_GB\n" @@ -14105,9 +14105,8 @@ msgstr "Download" #. type: Plain text #: orig-docs/README:60 -#, fuzzy msgid "You can get the newest version at http://www.phpmyadmin.net/." -msgstr "You can get the newest version at http://www.phpmyadmin.net/." +msgstr "You can get the newest version at http://www.phpmyadmin.net/" #. type: Title - #: orig-docs/README:62 @@ -14117,7 +14116,6 @@ msgstr "More Information" #. type: Plain text #: orig-docs/README:65 -#, fuzzy msgid "Please see the Documentation.txt/.html file." msgstr "Please see the Documentation.txt/.html file." @@ -14129,7 +14127,6 @@ msgstr "Support" #. type: Plain text #: orig-docs/README:70 -#, fuzzy msgid "See reference about support forums under http://www.phpmyadmin.net/" msgstr "See reference about support forums under http://www.phpmyadmin.net/" diff --git a/po/sl.po b/po/sl.po index c7b031f..fc08419 100644 --- a/po/sl.po +++ b/po/sl.po @@ -8,32 +8,30 @@ msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-31 15:54+0100\n" -"PO-Revision-Date: 2010-09-11 16:21+0200\n" +"PO-Revision-Date: 2011-01-01 23:04+0200\n" "Last-Translator: Domen <dbc334(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3);\n" "X-Generator: Pootle 2.0.5\n" #. type: Content of: <html><head><title> #: orig-docs/Documentation.html:12 -#, fuzzy msgid "phpMyAdmin @@VER@@ - Documentation" -msgstr "Dokumentacija phpMyAdmin" +msgstr "phpMyAdmin @@VER@@ - Dokumentacija" #. type: Content of: <html><body><div><h1> #: orig-docs/Documentation.html:19 -#, fuzzy msgid "" "<a href=\"http://www.phpmyadmin.net/\">php<span class=\"myadmin\">MyAdmin</" "span></a> @@VER@@ Documentation" msgstr "" -"<a href=\"http://www.phpmyadmin.net/\">php<span class=\"myadmin\">MyAdmin</" -"span></a> 3.4.0-dev Dokumentacija" +"Dokumentacija <a href=\"http://www.phpmyadmin.net/\">php<span " +"class=\"myadmin\">MyAdmin</span></a> @@VER@@" #. type: Content of: <html><body><ul><li> #: orig-docs/Documentation.html:27 @@ -2893,16 +2891,14 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1385 -#, fuzzy msgid "" "Define how long login cookie should be stored in browser. Default 0 means " "that it will be kept for existing session. This is recommended for not " "trusted environments." msgstr "" -"Določa, kako dolgo (v sekundah) naj bo prijavni piškotek shranjen v " -"brskalniku. Privzeta vrednost 0 pomeni, da bo shranjen samo za obstoječo " -"sejo in bo izbrisan takoj, ko zaprete okno brskalnika. To je priporočeno za " -"okolja, ki jim ne zaupate." +"Določa, kako dolgo naj bo prijavni piškotek shranjen v brskalniku. Privzeta " +"vrednost 0 pomeni, da bo shranjen samo za obstoječo sejo. To je priporočeno " +"za okolja, ki jim ne zaupate." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1389 @@ -10272,12 +10268,12 @@ msgstr "" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4820 msgid "ENUM/SET editor" -msgstr "" +msgstr "Urejevalnik ENUM/SET" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4821 msgid "Simplified interface for export/import" -msgstr "" +msgstr "Poenostavljen vmesnik za uvoz/izvoz" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:4824 @@ -10287,7 +10283,7 @@ msgstr "" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4826 msgid "AJAXifying the interface" -msgstr "" +msgstr "Ajaxifiranje vmesnika" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:4829 @@ -11061,22 +11057,21 @@ msgstr "-->" #. type: Title = #: orig-docs/INSTALL:2 -#, fuzzy, no-wrap +#, no-wrap msgid "phpMyAdmin - Installation" -msgstr "phpMyAdmin - Namestitev\n" +msgstr "phpMyAdmin - Namestitev" #. type: Plain text #: orig-docs/INSTALL:5 -#, fuzzy msgid "" "Please have a look to the Documentation.txt or Documentation.html files." -msgstr "Prosimo, oglejte si datoteko Documentation.txt/.html." +msgstr "Prosimo, oglejte si datoteko Documentation.txt ali Documentation.html." #. type: Title = #: orig-docs/TODO:2 -#, fuzzy, no-wrap +#, no-wrap msgid "phpMyAdmin - Todo" -msgstr "phpMyAdmin - Seznam opravil\n" +msgstr "phpMyAdmin - Seznam opravil" #. type: Plain text #: orig-docs/TODO:5 @@ -11096,15 +11091,14 @@ msgstr "" #. type: Title = #: orig-docs/README:2 -#, fuzzy, no-wrap +#, no-wrap msgid "phpMyAdmin - Readme" -msgstr "phpMyAdmin - Beri me\n" +msgstr "phpMyAdmin - Beri me" #. type: Plain text #: orig-docs/README:5 -#, fuzzy msgid "Version @@VER@@" -msgstr "Različica" +msgstr "Različica @@VER@@" #. type: Plain text #: orig-docs/README:7 @@ -11163,9 +11157,9 @@ msgstr "spletni brskalnik (očitno!)" #. type: Title - #: orig-docs/README:51 -#, fuzzy, no-wrap +#, no-wrap msgid "Summary" -msgstr "Povzetek\n" +msgstr "Povzetek" #. type: Plain text #: orig-docs/README:55 @@ -11182,27 +11176,25 @@ msgstr "Prenesi" #. type: Plain text #: orig-docs/README:60 -#, fuzzy msgid "You can get the newest version at http://www.phpmyadmin.net/." msgstr "Najnovejšo različico lahko dobite na http://www.phpmyadmin.net/." #. type: Title - #: orig-docs/README:62 -#, fuzzy, no-wrap +#, no-wrap msgid "More Information" -msgstr "Podatki" +msgstr "Več informacij" #. type: Plain text #: orig-docs/README:65 -#, fuzzy msgid "Please see the Documentation.txt/.html file." msgstr "Prosimo, oglejte si datoteko Documentation.txt/.html." #. type: Title - #: orig-docs/README:67 -#, fuzzy, no-wrap +#, no-wrap msgid "Support" -msgstr "Podpora\n" +msgstr "Podpora" #. type: Plain text #: orig-docs/README:70 @@ -11212,13 +11204,12 @@ msgstr "Oglejte si sklice o podpornih forumih na http://www.phpmyadmin.net/" #. type: Title - #: orig-docs/README:73 -#, fuzzy, no-wrap +#, no-wrap msgid "Enjoy!" -msgstr "Uživajte!\n" +msgstr "Uživajte!" #. type: Plain text #: orig-docs/README:76 -#, fuzzy msgid "The phpMyAdmin Devel team" msgstr "Skupina razvijalcev phpMyAdmin" @@ -11229,33 +11220,23 @@ msgstr "" #. type: Plain text #: orig-docs/README:82 -#, fuzzy msgid "" "Please, don't send us emails with question like \"How do I compile PHP with " "MySQL-support\". We just don't have the time to be your free help desk." msgstr "" -"Pripis: \n" -" Prosimo, ne pošiljajte nam e-pošt z vprašanji, kot je \"Kako prevedem\n" -" PHP s podporo MySQL\". Preprosto nimamo časa, da bi bili vaša\n" -" brezplačna pomoč uporabnikom.\n" -" Prosimo, naslovite vaša vprašanja na primerne poštne sezname / forume.\n" -" Preden stopite v stik z nami, prosimo, preberite Documentation.html\n" -" (še posebej del FAQ).\n" +"Prosimo, ne pošiljajte nam e-sporočil z vprašanji, kot je \"Kako prevedem PHP " +"s podporo MySQL\". Preprosto nimamo časa, da bi bili vaša brezplačna pomoč " +"uporabnikom." #. type: Plain text #: orig-docs/README:85 -#, fuzzy msgid "" "Please send your questions to the appropriate mailing lists / forums. " "Before contacting us, please read the Documentation.html (esp. the FAQ part)." msgstr "" -"Pripis: \n" -" Prosimo, ne pošiljajte nam e-pošt z vprašanji, kot je \"Kako prevedem\n" -" PHP s podporo MySQL\". Preprosto nimamo časa, da bi bili vaša\n" -" brezplačna pomoč uporabnikom.\n" -" Prosimo, naslovite vaša vprašanja na primerne poštne sezname / forume.\n" -" Preden stopite v stik z nami, prosimo, preberite Documentation.html\n" -" (še posebej del FAQ).\n" +"Prosimo, naslovite vaša vprašanja na primerne poštne sezname / forume. " +"Preden stopite v stik z nami, prosimo, preberite Documentation.html (še " +"posebej del FAQ)." #~ msgid "<a href=\"translators.html\">Translators</a>" #~ msgstr "<a href=\"translators.html\">Prevajalci</a>" diff --git a/po/tr.po b/po/tr.po index 224b674..0b9b503 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-31 15:54+0100\n" -"PO-Revision-Date: 2010-12-31 16:32+0200\n" +"PO-Revision-Date: 2011-01-01 23:40+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: none\n" "Language: tr\n" @@ -404,11 +404,12 @@ msgstr "" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:140 -#, fuzzy msgid "" "communicate in <a href=\"http://www.phpmyadmin.net/home_page/translations.php" "\">62 different languages</a>" -msgstr "<a href=\"./translators.html\">58 farklı dilde</a> iletişim kurabilir" +msgstr "" +"<a href=\"http://www.phpmyadmin.net/home_page/translations.php\">62 farklı " +"dilde</a> iletişim kurabilir" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:142 @@ -875,6 +876,13 @@ msgid "" "multi-user installation (this database would then be accessed by the " "controluser, so no other user should have rights to it)." msgstr "" +"Yeni özelliklerin (yer imleri, yorumlar, <abbr title=\"structured query " +"language\">SQL</abbr>-geçmişi, izleme mekanizması, <abbr title=\"Portable " +"Document Format\">PDF</abbr>-üretme, sütun içeriği dönüşümü, v.s.) bütün " +"grubu için özel tablo grubu oluşturmanız gerekir. Bu tablolar kendi " +"veritabanınıza veya çoklu kullanıcılı kurulumlar (bu veritabanına, denetim " +"kullanıcısı tarafından erişilebilecektir bu yüzden diğer hiçbir kullanıcı bu " +"hakka sahip olmamalıdır) için merkezi veritabanına yerleştirilebilir." #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:335 @@ -884,6 +892,10 @@ msgid "" "pay special attention to <a href=\"#faq1_23\"> <abbr title=\"Frequently " "Asked Questions\">FAQ</abbr> 1.23</a>)." msgstr "" +"Lütfen <tt>./scripts/</tt> dizininize bakın, <i>create_tables.sql</i> " +"adındaki dosyayı burada bulmalısınız. (Eğer Windows sunucusu " +"kullanıyorsanız, <a href=\"#faq1_23\"> <abbr title=\"Sıkça Sorulan " +"Sorular\">SSS</abbr> 1.23</a>'e özellikle dikkat edin)." #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:340 @@ -892,6 +904,10 @@ msgid "" "please use <i>./scripts/upgrade_tables_mysql_4_1_2+.sql</i> and then create " "new tables by importing <i>./scripts/create_tables.sql</i>." msgstr "" +"Eğer zaten bu altyapıya sahipseniz ve MySQL 4.1.2 veya yenisine " +"yükseltmişseniz, lütfen <i>./scripts/upgrade_tables_mysql_4_1_2+.sql</i> " +"dosyasını kullanın ve sonra <i>./scripts/create_tables.sql</i> dosyasını içe " +"aktararak yeni tabloları oluşturun." #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:344 @@ -901,6 +917,10 @@ msgid "" "and tables, and that the script may need some tuning, depending on the " "database name." msgstr "" +"phpMyAdmin'ninizi sizin için tablo oluşturmada kullanabilirsiniz. Lütfen " +"veritabanları ve tablolar oluşturmak için özel (yönetici) yetkilere " +"ihtiyacınız olduğunun farkında olun ve bu betiğin veritabanının adına bağlı " +"olarak bazı ayarlamalara ihtiyacı olabilir." #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:349 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1398-ge37d3d5
by Michal Čihař 02 Jan '11

02 Jan '11

The branch, master has been updated via e37d3d52d1e6662943ac371e437e99799e4d991b (commit) via f66fa349760bcae576c61c891fb056bf620787a9 (commit) via e49cd176eebd7c63d3337e731fd73287df8a0378 (commit) via 381ee82cec60e5324db64508e4584f4a2bdb6b5b (commit) via 4ea81c2b3ad06da0365aa2aa626f77b7e540a570 (commit) via f2ce3b652aac16203e3057c049aa0f72e0136b65 (commit) via 201c663a416f8ef77780ee31fd9a94d1b34ad292 (commit) via 9aece28f16515298ae8c3e616882fbc112c9a3fe (commit) via be0d2705d1a51fed2ecc3f0d46deffba2c2e916f (commit) via 1a471e9300d876425ecf9bd08d0f3074051335e6 (commit) via 68570a6cd9ff87d5eb7dda3dcfd5b2883e830f2c (commit) via f340a1b3d7b711c77df8fc3fe3c732a5d82cecee (commit) via 66cb1192f4eead4da4c61b8b987d727b81190d2d (commit) via 3cf80bb3267210f26e44876fc436057f4667ac20 (commit) from bc49e8b30b4ba594fe1498c7152c632972aa442b (commit) - Log ----------------------------------------------------------------- commit e37d3d52d1e6662943ac371e437e99799e4d991b Merge: f66fa349760bcae576c61c891fb056bf620787a9 bc49e8b30b4ba594fe1498c7152c632972aa442b Author: Pootle server <pootle(a)cihar.com> Date: Sun Jan 2 14:40:25 2011 +0100 Merge remote branch 'origin/master' commit f66fa349760bcae576c61c891fb056bf620787a9 Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 22:58:47 2011 +0200 Translation update done using Pootle. commit e49cd176eebd7c63d3337e731fd73287df8a0378 Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 22:57:41 2011 +0200 Translation update done using Pootle. commit 381ee82cec60e5324db64508e4584f4a2bdb6b5b Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 22:57:07 2011 +0200 Translation update done using Pootle. commit 4ea81c2b3ad06da0365aa2aa626f77b7e540a570 Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 22:55:59 2011 +0200 Translation update done using Pootle. commit f2ce3b652aac16203e3057c049aa0f72e0136b65 Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 22:55:52 2011 +0200 Translation update done using Pootle. commit 201c663a416f8ef77780ee31fd9a94d1b34ad292 Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 22:55:14 2011 +0200 Translation update done using Pootle. commit 9aece28f16515298ae8c3e616882fbc112c9a3fe Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 22:55:10 2011 +0200 Translation update done using Pootle. commit be0d2705d1a51fed2ecc3f0d46deffba2c2e916f Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 22:55:02 2011 +0200 Translation update done using Pootle. commit 1a471e9300d876425ecf9bd08d0f3074051335e6 Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 22:54:54 2011 +0200 Translation update done using Pootle. commit 68570a6cd9ff87d5eb7dda3dcfd5b2883e830f2c Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 22:54:43 2011 +0200 Translation update done using Pootle. commit f340a1b3d7b711c77df8fc3fe3c732a5d82cecee Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 22:54:38 2011 +0200 Translation update done using Pootle. commit 66cb1192f4eead4da4c61b8b987d727b81190d2d Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 22:52:25 2011 +0200 Translation update done using Pootle. commit 3cf80bb3267210f26e44876fc436057f4667ac20 Author: Domen <dbc334(a)gmail.com> Date: Sat Jan 1 22:52:22 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/sl.po | 39 +++++++++++++++++---------------------- 1 files changed, 17 insertions(+), 22 deletions(-) diff --git a/po/sl.po b/po/sl.po index 72399fa..0193dd5 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-29 08:42-0500\n" -"PO-Revision-Date: 2010-12-16 00:56+0200\n" +"PO-Revision-Date: 2011-01-01 22:58+0200\n" "Last-Translator: Domen <dbc334(a)gmail.com>\n" "Language-Team: slovenian <sl(a)li.org>\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sl\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3);\n" "X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:35 browse_foreigners.php:53 @@ -811,17 +811,16 @@ msgstr "Vnesite vsako vrednost v svoje polje." #: enum_editor.php:57 msgid "+ Restart insertion and add a new value" -msgstr "" +msgstr "+ Ponovno začni vstavljanje in dodaj novo vrednost" #: enum_editor.php:67 -#, fuzzy #| msgid "Output:" msgid "Output" -msgstr "Izhod:" +msgstr "Izhod" #: enum_editor.php:68 msgid "Copy and paste the joined values into the \"Length/Values\" field" -msgstr "" +msgstr "Kopiraj in prilepi združene vrednosti v polje \"Dolžina/Vrednosti\"" #: export.php:73 msgid "Selected export type has to be saved in file!" @@ -1107,13 +1106,12 @@ msgstr "Urejanje v vrstici" #: js/messages.php:89 msgid "Hide search criteria" -msgstr "" +msgstr "Skrij iskalne pogoje" #: js/messages.php:90 -#, fuzzy #| msgid "Show query chart" msgid "Show search criteria" -msgstr "Prikaži graf poizvedbe" +msgstr "Prikaži iskalne pogoje" #: js/messages.php:93 tbl_change.php:294 tbl_indexes.php:198 #: tbl_indexes.php:223 @@ -2099,7 +2097,7 @@ msgstr "Imenik, ki ste ga določili za nalaganje, je nedosegljiv" #: libraries/common.lib.php:2983 msgid "There are no files to upload" -msgstr "" +msgstr "Nobene datoteke ni za naložiti" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 @@ -5468,7 +5466,7 @@ msgid "" "(1,2,3)</code>" msgstr "" "vključi imena stolpcev v vsaki izjavi <code>INSERT</code><br />   " -"    Primer: <code>INSERT INTO ime_tabele (sto_A,sto_B,sto_C) " +"    Primer: <code>INSERT INTO ime_tabele (stolp_A,stolp_B,stolp_C) " "VALUES (1,2,3)</code>" #: libraries/export/sql.php:155 @@ -6571,10 +6569,9 @@ msgid "You have to add at least one column." msgstr "Dodati morate vsaj en stolpec." #: libraries/tbl_properties.inc.php:797 -#, fuzzy #| msgid "Add a new server" msgid "+ Add a new value" -msgstr "Dodaj nov strežnik" +msgstr "+ Dodaj novo vrednost" #: libraries/tbl_triggers.lib.php:28 msgid "Event" @@ -7091,7 +7088,7 @@ msgstr "Ustvari stran in izvozi nanjo" #: pmd_pdf.php:111 msgid "New page name: " -msgstr "Ime nove strani: " +msgstr "Ime nove strani: " #: pmd_pdf.php:114 msgid "Export/Import to scale" @@ -9655,24 +9652,22 @@ msgid "Browse distinct values" msgstr "Prebrskaj različne vrednosti" #: tbl_structure.php:165 tbl_structure.php:166 -#, fuzzy #| msgid "Adding Primary Key" msgid "Add primary key" -msgstr "Dodajanje primarnega ključa" +msgstr "Dodaj primarni ključ" #: tbl_structure.php:167 tbl_structure.php:168 -#, fuzzy #| msgid "Apply index(s)" msgid "Add index" -msgstr "Uveljavi indeks(e)" +msgstr "Dodaj indeks" #: tbl_structure.php:169 tbl_structure.php:170 msgid "Add unique index" -msgstr "" +msgstr "Dodaj izvirno vrednost" #: tbl_structure.php:171 tbl_structure.php:172 msgid "Add FULLTEXT index" -msgstr "" +msgstr "Dodaj indeks FULLTEXT" #: tbl_structure.php:384 msgctxt "None for default" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1384-gbc49e8b
by Marc Delisle 02 Jan '11

02 Jan '11

The branch, master has been updated via bc49e8b30b4ba594fe1498c7152c632972aa442b (commit) from b923bb3fbbb2260ddf2f3aeb5e580c037ff1e637 (commit) - Log ----------------------------------------------------------------- commit bc49e8b30b4ba594fe1498c7152c632972aa442b Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jan 2 08:10:07 2011 -0500 Incorrect linefeed inside span harms type detection ----------------------------------------------------------------------- Summary of changes: tbl_change.php | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tbl_change.php b/tbl_change.php index eff5ead..5724303 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -427,8 +427,7 @@ foreach ($rows as $row_id => $vrow) { <input type="hidden" name="fields_name<?php echo $field_name_appendix; ?>" value="<?php echo $field['Field_html']; ?>"/> </td> <?php if ($cfg['ShowFieldTypesInDataEditView']) { ?> - <td align="center"<?php echo $field['wrap']; ?>><span class="column_type"> - <?php echo $field['pma_type']; ?></span> + <td align="center"<?php echo $field['wrap']; ?>><span class="column_type"><?php echo $field['pma_type']; ?></span> </td> <?php } //End if hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1383-gb923bb3
by Marc Delisle 02 Jan '11

02 Jan '11

The branch, master has been updated via b923bb3fbbb2260ddf2f3aeb5e580c037ff1e637 (commit) from 6ebc1e413d419c73e1b9e025b063c507128dde2a (commit) - Log ----------------------------------------------------------------- commit b923bb3fbbb2260ddf2f3aeb5e580c037ff1e637 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jan 2 08:00:25 2011 -0500 Upgrade to jQuery 1.4.4 ----------------------------------------------------------------------- Summary of changes: db_search.php | 2 +- index.php | 2 +- js/jquery/{jquery-1.4.2.js => jquery-1.4.4.js} | 3125 +++++++++++++++--------- libraries/auth/cookie.auth.lib.php | 2 +- libraries/common.inc.php | 2 +- navigation.php | 2 +- pmd_general.php | 2 +- setup/index.php | 2 +- 8 files changed, 2039 insertions(+), 1100 deletions(-) rename js/jquery/{jquery-1.4.2.js => jquery-1.4.4.js} (68%) diff --git a/db_search.php b/db_search.php index 3defeb4..22415aa 100644 --- a/db_search.php +++ b/db_search.php @@ -37,7 +37,7 @@ */ require_once './libraries/common.inc.php'; -$GLOBALS['js_include'][] = 'jquery/jquery-1.4.2.js'; +$GLOBALS['js_include'][] = 'jquery/jquery-1.4.4.js'; $GLOBALS['js_include'][] = 'db_search.js'; /** diff --git a/index.php b/index.php index 16e13d0..644a123 100644 --- a/index.php +++ b/index.php @@ -152,7 +152,7 @@ header('Content-Type: text/html; charset=' . $GLOBALS['charset']); }; // ]]> </script> -<script src="./js/jquery/jquery-1.4.2.js" type="text/javascript"></script> +<script src="./js/jquery/jquery-1.4.4.js" type="text/javascript"></script> <script src="./js/update-location.js" type="text/javascript"></script> <script src="./js/common.js" type="text/javascript"></script> </head> diff --git a/js/jquery/jquery-1.4.2.js b/js/jquery/jquery-1.4.4.js similarity index 68% rename from js/jquery/jquery-1.4.2.js rename to js/jquery/jquery-1.4.4.js index fff6776..a4f1145 100644 --- a/js/jquery/jquery-1.4.2.js +++ b/js/jquery/jquery-1.4.4.js @@ -1,5 +1,5 @@ /*! - * jQuery JavaScript Library v1.4.2 + * jQuery JavaScript Library v1.4.4 * http://jquery.com/ * * Copyright 2010, John Resig @@ -11,10 +11,14 @@ * Copyright 2010, The Dojo Foundation * Released under the MIT, BSD, and GPL Licenses. * - * Date: Sat Feb 13 22:33:48 2010 -0500 + * Date: Thu Nov 11 19:04:53 2010 -0500 */ (function( window, undefined ) { +// Use the correct document accordingly with window argument (sandbox) +var document = window.document; +var jQuery = (function() { + // Define a local copy of jQuery var jQuery = function( selector, context ) { // The jQuery object is actually just the init constructor 'enhanced' @@ -27,28 +31,45 @@ var jQuery = function( selector, context ) { // Map over the $ in case of overwrite _$ = window.$, - // Use the correct document accordingly with window argument (sandbox) - document = window.document, - // A central reference to the root jQuery(document) rootjQuery, // A simple way to check for HTML strings or ID strings // (both of which we optimize for) - quickExpr = /^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/, + quickExpr = /^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/, // Is it a simple selector isSimple = /^.[^:#\[\.,]*$/, // Check if a string has a non-whitespace character in it rnotwhite = /\S/, + rwhite = /\s/, // Used for trimming whitespace - rtrim = /^(\s|\u00A0)+|(\s|\u00A0)+$/g, + trimLeft = /^\s+/, + trimRight = /\s+$/, + + // Check for non-word characters + rnonword = /\W/, + + // Check for digits + rdigit = /\d/, // Match a standalone tag rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/, + // JSON RegExp + rvalidchars = /^[\],:{}\s]*$/, + rvalidescape = /\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, + rvalidtokens = /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, + rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g, + + // Useragent RegExp + rwebkit = /(webkit)[ \/]([\w.]+)/, + ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/, + rmsie = /(msie) ([\w.]+)/, + rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/, + // Keep a UserAgent string for use with jQuery.browser userAgent = navigator.userAgent, @@ -66,10 +87,14 @@ var jQuery = function( selector, context ) { // Save a reference to some core methods toString = Object.prototype.toString, - hasOwnProperty = Object.prototype.hasOwnProperty, + hasOwn = Object.prototype.hasOwnProperty, push = Array.prototype.push, slice = Array.prototype.slice, - indexOf = Array.prototype.indexOf; + trim = String.prototype.trim, + indexOf = Array.prototype.indexOf, + + // [[Class]] -> type pairs + class2type = {}; jQuery.fn = jQuery.prototype = { init: function( selector, context ) { @@ -88,7 +113,7 @@ jQuery.fn = jQuery.prototype = { } // The body element only exists once, optimize finding it - if ( selector === "body" && !context ) { + if ( selector === "body" && !context && document.body ) { this.context = document; this[0] = document.body; this.selector = "body"; @@ -122,7 +147,7 @@ jQuery.fn = jQuery.prototype = { } } else { - ret = buildFragment( [ match[1] ], [ doc ] ); + ret = jQuery.buildFragment( [ match[1] ], [ doc ] ); selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes; } @@ -132,7 +157,9 @@ jQuery.fn = jQuery.prototype = { } else { elem = document.getElementById( match[2] ); - if ( elem ) { + // Check parentNode to catch when Blackberry 4.6 returns + // nodes that are no longer in the document #6963 + if ( elem && elem.parentNode ) { // Handle the case where IE and Opera return items // by name instead of ID if ( elem.id !== match[2] ) { @@ -150,7 +177,7 @@ jQuery.fn = jQuery.prototype = { } // HANDLE: $("TAG") - } else if ( !context && /^\w+$/.test( selector ) ) { + } else if ( !context && !rnonword.test( selector ) ) { this.selector = selector; this.context = document; selector = document.getElementsByTagName( selector ); @@ -184,7 +211,7 @@ jQuery.fn = jQuery.prototype = { selector: "", // The current version of jQuery being used - jquery: "1.4.2", + jquery: "1.4.4", // The default length of a jQuery object is 0 length: 0, @@ -303,8 +330,11 @@ jQuery.fn = jQuery.prototype = { jQuery.fn.init.prototype = jQuery.fn; jQuery.extend = jQuery.fn.extend = function() { - // copy reference to target object - var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options, name, src, copy; + var options, name, src, copy, copyIsArray, clone, + target = arguments[0] || {}, + i = 1, + length = arguments.length, + deep = false; // Handle a deep copy situation if ( typeof target === "boolean" ) { @@ -338,10 +368,15 @@ jQuery.extend = jQuery.fn.extend = function() { continue; } - // Recurse if we're merging object literal values or arrays - if ( deep && copy && ( jQuery.isPlainObject(copy) || jQuery.isArray(copy) ) ) { - var clone = src && ( jQuery.isPlainObject(src) || jQuery.isArray(src) ) ? src - : jQuery.isArray(copy) ? [] : {}; + // Recurse if we're merging plain objects or arrays + if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) { + if ( copyIsArray ) { + copyIsArray = false; + clone = src && jQuery.isArray(src) ? src : []; + + } else { + clone = src && jQuery.isPlainObject(src) ? src : {}; + } // Never move original objects, clone them target[ name ] = jQuery.extend( deep, clone, copy ); @@ -371,34 +406,51 @@ jQuery.extend({ // Is the DOM ready to be used? Set to true once it occurs. isReady: false, + + // A counter to track how many items to wait for before + // the ready event fires. See #6781 + readyWait: 1, // Handle when the DOM is ready - ready: function() { + ready: function( wait ) { + // A third-party is pushing the ready event forwards + if ( wait === true ) { + jQuery.readyWait--; + } + // Make sure that the DOM is not already loaded - if ( !jQuery.isReady ) { + if ( !jQuery.readyWait || (wait !== true && !jQuery.isReady) ) { // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443). if ( !document.body ) { - return setTimeout( jQuery.ready, 13 ); + return setTimeout( jQuery.ready, 1 ); } // Remember that the DOM is ready jQuery.isReady = true; + // If a normal DOM Ready event fired, decrement, and wait if need be + if ( wait !== true && --jQuery.readyWait > 0 ) { + return; + } + // If there are functions bound, to execute if ( readyList ) { // Execute all of them - var fn, i = 0; - while ( (fn = readyList[ i++ ]) ) { - fn.call( document, jQuery ); - } + var fn, + i = 0, + ready = readyList; // Reset the list of functions readyList = null; - } - // Trigger any bound ready events - if ( jQuery.fn.triggerHandler ) { - jQuery( document ).triggerHandler( "ready" ); + while ( (fn = ready[ i++ ]) ) { + fn.call( document, jQuery ); + } + + // Trigger any bound ready events + if ( jQuery.fn.trigger ) { + jQuery( document ).trigger( "ready" ).unbind( "ready" ); + } } } }, @@ -413,7 +465,8 @@ jQuery.extend({ // Catch cases where $(document).ready() is called after the // browser event has already occurred. if ( document.readyState === "complete" ) { - return jQuery.ready(); + // Handle it asynchronously to allow scripts the opportunity to delay ready + return setTimeout( jQuery.ready, 1 ); } // Mozilla, Opera and webkit nightlies currently support this event @@ -451,25 +504,40 @@ jQuery.extend({ // Since version 1.3, DOM methods and functions like alert // aren't supported. They return false on IE (#2968). isFunction: function( obj ) { - return toString.call(obj) === "[object Function]"; + return jQuery.type(obj) === "function"; + }, + + isArray: Array.isArray || function( obj ) { + 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; + }, + + isNaN: function( obj ) { + return obj == null || !rdigit.test( obj ) || isNaN( obj ); }, - isArray: function( obj ) { - return toString.call(obj) === "[object Array]"; + type: function( obj ) { + return obj == null ? + String( obj ) : + class2type[ toString.call(obj) ] || "object"; }, isPlainObject: function( obj ) { // Must be an Object. // Because of IE, we also have to check the presence of the constructor property. // Make sure that DOM nodes and window objects don't pass through, as well - if ( !obj || toString.call(obj) !== "[object Object]" || obj.nodeType || obj.setInterval ) { + if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) { return false; } // Not own constructor property must be Object - if ( obj.constructor - && !hasOwnProperty.call(obj, "constructor") - && !hasOwnProperty.call(obj.constructor.prototype, "isPrototypeOf") ) { + if ( obj.constructor && + !hasOwn.call(obj, "constructor") && + !hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) { return false; } @@ -479,7 +547,7 @@ jQuery.extend({ var key; for ( key in obj ) {} - return key === undefined || hasOwnProperty.call( obj, key ); + return key === undefined || hasOwn.call( obj, key ); }, isEmptyObject: function( obj ) { @@ -503,9 +571,9 @@ jQuery.extend({ // Make sure the incoming data is actual JSON // Logic borrowed from http://json.org/json2.js - if ( /^[\],:{}\s]*$/.test(data.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, "@") - .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, "]") - .replace(/(?:^|:|,)(?:\s*\[)+/g, "")) ) { + if ( rvalidchars.test(data.replace(rvalidescape, "@") + .replace(rvalidtokens, "]") + .replace(rvalidbraces, "")) ) { // Try to use the native JSON parser first return window.JSON && window.JSON.parse ? @@ -584,9 +652,20 @@ jQuery.extend({ return object; }, - trim: function( text ) { - return (text || "").replace( rtrim, "" ); - }, + // Use native String.trim function wherever possible + trim: trim ? + function( text ) { + return text == null ? + "" : + trim.call( text ); + } : + + // Otherwise use our own trimming functionality + function( text ) { + return text == null ? + "" : + text.toString().replace( trimLeft, "" ).replace( trimRight, "" ); + }, // results is for internal usage only makeArray: function( array, results ) { @@ -596,7 +675,10 @@ jQuery.extend({ // The window, strings (and functions) also have 'length' // The extra typeof function check is to prevent crashes // in Safari 2 (See: #3039) - if ( array.length == null || typeof array === "string" || jQuery.isFunction(array) || (typeof array !== "function" && array.setInterval) ) { + // Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930 + var type = jQuery.type(array); + + if ( array.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( array ) ) { push.call( ret, array ); } else { jQuery.merge( ret, array ); @@ -621,7 +703,8 @@ jQuery.extend({ }, merge: function( first, second ) { - var i = first.length, j = 0; + var i = first.length, + j = 0; if ( typeof second.length === "number" ) { for ( var l = second.length; j < l; j++ ) { @@ -640,12 +723,14 @@ jQuery.extend({ }, grep: function( elems, callback, inv ) { - var ret = []; + var ret = [], retVal; + inv = !!inv; // Go through the array, only saving the items // that pass the validator function for ( var i = 0, length = elems.length; i < length; i++ ) { - if ( !inv !== !callback( elems[ i ], i ) ) { + retVal = !!callback( elems[ i ], i ); + if ( inv !== retVal ) { ret.push( elems[ i ] ); } } @@ -701,16 +786,49 @@ jQuery.extend({ return proxy; }, + // Mutifunctional method to get and set values to a collection + // The value/s can be optionally by executed if its a function + access: function( elems, key, value, exec, fn, pass ) { + var length = elems.length; + + // Setting many attributes + if ( typeof key === "object" ) { + for ( var k in key ) { + jQuery.access( elems, k, key[k], exec, fn, value ); + } + return elems; + } + + // Setting one attribute + if ( value !== undefined ) { + // Optionally, function values get executed if exec is true + exec = !pass && exec && 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 ); + } + + return elems; + } + + // Getting an attribute + return length ? fn( elems[0], key ) : undefined; + }, + + now: function() { + return (new Date()).getTime(); + }, + // Use of jQuery.browser is frowned upon. // More details: http://docs.jquery.com/Utilities/jQuery.browser uaMatch: function( ua ) { ua = ua.toLowerCase(); - var match = /(webkit)[ \/]([\w.]+)/.exec( ua ) || - /(opera)(?:.*version)?[ \/]([\w.]+)/.exec( ua ) || - /(msie) ([\w.]+)/.exec( ua ) || - !/compatible/.test( ua ) && /(mozilla)(?:.*? rv:([\w.]+))?/.exec( ua ) || - []; + var match = rwebkit.exec( ua ) || + ropera.exec( ua ) || + rmsie.exec( ua ) || + ua.indexOf("compatible") < 0 && rmozilla.exec( ua ) || + []; return { browser: match[1] || "", version: match[2] || "0" }; }, @@ -718,6 +836,11 @@ jQuery.extend({ browser: {} }); +// Populate the class2type map +jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) { + class2type[ "[object " + name + "]" ] = name.toLowerCase(); +}); + browserMatch = jQuery.uaMatch( userAgent ); if ( browserMatch.browser ) { jQuery.browser[ browserMatch.browser ] = true; @@ -735,6 +858,13 @@ if ( indexOf ) { }; } +// Verify that \s matches non-breaking spaces +// (IE fails on this test) +if ( !rwhite.test( "\xA0" ) ) { + trimLeft = /^[\s\xA0]+/; + trimRight = /[\s\xA0]+$/; +} + // All jQuery objects should point back to these rootjQuery = jQuery(document); @@ -765,7 +895,7 @@ function doScrollCheck() { // If IE is used, use the trick by Diego Perini // http://javascript.nwbox.com/IEContentLoaded/ document.documentElement.doScroll("left"); - } catch( error ) { + } catch(e) { setTimeout( doScrollCheck, 1 ); return; } @@ -774,54 +904,12 @@ function doScrollCheck() { jQuery.ready(); } -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 || "" ); - } +// Expose jQuery to the global object +return (window.jQuery = window.$ = jQuery); - if ( elem.parentNode ) { - elem.parentNode.removeChild( elem ); - } -} +})(); -// Mutifunctional method to get and set values to a collection -// The value/s can be optionally by executed if its a function -function access( elems, key, value, exec, fn, pass ) { - var length = elems.length; - - // Setting many attributes - if ( typeof key === "object" ) { - for ( var k in key ) { - access( elems, k, key[k], exec, fn, value ); - } - return elems; - } - - // Setting one attribute - if ( value !== undefined ) { - // Optionally, function values get executed if exec is true - exec = !pass && exec && 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 ); - } - - return elems; - } - - // Getting an attribute - return length ? fn( elems[0], key ) : undefined; -} -function now() { - return (new Date).getTime(); -} (function() { jQuery.support = {}; @@ -829,13 +917,15 @@ function now() { var root = document.documentElement, script = document.createElement("script"), div = document.createElement("div"), - id = "script" + now(); + id = "script" + jQuery.now(); div.style.display = "none"; div.innerHTML = " <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>"; var all = div.getElementsByTagName("*"), - a = div.getElementsByTagName("a")[0]; + a = div.getElementsByTagName("a")[0], + select = document.createElement("select"), + opt = select.appendChild( document.createElement("option") ); // Can't get basic test support if ( !all || !all.length || !a ) { @@ -878,18 +968,25 @@ function now() { // Make sure that a selected-by-default option has a working selected property. // (WebKit defaults to false instead of true, IE too, if it's in an optgroup) - optSelected: document.createElement("select").appendChild( document.createElement("option") ).selected, - - parentNode: div.removeChild( div.appendChild( document.createElement("div") ) ).parentNode === null, + optSelected: opt.selected, // Will be defined later deleteExpando: true, + optDisabled: false, checkClone: false, scriptEval: false, noCloneEvent: true, - boxModel: null + boxModel: null, + inlineBlockNeedsLayout: false, + shrinkWrapBlocks: false, + reliableHiddenOffsets: true }; + // Make sure that the options inside disabled selects aren't marked as disabled + // (WebKit marks them as diabled) + select.disabled = true; + jQuery.support.optDisabled = !opt.disabled; + script.type = "text/javascript"; try { script.appendChild( document.createTextNode( "window." + id + "=1;" ) ); @@ -909,7 +1006,7 @@ function now() { // Fails in Internet Explorer try { delete script.test; - + } catch(e) { jQuery.support.deleteExpando = false; } @@ -943,27 +1040,63 @@ function now() { document.body.appendChild( div ); jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2; - document.body.removeChild( div ).style.display = 'none'; - div = null; + 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; + jQuery.support.inlineBlockNeedsLayout = div.offsetWidth === 2; + + // Check if elements with layout shrink-wrap their children + // (IE 6 does this) + div.style.display = ""; + div.innerHTML = "<div style='width:4px;'></div>"; + jQuery.support.shrinkWrapBlocks = div.offsetWidth !== 2; + } + + div.innerHTML = "<table><tr><td style='padding:0;display:none'></td><td>t</td></tr></table>"; + var 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) + jQuery.support.reliableHiddenOffsets = 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) + jQuery.support.reliableHiddenOffsets = jQuery.support.reliableHiddenOffsets && tds[0].offsetHeight === 0; + div.innerHTML = ""; + + document.body.removeChild( div ).style.display = "none"; + div = tds = null; }); // Technique from Juriy Zaytsev // http://thinkweb2.com/projects/prototype/detecting-event-support-without-bro… - var eventSupported = function( eventName ) { - var el = document.createElement("div"); - eventName = "on" + eventName; - - var isSupported = (eventName in el); - if ( !isSupported ) { - el.setAttribute(eventName, "return;"); - isSupported = typeof el[eventName] === "function"; - } - el = null; - - return isSupported; + var eventSupported = function( eventName ) { + var el = document.createElement("div"); + eventName = "on" + eventName; + + var isSupported = (eventName in el); + if ( !isSupported ) { + el.setAttribute(eventName, "return;"); + isSupported = typeof el[eventName] === "function"; + } + el = null; + + return isSupported; }; - + jQuery.support.submitBubbles = eventSupported("submit"); jQuery.support.changeBubbles = eventSupported("change"); @@ -971,35 +1104,31 @@ function now() { root = script = div = all = a = null; })(); -jQuery.props = { - "for": "htmlFor", - "class": "className", - readonly: "readOnly", - maxlength: "maxLength", - cellspacing: "cellSpacing", - rowspan: "rowSpan", - colspan: "colSpan", - tabindex: "tabIndex", - usemap: "useMap", - frameborder: "frameBorder" -}; -var expando = "jQuery" + now(), uuid = 0, windowData = {}; + + +var windowData = {}, + rbrace = /^(?:\{.*\}|\[.*\])$/; jQuery.extend({ cache: {}, - - expando:expando, + + // Please use with caution + uuid: 0, + + // Unique for each copy of jQuery on the page + expando: "jQuery" + jQuery.now(), // The following elements throw uncatchable exceptions if you // attempt to add expando properties to them. noData: { "embed": true, - "object": true, + // Ban all objects except for Flash (which handle expandos) + "object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000", "applet": true }, data: function( elem, name, data ) { - if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) { + if ( !jQuery.acceptData( elem ) ) { return; } @@ -1007,29 +1136,38 @@ jQuery.extend({ windowData : elem; - var id = elem[ expando ], cache = jQuery.cache, thisCache; + var isNode = elem.nodeType, + id = isNode ? elem[ jQuery.expando ] : null, + cache = jQuery.cache, thisCache; - if ( !id && typeof name === "string" && data === undefined ) { - return null; + if ( isNode && !id && typeof name === "string" && data === undefined ) { + return; } + // Get the data from the object directly + if ( !isNode ) { + cache = elem; + // Compute a unique ID for the element - if ( !id ) { - id = ++uuid; + } else if ( !id ) { + elem[ jQuery.expando ] = id = ++jQuery.uuid; } // Avoid generating a new cache unless none exists and we // want to manipulate it. if ( typeof name === "object" ) { - elem[ expando ] = id; - thisCache = cache[ id ] = jQuery.extend(true, {}, name); + if ( isNode ) { + cache[ id ] = jQuery.extend(cache[ id ], name); + + } else { + jQuery.extend( cache, name ); + } - } else if ( !cache[ id ] ) { - elem[ expando ] = id; + } else if ( isNode && !cache[ id ] ) { cache[ id ] = {}; } - thisCache = cache[ id ]; + thisCache = isNode ? cache[ id ] : cache; // Prevent overriding the named cache with undefined values if ( data !== undefined ) { @@ -1040,7 +1178,7 @@ jQuery.extend({ }, removeData: function( elem, name ) { - if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) { + if ( !jQuery.acceptData( elem ) ) { return; } @@ -1048,7 +1186,10 @@ jQuery.extend({ windowData : elem; - var id = elem[ expando ], cache = jQuery.cache, thisCache = cache[ id ]; + var isNode = elem.nodeType, + id = isNode ? elem[ jQuery.expando ] : elem, + cache = jQuery.cache, + thisCache = isNode ? cache[ id ] : id; // If we want to remove a specific section of the element's data if ( name ) { @@ -1057,30 +1198,66 @@ jQuery.extend({ delete thisCache[ name ]; // If we've removed all the data, remove the element's cache - if ( jQuery.isEmptyObject(thisCache) ) { + if ( isNode && jQuery.isEmptyObject(thisCache) ) { jQuery.removeData( elem ); } } // Otherwise, we want to remove all of the element's data } else { - if ( jQuery.support.deleteExpando ) { + if ( isNode && jQuery.support.deleteExpando ) { delete elem[ jQuery.expando ]; } else if ( elem.removeAttribute ) { elem.removeAttribute( jQuery.expando ); - } // Completely remove the data cache - delete cache[ id ]; + } else if ( isNode ) { + delete cache[ id ]; + + // Remove all fields from the object + } else { + for ( var n in elem ) { + delete elem[ n ]; + } + } } + }, + + // A method for determining if a DOM node can handle the data expando + acceptData: function( elem ) { + if ( elem.nodeName ) { + var match = jQuery.noData[ elem.nodeName.toLowerCase() ]; + + if ( match ) { + return !(match === true || elem.getAttribute("classid") !== match); + } + } + + return true; } }); jQuery.fn.extend({ data: function( key, value ) { - if ( typeof key === "undefined" && this.length ) { - return jQuery.data( this[0] ); + var data = null; + + if ( typeof key === "undefined" ) { + if ( this.length ) { + var attr = this[0].attributes, name; + data = jQuery.data( this[0] ); + + for ( var i = 0, l = attr.length; i < l; i++ ) { + name = attr[i].name; + + if ( name.indexOf( "data-" ) === 0 ) { + name = name.substr( 5 ); + dataAttr( this[0], name, data[ name ] ); + } + } + } + + return data; } else if ( typeof key === "object" ) { return this.each(function() { @@ -1092,17 +1269,26 @@ jQuery.fn.extend({ parts[1] = parts[1] ? "." + parts[1] : ""; if ( value === undefined ) { - var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]); + data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]); + // 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 ); } + return data === undefined && parts[1] ? this.data( parts[0] ) : data; + } else { - return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function() { + return this.each(function() { + var $this = jQuery( this ), + args = [ parts[0], value ]; + + $this.triggerHandler( "setData" + parts[1] + "!", args ); jQuery.data( this, key, value ); + $this.triggerHandler( "changeData" + parts[1] + "!", args ); }); } }, @@ -1113,6 +1299,37 @@ jQuery.fn.extend({ }); } }); + +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 ) { + data = elem.getAttribute( "data-" + key ); + + if ( typeof data === "string" ) { + try { + data = data === "true" ? true : + data === "false" ? false : + data === "null" ? null : + !jQuery.isNaN( data ) ? parseFloat( data ) : + rbrace.test( data ) ? jQuery.parseJSON( data ) : + data; + } catch( e ) {} + + // Make sure we set the data so it isn't changed later + jQuery.data( elem, key, data ); + + } else { + data = undefined; + } + } + + return data; +} + + + + jQuery.extend({ queue: function( elem, type, data ) { if ( !elem ) { @@ -1140,7 +1357,8 @@ jQuery.extend({ dequeue: function( elem, type ) { type = type || "fx"; - var queue = jQuery.queue( elem, type ), fn = queue.shift(); + var queue = jQuery.queue( elem, type ), + fn = queue.shift(); // If the fx queue is dequeued, always remove the progress sentinel if ( fn === "inprogress" ) { @@ -1171,7 +1389,7 @@ jQuery.fn.extend({ if ( data === undefined ) { return jQuery.queue( this[0], type ); } - return this.each(function( i, elem ) { + return this.each(function( i ) { var queue = jQuery.queue( this, type, data ); if ( type === "fx" && queue[0] !== "inprogress" ) { @@ -1203,18 +1421,35 @@ jQuery.fn.extend({ return this.queue( type || "fx", [] ); } }); + + + + var rclass = /[\n\t]/g, - rspace = /\s+/, + rspaces = /\s+/, rreturn = /\r/g, - rspecialurl = /href|src|style/, - rtype = /(button|input)/i, - rfocusable = /(button|input|object|select|textarea)/i, - rclickable = /^(a|area)$/i, - rradiocheck = /radio|checkbox/; + rspecialurl = /^(?:href|src|style)$/, + rtype = /^(?:button|input)$/i, + rfocusable = /^(?:button|input|object|select|textarea)$/i, + rclickable = /^a(?:rea)?$/i, + rradiocheck = /^(?:radio|checkbox)$/i; + +jQuery.props = { + "for": "htmlFor", + "class": "className", + readonly: "readOnly", + maxlength: "maxLength", + cellspacing: "cellSpacing", + rowspan: "rowSpan", + colspan: "colSpan", + tabindex: "tabIndex", + usemap: "useMap", + frameborder: "frameBorder" +}; jQuery.fn.extend({ attr: function( name, value ) { - return access( this, name, value, true, jQuery.attr ); + return jQuery.access( this, name, value, true, jQuery.attr ); }, removeAttr: function( name, fn ) { @@ -1235,7 +1470,7 @@ jQuery.fn.extend({ } if ( value && typeof value === "string" ) { - var classNames = (value || "").split( rspace ); + var classNames = (value || "").split( rspaces ); for ( var i = 0, l = this.length; i < l; i++ ) { var elem = this[i]; @@ -1245,7 +1480,9 @@ jQuery.fn.extend({ elem.className = value; } else { - var className = " " + elem.className + " ", setClass = elem.className; + var className = " " + elem.className + " ", + setClass = elem.className; + for ( var c = 0, cl = classNames.length; c < cl; c++ ) { if ( className.indexOf( " " + classNames[c] + " " ) < 0 ) { setClass += " " + classNames[c]; @@ -1269,7 +1506,7 @@ jQuery.fn.extend({ } if ( (value && typeof value === "string") || value === undefined ) { - var classNames = (value || "").split(rspace); + var classNames = (value || "").split( rspaces ); for ( var i = 0, l = this.length; i < l; i++ ) { var elem = this[i]; @@ -1293,7 +1530,8 @@ jQuery.fn.extend({ }, toggleClass: function( value, stateVal ) { - var type = typeof value, isBool = typeof stateVal === "boolean"; + var type = typeof value, + isBool = typeof stateVal === "boolean"; if ( jQuery.isFunction( value ) ) { return this.each(function(i) { @@ -1305,9 +1543,11 @@ jQuery.fn.extend({ return this.each(function() { if ( type === "string" ) { // toggle individual class names - var className, i = 0, self = jQuery(this), + var className, + i = 0, + self = jQuery( this ), state = stateVal, - classNames = value.split( rspace ); + classNames = value.split( rspaces ); while ( (className = classNames[ i++ ]) ) { // check each className given, space seperated list @@ -1339,12 +1579,15 @@ jQuery.fn.extend({ }, val: function( value ) { - if ( value === undefined ) { + if ( !arguments.length ) { var elem = this[0]; if ( elem ) { if ( jQuery.nodeName( elem, "option" ) ) { - return (elem.attributes.value || {}).specified ? elem.value : elem.text; + // attributes.value is undefined in Blackberry 4.7 but + // uses .value. See #6932 + var val = elem.attributes.value; + return !val || val.specified ? elem.value : elem.text; } // We need to handle select boxes special @@ -1363,8 +1606,11 @@ jQuery.fn.extend({ for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) { var option = options[ i ]; - if ( option.selected ) { - // Get the specifc value for the option + // Don't return options that are disabled or in a disabled optgroup + if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) && + (!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) { + + // Get the specific value for the option value = jQuery(option).val(); // We don't need an array for one selects @@ -1407,10 +1653,15 @@ jQuery.fn.extend({ val = value.call(this, i, self.val()); } - // Typecast each time if the value is a Function and the appended - // value is therefore different each time. - if ( typeof val === "number" ) { + // Treat null/undefined as ""; convert numbers to string + if ( val == null ) { + val = ""; + } else if ( typeof val === "number" ) { val += ""; + } else if ( jQuery.isArray(val) ) { + val = jQuery.map(val, function (value) { + return value == null ? "" : value + ""; + }); } if ( jQuery.isArray(val) && rradiocheck.test( this.type ) ) { @@ -1463,89 +1714,103 @@ jQuery.extend({ // Try to normalize/fix the name name = notxml && jQuery.props[ name ] || name; - // Only do all the following if this is a node (faster for style) - if ( elem.nodeType === 1 ) { - // These attributes require special treatment - var special = rspecialurl.test( name ); - - // Safari mis-reports the default selected property of an option - // Accessing the parent's selectedIndex property fixes it - if ( name === "selected" && !jQuery.support.optSelected ) { - var parent = elem.parentNode; - if ( parent ) { - parent.selectedIndex; - - // Make sure that it also works with optgroups, see #5701 - if ( parent.parentNode ) { - parent.parentNode.selectedIndex; - } - } - } + // These attributes require special treatment + var special = rspecialurl.test( name ); - // If applicable, access the attribute via the DOM 0 way - if ( name in elem && notxml && !special ) { - if ( set ) { - // We can't allow the type property to be changed (since it causes problems in IE) - if ( name === "type" && rtype.test( elem.nodeName ) && elem.parentNode ) { - jQuery.error( "type property can't be changed" ); - } + // Safari mis-reports the default selected property of an option + // Accessing the parent's selectedIndex property fixes it + if ( name === "selected" && !jQuery.support.optSelected ) { + var parent = elem.parentNode; + if ( parent ) { + parent.selectedIndex; - elem[ name ] = value; + // Make sure that it also works with optgroups, see #5701 + if ( parent.parentNode ) { + parent.parentNode.selectedIndex; } + } + } - // browsers index elements by id/name on forms, give priority to attributes. - if ( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) ) { - return elem.getAttributeNode( name ).nodeValue; + // If applicable, access the attribute via the DOM 0 way + // 'in' checks fail in Blackberry 4.7 #6931 + if ( (name in elem || elem[ name ] !== undefined) && notxml && !special ) { + if ( set ) { + // We can't allow the type property to be changed (since it causes problems in IE) + if ( name === "type" && rtype.test( elem.nodeName ) && elem.parentNode ) { + jQuery.error( "type property can't be changed" ); } - // 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-tabind… - if ( name === "tabIndex" ) { - var attributeNode = elem.getAttributeNode( "tabIndex" ); + if ( value === null ) { + if ( elem.nodeType === 1 ) { + elem.removeAttribute( name ); + } - return attributeNode && attributeNode.specified ? - attributeNode.value : - rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ? - 0 : - undefined; + } else { + elem[ name ] = value; } + } - return elem[ name ]; + // browsers index elements by id/name on forms, give priority to attributes. + if ( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) ) { + return elem.getAttributeNode( name ).nodeValue; } - if ( !jQuery.support.style && notxml && name === "style" ) { - if ( set ) { - elem.style.cssText = "" + value; - } + // 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-tabind… + if ( name === "tabIndex" ) { + var attributeNode = elem.getAttributeNode( "tabIndex" ); - return elem.style.cssText; + return attributeNode && attributeNode.specified ? + attributeNode.value : + rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ? + 0 : + undefined; } + return elem[ name ]; + } + + if ( !jQuery.support.style && notxml && name === "style" ) { if ( set ) { - // convert the value to a string (all browsers do this but IE) see #1070 - elem.setAttribute( name, "" + value ); + elem.style.cssText = "" + value; } - var attr = !jQuery.support.hrefNormalized && notxml && special ? - // Some attributes require a special call on IE - elem.getAttribute( name, 2 ) : - elem.getAttribute( name ); + return elem.style.cssText; + } + + if ( set ) { + // convert the value to a string (all browsers do this but IE) see #1070 + elem.setAttribute( name, "" + value ); + } - // Non-existent attributes return null, we normalize to undefined - return attr === null ? undefined : attr; + // Ensure that missing attributes return undefined + // Blackberry 4.7 returns "" from getAttribute #6938 + if ( !elem.attributes[ name ] && (elem.hasAttribute && !elem.hasAttribute( name )) ) { + return undefined; } - // elem is actually elem.style ... set the style - // Using attr for specific style information is now deprecated. Use style instead. - return jQuery.style( elem, name, value ); + var attr = !jQuery.support.hrefNormalized && notxml && special ? + // Some attributes require a special call on IE + elem.getAttribute( name, 2 ) : + elem.getAttribute( name ); + + // Non-existent attributes return null, we normalize to undefined + return attr === null ? undefined : attr; } }); + + + + var rnamespaces = /\.(.*)$/, + rformElems = /^(?:textarea|input|select)$/i, + rperiod = /\./g, + rspace = / /g, + rescape = /[^\w\s.|`]/g, fcleanup = function( nm ) { - return nm.replace(/[^\w\s\.\|`]/g, function( ch ) { - return "\\" + ch; - }); - }; + return nm.replace(rescape, "\\$&"); + }, + focusCounts = { focusin: 0, focusout: 0 }; /* * A number of helper functions used for managing events. @@ -1563,10 +1828,17 @@ jQuery.event = { // For whatever reason, IE has trouble passing the window object // around, causing it to be cloned in the process - if ( elem.setInterval && ( elem !== window && !elem.frameElement ) ) { + if ( jQuery.isWindow( elem ) && ( elem !== window && !elem.frameElement ) ) { elem = window; } + if ( handler === false ) { + handler = returnFalse; + } else if ( !handler ) { + // Fixes bug #7229. Fix recommended by jdalton + return; + } + var handleObjIn, handleObj; if ( handler.handler ) { @@ -1588,8 +1860,28 @@ jQuery.event = { return; } - var events = elemData.events = elemData.events || {}, - eventHandle = elemData.handle, eventHandle; + // Use a key less likely to result in collisions for plain JS objects. + // Fixes bug #7150. + var eventKey = elem.nodeType ? "events" : "__events__", + events = elemData[ eventKey ], + eventHandle = elemData.handle; + + if ( typeof events === "function" ) { + // On plain objects events is a fn that holds the the data + // which prevents this data from being JSON serialized + // the function does not need to be called, it just contains the data + eventHandle = events.handle; + events = events.events; + + } else if ( !events ) { + if ( !elem.nodeType ) { + // On plain objects, create a fn that acts as the holder + // of the values to avoid JSON serialization of event data + elemData[ eventKey ] = elemData = function(){}; + } + + elemData.events = events = {}; + } if ( !eventHandle ) { elemData.handle = eventHandle = function() { @@ -1628,7 +1920,9 @@ jQuery.event = { } handleObj.type = type; - handleObj.guid = handler.guid; + if ( !handleObj.guid ) { + handleObj.guid = handler.guid; + } // Get the current list of functions bound to this event var handlers = events[ type ], @@ -1680,13 +1974,23 @@ jQuery.event = { return; } - var ret, type, fn, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType, + if ( handler === false ) { + handler = returnFalse; + } + + var ret, type, fn, j, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType, + eventKey = elem.nodeType ? "events" : "__events__", elemData = jQuery.data( elem ), - events = elemData && elemData.events; + events = elemData && elemData[ eventKey ]; if ( !elemData || !events ) { return; } + + if ( typeof events === "function" ) { + elemData = events; + events = events.events; + } // types is actually an event object here if ( types && types.type ) { @@ -1721,7 +2025,7 @@ jQuery.event = { type = namespaces.shift(); namespace = new RegExp("(^|\\.)" + - jQuery.map( namespaces.slice(0).sort(), fcleanup ).join("\\.(?:.*\\.)?") + "(\\.|$)") + jQuery.map( namespaces.slice(0).sort(), fcleanup ).join("\\.(?:.*\\.)?") + "(\\.|$)"); } eventType = events[ type ]; @@ -1731,7 +2035,7 @@ jQuery.event = { } if ( !handler ) { - for ( var j = 0; j < eventType.length; j++ ) { + for ( j = 0; j < eventType.length; j++ ) { handleObj = eventType[ j ]; if ( all || namespace.test( handleObj.namespace ) ) { @@ -1745,7 +2049,7 @@ jQuery.event = { special = jQuery.event.special[ type ] || {}; - for ( var j = pos || 0; j < eventType.length; j++ ) { + for ( j = pos || 0; j < eventType.length; j++ ) { handleObj = eventType[ j ]; if ( handler.guid === handleObj.guid ) { @@ -1769,7 +2073,7 @@ jQuery.event = { // remove generic event handler if no more handlers exist if ( eventType.length === 0 || pos != null && eventType.length === 1 ) { if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) { - removeEvent( elem, type, elemData.handle ); + jQuery.removeEvent( elem, type, elemData.handle ); } ret = null; @@ -1787,7 +2091,10 @@ jQuery.event = { delete elemData.events; delete elemData.handle; - if ( jQuery.isEmptyObject( elemData ) ) { + if ( typeof elemData === "function" ) { + jQuery.removeData( elem, eventKey ); + + } else if ( jQuery.isEmptyObject( elemData ) ) { jQuery.removeData( elem ); } } @@ -1802,7 +2109,7 @@ jQuery.event = { if ( !bubbling ) { event = typeof event === "object" ? // jQuery.Event object - event[expando] ? event : + event[ jQuery.expando ] ? event : // Object literal jQuery.extend( jQuery.Event(type), event ) : // Just the event type (string) @@ -1847,7 +2154,10 @@ jQuery.event = { event.currentTarget = elem; // Trigger the event, it is assumed that "handle" is a function - var handle = jQuery.data( elem, "handle" ); + var handle = elem.nodeType ? + jQuery.data( elem, "handle" ) : + (jQuery.data( elem, "__events__" ) || {}).handle; + if ( handle ) { handle.apply( elem, data ); } @@ -1859,41 +2169,44 @@ jQuery.event = { if ( !(elem && elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()]) ) { if ( elem[ "on" + type ] && elem[ "on" + type ].apply( elem, data ) === false ) { event.result = false; + event.preventDefault(); } } // prevent IE from throwing an error for some elements with some event types, see #3533 - } catch (e) {} + } catch (inlineError) {} if ( !event.isPropagationStopped() && parent ) { jQuery.event.trigger( event, data, parent, true ); } else if ( !event.isDefaultPrevented() ) { - var target = event.target, old, - isClick = jQuery.nodeName(target, "a") && type === "click", - special = jQuery.event.special[ type ] || {}; + var old, + target = event.target, + targetType = type.replace( rnamespaces, "" ), + isClick = jQuery.nodeName( target, "a" ) && targetType === "click", + special = jQuery.event.special[ targetType ] || {}; if ( (!special._default || special._default.call( elem, event ) === false) && !isClick && !(target && target.nodeName && jQuery.noData[target.nodeName.toLowerCase()]) ) { try { - if ( target[ type ] ) { + if ( target[ targetType ] ) { // Make sure that we don't accidentally re-trigger the onFOO events - old = target[ "on" + type ]; + old = target[ "on" + targetType ]; if ( old ) { - target[ "on" + type ] = null; + target[ "on" + targetType ] = null; } jQuery.event.triggered = true; - target[ type ](); + target[ targetType ](); } // prevent IE from throwing an error for some elements with some event types, see #3533 - } catch (e) {} + } catch (triggerError) {} if ( old ) { - target[ "on" + type ] = old; + target[ "on" + targetType ] = old; } jQuery.event.triggered = false; @@ -1902,9 +2215,11 @@ jQuery.event = { }, handle: function( event ) { - var all, handlers, namespaces, namespace, events; + var all, handlers, namespaces, namespace_re, events, + namespace_sort = [], + args = jQuery.makeArray( arguments ); - event = arguments[0] = jQuery.event.fix( event || window.event ); + event = args[0] = jQuery.event.fix( event || window.event ); event.currentTarget = this; // Namespaced event handlers @@ -1913,10 +2228,19 @@ jQuery.event = { if ( !all ) { namespaces = event.type.split("."); event.type = namespaces.shift(); - namespace = new RegExp("(^|\\.)" + namespaces.slice(0).sort().join("\\.(?:.*\\.)?") + "(\\.|$)"); + namespace_sort = namespaces.slice(0).sort(); + namespace_re = new RegExp("(^|\\.)" + namespace_sort.join("\\.(?:.*\\.)?") + "(\\.|$)"); } - var events = jQuery.data(this, "events"), handlers = events[ event.type ]; + event.namespace = event.namespace || namespace_sort.join("."); + + events = jQuery.data(this, this.nodeType ? "events" : "__events__"); + + if ( typeof events === "function" ) { + events = events.events; + } + + handlers = (events || {})[ event.type ]; if ( events && handlers ) { // Clone the handlers to prevent manipulation @@ -1926,14 +2250,14 @@ jQuery.event = { var handleObj = handlers[ j ]; // Filter the functions by class - if ( all || namespace.test( handleObj.namespace ) ) { + if ( all || 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; - var ret = handleObj.handler.apply( this, arguments ); + var ret = handleObj.handler.apply( this, args ); if ( ret !== undefined ) { event.result = ret; @@ -1953,10 +2277,10 @@ jQuery.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 originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "), + 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(" "), fix: function( event ) { - if ( event[ expando ] ) { + if ( event[ jQuery.expando ] ) { return event; } @@ -1972,7 +2296,8 @@ jQuery.event = { // Fix target property, if necessary if ( !event.target ) { - event.target = event.srcElement || document; // Fixes #1925 where srcElement might not be defined either + // Fixes #1925 where srcElement might not be defined either + event.target = event.srcElement || document; } // check if target is a textnode (safari) @@ -1987,14 +2312,16 @@ jQuery.event = { // Calculate pageX/Y if missing and clientX/Y available if ( event.pageX == null && event.clientX != null ) { - var doc = document.documentElement, body = document.body; + var doc = document.documentElement, + body = document.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 && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode) ) { - event.which = event.charCode || event.keyCode; + 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) @@ -2026,36 +2353,24 @@ jQuery.event = { live: { add: function( handleObj ) { - jQuery.event.add( this, handleObj.origType, jQuery.extend({}, handleObj, {handler: liveHandler}) ); + jQuery.event.add( this, + liveConvert( handleObj.origType, handleObj.selector ), + jQuery.extend({}, handleObj, {handler: liveHandler, guid: handleObj.handler.guid}) ); }, remove: function( handleObj ) { - var remove = true, - type = handleObj.origType.replace(rnamespaces, ""); - - jQuery.each( jQuery.data(this, "events").live || [], function() { - if ( type === this.origType.replace(rnamespaces, "") ) { - remove = false; - return false; - } - }); - - if ( remove ) { - jQuery.event.remove( this, handleObj.origType, liveHandler ); - } + jQuery.event.remove( this, liveConvert( handleObj.origType, handleObj.selector ), handleObj ); } - }, beforeunload: { setup: function( data, namespaces, eventHandle ) { // We only want to do this special case on windows - if ( this.setInterval ) { + if ( jQuery.isWindow( this ) ) { this.onbeforeunload = eventHandle; } - - return false; }, + teardown: function( namespaces, eventHandle ) { if ( this.onbeforeunload === eventHandle ) { this.onbeforeunload = null; @@ -2065,12 +2380,16 @@ jQuery.event = { } }; -var removeEvent = document.removeEventListener ? +jQuery.removeEvent = document.removeEventListener ? function( elem, type, handle ) { - elem.removeEventListener( type, handle, false ); + if ( elem.removeEventListener ) { + elem.removeEventListener( type, handle, false ); + } } : function( elem, type, handle ) { - elem.detachEvent( "on" + type, handle ); + if ( elem.detachEvent ) { + elem.detachEvent( "on" + type, handle ); + } }; jQuery.Event = function( src ) { @@ -2090,10 +2409,10 @@ jQuery.Event = function( src ) { // timeStamp is buggy for some events on Firefox(#3843) // So we won't rely on the native value - this.timeStamp = now(); + this.timeStamp = jQuery.now(); // Mark it as fixed - this[ expando ] = true; + this[ jQuery.expando ] = true; }; function returnFalse() { @@ -2117,9 +2436,11 @@ jQuery.Event.prototype = { // if preventDefault exists run it on the original event if ( e.preventDefault ) { e.preventDefault(); - } + // otherwise set the returnValue property of the original event to false (IE) - e.returnValue = false; + } else { + e.returnValue = false; + } }, stopPropagation: function() { this.isPropagationStopped = returnTrue; @@ -2199,17 +2520,21 @@ if ( !jQuery.support.submitBubbles ) { setup: function( data, namespaces ) { if ( this.nodeName.toLowerCase() !== "form" ) { jQuery.event.add(this, "click.specialSubmit", function( e ) { - var elem = e.target, type = elem.type; + var elem = e.target, + type = elem.type; if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) { + e.liveFired = undefined; return trigger( "submit", this, arguments ); } }); jQuery.event.add(this, "keypress.specialSubmit", function( e ) { - var elem = e.target, type = elem.type; + var elem = e.target, + type = elem.type; if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) { + e.liveFired = undefined; return trigger( "submit", this, arguments ); } }); @@ -2229,9 +2554,7 @@ if ( !jQuery.support.submitBubbles ) { // change delegation, happens here so we have bind. if ( !jQuery.support.changeBubbles ) { - var formElems = /textarea|input|select/i, - - changeFilters, + var changeFilters, getVal = function( elem ) { var type = elem.type, val = elem.value; @@ -2256,7 +2579,7 @@ if ( !jQuery.support.changeBubbles ) { testChange = function testChange( e ) { var elem = e.target, data, val; - if ( !formElems.test( elem.nodeName ) || elem.readOnly ) { + if ( !rformElems.test( elem.nodeName ) || elem.readOnly ) { return; } @@ -2274,6 +2597,7 @@ if ( !jQuery.support.changeBubbles ) { if ( data != null || val ) { e.type = "change"; + e.liveFired = undefined; return jQuery.event.trigger( e, arguments[1], elem ); } }; @@ -2282,6 +2606,8 @@ if ( !jQuery.support.changeBubbles ) { filters: { focusout: testChange, + beforedeactivate: testChange, + click: function( e ) { var elem = e.target, type = elem.type; @@ -2304,7 +2630,7 @@ if ( !jQuery.support.changeBubbles ) { // Beforeactivate happens also before the previous element is blurred // with this event you can't trigger a change event, but you can store - // information/focus[in] is not needed anymore + // information beforeactivate: function( e ) { var elem = e.target; jQuery.data( elem, "_change_data", getVal(elem) ); @@ -2320,17 +2646,20 @@ if ( !jQuery.support.changeBubbles ) { jQuery.event.add( this, type + ".specialChange", changeFilters[type] ); } - return formElems.test( this.nodeName ); + return rformElems.test( this.nodeName ); }, teardown: function( namespaces ) { jQuery.event.remove( this, ".specialChange" ); - return formElems.test( this.nodeName ); + 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 ) { @@ -2343,17 +2672,21 @@ if ( document.addEventListener ) { jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) { jQuery.event.special[ fix ] = { setup: function() { - this.addEventListener( orig, handler, true ); + if ( focusCounts[fix]++ === 0 ) { + document.addEventListener( orig, handler, true ); + } }, teardown: function() { - this.removeEventListener( orig, handler, true ); + if ( --focusCounts[fix] === 0 ) { + document.removeEventListener( orig, handler, true ); + } } }; function handler( e ) { e = jQuery.event.fix( e ); e.type = fix; - return jQuery.event.handle.call( this, e ); + return jQuery.event.trigger( e, null, e.target ); } }); } @@ -2368,7 +2701,7 @@ jQuery.each(["bind", "one"], function( i, name ) { return this; } - if ( jQuery.isFunction( data ) ) { + if ( jQuery.isFunction( data ) || data === false ) { fn = data; data = undefined; } @@ -2439,7 +2772,8 @@ jQuery.fn.extend({ toggle: function( fn ) { // Save reference to arguments for access in closure - var args = arguments, i = 1; + var args = arguments, + i = 1; // link all the functions, so any of them can unbind this click handler while ( i < args.length ) { @@ -2476,6 +2810,14 @@ jQuery.each(["live", "die"], function( i, name ) { 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 ( jQuery.isFunction( data ) ) { fn = data; @@ -2510,30 +2852,39 @@ jQuery.each(["live", "die"], function( i, name ) { if ( name === "live" ) { // bind live handler - context.each(function(){ - jQuery.event.add( this, liveConvert( type, selector ), + 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( liveConvert( type, selector ), fn ); + context.unbind( "live." + liveConvert( type, selector ), fn ); } } return this; - } + }; }); function liveHandler( event ) { - var stop, elems = [], selectors = [], args = arguments, - related, match, handleObj, elem, j, i, l, data, - events = jQuery.data( this, "events" ); + var stop, maxLevel, related, match, handleObj, elem, j, i, l, data, close, namespace, ret, + elems = [], + selectors = [], + events = jQuery.data( this, this.nodeType ? "events" : "__events__" ); + + if ( typeof events === "function" ) { + events = events.events; + } // Make sure we avoid non-left-click bubbling in Firefox (#3861) if ( event.liveFired === this || !events || !events.live || event.button && event.type === "click" ) { return; } + + if ( event.namespace ) { + namespace = new RegExp("(^|\\.)" + event.namespace.split(".").join("\\.(?:.*\\.)?") + "(\\.|$)"); + } event.liveFired = this; @@ -2553,20 +2904,23 @@ function liveHandler( event ) { 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 ( match[i].selector === handleObj.selector ) { - elem = match[i].elem; + if ( close.selector === handleObj.selector && (!namespace || namespace.test( handleObj.namespace )) ) { + 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]; } if ( !related || related !== elem ) { - elems.push({ elem: elem, handleObj: handleObj }); + elems.push({ elem: elem, handleObj: handleObj, level: close.level }); } } } @@ -2574,13 +2928,26 @@ function liveHandler( event ) { 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; - if ( match.handleObj.origHandler.apply( match.elem, args ) === false ) { - stop = false; - break; + 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; + } } } @@ -2588,7 +2955,7 @@ function liveHandler( event ) { } function liveConvert( type, selector ) { - return "live." + (type && type !== "*" ? type + "." : "") + selector.replace(/\./g, "`").replace(/ /g, "&"); + return (type && type !== "*" ? type + "." : "") + selector.replace(rperiod, "`").replace(rspace, "&"); } jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " + @@ -2596,8 +2963,15 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl "change select submit keydown keypress keyup error").split(" "), function( i, name ) { // Handle event binding - jQuery.fn[ name ] = function( fn ) { - return fn ? this.bind( name, fn ) : this.trigger( name ); + jQuery.fn[ name ] = function( data, fn ) { + if ( fn == null ) { + fn = data; + data = null; + } + + return arguments.length > 0 ? + this.bind( name, data, fn ) : + this.trigger( name ); }; if ( jQuery.attrFn ) { @@ -2610,7 +2984,7 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl // More info: // - http://isaacschlueter.com/2006/10/msie-memory-leaks/ if ( window.attachEvent && !window.addEventListener ) { - window.attachEvent("onunload", function() { + jQuery(window).bind("unload", function() { for ( var id in jQuery.cache ) { if ( jQuery.cache[ id ].handle ) { // Try/Catch is to handle iframes being unloaded, see #4280 @@ -2621,6 +2995,8 @@ if ( window.attachEvent && !window.addEventListener ) { } }); } + + /*! * Sizzle CSS Selector Engine - v1.0 * Copyright 2009, The Dojo Foundation @@ -2629,7 +3005,7 @@ if ( window.attachEvent && !window.addEventListener ) { */ (function(){ -var chunker = /((?:$(?:\([^()]+$|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g, +var chunker = /((?:$(?:\([^()]+$|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g, done = 0, toString = Object.prototype.toString, hasDuplicate = false, @@ -2639,14 +3015,16 @@ var chunker = /((?:$(?:\([^()]+$|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^ // optimization where it does not always call our comparision // function. If that is the case, discard the hasDuplicate value. // Thus far that includes Google Chrome. -[0, 0].sort(function(){ +[0, 0].sort(function() { baseHasDuplicate = false; return 0; }); -var Sizzle = function(selector, context, results, seed) { +var Sizzle = function( selector, context, results, seed ) { results = results || []; - var origContext = context = context || document; + context = context || document; + + var origContext = context; if ( context.nodeType !== 1 && context.nodeType !== 9 ) { return []; @@ -2656,24 +3034,34 @@ var Sizzle = function(selector, context, results, seed) { return results; } - var parts = [], m, set, checkSet, extra, prune = true, contextXML = isXML(context), + var m, set, checkSet, extra, ret, cur, pop, i, + prune = true, + contextXML = Sizzle.isXML( context ), + parts = [], soFar = selector; // Reset the position of the chunker regexp (start from head) - while ( (chunker.exec(""), m = chunker.exec(soFar)) !== null ) { - soFar = m[3]; + do { + chunker.exec( "" ); + m = chunker.exec( soFar ); + + if ( m ) { + soFar = m[3]; - parts.push( m[1] ); + parts.push( m[1] ); - if ( m[2] ) { - extra = m[3]; - break; + if ( m[2] ) { + extra = m[3]; + break; + } } - } + } while ( m ); if ( parts.length > 1 && origPOS.exec( selector ) ) { + if ( parts.length === 2 && Expr.relative[ parts[0] ] ) { set = posProcess( parts[0] + parts[1], context ); + } else { set = Expr.relative[ parts[0] ] ? [ context ] : @@ -2689,29 +3077,38 @@ var Sizzle = function(selector, context, results, seed) { set = posProcess( selector, set ); } } + } else { // Take a shortcut and set the context if the root selector is an ID // (but not if it'll be faster if the inner selector is an ID) if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML && Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) { - var ret = Sizzle.find( parts.shift(), context, contextXML ); - context = ret.expr ? Sizzle.filter( ret.expr, ret.set )[0] : ret.set[0]; + + ret = Sizzle.find( parts.shift(), context, contextXML ); + context = ret.expr ? + Sizzle.filter( ret.expr, ret.set )[0] : + ret.set[0]; } if ( context ) { - var ret = seed ? + ret = seed ? { expr: parts.pop(), set: makeArray(seed) } : Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML ); - set = ret.expr ? Sizzle.filter( ret.expr, ret.set ) : ret.set; + + set = ret.expr ? + Sizzle.filter( ret.expr, ret.set ) : + ret.set; if ( parts.length > 0 ) { - checkSet = makeArray(set); + checkSet = makeArray( set ); + } else { prune = false; } while ( parts.length ) { - var cur = parts.pop(), pop = cur; + cur = parts.pop(); + pop = cur; if ( !Expr.relative[ cur ] ) { cur = ""; @@ -2725,6 +3122,7 @@ var Sizzle = function(selector, context, results, seed) { Expr.relative[ cur ]( checkSet, pop, contextXML ); } + } else { checkSet = parts = []; } @@ -2741,19 +3139,22 @@ var Sizzle = function(selector, context, results, seed) { if ( toString.call(checkSet) === "[object Array]" ) { if ( !prune ) { results.push.apply( results, checkSet ); + } else if ( context && context.nodeType === 1 ) { - for ( var i = 0; checkSet[i] != null; i++ ) { - if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && contains(context, checkSet[i])) ) { + for ( i = 0; checkSet[i] != null; i++ ) { + if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i])) ) { results.push( set[i] ); } } + } else { - for ( var i = 0; checkSet[i] != null; i++ ) { + for ( i = 0; checkSet[i] != null; i++ ) { if ( checkSet[i] && checkSet[i].nodeType === 1 ) { results.push( set[i] ); } } } + } else { makeArray( checkSet, results ); } @@ -2766,15 +3167,15 @@ var Sizzle = function(selector, context, results, seed) { return results; }; -Sizzle.uniqueSort = function(results){ +Sizzle.uniqueSort = function( results ) { if ( sortOrder ) { hasDuplicate = baseHasDuplicate; - results.sort(sortOrder); + results.sort( sortOrder ); if ( hasDuplicate ) { for ( var i = 1; i < results.length; i++ ) { - if ( results[i] === results[i-1] ) { - results.splice(i--, 1); + if ( results[i] === results[ i - 1 ] ) { + results.splice( i--, 1 ); } } } @@ -2783,27 +3184,33 @@ Sizzle.uniqueSort = function(results){ return results; }; -Sizzle.matches = function(expr, set){ - return Sizzle(expr, null, null, set); +Sizzle.matches = function( expr, set ) { + return Sizzle( expr, null, null, set ); +}; + +Sizzle.matchesSelector = function( node, expr ) { + return Sizzle( expr, null, null, [node] ).length > 0; }; -Sizzle.find = function(expr, context, isXML){ - var set, match; +Sizzle.find = function( expr, context, isXML ) { + var set; if ( !expr ) { return []; } for ( var i = 0, l = Expr.order.length; i < l; i++ ) { - var type = Expr.order[i], match; + var match, + type = Expr.order[i]; if ( (match = Expr.leftMatch[ type ].exec( expr )) ) { var left = match[1]; - match.splice(1,1); + match.splice( 1, 1 ); if ( left.substr( left.length - 1 ) !== "\\" ) { match[1] = (match[1] || "").replace(/\\/g, ""); set = Expr.find[ type ]( match, context, isXML ); + if ( set != null ) { expr = expr.replace( Expr.match[ type ], "" ); break; @@ -2813,20 +3220,26 @@ Sizzle.find = function(expr, context, isXML){ } if ( !set ) { - set = context.getElementsByTagName("*"); + set = context.getElementsByTagName( "*" ); } - return {set: set, expr: expr}; + return { set: set, expr: expr }; }; -Sizzle.filter = function(expr, set, inplace, not){ - var old = expr, result = [], curLoop = set, match, anyFound, - isXMLFilter = set && set[0] && isXML(set[0]); +Sizzle.filter = function( expr, set, inplace, not ) { + var match, anyFound, + old = expr, + result = [], + curLoop = set, + isXMLFilter = set && set[0] && Sizzle.isXML( set[0] ); while ( expr && set.length ) { for ( var type in Expr.filter ) { if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) { - var filter = Expr.filter[ type ], found, item, left = match[1]; + var found, item, + filter = Expr.filter[ type ], + left = match[1]; + anyFound = false; match.splice(1,1); @@ -2844,6 +3257,7 @@ Sizzle.filter = function(expr, set, inplace, not){ if ( !match ) { anyFound = found = true; + } else if ( match === true ) { continue; } @@ -2858,9 +3272,11 @@ Sizzle.filter = function(expr, set, inplace, not){ if ( inplace && found != null ) { if ( pass ) { anyFound = true; + } else { curLoop[i] = false; } + } else if ( pass ) { result.push( item ); anyFound = true; @@ -2889,6 +3305,7 @@ Sizzle.filter = function(expr, set, inplace, not){ if ( expr === old ) { if ( anyFound == null ) { Sizzle.error( expr ); + } else { break; } @@ -2906,30 +3323,35 @@ Sizzle.error = function( msg ) { var Expr = Sizzle.selectors = { order: [ "ID", "NAME", "TAG" ], + match: { - ID: /#((?:[\w\u00c0-\uFFFF-]|\\.)+)/, - CLASS: /\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/, - NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/, - ATTR: /\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/, - TAG: /^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/, - CHILD: /:(only|nth|last|first)-child(?:$(even|odd|[\dn+-]*)$)?/, - POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:$(\d*)$)?(?=[^-]|$)/, - PSEUDO: /:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:$(['"]?)((?:\([^$]+\)|[^]*)+)\2\))?/ + ID: /#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/, + CLASS: /\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/, + NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/, + ATTR: /\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/, + TAG: /^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/, + CHILD: /:(only|nth|last|first)-child(?:$(even|odd|[\dn+\-]*)$)?/, + POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:$(\d*)$)?(?=[^\-]|$)/, + PSEUDO: /:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:$(['"]?)((?:\([^$]+\)|[^]*)+)\2\))?/ }, + leftMatch: {}, + attrMap: { "class": "className", "for": "htmlFor" }, + attrHandle: { - href: function(elem){ - return elem.getAttribute("href"); + href: function( elem ) { + return elem.getAttribute( "href" ); } }, + relative: { "+": function(checkSet, part){ var isPartStr = typeof part === "string", - isTag = isPartStr && !/\W/.test(part), + isTag = isPartStr && !/\W/.test( part ), isPartStrNotTag = isPartStr && !isTag; if ( isTag ) { @@ -2950,22 +3372,29 @@ var Expr = Sizzle.selectors = { Sizzle.filter( part, checkSet, true ); } }, - ">": function(checkSet, part){ - var isPartStr = typeof part === "string"; - if ( isPartStr && !/\W/.test(part) ) { + ">": function( checkSet, part ) { + var elem, + isPartStr = typeof part === "string", + i = 0, + l = checkSet.length; + + if ( isPartStr && !/\W/.test( part ) ) { part = part.toLowerCase(); - for ( var i = 0, l = checkSet.length; i < l; i++ ) { - var elem = checkSet[i]; + for ( ; i < l; i++ ) { + elem = checkSet[i]; + if ( elem ) { var parent = elem.parentNode; checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false; } } + } else { - for ( var i = 0, l = checkSet.length; i < l; i++ ) { - var elem = checkSet[i]; + for ( ; i < l; i++ ) { + elem = checkSet[i]; + if ( elem ) { checkSet[i] = isPartStr ? elem.parentNode : @@ -2978,37 +3407,50 @@ var Expr = Sizzle.selectors = { } } }, + "": function(checkSet, part, isXML){ - var doneName = done++, checkFn = dirCheck; + var nodeCheck, + doneName = done++, + checkFn = dirCheck; if ( typeof part === "string" && !/\W/.test(part) ) { - var nodeCheck = part = part.toLowerCase(); + part = part.toLowerCase(); + nodeCheck = part; checkFn = dirNodeCheck; } - checkFn("parentNode", part, doneName, checkSet, nodeCheck, isXML); + checkFn( "parentNode", part, doneName, checkSet, nodeCheck, isXML ); }, - "~": function(checkSet, part, isXML){ - var doneName = done++, checkFn = dirCheck; - if ( typeof part === "string" && !/\W/.test(part) ) { - var nodeCheck = part = part.toLowerCase(); + "~": function( checkSet, part, isXML ) { + var nodeCheck, + doneName = done++, + checkFn = dirCheck; + + if ( typeof part === "string" && !/\W/.test( part ) ) { + part = part.toLowerCase(); + nodeCheck = part; checkFn = dirNodeCheck; } - checkFn("previousSibling", part, doneName, checkSet, nodeCheck, isXML); + checkFn( "previousSibling", part, doneName, checkSet, nodeCheck, isXML ); } }, + find: { - ID: function(match, context, isXML){ + ID: function( match, context, isXML ) { if ( typeof context.getElementById !== "undefined" && !isXML ) { var m = context.getElementById(match[1]); - return m ? [m] : []; + // Check parentNode to catch when Blackberry 4.6 returns + // nodes that are no longer in the document #6963 + return m && m.parentNode ? [m] : []; } }, - NAME: function(match, context){ + + NAME: function( match, context ) { if ( typeof context.getElementsByName !== "undefined" ) { - var ret = [], results = context.getElementsByName(match[1]); + var ret = [], + results = context.getElementsByName( match[1] ); for ( var i = 0, l = results.length; i < l; i++ ) { if ( results[i].getAttribute("name") === match[1] ) { @@ -3019,12 +3461,13 @@ var Expr = Sizzle.selectors = { return ret.length === 0 ? null : ret; } }, - TAG: function(match, context){ - return context.getElementsByTagName(match[1]); + + TAG: function( match, context ) { + return context.getElementsByTagName( match[1] ); } }, preFilter: { - CLASS: function(match, curLoop, inplace, result, not, isXML){ + CLASS: function( match, curLoop, inplace, result, not, isXML ) { match = " " + match[1].replace(/\\/g, "") + " "; if ( isXML ) { @@ -3037,6 +3480,7 @@ var Expr = Sizzle.selectors = { if ( !inplace ) { result.push( elem ); } + } else if ( inplace ) { curLoop[i] = false; } @@ -3045,13 +3489,16 @@ var Expr = Sizzle.selectors = { return false; }, - ID: function(match){ + + ID: function( match ) { return match[1].replace(/\\/g, ""); }, - TAG: function(match, curLoop){ + + TAG: function( match, curLoop ) { return match[1].toLowerCase(); }, - CHILD: function(match){ + + CHILD: function( match ) { if ( match[1] === "nth" ) { // parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6' var test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec( @@ -3068,7 +3515,8 @@ var Expr = Sizzle.selectors = { return match; }, - ATTR: function(match, curLoop, inplace, result, not, isXML){ + + ATTR: function( match, curLoop, inplace, result, not, isXML ) { var name = match[1].replace(/\\/g, ""); if ( !isXML && Expr.attrMap[name] ) { @@ -3081,159 +3529,203 @@ var Expr = Sizzle.selectors = { return match; }, - PSEUDO: function(match, curLoop, inplace, result, not){ + + PSEUDO: function( match, curLoop, inplace, result, not ) { if ( match[1] === "not" ) { // If we're dealing with a complex expression, or a simple one if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) { match[3] = Sizzle(match[3], null, null, curLoop); + } else { var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not); + if ( !inplace ) { result.push.apply( result, ret ); } + return false; } + } else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) { return true; } return match; }, - POS: function(match){ + + POS: function( match ) { match.unshift( true ); + return match; } }, + filters: { - enabled: function(elem){ + enabled: function( elem ) { return elem.disabled === false && elem.type !== "hidden"; }, - disabled: function(elem){ + + disabled: function( elem ) { return elem.disabled === true; }, - checked: function(elem){ + + checked: function( elem ) { return elem.checked === true; }, - selected: function(elem){ + + selected: function( elem ) { // Accessing this property makes selected-by-default // options in Safari work properly elem.parentNode.selectedIndex; + return elem.selected === true; }, - parent: function(elem){ + + parent: function( elem ) { return !!elem.firstChild; }, - empty: function(elem){ + + empty: function( elem ) { return !elem.firstChild; }, - has: function(elem, i, match){ + + has: function( elem, i, match ) { return !!Sizzle( match[3], elem ).length; }, - header: function(elem){ - return /h\d/i.test( elem.nodeName ); + + header: function( elem ) { + return (/h\d/i).test( elem.nodeName ); }, - text: function(elem){ + + text: function( elem ) { return "text" === elem.type; }, - radio: function(elem){ + radio: function( elem ) { return "radio" === elem.type; }, - checkbox: function(elem){ + + checkbox: function( elem ) { return "checkbox" === elem.type; }, - file: function(elem){ + + file: function( elem ) { return "file" === elem.type; }, - password: function(elem){ + password: function( elem ) { return "password" === elem.type; }, - submit: function(elem){ + + submit: function( elem ) { return "submit" === elem.type; }, - image: function(elem){ + + image: function( elem ) { return "image" === elem.type; }, - reset: function(elem){ + + reset: function( elem ) { return "reset" === elem.type; }, - button: function(elem){ + + button: function( elem ) { return "button" === elem.type || elem.nodeName.toLowerCase() === "button"; }, - input: function(elem){ - return /input|select|textarea|button/i.test(elem.nodeName); + + input: function( elem ) { + return (/input|select|textarea|button/i).test( elem.nodeName ); } }, setFilters: { - first: function(elem, i){ + first: function( elem, i ) { return i === 0; }, - last: function(elem, i, match, array){ + + last: function( elem, i, match, array ) { return i === array.length - 1; }, - even: function(elem, i){ + + even: function( elem, i ) { return i % 2 === 0; }, - odd: function(elem, i){ + + odd: function( elem, i ) { return i % 2 === 1; }, - lt: function(elem, i, match){ + + lt: function( elem, i, match ) { return i < match[3] - 0; }, - gt: function(elem, i, match){ + + gt: function( elem, i, match ) { return i > match[3] - 0; }, - nth: function(elem, i, match){ + + nth: function( elem, i, match ) { return match[3] - 0 === i; }, - eq: function(elem, i, match){ + + eq: function( elem, i, match ) { return match[3] - 0 === i; } }, filter: { - PSEUDO: function(elem, match, i, array){ - var name = match[1], filter = Expr.filters[ name ]; + PSEUDO: function( elem, match, i, array ) { + var name = match[1], + filter = Expr.filters[ name ]; if ( filter ) { return filter( elem, i, match, array ); + } else if ( name === "contains" ) { - return (elem.textContent || elem.innerText || getText([ elem ]) || "").indexOf(match[3]) >= 0; + return (elem.textContent || elem.innerText || Sizzle.getText([ elem ]) || "").indexOf(match[3]) >= 0; + } else if ( name === "not" ) { var not = match[3]; - for ( var i = 0, l = not.length; i < l; i++ ) { - if ( not[i] === elem ) { + for ( var j = 0, l = not.length; j < l; j++ ) { + if ( not[j] === elem ) { return false; } } return true; + } else { Sizzle.error( "Syntax error, unrecognized expression: " + name ); } }, - CHILD: function(elem, match){ - var type = match[1], node = elem; - switch (type) { - case 'only': - case 'first': + + CHILD: function( elem, match ) { + var type = match[1], + node = elem; + + switch ( type ) { + case "only": + case "first": while ( (node = node.previousSibling) ) { if ( node.nodeType === 1 ) { return false; } } + if ( type === "first" ) { return true; } + node = elem; - case 'last': + + case "last": while ( (node = node.nextSibling) ) { if ( node.nodeType === 1 ) { return false; } } + return true; - case 'nth': - var first = match[2], last = match[3]; + + case "nth": + var first = match[2], + last = match[3]; if ( first === 1 && last === 0 ) { return true; @@ -3244,33 +3736,41 @@ var Expr = Sizzle.selectors = { if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) { var count = 0; + for ( node = parent.firstChild; node; node = node.nextSibling ) { if ( node.nodeType === 1 ) { node.nodeIndex = ++count; } } + parent.sizcache = doneName; } var diff = elem.nodeIndex - last; + if ( first === 0 ) { return diff === 0; + } else { return ( diff % first === 0 && diff / first >= 0 ); } } }, - ID: function(elem, match){ + + ID: function( elem, match ) { return elem.nodeType === 1 && elem.getAttribute("id") === match; }, - TAG: function(elem, match){ + + TAG: function( elem, match ) { return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match; }, - CLASS: function(elem, match){ + + CLASS: function( elem, match ) { return (" " + (elem.className || elem.getAttribute("class")) + " ") .indexOf( match ) > -1; }, - ATTR: function(elem, match){ + + ATTR: function( elem, match ) { var name = match[1], result = Expr.attrHandle[ name ] ? Expr.attrHandle[ name ]( elem ) : @@ -3301,8 +3801,10 @@ var Expr = Sizzle.selectors = { value === check || value.substr(0, check.length + 1) === check + "-" : false; }, - POS: function(elem, match, i, array){ - var name = match[2], filter = Expr.setFilters[ name ]; + + POS: function( elem, match, i, array ) { + var name = match[2], + filter = Expr.setFilters[ name ]; if ( filter ) { return filter( elem, i, match, array ); @@ -3311,16 +3813,17 @@ var Expr = Sizzle.selectors = { } }; -var origPOS = Expr.match.POS; +var origPOS = Expr.match.POS, + fescape = function(all, num){ + return "\\" + (num - 0 + 1); + }; 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, function(all, num){ - return "\\" + (num - 0 + 1); - })); + 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) ); } -var makeArray = function(array, results) { +var makeArray = function( array, results ) { array = Array.prototype.slice.call( array, 0 ); if ( results ) { @@ -3339,19 +3842,22 @@ try { Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType; // Provide a fallback method if it does not work -} catch(e){ - makeArray = function(array, results) { - var ret = results || []; +} catch( e ) { + makeArray = function( array, results ) { + var i = 0, + ret = results || []; if ( toString.call(array) === "[object Array]" ) { Array.prototype.push.apply( ret, array ); + } else { if ( typeof array.length === "number" ) { - for ( var i = 0, l = array.length; i < l; i++ ) { + for ( var l = array.length; i < l; i++ ) { ret.push( array[i] ); } + } else { - for ( var i = 0; array[i]; i++ ) { + for ( ; array[i]; i++ ) { ret.push( array[i] ); } } @@ -3361,62 +3867,99 @@ try { }; } -var sortOrder; +var sortOrder, siblingCheck; if ( document.documentElement.compareDocumentPosition ) { sortOrder = function( a, b ) { + if ( a === b ) { + hasDuplicate = true; + return 0; + } + if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) { - if ( a == b ) { - hasDuplicate = true; - } return a.compareDocumentPosition ? -1 : 1; } - var ret = a.compareDocumentPosition(b) & 4 ? -1 : a === b ? 0 : 1; - if ( ret === 0 ) { - hasDuplicate = true; - } - return ret; + return a.compareDocumentPosition(b) & 4 ? -1 : 1; }; -} else if ( "sourceIndex" in document.documentElement ) { + +} else { sortOrder = function( a, b ) { - if ( !a.sourceIndex || !b.sourceIndex ) { - if ( a == b ) { - hasDuplicate = true; - } - return a.sourceIndex ? -1 : 1; + var al, bl, + ap = [], + bp = [], + aup = a.parentNode, + bup = b.parentNode, + cur = aup; + + // The nodes are identical, we can exit early + if ( a === b ) { + hasDuplicate = true; + return 0; + + // If the nodes are siblings (or identical) we can do a quick check + } else if ( aup === bup ) { + return siblingCheck( a, b ); + + // If no parents were found then the nodes are disconnected + } else if ( !aup ) { + return -1; + + } else if ( !bup ) { + return 1; } - var ret = a.sourceIndex - b.sourceIndex; - if ( ret === 0 ) { - hasDuplicate = true; + // Otherwise they're somewhere else in the tree so we need + // to build up a full list of the parentNodes for comparison + while ( cur ) { + ap.unshift( cur ); + cur = cur.parentNode; } - return ret; - }; -} else if ( document.createRange ) { - sortOrder = function( a, b ) { - if ( !a.ownerDocument || !b.ownerDocument ) { - if ( a == b ) { - hasDuplicate = true; + + cur = bup; + + while ( cur ) { + bp.unshift( cur ); + cur = cur.parentNode; + } + + al = ap.length; + bl = bp.length; + + // Start walking down the tree looking for a discrepancy + for ( var i = 0; i < al && i < bl; i++ ) { + if ( ap[i] !== bp[i] ) { + return siblingCheck( ap[i], bp[i] ); } - return a.ownerDocument ? -1 : 1; } - var aRange = a.ownerDocument.createRange(), bRange = b.ownerDocument.createRange(); - aRange.setStart(a, 0); - aRange.setEnd(a, 0); - bRange.setStart(b, 0); - bRange.setEnd(b, 0); - var ret = aRange.compareBoundaryPoints(Range.START_TO_END, bRange); - if ( ret === 0 ) { - hasDuplicate = true; + // We ended someplace up the tree so do a sibling check + return i === al ? + siblingCheck( a, bp[i], -1 ) : + siblingCheck( ap[i], b, 1 ); + }; + + siblingCheck = function( a, b, ret ) { + if ( a === b ) { + return ret; } - return ret; + + var cur = a.nextSibling; + + while ( cur ) { + if ( cur === b ) { + return -1; + } + + cur = cur.nextSibling; + } + + return 1; }; } // Utility function for retreiving the text value of an array of DOM nodes -function getText( elems ) { +Sizzle.getText = function( elems ) { var ret = "", elem; for ( var i = 0; elems[i]; i++ ) { @@ -3428,43 +3971,52 @@ function getText( elems ) { // Traverse everything else, except comment nodes } else if ( elem.nodeType !== 8 ) { - ret += getText( elem.childNodes ); + 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(){ // We're going to inject a fake input element with a specified name var form = document.createElement("div"), - id = "script" + (new Date).getTime(); + id = "script" + (new Date()).getTime(), + root = document.documentElement; + form.innerHTML = "<a name='" + id + "'/>"; // Inject it into the root element, check its status, and remove it quickly - var root = document.documentElement; root.insertBefore( form, root.firstChild ); // The workaround has to do additional checks after a getElementById // Which slows things down for other browsers (hence the branching) if ( document.getElementById( id ) ) { - Expr.find.ID = function(match, context, isXML){ + Expr.find.ID = function( match, context, isXML ) { if ( typeof context.getElementById !== "undefined" && !isXML ) { var m = context.getElementById(match[1]); - return m ? m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? [m] : undefined : []; + + return m ? + m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? + [m] : + undefined : + []; } }; - Expr.filter.ID = function(elem, match){ + Expr.filter.ID = function( elem, match ) { var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id"); + return elem.nodeType === 1 && node && node.nodeValue === match; }; } root.removeChild( form ); - root = form = null; // release memory in IE + + // release memory in IE + root = form = null; })(); (function(){ @@ -3477,8 +4029,8 @@ function getText( elems ) { // Make sure no comments are found if ( div.getElementsByTagName("*").length > 0 ) { - Expr.find.TAG = function(match, context){ - var results = context.getElementsByTagName(match[1]); + Expr.find.TAG = function( match, context ) { + var results = context.getElementsByTagName( match[1] ); // Filter out possible comments if ( match[1] === "*" ) { @@ -3499,19 +4051,25 @@ function getText( elems ) { // Check to see if an attribute returns normalized href attributes div.innerHTML = "<a href='#'></a>"; + if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" && div.firstChild.getAttribute("href") !== "#" ) { - Expr.attrHandle.href = function(elem){ - return elem.getAttribute("href", 2); + + Expr.attrHandle.href = function( elem ) { + return elem.getAttribute( "href", 2 ); }; } - div = null; // release memory in IE + // release memory in IE + div = null; })(); if ( document.querySelectorAll ) { (function(){ - var oldSizzle = Sizzle, div = document.createElement("div"); + var oldSizzle = Sizzle, + div = document.createElement("div"), + id = "__sizzle__"; + div.innerHTML = "<p class='TEST'></p>"; // Safari can't handle uppercase or unicode characters when @@ -3520,15 +4078,42 @@ if ( document.querySelectorAll ) { return; } - Sizzle = function(query, context, extra, seed){ + Sizzle = function( query, context, extra, seed ) { context = context || document; + // Make sure that attribute selectors are quoted + query = query.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']"); + // Only use querySelectorAll on non-XML documents // (ID selectors don't work in non-HTML documents) - if ( !seed && context.nodeType === 9 && !isXML(context) ) { - try { - return makeArray( context.querySelectorAll(query), extra ); - } catch(e){} + if ( !seed && !Sizzle.isXML(context) ) { + if ( context.nodeType === 9 ) { + try { + return makeArray( context.querySelectorAll(query), extra ); + } catch(qsaError) {} + + // qSA works strangely on Element-rooted queries + // We can work around this by specifying an extra ID on the root + // and working up from there (Thanks to Andrew Dupont for the technique) + // IE 8 doesn't work on object elements + } else if ( context.nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) { + var old = context.getAttribute( "id" ), + nid = old || id; + + if ( !old ) { + context.setAttribute( "id", nid ); + } + + try { + return makeArray( context.querySelectorAll( "#" + nid + " " + query ), extra ); + + } catch(pseudoError) { + } finally { + if ( !old ) { + context.removeAttribute( "id" ); + } + } + } } return oldSizzle(query, context, extra, seed); @@ -3538,11 +4123,44 @@ if ( document.querySelectorAll ) { Sizzle[ prop ] = oldSizzle[ prop ]; } - div = null; // release memory in IE + // release memory in IE + div = null; })(); } (function(){ + var html = document.documentElement, + matches = html.matchesSelector || html.mozMatchesSelector || html.webkitMatchesSelector || html.msMatchesSelector, + pseudoWorks = false; + + try { + // This should fail with an exception + // Gecko does not error, returns false instead + matches.call( document.documentElement, "[test!='']:sizzle" ); + + } catch( pseudoError ) { + pseudoWorks = true; + } + + if ( matches ) { + Sizzle.matchesSelector = function( node, expr ) { + // Make sure that attribute selectors are quoted + expr = expr.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']"); + + if ( !Sizzle.isXML( node ) ) { + try { + if ( pseudoWorks || !Expr.match.PSEUDO.test( expr ) && !/!=/.test( expr ) ) { + return matches.call( node, expr ); + } + } catch(e) {} + } + + return Sizzle(expr, null, null, [node]).length > 0; + }; + } +})(); + +(function(){ var div = document.createElement("div"); div.innerHTML = "<div class='test e'></div><div class='test'></div>"; @@ -3561,22 +4179,25 @@ if ( document.querySelectorAll ) { } Expr.order.splice(1, 0, "CLASS"); - Expr.find.CLASS = function(match, context, isXML) { + Expr.find.CLASS = function( match, context, isXML ) { if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) { return context.getElementsByClassName(match[1]); } }; - div = null; // release memory in IE + // release memory in IE + div = null; })(); function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { for ( var i = 0, l = checkSet.length; i < l; i++ ) { var elem = checkSet[i]; + if ( elem ) { - elem = elem[dir]; var match = false; + elem = elem[dir]; + while ( elem ) { if ( elem.sizcache === doneName ) { match = checkSet[elem.sizset]; @@ -3604,9 +4225,11 @@ function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { for ( var i = 0, l = checkSet.length; i < l; i++ ) { var elem = checkSet[i]; + if ( elem ) { - elem = elem[dir]; var match = false; + + elem = elem[dir]; while ( elem ) { if ( elem.sizcache === doneName ) { @@ -3619,6 +4242,7 @@ function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { elem.sizcache = doneName; elem.sizset = i; } + if ( typeof cur !== "string" ) { if ( elem === cur ) { match = true; @@ -3639,21 +4263,34 @@ function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { } } -var contains = document.compareDocumentPosition ? function(a, b){ - return !!(a.compareDocumentPosition(b) & 16); -} : function(a, b){ - return a !== b && (a.contains ? a.contains(b) : true); -}; +if ( document.documentElement.contains ) { + Sizzle.contains = function( a, b ) { + return a !== b && (a.contains ? a.contains(b) : true); + }; -var isXML = function(elem){ +} else if ( document.documentElement.compareDocumentPosition ) { + Sizzle.contains = function( a, b ) { + return !!(a.compareDocumentPosition(b) & 16); + }; + +} else { + Sizzle.contains = function() { + return false; + }; +} + +Sizzle.isXML = function( elem ) { // documentElement is verified for cases where it doesn't yet exist // (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 tmpSet = [], later = "", match, +var posProcess = function( selector, context ) { + var match, + tmpSet = [], + later = "", root = context.nodeType ? [context] : context; // Position selectors must be done after the filter @@ -3677,53 +4314,26 @@ jQuery.find = Sizzle; jQuery.expr = Sizzle.selectors; jQuery.expr[":"] = jQuery.expr.filters; jQuery.unique = Sizzle.uniqueSort; -jQuery.text = getText; -jQuery.isXMLDoc = isXML; -jQuery.contains = contains; +jQuery.text = Sizzle.getText; +jQuery.isXMLDoc = Sizzle.isXML; +jQuery.contains = Sizzle.contains; -return; - -window.Sizzle = Sizzle; })(); + + var runtil = /Until$/, rparentsprev = /^(?:parents|prevUntil|prevAll)/, // Note: This RegExp should be improved, or likely pulled from Sizzle rmultiselector = /,/, - slice = Array.prototype.slice; - -// Implement the identical functionality for filter and not -var winnow = function( elements, qualifier, keep ) { - if ( jQuery.isFunction( qualifier ) ) { - return jQuery.grep(elements, function( elem, i ) { - return !!qualifier.call( elem, i, elem ) === keep; - }); - - } else if ( qualifier.nodeType ) { - return jQuery.grep(elements, function( elem, i ) { - return (elem === qualifier) === keep; - }); - - } else if ( typeof qualifier === "string" ) { - var filtered = jQuery.grep(elements, function( elem ) { - return elem.nodeType === 1; - }); - - if ( isSimple.test( qualifier ) ) { - return jQuery.filter(qualifier, filtered, !keep); - } else { - qualifier = jQuery.filter( qualifier, filtered ); - } - } - - return jQuery.grep(elements, function( elem, i ) { - return (jQuery.inArray( elem, qualifier ) >= 0) === keep; - }); -}; + isSimple = /^.[^:#\[\.,]*$/, + slice = Array.prototype.slice, + POS = jQuery.expr.match.POS; jQuery.fn.extend({ find: function( selector ) { - var ret = this.pushStack( "", "find", selector ), length = 0; + var ret = this.pushStack( "", "find", selector ), + length = 0; for ( var i = 0, l = this.length; i < l; i++ ) { length = ret.length; @@ -3769,11 +4379,15 @@ jQuery.fn.extend({ }, closest: function( selectors, context ) { + var ret = [], i, l, cur = this[0]; + if ( jQuery.isArray( selectors ) ) { - var ret = [], cur = this[0], match, matches = {}, selector; + var match, selector, + matches = {}, + level = 1; if ( cur && selectors.length ) { - for ( var i = 0, l = selectors.length; i < l; i++ ) { + for ( i = 0, l = selectors.length; i < l; i++ ) { selector = selectors[i]; if ( !matches[selector] ) { @@ -3788,29 +4402,41 @@ jQuery.fn.extend({ match = matches[selector]; if ( match.jquery ? match.index(cur) > -1 : jQuery(cur).is(match) ) { - ret.push({ selector: selector, elem: cur }); - delete matches[selector]; + ret.push({ selector: selector, elem: cur, level: level }); } } + cur = cur.parentNode; + level++; } } return ret; } - var pos = jQuery.expr.match.POS.test( selectors ) ? + var pos = POS.test( selectors ) ? jQuery( selectors, context || this.context ) : null; - return this.map(function( i, cur ) { - while ( cur && cur.ownerDocument && cur !== context ) { - if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selectors) ) { - return cur; + for ( i = 0, l = this.length; i < l; i++ ) { + cur = this[i]; + + while ( cur ) { + if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) { + ret.push( cur ); + break; + + } else { + cur = cur.parentNode; + if ( !cur || !cur.ownerDocument || cur === context ) { + break; + } } - cur = cur.parentNode; } - return null; - }); + } + + ret = ret.length > 1 ? jQuery.unique(ret) : ret; + + return this.pushStack( ret, "closest", selectors ); }, // Determine the position of an element within @@ -3918,11 +4544,15 @@ jQuery.extend({ expr = ":not(" + expr + ")"; } - return jQuery.find.matches(expr, elems); + return elems.length === 1 ? + jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] : + jQuery.find.matches(expr, elems); }, dir: function( elem, dir, until ) { - var matched = [], cur = elem[dir]; + var matched = [], + cur = elem[ dir ]; + while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) { if ( cur.nodeType === 1 ) { matched.push( cur ); @@ -3957,20 +4587,50 @@ jQuery.extend({ return r; } }); + +// Implement the identical functionality for filter and not +function winnow( elements, qualifier, keep ) { + if ( jQuery.isFunction( qualifier ) ) { + return jQuery.grep(elements, function( elem, i ) { + var retVal = !!qualifier.call( elem, i, elem ); + return retVal === keep; + }); + + } else if ( qualifier.nodeType ) { + return jQuery.grep(elements, function( elem, i ) { + return (elem === qualifier) === keep; + }); + + } else if ( typeof qualifier === "string" ) { + var filtered = jQuery.grep(elements, function( elem ) { + return elem.nodeType === 1; + }); + + if ( isSimple.test( qualifier ) ) { + return jQuery.filter(qualifier, filtered, !keep); + } else { + qualifier = jQuery.filter( qualifier, filtered ); + } + } + + return jQuery.grep(elements, function( elem, i ) { + return (jQuery.inArray( elem, qualifier ) >= 0) === keep; + }); +} + + + + var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g, rleadingWhitespace = /^\s+/, - rxhtmlTag = /(<([\w:]+)[^>]*?)\/>/g, - rselfClosing = /^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i, + rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig, rtagName = /<([\w:]+)/, rtbody = /<tbody/i, rhtml = /<|&#?\w+;/, - rnocache = /<script|<object|<embed|<option|<style/i, - rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i, // checked="checked" or checked (html5) - fcloseTag = function( all, front, tag ) { - return rselfClosing.test( tag ) ? - all : - front + "></" + tag + ">"; - }, + rnocache = /<(?:script|object|embed|option|style)/i, + // checked="checked" or checked (html5) + rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i, + raction = /\=([^="'>\s]+\/)>/g, wrapMap = { option: [ 1, "<select multiple='multiple'>", "</select>" ], legend: [ 1, "<fieldset>", "</fieldset>" ], @@ -3995,7 +4655,8 @@ jQuery.fn.extend({ text: function( text ) { if ( jQuery.isFunction(text) ) { return this.each(function(i) { - var self = jQuery(this); + var self = jQuery( this ); + self.text( text.call(this, i, self.text()) ); }); } @@ -4044,7 +4705,8 @@ jQuery.fn.extend({ } return this.each(function() { - var self = jQuery( this ), contents = self.contents(); + var self = jQuery( this ), + contents = self.contents(); if ( contents.length ) { contents.wrapAll( html ); @@ -4155,7 +4817,9 @@ jQuery.fn.extend({ // attributes in IE that are actually only stored // as properties will not be copied (such as the // the name attribute on an input). - var html = this.outerHTML, ownerDocument = this.ownerDocument; + var html = this.outerHTML, + ownerDocument = this.ownerDocument; + if ( !html ) { var div = ownerDocument.createElement("div"); div.appendChild( this.cloneNode(true) ); @@ -4164,7 +4828,7 @@ jQuery.fn.extend({ return jQuery.clean([html.replace(rinlinejQuery, "") // Handle the case in IE 8 where action=/test/> self-closes a tag - .replace(/=([^="'>\s]+\/)>/g, '="$1">') + .replace(raction, '="$1">') .replace(rleadingWhitespace, "")], ownerDocument)[0]; } else { return this.cloneNode(true); @@ -4192,7 +4856,7 @@ jQuery.fn.extend({ (jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value )) && !wrapMap[ (rtagName.exec( value ) || ["", ""])[1].toLowerCase() ] ) { - value = value.replace(rxhtmlTag, fcloseTag); + value = value.replace(rxhtmlTag, "<$1></$2>"); try { for ( var i = 0, l = this.length; i < l; i++ ) { @@ -4210,10 +4874,9 @@ jQuery.fn.extend({ } else if ( jQuery.isFunction( value ) ) { this.each(function(i){ - var self = jQuery(this), old = self.html(); - self.empty().append(function(){ - return value.call( this, i, old ); - }); + var self = jQuery( this ); + + self.html( value.call(this, i, self.html()) ); }); } else { @@ -4235,13 +4898,14 @@ jQuery.fn.extend({ } if ( typeof value !== "string" ) { - value = jQuery(value).detach(); + value = jQuery( value ).detach(); } return this.each(function() { - var next = this.nextSibling, parent = this.parentNode; + var next = this.nextSibling, + parent = this.parentNode; - jQuery(this).remove(); + jQuery( this ).remove(); if ( next ) { jQuery(next).before( value ); @@ -4259,7 +4923,9 @@ jQuery.fn.extend({ }, domManip: function( args, table, callback ) { - var results, first, value = args[0], scripts = [], fragment, parent; + var results, first, fragment, parent, + value = args[0], + scripts = []; // We can't cloneNode fragments that contain checked, in WebKit if ( !jQuery.support.checkClone && arguments.length === 3 && typeof value === "string" && rchecked.test( value ) ) { @@ -4284,7 +4950,7 @@ jQuery.fn.extend({ results = { fragment: parent }; } else { - results = buildFragment( args, this, scripts ); + results = jQuery.buildFragment( args, this, scripts ); } fragment = results.fragment; @@ -4316,16 +4982,16 @@ jQuery.fn.extend({ } return this; - - function root( elem, cur ) { - return jQuery.nodeName(elem, "table") ? - (elem.getElementsByTagName("tbody")[0] || - elem.appendChild(elem.ownerDocument.createElement("tbody"))) : - elem; - } } }); +function root( elem, cur ) { + return jQuery.nodeName(elem, "table") ? + (elem.getElementsByTagName("tbody")[0] || + elem.appendChild(elem.ownerDocument.createElement("tbody"))) : + elem; +} + function cloneCopyEvent(orig, ret) { var i = 0; @@ -4334,7 +5000,9 @@ function cloneCopyEvent(orig, ret) { return; } - var oldData = jQuery.data( orig[i++] ), curData = jQuery.data( this, oldData ), events = oldData && oldData.events; + var oldData = jQuery.data( orig[i++] ), + curData = jQuery.data( this, oldData ), + events = oldData && oldData.events; if ( events ) { delete curData.handle; @@ -4349,7 +5017,7 @@ function cloneCopyEvent(orig, ret) { }); } -function buildFragment( args, nodes, scripts ) { +jQuery.buildFragment = function( args, nodes, scripts ) { var fragment, cacheable, cacheresults, doc = (nodes && nodes[0] ? nodes[0].ownerDocument || nodes[0] : document); @@ -4379,7 +5047,7 @@ function buildFragment( args, nodes, scripts ) { } return { fragment: fragment, cacheable: cacheable }; -} +}; jQuery.fragments = {}; @@ -4391,7 +5059,8 @@ jQuery.each({ replaceAll: "replaceWith" }, function( name, original ) { jQuery.fn[ name ] = function( selector ) { - var ret = [], insert = jQuery( selector ), + var ret = [], + insert = jQuery( selector ), parent = this.length === 1 && this[0].parentNode; if ( parent && parent.nodeType === 11 && parent.childNodes.length === 1 && insert.length === 1 ) { @@ -4401,7 +5070,7 @@ jQuery.each({ } else { for ( var i = 0, l = insert.length; i < l; i++ ) { var elems = (i > 0 ? this.clone(true) : this).get(); - jQuery.fn[ original ].apply( jQuery(insert[i]), elems ); + jQuery( insert[i] )[ original ]( elems ); ret = ret.concat( elems ); } @@ -4436,7 +5105,7 @@ jQuery.extend({ } else if ( typeof elem === "string" ) { // Fix "XHTML"-style tags in all browsers - elem = elem.replace(rxhtmlTag, fcloseTag); + elem = elem.replace(rxhtmlTag, "<$1></$2>"); // Trim whitespace, otherwise indexOf won't work as expected var tag = (rtagName.exec( elem ) || ["", ""])[1].toLowerCase(), @@ -4489,7 +5158,7 @@ jQuery.extend({ } if ( fragment ) { - for ( var i = 0; ret[i]; i++ ) { + 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] ); @@ -4511,18 +5180,22 @@ jQuery.extend({ deleteExpando = jQuery.support.deleteExpando; for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) { + if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) { + continue; + } + id = elem[ jQuery.expando ]; if ( id ) { data = cache[ id ]; - if ( data.events ) { + if ( data && data.events ) { for ( var type in data.events ) { if ( special[ type ] ) { jQuery.event.remove( elem, type ); } else { - removeEvent( elem, type, data.handle ); + jQuery.removeEvent( elem, type, data.handle ); } } } @@ -4539,252 +5212,379 @@ jQuery.extend({ } } }); -// exclude the following css properties to add px -var rexclude = /z-?index|font-?weight|opacity|zoom|line-?height/i, - ralpha = /alpha$[^)]*$/, + +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 || "" ); + } + + if ( elem.parentNode ) { + elem.parentNode.removeChild( elem ); + } +} + + + + +var ralpha = /alpha$[^)]*$/i, ropacity = /opacity=([^)]*)/, - rfloat = /float/i, rdashAlpha = /-([a-z])/ig, rupper = /([A-Z])/g, rnumpx = /^-?\d+(?:px)?$/i, rnum = /^-?\d/, - cssShow = { position: "absolute", visibility: "hidden", display:"block" }, + cssShow = { position: "absolute", visibility: "hidden", display: "block" }, cssWidth = [ "Left", "Right" ], cssHeight = [ "Top", "Bottom" ], + curCSS, + + getComputedStyle, + currentStyle, - // cache check for defaultView.getComputedStyle - getComputedStyle = document.defaultView && document.defaultView.getComputedStyle, - // normalize float css property - styleFloat = jQuery.support.cssFloat ? "cssFloat" : "styleFloat", fcamelCase = function( all, letter ) { return letter.toUpperCase(); }; jQuery.fn.css = function( name, value ) { - return access( this, name, value, true, function( elem, name, value ) { - if ( value === undefined ) { - return jQuery.curCSS( elem, name ); - } - - if ( typeof value === "number" && !rexclude.test(name) ) { - value += "px"; - } + // Setting 'undefined' is a no-op + if ( arguments.length === 2 && value === undefined ) { + return this; + } - jQuery.style( elem, name, value ); + return jQuery.access( this, name, value, true, function( elem, name, value ) { + return value !== undefined ? + jQuery.style( elem, name, value ) : + jQuery.css( elem, name ); }); }; jQuery.extend({ - style: function( elem, name, value ) { - // don't set styles on text and comment nodes - if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) { - return undefined; + // Add in style property hooks for overriding the default + // behavior of getting and setting a style property + cssHooks: { + opacity: { + get: function( elem, computed ) { + if ( computed ) { + // We should always get a number back from opacity + var ret = curCSS( elem, "opacity", "opacity" ); + return ret === "" ? "1" : ret; + + } else { + return elem.style.opacity; + } + } } + }, + + // Exclude the following css properties to add px + cssNumber: { + "zIndex": true, + "fontWeight": true, + "opacity": true, + "zoom": true, + "lineHeight": true + }, + + // Add in properties whose names you wish to fix before + // setting or getting the value + cssProps: { + // normalize float css property + "float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat" + }, - // ignore negative width and height values #1599 - if ( (name === "width" || name === "height") && parseFloat(value) < 0 ) { - value = undefined; + // Get and set the style property on a DOM Node + style: function( elem, name, value, extra ) { + // Don't set styles on text and comment nodes + if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) { + return; } - var style = elem.style || elem, set = value !== undefined; + // Make sure that we're working with the right name + var ret, origName = jQuery.camelCase( name ), + style = elem.style, hooks = jQuery.cssHooks[ origName ]; - // IE uses filters for opacity - if ( !jQuery.support.opacity && name === "opacity" ) { - if ( set ) { - // IE has trouble with opacity if it does not have layout - // Force it by setting the zoom level - style.zoom = 1; + name = jQuery.cssProps[ origName ] || origName; - // Set the alpha filter to set the opacity - var opacity = parseInt( value, 10 ) + "" === "NaN" ? "" : "alpha(opacity=" + value * 100 + ")"; - var filter = style.filter || jQuery.curCSS( elem, "filter" ) || ""; - style.filter = ralpha.test(filter) ? filter.replace(ralpha, opacity) : opacity; + // Check if we're setting a value + if ( value !== undefined ) { + // Make sure that NaN and null values aren't set. See: #7116 + if ( typeof value === "number" && isNaN( value ) || value == null ) { + return; } - return style.filter && style.filter.indexOf("opacity=") >= 0 ? - (parseFloat( ropacity.exec(style.filter)[1] ) / 100) + "": - ""; + // If a number was passed in, add 'px' to the (except for certain CSS properties) + if ( typeof value === "number" && !jQuery.cssNumber[ origName ] ) { + value += "px"; + } + + // If a hook was provided, use that value, otherwise just set the specified value + if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value )) !== undefined ) { + // Wrapped to prevent IE from throwing errors when 'invalid' values are provided + // Fixes bug #5509 + try { + style[ name ] = value; + } catch(e) {} + } + + } else { + // If a hook was provided get the non-computed value from there + if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) { + return ret; + } + + // Otherwise just get the value from the style object + return style[ name ]; } + }, + + css: function( elem, name, extra ) { + // Make sure that we're working with the right name + var ret, origName = jQuery.camelCase( name ), + hooks = jQuery.cssHooks[ origName ]; - // Make sure we're using the right name for getting the float value - if ( rfloat.test( name ) ) { - name = styleFloat; + name = jQuery.cssProps[ origName ] || origName; + + // If a hook was provided get the computed value from there + if ( hooks && "get" in hooks && (ret = hooks.get( elem, true, extra )) !== undefined ) { + return ret; + + // Otherwise, if a way to get the computed value exists, use that + } else if ( curCSS ) { + return curCSS( elem, name, origName ); } + }, - name = name.replace(rdashAlpha, fcamelCase); + // A method for quickly swapping in/out CSS properties to get correct calculations + swap: function( elem, options, callback ) { + var old = {}; - if ( set ) { - style[ name ] = value; + // Remember the old values, and insert the new ones + for ( var name in options ) { + old[ name ] = elem.style[ name ]; + elem.style[ name ] = options[ name ]; } - return style[ name ]; + callback.call( elem ); + + // Revert the old values + for ( name in options ) { + elem.style[ name ] = old[ name ]; + } }, - css: function( elem, name, force, extra ) { - if ( name === "width" || name === "height" ) { - var val, props = cssShow, which = name === "width" ? cssWidth : cssHeight; + camelCase: function( string ) { + return string.replace( rdashAlpha, fcamelCase ); + } +}); - function getWH() { - val = name === "width" ? elem.offsetWidth : elem.offsetHeight; +// DEPRECATED, Use jQuery.css() instead +jQuery.curCSS = jQuery.css; - if ( extra === "border" ) { - return; +jQuery.each(["height", "width"], function( i, name ) { + jQuery.cssHooks[ name ] = { + get: function( elem, computed, extra ) { + var val; + + if ( computed ) { + if ( elem.offsetWidth !== 0 ) { + val = getWH( elem, name, extra ); + + } else { + jQuery.swap( elem, cssShow, function() { + val = getWH( elem, name, extra ); + }); } - jQuery.each( which, function() { - if ( !extra ) { - val -= parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0; + if ( val <= 0 ) { + val = curCSS( elem, name, name ); + + if ( val === "0px" && currentStyle ) { + val = currentStyle( elem, name, name ); } - if ( extra === "margin" ) { - val += parseFloat(jQuery.curCSS( elem, "margin" + this, true)) || 0; - } else { - val -= parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0; + if ( val != null ) { + // Should return "auto" instead of 0, use 0 for + // temporary backwards-compat + return val === "" || val === "auto" ? "0px" : val; } - }); - } + } - if ( elem.offsetWidth !== 0 ) { - getWH(); - } else { - jQuery.swap( elem, props, getWH ); - } + if ( val < 0 || val == null ) { + val = elem.style[ name ]; - return Math.max(0, Math.round(val)); - } + // Should return "auto" instead of 0, use 0 for + // temporary backwards-compat + return val === "" || val === "auto" ? "0px" : val; + } - return jQuery.curCSS( elem, name, force ); - }, + return typeof val === "string" ? val : val + "px"; + } + }, - curCSS: function( elem, name, force ) { - var ret, style = elem.style, filter; + set: function( elem, value ) { + if ( rnumpx.test( value ) ) { + // ignore negative width and height values #1599 + value = parseFloat(value); - // IE uses filters for opacity - if ( !jQuery.support.opacity && name === "opacity" && elem.currentStyle ) { - ret = ropacity.test(elem.currentStyle.filter || "") ? - (parseFloat(RegExp.$1) / 100) + "" : - ""; - - return ret === "" ? - "1" : - ret; - } + if ( value >= 0 ) { + return value + "px"; + } - // Make sure we're using the right name for getting the float value - if ( rfloat.test( name ) ) { - name = styleFloat; + } else { + return value; + } } + }; +}); - if ( !force && style && style[ name ] ) { - ret = style[ name ]; +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" : ""; + }, - } else if ( getComputedStyle ) { + set: function( elem, value ) { + var style = elem.style; - // Only "float" is needed here - if ( rfloat.test( name ) ) { - name = "float"; - } + // IE has trouble with opacity if it does not have layout + // Force it by setting the zoom level + style.zoom = 1; - name = name.replace( rupper, "-$1" ).toLowerCase(); + // Set the alpha filter to set the opacity + var opacity = jQuery.isNaN(value) ? + "" : + "alpha(opacity=" + value * 100 + ")", + filter = style.filter || ""; - var defaultView = elem.ownerDocument.defaultView; + style.filter = ralpha.test(filter) ? + filter.replace(ralpha, opacity) : + style.filter + ' ' + opacity; + } + }; +} - if ( !defaultView ) { - return null; - } +if ( document.defaultView && document.defaultView.getComputedStyle ) { + getComputedStyle = function( elem, newName, name ) { + var ret, defaultView, computedStyle; - var computedStyle = defaultView.getComputedStyle( elem, null ); + name = name.replace( rupper, "-$1" ).toLowerCase(); - if ( computedStyle ) { - ret = computedStyle.getPropertyValue( name ); - } + if ( !(defaultView = elem.ownerDocument.defaultView) ) { + return undefined; + } - // We should always get a number back from opacity - if ( name === "opacity" && ret === "" ) { - ret = "1"; + if ( (computedStyle = defaultView.getComputedStyle( elem, null )) ) { + ret = computedStyle.getPropertyValue( name ); + if ( ret === "" && !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) { + ret = jQuery.style( elem, name ); } + } - } else if ( elem.currentStyle ) { - var camelCase = name.replace(rdashAlpha, fcamelCase); + return ret; + }; +} - ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ]; +if ( document.documentElement.currentStyle ) { + currentStyle = function( elem, name ) { + var left, rsLeft, + ret = elem.currentStyle && elem.currentStyle[ name ], + style = elem.style; - // From the awesome hack by Dean Edwards - // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291 + // 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 ) ) { - // Remember the original values - var left = style.left, rsLeft = elem.runtimeStyle.left; + // 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 ) ) { + // Remember the original values + left = style.left; + rsLeft = elem.runtimeStyle.left; - // Put in the new values to get a computed value out - elem.runtimeStyle.left = elem.currentStyle.left; - style.left = camelCase === "fontSize" ? "1em" : (ret || 0); - ret = style.pixelLeft + "px"; + // Put in the new values to get a computed value out + elem.runtimeStyle.left = elem.currentStyle.left; + style.left = name === "fontSize" ? "1em" : (ret || 0); + ret = style.pixelLeft + "px"; - // Revert the changed values - style.left = left; - elem.runtimeStyle.left = rsLeft; - } + // Revert the changed values + style.left = left; + elem.runtimeStyle.left = rsLeft; } - return ret; - }, + return ret === "" ? "auto" : ret; + }; +} - // A method for quickly swapping in/out CSS properties to get correct calculations - swap: function( elem, options, callback ) { - var old = {}; +curCSS = getComputedStyle || currentStyle; - // Remember the old values, and insert the new ones - for ( var name in options ) { - old[ name ] = elem.style[ name ]; - elem.style[ name ] = options[ name ]; +function getWH( elem, name, extra ) { + var which = name === "width" ? cssWidth : cssHeight, + val = name === "width" ? elem.offsetWidth : elem.offsetHeight; + + if ( extra === "border" ) { + return val; + } + + jQuery.each( which, function() { + if ( !extra ) { + val -= parseFloat(jQuery.css( elem, "padding" + this )) || 0; } - callback.call( elem ); + if ( extra === "margin" ) { + val += parseFloat(jQuery.css( elem, "margin" + this )) || 0; - // Revert the old values - for ( var name in options ) { - elem.style[ name ] = old[ name ]; + } else { + val -= parseFloat(jQuery.css( elem, "border" + this + "Width" )) || 0; } - } -}); + }); + + return val; +} if ( jQuery.expr && jQuery.expr.filters ) { jQuery.expr.filters.hidden = function( elem ) { - var width = elem.offsetWidth, height = elem.offsetHeight, - skip = elem.nodeName.toLowerCase() === "tr"; - - return width === 0 && height === 0 && !skip ? - true : - width > 0 && height > 0 && !skip ? - false : - jQuery.curCSS(elem, "display") === "none"; + var width = elem.offsetWidth, + height = elem.offsetHeight; + + return (width === 0 && height === 0) || (!jQuery.support.reliableHiddenOffsets && (elem.style.display || jQuery.css( elem, "display" )) === "none"); }; jQuery.expr.filters.visible = function( elem ) { return !jQuery.expr.filters.hidden( elem ); }; } -var jsc = now(), - rscript = /<script(.|\s)*?\/script>/gi, - rselectTextarea = /select|textarea/i, - rinput = /color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i, - jsre = /=\?(&|$)/, + + + + +var jsc = jQuery.now(), + rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi, + rselectTextarea = /^(?:select|textarea)/i, + rinput = /^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i, + rnoContent = /^(?:GET|HEAD)$/, + rbracket = /\[\]$/, + jsre = /\=\?(&|$)/, rquery = /\?/, - rts = /(\?|&)_=.*?(&|$)/, + rts = /([?&])_=[^&]*/, rurl = /^(\w+:)?\/\/([^\/?#]+)/, r20 = /%20/g, + rhash = /#.*$/, // Keep a copy of the old load method _load = jQuery.fn.load; jQuery.fn.extend({ load: function( url, params, callback ) { - if ( typeof url !== "string" ) { - return _load.call( this, url ); + if ( typeof url !== "string" && _load ) { + return _load.apply( this, arguments ); // Don't do a request if no elements are being requested } else if ( !this.length ) { @@ -4829,7 +5629,7 @@ jQuery.fn.extend({ // See if a selector was specified self.html( selector ? // Create a dummy div to hold the results - jQuery("<div />") + jQuery("<div>") // inject the contents of the document in, removing the scripts // to avoid any 'Permission Denied' errors in IE .append(res.responseText.replace(rscript, "")) @@ -4853,6 +5653,7 @@ jQuery.fn.extend({ serialize: function() { return jQuery.param(this.serializeArray()); }, + serializeArray: function() { return this.map(function() { return this.elements ? jQuery.makeArray(this.elements) : this; @@ -4884,7 +5685,6 @@ jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".sp }); jQuery.extend({ - get: function( url, data, callback, type ) { // shift arguments if data argument was omited if ( jQuery.isFunction( data ) ) { @@ -4945,19 +5745,10 @@ jQuery.extend({ password: null, traditional: false, */ - // Create the request object; Microsoft failed to properly - // implement the XMLHttpRequest in IE7 (can't request local files), - // so we use the ActiveXObject when it is available // This function can be overriden by calling jQuery.ajaxSetup - xhr: window.XMLHttpRequest && (window.location.protocol !== "file:" || !window.ActiveXObject) ? - function() { - return new window.XMLHttpRequest(); - } : - function() { - try { - return new window.ActiveXObject("Microsoft.XMLHTTP"); - } catch(e) {} - }, + xhr: function() { + return new window.XMLHttpRequest(); + }, accepts: { xml: "application/xml, text/xml", html: "text/html", @@ -4968,16 +5759,14 @@ jQuery.extend({ } }, - // Last-Modified header cache for next request - lastModified: {}, - etag: {}, - ajax: function( origSettings ) { - var s = jQuery.extend(true, {}, jQuery.ajaxSettings, origSettings); - - var jsonp, status, data, - callbackContext = origSettings && origSettings.context || s, - type = s.type.toUpperCase(); + var s = jQuery.extend(true, {}, jQuery.ajaxSettings, origSettings), + jsonp, status, data, type = s.type.toUpperCase(), noContent = rnoContent.test(type); + + s.url = s.url.replace( rhash, "" ); + + // Use original (not extended) context object if it was provided + s.context = origSettings && origSettings.context != null ? origSettings.context : s; // convert data if not already a string if ( s.data && s.processData && typeof s.data !== "string" ) { @@ -5012,17 +5801,25 @@ jQuery.extend({ s.dataType = "script"; // Handle JSONP-style loading - window[ jsonp ] = window[ jsonp ] || function( tmp ) { - data = tmp; - success(); - complete(); - // Garbage collect - window[ jsonp ] = undefined; + var customJsonp = window[ jsonp ]; - try { - delete window[ jsonp ]; - } catch(e) {} + window[ jsonp ] = function( tmp ) { + if ( jQuery.isFunction( customJsonp ) ) { + customJsonp( tmp ); + + } else { + // Garbage collect + window[ jsonp ] = undefined; + + try { + delete window[ jsonp ]; + } catch( jsonpError ) {} + } + data = tmp; + jQuery.handleSuccess( s, xhr, status, data ); + jQuery.handleComplete( s, xhr, status, data ); + if ( head ) { head.removeChild( script ); } @@ -5033,39 +5830,39 @@ jQuery.extend({ s.cache = false; } - if ( s.cache === false && type === "GET" ) { - var ts = now(); + if ( s.cache === false && noContent ) { + var ts = jQuery.now(); // try replacing _= if it is there - var ret = s.url.replace(rts, "$1_=" + ts + "$2"); + var 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 : ""); } - // If data is available, append data to url for get requests - if ( s.data && type === "GET" ) { + // If data is available, append data to url for GET/HEAD requests + if ( s.data && noContent ) { s.url += (rquery.test(s.url) ? "&" : "?") + s.data; } // Watch for a new set of requests - if ( s.global && ! jQuery.active++ ) { + if ( s.global && jQuery.active++ === 0 ) { jQuery.event.trigger( "ajaxStart" ); } // Matches an absolute URL, and saves the domain var parts = rurl.exec( s.url ), - remote = parts && (parts[1] && parts[1] !== location.protocol || parts[2] !== location.host); + remote = parts && (parts[1] && parts[1].toLowerCase() !== location.protocol || parts[2].toLowerCase() !== location.host); // If we're requesting a remote document // and trying to load JSON or Script with a GET if ( s.dataType === "script" && type === "GET" && remote ) { var head = document.getElementsByTagName("head")[0] || document.documentElement; var script = document.createElement("script"); - script.src = s.url; if ( s.scriptCharset ) { script.charset = s.scriptCharset; } + script.src = s.url; // Handle Script loading if ( !jsonp ) { @@ -5076,8 +5873,8 @@ jQuery.extend({ if ( !done && (!this.readyState || this.readyState === "loaded" || this.readyState === "complete") ) { done = true; - success(); - complete(); + jQuery.handleSuccess( s, xhr, status, data ); + jQuery.handleComplete( s, xhr, status, data ); // Handle memory leak in IE script.onload = script.onreadystatechange = null; @@ -5115,8 +5912,8 @@ jQuery.extend({ // Need an extra try/catch for cross domain requests in Firefox 3 try { - // Set the correct header, if data is being sent - if ( s.data || origSettings && origSettings.contentType ) { + // Set content-type if data specified and content-body is valid for this type + if ( (s.data != null && !noContent) || (origSettings && origSettings.contentType) ) { xhr.setRequestHeader("Content-Type", s.contentType); } @@ -5139,14 +5936,14 @@ jQuery.extend({ // Set the Accepts header for the server, depending on the dataType xhr.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ? - s.accepts[ s.dataType ] + ", */*" : + s.accepts[ s.dataType ] + ", */*; q=0.01" : s.accepts._default ); - } catch(e) {} + } catch( headerError ) {} // Allow custom headers/mimetypes and early abort - if ( s.beforeSend && s.beforeSend.call(callbackContext, xhr, s) === false ) { + if ( s.beforeSend && s.beforeSend.call(s.context, xhr, s) === false ) { // Handle the global AJAX counter - if ( s.global && ! --jQuery.active ) { + if ( s.global && jQuery.active-- === 1 ) { jQuery.event.trigger( "ajaxStop" ); } @@ -5156,7 +5953,7 @@ jQuery.extend({ } if ( s.global ) { - trigger("ajaxSend", [xhr, s]); + jQuery.triggerGlobal( s, "ajaxSend", [xhr, s] ); } // Wait for a response to come back @@ -5166,7 +5963,7 @@ jQuery.extend({ // Opera doesn't call onreadystatechange before this point // so we simulate the call if ( !requestDone ) { - complete(); + jQuery.handleComplete( s, xhr, status, data ); } requestDone = true; @@ -5194,9 +5991,9 @@ jQuery.extend({ try { // process the data (runs the xml through httpData regardless of callback) data = jQuery.httpData( xhr, s.dataType, s ); - } catch(err) { + } catch( parserError ) { status = "parsererror"; - errMsg = err; + errMsg = parserError; } } @@ -5204,14 +6001,16 @@ jQuery.extend({ if ( status === "success" || status === "notmodified" ) { // JSONP handles its own success callback if ( !jsonp ) { - success(); + jQuery.handleSuccess( s, xhr, status, data ); } } else { - jQuery.handleError(s, xhr, status, errMsg); + jQuery.handleError( s, xhr, status, errMsg ); } // Fire the complete handlers - complete(); + if ( !jsonp ) { + jQuery.handleComplete( s, xhr, status, data ); + } if ( isTimeout === "timeout" ) { xhr.abort(); @@ -5224,18 +6023,21 @@ jQuery.extend({ } }; - // Override the abort handler, if we can (IE doesn't allow it, but that's OK) + // Override the abort handler, if we can (IE 6 doesn't allow it, but that's OK) // Opera doesn't fire onreadystatechange at all on abort try { var oldAbort = xhr.abort; xhr.abort = function() { if ( xhr ) { - oldAbort.call( xhr ); + // oldAbort has no call property in IE7 so + // just do it this way, which works in all + // browsers + Function.prototype.call.call( oldAbort, xhr ); } onreadystatechange( "abort" ); }; - } catch(e) { } + } catch( abortError ) {} // Timeout checker if ( s.async && s.timeout > 0 ) { @@ -5249,11 +6051,13 @@ jQuery.extend({ // Send the data try { - xhr.send( type === "POST" || type === "PUT" || type === "DELETE" ? s.data : null ); - } catch(e) { - jQuery.handleError(s, xhr, null, e); + xhr.send( noContent || s.data == null ? null : s.data ); + + } catch( sendError ) { + jQuery.handleError( s, xhr, null, sendError ); + // Fire the complete handlers - complete(); + jQuery.handleComplete( s, xhr, status, data ); } // firefox 1.5 doesn't fire statechange for sync requests @@ -5261,66 +6065,145 @@ jQuery.extend({ onreadystatechange(); } - function success() { - // If a local callback was specified, fire it and pass it the data - if ( s.success ) { - s.success.call( callbackContext, data, status, xhr ); - } + // return XMLHttpRequest to allow aborting the request etc. + return xhr; + }, - // Fire the global callback - if ( s.global ) { - trigger( "ajaxSuccess", [xhr, s] ); + // Serialize an array of form elements or a set of + // key/values into a query string + param: function( a, traditional ) { + var s = [], + add = function( key, value ) { + // If value is a function, invoke it and return its value + value = jQuery.isFunction(value) ? value() : value; + s[ s.length ] = encodeURIComponent(key) + "=" + encodeURIComponent(value); + }; + + // Set traditional to true for jQuery <= 1.3.2 behavior. + if ( traditional === undefined ) { + traditional = jQuery.ajaxSettings.traditional; + } + + // If an array was passed in, assume that it is an array of form elements. + if ( jQuery.isArray(a) || a.jquery ) { + // Serialize the form elements + jQuery.each( a, function() { + add( this.name, this.value ); + }); + + } else { + // If traditional, encode the "old" way (the way 1.3.2 or older + // did it), otherwise encode params recursively. + for ( var prefix in a ) { + buildParams( prefix, a[prefix], traditional, add ); } } - function complete() { - // Process result - if ( s.complete ) { - s.complete.call( callbackContext, xhr, status); - } + // Return the resulting serialization + return s.join("&").replace(r20, "+"); + } +}); - // The request was completed - if ( s.global ) { - trigger( "ajaxComplete", [xhr, s] ); - } +function buildParams( prefix, obj, traditional, add ) { + if ( jQuery.isArray(obj) && obj.length ) { + // Serialize array item. + jQuery.each( obj, function( i, v ) { + if ( traditional || rbracket.test( prefix ) ) { + // Treat each array item as a scalar. + add( prefix, v ); - // Handle the global AJAX counter - if ( s.global && ! --jQuery.active ) { - jQuery.event.trigger( "ajaxStop" ); + } else { + // If array item is non-scalar (array or object), encode its + // numeric index to resolve deserialization ambiguity issues. + // Note that rack (as of 1.0.0) can't currently deserialize + // nested arrays properly, and attempting to do so may cause + // 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 ); } + }); + + } else if ( !traditional && obj != null && typeof obj === "object" ) { + if ( jQuery.isEmptyObject( obj ) ) { + add( prefix, "" ); + + // Serialize object item. + } else { + jQuery.each( obj, function( k, v ) { + buildParams( prefix + "[" + k + "]", v, traditional, add ); + }); } - - function trigger(type, args) { - (s.context ? jQuery(s.context) : jQuery.event).trigger(type, args); - } + + } else { + // Serialize scalar item. + add( prefix, obj ); + } +} - // return XMLHttpRequest to allow aborting the request etc. - return xhr; - }, +// This is still on the jQuery object... for now +// Want to move this to jQuery.ajax some day +jQuery.extend({ + + // Counter for holding the number of active queries + active: 0, + + // Last-Modified header cache for next request + lastModified: {}, + etag: {}, handleError: function( s, xhr, status, e ) { // If a local callback was specified, fire it if ( s.error ) { - s.error.call( s.context || s, xhr, status, e ); + s.error.call( s.context, xhr, status, e ); } // Fire the global callback if ( s.global ) { - (s.context ? jQuery(s.context) : jQuery.event).trigger( "ajaxError", [xhr, s, e] ); + jQuery.triggerGlobal( s, "ajaxError", [xhr, s, e] ); } }, - // Counter for holding the number of active queries - active: 0, + handleSuccess: function( s, xhr, status, data ) { + // If a local callback was specified, fire it and pass it the data + if ( s.success ) { + s.success.call( s.context, data, status, xhr ); + } + + // Fire the global callback + if ( s.global ) { + jQuery.triggerGlobal( s, "ajaxSuccess", [xhr, s] ); + } + }, + + handleComplete: function( s, xhr, status ) { + // Process result + if ( s.complete ) { + s.complete.call( s.context, xhr, status ); + } + + // The request was completed + if ( s.global ) { + jQuery.triggerGlobal( s, "ajaxComplete", [xhr, s] ); + } + + // Handle the global AJAX counter + if ( s.global && jQuery.active-- === 1 ) { + jQuery.event.trigger( "ajaxStop" ); + } + }, + + triggerGlobal: function( s, type, args ) { + (s.context && s.context.url == null ? jQuery(s.context) : jQuery.event).trigger(type, args); + }, // Determines if an XMLHttpRequest was successful or not httpSuccess: function( xhr ) { try { // IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450 return !xhr.status && location.protocol === "file:" || - // Opera returns 0 when status is 304 - ( xhr.status >= 200 && xhr.status < 300 ) || - xhr.status === 304 || xhr.status === 1223 || xhr.status === 0; + xhr.status >= 200 && xhr.status < 300 || + xhr.status === 304 || xhr.status === 1223; } catch(e) {} return false; @@ -5339,8 +6222,7 @@ jQuery.extend({ jQuery.etag[url] = etag; } - // Opera returns 0 when status is 304 - return xhr.status === 304 || xhr.status === 0; + return xhr.status === 304; }, httpData: function( xhr, type, s ) { @@ -5371,77 +6253,40 @@ jQuery.extend({ } return data; - }, + } - // Serialize an array of form elements or a set of - // key/values into a query string - param: function( a, traditional ) { - var s = []; - - // Set traditional to true for jQuery <= 1.3.2 behavior. - if ( traditional === undefined ) { - traditional = jQuery.ajaxSettings.traditional; - } - - // If an array was passed in, assume that it is an array of form elements. - if ( jQuery.isArray(a) || a.jquery ) { - // Serialize the form elements - jQuery.each( a, function() { - add( this.name, this.value ); - }); - - } else { - // If traditional, encode the "old" way (the way 1.3.2 or older - // did it), otherwise encode params recursively. - for ( var prefix in a ) { - buildParams( prefix, a[prefix] ); - } +}); + +/* + * Create the request object; Microsoft failed to properly + * implement the XMLHttpRequest in IE7 (can't request local files), + * so we use the ActiveXObject when it is available + * Additionally XMLHttpRequest can be disabled in IE7/IE8 so + * we need a fallback. + */ +if ( window.ActiveXObject ) { + jQuery.ajaxSettings.xhr = function() { + if ( window.location.protocol !== "file:" ) { + try { + return new window.XMLHttpRequest(); + } catch(xhrError) {} } - // Return the resulting serialization - return s.join("&").replace(r20, "+"); + try { + return new window.ActiveXObject("Microsoft.XMLHTTP"); + } catch(activeError) {} + }; +} + +// Does this browser support XHR requests? +jQuery.support.ajax = !!jQuery.ajaxSettings.xhr(); + + - function buildParams( prefix, obj ) { - if ( jQuery.isArray(obj) ) { - // Serialize array item. - jQuery.each( obj, function( i, v ) { - if ( traditional || /\[\]$/.test( prefix ) ) { - // Treat each array item as a scalar. - add( prefix, v ); - } else { - // If array item is non-scalar (array or object), encode its - // numeric index to resolve deserialization ambiguity issues. - // Note that rack (as of 1.0.0) can't currently deserialize - // nested arrays properly, and attempting to do so may cause - // 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 ); - } - }); - - } else if ( !traditional && obj != null && typeof obj === "object" ) { - // Serialize object item. - jQuery.each( obj, function( k, v ) { - buildParams( prefix + "[" + k + "]", v ); - }); - - } else { - // Serialize scalar item. - add( prefix, obj ); - } - } - function add( key, value ) { - // If value is a function, invoke it and return its value - value = jQuery.isFunction(value) ? value() : value; - s[ s.length ] = encodeURIComponent(key) + "=" + encodeURIComponent(value); - } - } -}); var elemdisplay = {}, - rfxtypes = /toggle|show|hide/, - rfxnum = /^([+-]=)?([\d+-.]+)(.*)$/, + rfxtypes = /^(?:toggle|show|hide)$/, + rfxnum = /^([+\-]=)?([\d+.\-]+)(.*)$/, timerId, fxAttrs = [ // height animations @@ -5453,66 +6298,63 @@ var elemdisplay = {}, ]; jQuery.fn.extend({ - show: function( speed, callback ) { - if ( speed || speed === 0) { - return this.animate( genFx("show", 3), speed, callback); - - } else { - for ( var i = 0, l = this.length; i < l; i++ ) { - var old = jQuery.data(this[i], "olddisplay"); + show: function( speed, easing, callback ) { + var elem, display; - this[i].style.display = old || ""; - - if ( jQuery.css(this[i], "display") === "none" ) { - var nodeName = this[i].nodeName, display; - - if ( elemdisplay[ nodeName ] ) { - display = elemdisplay[ nodeName ]; - - } else { - var elem = jQuery("<" + nodeName + " />").appendTo("body"); - - display = elem.css("display"); - - if ( display === "none" ) { - display = "block"; - } - - elem.remove(); + if ( speed || speed === 0 ) { + return this.animate( genFx("show", 3), speed, easing, callback); - elemdisplay[ nodeName ] = display; - } + } else { + for ( var i = 0, j = this.length; i < j; i++ ) { + elem = this[i]; + display = elem.style.display; + + // Reset the inline display of this element to learn if it is + // being hidden by cascaded rules or not + if ( !jQuery.data(elem, "olddisplay") && display === "none" ) { + display = elem.style.display = ""; + } - jQuery.data(this[i], "olddisplay", display); + // 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)); } } - // Set the display of the elements in a second loop + // Set the display of most of the elements in a second loop // to avoid the constant reflow - for ( var j = 0, k = this.length; j < k; j++ ) { - this[j].style.display = jQuery.data(this[j], "olddisplay") || ""; + for ( i = 0; i < j; i++ ) { + elem = this[i]; + display = elem.style.display; + + if ( display === "" || display === "none" ) { + elem.style.display = jQuery.data(elem, "olddisplay") || ""; + } } return this; } }, - hide: function( speed, callback ) { + hide: function( speed, easing, callback ) { if ( speed || speed === 0 ) { - return this.animate( genFx("hide", 3), speed, callback); + return this.animate( genFx("hide", 3), speed, easing, callback); } else { - for ( var i = 0, l = this.length; i < l; i++ ) { - var old = jQuery.data(this[i], "olddisplay"); - if ( !old && old !== "none" ) { - jQuery.data(this[i], "olddisplay", jQuery.css(this[i], "display")); + for ( var i = 0, j = this.length; i < j; i++ ) { + var display = jQuery.css( this[i], "display" ); + + if ( display !== "none" ) { + jQuery.data( this[i], "olddisplay", display ); } } // Set the display of the elements in a second loop // to avoid the constant reflow - for ( var j = 0, k = this.length; j < k; j++ ) { - this[j].style.display = "none"; + for ( i = 0; i < j; i++ ) { + this[i].style.display = "none"; } return this; @@ -5522,7 +6364,7 @@ jQuery.fn.extend({ // Save the old toggle function _toggle: jQuery.fn.toggle, - toggle: function( fn, fn2 ) { + toggle: function( fn, fn2, callback ) { var bool = typeof fn === "boolean"; if ( jQuery.isFunction(fn) && jQuery.isFunction(fn2) ) { @@ -5535,15 +6377,15 @@ jQuery.fn.extend({ }); } else { - this.animate(genFx("toggle", 3), fn, fn2); + this.animate(genFx("toggle", 3), fn, fn2, callback); } return this; }, - fadeTo: function( speed, to, callback ) { + fadeTo: function( speed, to, easing, callback ) { return this.filter(":hidden").css("opacity", 0).show().end() - .animate({opacity: to}, speed, callback); + .animate({opacity: to}, speed, easing, callback); }, animate: function( prop, speed, easing, callback ) { @@ -5554,12 +6396,16 @@ jQuery.fn.extend({ } return this[ optall.queue === false ? "each" : "queue" ](function() { + // XXX 'this' does not always have a nodeName when running the + // test suite + var opt = jQuery.extend({}, optall), p, - hidden = this.nodeType === 1 && jQuery(this).is(":hidden"), + isElement = this.nodeType === 1, + hidden = isElement && jQuery(this).is(":hidden"), self = this; for ( p in prop ) { - var name = p.replace(rdashAlpha, fcamelCase); + var name = jQuery.camelCase( p ); if ( p !== name ) { prop[ name ] = prop[ p ]; @@ -5571,12 +6417,35 @@ jQuery.fn.extend({ return opt.complete.call(this); } - if ( ( p === "height" || p === "width" ) && this.style ) { - // Store display property - opt.display = jQuery.css(this, "display"); - + if ( isElement && ( p === "height" || p === "width" ) ) { // Make sure that nothing sneaks out - opt.overflow = this.style.overflow; + // Record all 3 overflow attributes because IE does not + // change the overflow attribute when overflowX and + // overflowY are set to the same value + 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 + if ( jQuery.css( this, "display" ) === "inline" && + jQuery.css( this, "float" ) === "none" ) { + if ( !jQuery.support.inlineBlockNeedsLayout ) { + this.style.display = "inline-block"; + + } else { + var 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; + } + } + } } if ( jQuery.isArray( prop[p] ) ) { @@ -5600,7 +6469,7 @@ jQuery.fn.extend({ } else { var parts = rfxnum.exec(val), - start = e.cur(true) || 0; + start = e.cur() || 0; if ( parts ) { var end = parseFloat( parts[2] ), @@ -5608,9 +6477,9 @@ jQuery.fn.extend({ // We need to compute starting value if ( unit !== "px" ) { - self.style[ name ] = (end || 1) + unit; - start = ((end || 1) / e.cur(true)) * start; - self.style[ name ] = start + unit; + jQuery.style( self, name, (end || 1) + unit); + start = ((end || 1) / e.cur()) * start; + jQuery.style( self, name, start + unit); } // If a +=/-= token was provided, we're doing a relative animation @@ -5662,22 +6531,33 @@ jQuery.fn.extend({ }); +function genFx( type, num ) { + var obj = {}; + + jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() { + obj[ this ] = type; + }); + + return obj; +} + // Generate shortcuts for custom animations jQuery.each({ slideDown: genFx("show", 1), slideUp: genFx("hide", 1), slideToggle: genFx("toggle", 1), fadeIn: { opacity: "show" }, - fadeOut: { opacity: "hide" } + fadeOut: { opacity: "hide" }, + fadeToggle: { opacity: "toggle" } }, function( name, props ) { - jQuery.fn[ name ] = function( speed, callback ) { - return this.animate( props, speed, callback ); + jQuery.fn[ name ] = function( speed, easing, callback ) { + return this.animate( props, speed, easing, callback ); }; }); jQuery.extend({ speed: function( speed, easing, fn ) { - var opt = speed && typeof speed === "object" ? speed : { + var opt = speed && typeof speed === "object" ? jQuery.extend({}, speed) : { complete: fn || !fn && easing || jQuery.isFunction( speed ) && speed, duration: speed, @@ -5685,7 +6565,7 @@ jQuery.extend({ }; opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration : - jQuery.fx.speeds[opt.duration] || jQuery.fx.speeds._default; + opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[opt.duration] : jQuery.fx.speeds._default; // Queueing opt.old = opt.complete; @@ -5732,33 +6612,30 @@ jQuery.fx.prototype = { } (jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this ); - - // Set display property to block for height/width animations - if ( ( this.prop === "height" || this.prop === "width" ) && this.elem.style ) { - this.elem.style.display = "block"; - } }, // Get the current size - cur: function( force ) { + cur: function() { if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) ) { return this.elem[ this.prop ]; } - var r = parseFloat(jQuery.css(this.elem, this.prop, force)); - return r && r > -10000 ? r : parseFloat(jQuery.curCSS(this.elem, this.prop)) || 0; + var r = parseFloat( jQuery.css( this.elem, this.prop ) ); + return r && r > -10000 ? r : 0; }, // Start an animation from one number to another custom: function( from, to, unit ) { - this.startTime = now(); + var self = this, + fx = jQuery.fx; + + this.startTime = jQuery.now(); this.start = from; this.end = to; this.unit = unit || this.unit || "px"; this.now = this.start; this.pos = this.state = 0; - var self = this; function t( gotoEnd ) { return self.step(gotoEnd); } @@ -5766,7 +6643,7 @@ jQuery.fx.prototype = { t.elem = this.elem; if ( t() && jQuery.timers.push(t) && !timerId ) { - timerId = setInterval(jQuery.fx.tick, 13); + timerId = setInterval(fx.tick, fx.interval); } }, @@ -5797,7 +6674,7 @@ jQuery.fx.prototype = { // Each step of an animation step: function( gotoEnd ) { - var t = now(), done = true; + var t = jQuery.now(), done = true; if ( gotoEnd || t >= this.options.duration + this.startTime ) { this.now = this.end; @@ -5813,17 +6690,14 @@ jQuery.fx.prototype = { } if ( done ) { - if ( this.options.display != null ) { - // Reset the overflow - this.elem.style.overflow = this.options.overflow; - - // Reset the display - var old = jQuery.data(this.elem, "olddisplay"); - this.elem.style.display = old ? old : this.options.display; - - if ( jQuery.css(this.elem, "display") === "none" ) { - this.elem.style.display = "block"; - } + // Reset the overflow + if ( this.options.overflow != null && !jQuery.support.shrinkWrapBlocks ) { + var elem = this.elem, + options = this.options; + + jQuery.each( [ "", "X", "Y" ], function (index, value) { + elem.style[ "overflow" + value ] = options.overflow[index]; + } ); } // Hide the element if the "hide" operation was done @@ -5834,7 +6708,7 @@ jQuery.fx.prototype = { // Reset the properties, if the item has been hidden or shown if ( this.options.hide || this.options.show ) { for ( var p in this.options.curAnim ) { - jQuery.style(this.elem, p, this.options.orig[p]); + jQuery.style( this.elem, p, this.options.orig[p] ); } } @@ -5876,22 +6750,24 @@ jQuery.extend( jQuery.fx, { jQuery.fx.stop(); } }, - + + interval: 13, + stop: function() { clearInterval( timerId ); timerId = null; }, - + speeds: { slow: 600, - fast: 200, - // Default speed - _default: 400 + fast: 200, + // Default speed + _default: 400 }, step: { opacity: function( fx ) { - jQuery.style(fx.elem, "opacity", fx.now); + jQuery.style( fx.elem, "opacity", fx.now ); }, _default: function( fx ) { @@ -5912,18 +6788,32 @@ if ( jQuery.expr && jQuery.expr.filters ) { }; } -function genFx( type, num ) { - var obj = {}; +function defaultDisplay( nodeName ) { + if ( !elemdisplay[ nodeName ] ) { + var elem = jQuery("<" + nodeName + ">").appendTo("body"), + display = elem.css("display"); - jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() { - obj[ this ] = type; - }); + elem.remove(); - return obj; + if ( display === "none" || display === "" ) { + display = "block"; + } + + elemdisplay[ nodeName ] = display; + } + + return elemdisplay[ nodeName ]; } + + + + +var rtable = /^t(?:able|d|h)$/i, + rroot = /^(?:body|html)$/i; + if ( "getBoundingClientRect" in document.documentElement ) { jQuery.fn.offset = function( options ) { - var elem = this[0]; + var elem = this[0], box; if ( options ) { return this.each(function( i ) { @@ -5939,10 +6829,26 @@ if ( "getBoundingClientRect" in document.documentElement ) { return jQuery.offset.bodyOffset( elem ); } - var box = elem.getBoundingClientRect(), doc = elem.ownerDocument, body = doc.body, docElem = doc.documentElement, - clientTop = docElem.clientTop || body.clientTop || 0, clientLeft = docElem.clientLeft || body.clientLeft || 0, - top = box.top + (self.pageYOffset || jQuery.support.boxModel && docElem.scrollTop || body.scrollTop ) - clientTop, - left = box.left + (self.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft) - clientLeft; + 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: 0, left: 0 }; + } + + var body = doc.body, + 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 ), + scrollLeft = (win.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft), + top = box.top + scrollTop - clientTop, + left = box.left + scrollLeft - clientLeft; return { top: top, left: left }; }; @@ -5967,11 +6873,16 @@ if ( "getBoundingClientRect" in document.documentElement ) { jQuery.offset.initialize(); - var offsetParent = elem.offsetParent, prevOffsetParent = elem, - doc = elem.ownerDocument, computedStyle, docElem = doc.documentElement, - body = doc.body, defaultView = doc.defaultView, + 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, - top = elem.offsetTop, left = elem.offsetLeft; + top = elem.offsetTop, + left = elem.offsetLeft; while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) { if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) { @@ -5986,12 +6897,13 @@ if ( "getBoundingClientRect" in document.documentElement ) { top += elem.offsetTop; left += elem.offsetLeft; - if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && /^t(able|d|h)$/i.test(elem.nodeName)) ) { + if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && rtable.test(elem.nodeName)) ) { top += parseFloat( computedStyle.borderTopWidth ) || 0; left += parseFloat( computedStyle.borderLeftWidth ) || 0; } - prevOffsetParent = offsetParent, offsetParent = elem.offsetParent; + prevOffsetParent = offsetParent; + offsetParent = elem.offsetParent; } if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) { @@ -6018,7 +6930,7 @@ if ( "getBoundingClientRect" in document.documentElement ) { jQuery.offset = { initialize: function() { - var body = document.body, container = document.createElement("div"), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat( jQuery.curCSS(body, "marginTop", true) ) || 0, + var body = document.body, container = document.createElement("div"), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat( jQuery.css(body, "marginTop") ) || 0, html = "<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>"; jQuery.extend( container.style, { position: "absolute", top: 0, left: 0, margin: 0, border: 0, width: "1px", height: "1px", visibility: "hidden" } ); @@ -6032,12 +6944,16 @@ jQuery.offset = { this.doesNotAddBorder = (checkDiv.offsetTop !== 5); this.doesAddBorderForTableAndCells = (td.offsetTop === 5); - checkDiv.style.position = "fixed", checkDiv.style.top = "20px"; + 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"; + innerDiv.style.overflow = "hidden"; + innerDiv.style.position = "relative"; + this.subtractsBorderForOverflowNotVisible = (checkDiv.offsetTop === -5); this.doesNotIncludeMarginInBodyOffset = (body.offsetTop !== bodyMarginTop); @@ -6048,36 +6964,52 @@ jQuery.offset = { }, bodyOffset: function( body ) { - var top = body.offsetTop, left = body.offsetLeft; + var top = body.offsetTop, + left = body.offsetLeft; jQuery.offset.initialize(); if ( jQuery.offset.doesNotIncludeMarginInBodyOffset ) { - top += parseFloat( jQuery.curCSS(body, "marginTop", true) ) || 0; - left += parseFloat( jQuery.curCSS(body, "marginLeft", true) ) || 0; + top += parseFloat( jQuery.css(body, "marginTop") ) || 0; + left += parseFloat( jQuery.css(body, "marginLeft") ) || 0; } return { top: top, left: left }; }, setOffset: function( elem, options, i ) { + var position = jQuery.css( elem, "position" ); + // set position first, in-case top/left are set even on static elem - if ( /static/.test( jQuery.curCSS( elem, "position" ) ) ) { + if ( position === "static" ) { elem.style.position = "relative"; } - var curElem = jQuery( elem ), + + var curElem = jQuery( elem ), curOffset = curElem.offset(), - curTop = parseInt( jQuery.curCSS( elem, "top", true ), 10 ) || 0, - curLeft = parseInt( jQuery.curCSS( elem, "left", true ), 10 ) || 0; + curCSSTop = jQuery.css( elem, "top" ), + curCSSLeft = jQuery.css( elem, "left" ), + calculatePosition = (position === "absolute" && 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 absolute + if ( calculatePosition ) { + curPosition = curElem.position(); + } + + curTop = calculatePosition ? curPosition.top : parseInt( curCSSTop, 10 ) || 0; + curLeft = calculatePosition ? curPosition.left : parseInt( curCSSLeft, 10 ) || 0; if ( jQuery.isFunction( options ) ) { options = options.call( elem, i, curOffset ); } - var props = { - top: (options.top - curOffset.top) + curTop, - left: (options.left - curOffset.left) + curLeft - }; + if (options.top != null) { + props.top = (options.top - curOffset.top) + curTop; + } + if (options.left != null) { + props.left = (options.left - curOffset.left) + curLeft; + } if ( "using" in options ) { options.using.call( elem, props ); @@ -6101,17 +7033,17 @@ jQuery.fn.extend({ // Get correct offsets offset = this.offset(), - parentOffset = /^body|html$/i.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset(); + parentOffset = rroot.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset(); // Subtract element margins // note: when an element has margin: auto the offsetLeft and marginLeft // are the same in Safari causing offset.left to incorrectly be 0 - offset.top -= parseFloat( jQuery.curCSS(elem, "marginTop", true) ) || 0; - offset.left -= parseFloat( jQuery.curCSS(elem, "marginLeft", true) ) || 0; + offset.top -= parseFloat( jQuery.css(elem, "marginTop") ) || 0; + offset.left -= parseFloat( jQuery.css(elem, "marginLeft") ) || 0; // Add offsetParent borders - parentOffset.top += parseFloat( jQuery.curCSS(offsetParent[0], "borderTopWidth", true) ) || 0; - parentOffset.left += parseFloat( jQuery.curCSS(offsetParent[0], "borderLeftWidth", true) ) || 0; + parentOffset.top += parseFloat( jQuery.css(offsetParent[0], "borderTopWidth") ) || 0; + parentOffset.left += parseFloat( jQuery.css(offsetParent[0], "borderLeftWidth") ) || 0; // Subtract the two offsets return { @@ -6123,7 +7055,7 @@ jQuery.fn.extend({ offsetParent: function() { return this.map(function() { var offsetParent = this.offsetParent || document.body; - while ( offsetParent && (!/^body|html$/i.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) { + while ( offsetParent && (!rroot.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) { offsetParent = offsetParent.offsetParent; } return offsetParent; @@ -6171,12 +7103,16 @@ jQuery.each( ["Left", "Top"], function( i, name ) { }); function getWindow( elem ) { - return ("scrollTo" in elem && elem.document) ? + return jQuery.isWindow( elem ) ? elem : elem.nodeType === 9 ? elem.defaultView || elem.parentWindow : false; } + + + + // Create innerHeight, innerWidth, outerHeight and outerWidth methods jQuery.each([ "Height", "Width" ], function( i, name ) { @@ -6185,14 +7121,14 @@ jQuery.each([ "Height", "Width" ], function( i, name ) { // innerHeight and innerWidth jQuery.fn["inner" + name] = function() { return this[0] ? - jQuery.css( this[0], type, false, "padding" ) : + parseFloat( jQuery.css( this[0], type, "padding" ) ) : null; }; // outerHeight and outerWidth jQuery.fn["outer" + name] = function( margin ) { return this[0] ? - jQuery.css( this[0], type, false, margin ? "margin" : "border" ) : + parseFloat( jQuery.css( this[0], type, margin ? "margin" : "border" ) ) : null; }; @@ -6210,31 +7146,34 @@ jQuery.each([ "Height", "Width" ], function( i, name ) { }); } - return ("scrollTo" in elem && elem.document) ? // does it walk and quack like a window? + if ( jQuery.isWindow( elem ) ) { // Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode - elem.document.compatMode === "CSS1Compat" && elem.document.documentElement[ "client" + name ] || - elem.document.body[ "client" + name ] : - - // Get document width or height - (elem.nodeType === 9) ? // is it a document - // Either scroll[Width/Height] or offset[Width/Height], whichever is greater - Math.max( - elem.documentElement["client" + name], - elem.body["scroll" + name], elem.documentElement["scroll" + name], - elem.body["offset" + name], elem.documentElement["offset" + name] - ) : - - // Get or set width or height on the element - size === undefined ? - // Get width or height on the element - jQuery.css( elem, type ) : - - // Set the width or height on the element (default to pixels if value is unitless) - this.css( type, typeof size === "string" ? size : size + "px" ); + return elem.document.compatMode === "CSS1Compat" && elem.document.documentElement[ "client" + name ] || + elem.document.body[ "client" + name ]; + + // 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] + ); + + // Get or set width or height on the element + } else if ( size === undefined ) { + var orig = jQuery.css( elem, type ), + ret = parseFloat( 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" ); + } }; }); -// Expose jQuery to the global object -window.jQuery = window.$ = jQuery; + })(window); diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index 870ac56..21ca47a 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -170,7 +170,7 @@ function PMA_auth() $page_title = 'phpMyAdmin '; require './libraries/header_meta_style.inc.php'; ?> -<script src="./js/jquery/jquery-1.4.2.js" type="text/javascript"></script> +<script src="./js/jquery/jquery-1.4.4.js" type="text/javascript"></script> <script src="./js/update-location.js" type="text/javascript"></script> <script type="text/javascript"> //<![CDATA[ diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 6628115..d65c254 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -539,7 +539,7 @@ $_REQUEST['js_frame'] = PMA_ifSetOr($_REQUEST['js_frame'], ''); * @global array $js_include */ $GLOBALS['js_include'] = array(); -$GLOBALS['js_include'][] = 'jquery/jquery-1.4.2.js'; +$GLOBALS['js_include'][] = 'jquery/jquery-1.4.4.js'; $GLOBALS['js_include'][] = 'update-location.js'; /** diff --git a/navigation.php b/navigation.php index aa16e66..6f799d6 100644 --- a/navigation.php +++ b/navigation.php @@ -130,7 +130,7 @@ require_once './libraries/header_http.inc.php'; <base target="frame_content" /> <link rel="stylesheet" type="text/css" href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&js_frame=left&nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" /> - <script src="./js/jquery/jquery-1.4.2.js" type="text/javascript"></script> + <script src="./js/jquery/jquery-1.4.4.js" type="text/javascript"></script> <script type="text/javascript" src="js/navigation.js"></script> <script type="text/javascript" src="js/functions.js"></script> <script type="text/javascript"> diff --git a/pmd_general.php b/pmd_general.php index eb2e445..cd9953a 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -27,7 +27,7 @@ $hidden = "hidden"; <link rel="shortcut icon" href="pmd/images/favicon.ico" type="image/x-icon" /> <link rel="stylesheet" type="text/css" href="pmd/styles/<?php echo $GLOBALS['PMD']['STYLE'] ?>/style1.css" /> <title>Designer</title> - <script src="./js/jquery/jquery-1.4.2.js" type="text/javascript"></script> + <script src="./js/jquery/jquery-1.4.4.js" type="text/javascript"></script> <script type="text/javascript"> // <![CDATA[ <?php diff --git a/setup/index.php b/setup/index.php index 7d78928..0d4ae4f 100644 --- a/setup/index.php +++ b/setup/index.php @@ -33,7 +33,7 @@ require './libraries/header_http.inc.php'; <link href="../favicon.ico" rel="icon" type="image/x-icon" /> <link href="../favicon.ico" rel="shortcut icon" type="image/x-icon" /> <link href="styles.css" rel="stylesheet" type="text/css" /> -<script type="text/javascript" src="../js/jquery/jquery-1.4.2.js"></script> +<script type="text/javascript" src="../js/jquery/jquery-1.4.4.js"></script> <script type="text/javascript" src="../js/jquery/jquery-ui-1.8.custom.js"></script> <script type="text/javascript" src="../js/jquery/jquery.json-2.2.js"></script> <script type="text/javascript" src="../js/config.js"></script> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin scripts branch, master, updated. b2856506838a42b7e868619f98aa932155a1bc92
by Michal Čihař 01 Jan '11

01 Jan '11

The branch, master has been updated via b2856506838a42b7e868619f98aa932155a1bc92 (commit) from 8fae4a3f22c4f578ee2d144bdc9b718e83a3bc40 (commit) - Log ----------------------------------------------------------------- commit b2856506838a42b7e868619f98aa932155a1bc92 Author: Michal Čihař <michal(a)cihar.com> Date: Sat Jan 1 16:47:31 2011 +0100 No longer push translators.html ----------------------------------------------------------------------- Summary of changes: website/pma-copy-docs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/website/pma-copy-docs b/website/pma-copy-docs index 662d798..71fc1b8 100755 --- a/website/pma-copy-docs +++ b/website/pma-copy-docs @@ -5,7 +5,7 @@ # Main documentation + required files cd /home/pmaweb/pma/phpmyadmin/ git pull -q -rsync -az favicon.ico CREDITS ChangeLog Documentation.html INSTALL LICENSE README changelog.php docs.css license.php translators.html web.sourceforge.net:htdocs/documentation/ +rsync -az favicon.ico CREDITS ChangeLog Documentation.html INSTALL LICENSE README changelog.php docs.css license.php web.sourceforge.net:htdocs/documentation/ cd themes/original/img/ rsync -az docs_menu_bg.png logo_right.png web.sourceforge.net:htdocs/documentation/themes/original/img/ cd /home/pmaweb/pma/phpMyAdmin/libraries/ hooks/post-receive -- phpMyAdmin scripts

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1382-g6ebc1e4
by Michal Čihař 01 Jan '11

01 Jan '11

The branch, master has been updated via 6ebc1e413d419c73e1b9e025b063c507128dde2a (commit) from 1b0116ba3b320bdeb3c36f7cdcb2c810e68df32b (commit) - Log ----------------------------------------------------------------- commit 6ebc1e413d419c73e1b9e025b063c507128dde2a Author: Michal Čihař <michal(a)cihar.com> Date: Sat Jan 1 16:44:10 2011 +0100 Remove unused CSS. ----------------------------------------------------------------------- Summary of changes: docs.css | 42 ------------------------------------------ 1 files changed, 0 insertions(+), 42 deletions(-) diff --git a/docs.css b/docs.css index 1d0f08d..96574d9 100644 --- a/docs.css +++ b/docs.css @@ -59,10 +59,6 @@ ul#footer { border: none; } -#footer li.logo { - padding: 0.5em; -} - #footer a { color: #c19e66; } @@ -155,31 +151,6 @@ p { margin: 1em; } -table { - margin: 1em; - border: none; -} - -table tr,table td,table th { - border: none; -} - -table.translators { - text-align: center; - display: table; margin-left: auto; margin-right: auto; - border-collapse: collapse; -} - -table.translators th { - color: #000000; - background-color: #d3dce3; -} - -table.translators td, table.translators th { - border: 1px solid #000000; - padding: 5px; -} - ul, dl, ol { margin: 1em; max-width: 70em; @@ -207,10 +178,6 @@ li pre { margin: 1em 0 1em 0; } -pre.wrap { - white-space: normal; -} - dt { font-weight: bold; margin-left: 2em; @@ -225,10 +192,6 @@ dd { font-family: monospace; } -dt.configrule { - font-weight: bold; -} - .important { color: #bb0000; background-color: #ffeeee; @@ -248,8 +211,3 @@ p.footnote { p.footnote:first-line { margin-left: -2%; } - -/* Block to mark separate translation string */ -div.l10n { - display: inline; -} hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1381-g1b0116b
by Marc Delisle 01 Jan '11

01 Jan '11

The branch, master has been updated via 1b0116ba3b320bdeb3c36f7cdcb2c810e68df32b (commit) from 20619dd544b180f2040bb4068a2891e7fb8cc622 (commit) - Log ----------------------------------------------------------------- commit 1b0116ba3b320bdeb3c36f7cdcb2c810e68df32b Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 1 09:38:33 2011 -0500 The filter on textfield did not do the intended result, it was catching other input elements; Unneeded wrapping of jQuery objects Prefix jQuery objects with dollar sign ----------------------------------------------------------------------- Summary of changes: js/tbl_change.js | 33 ++++++++++++++++++--------------- 1 files changed, 18 insertions(+), 15 deletions(-) diff --git a/js/tbl_change.js b/js/tbl_change.js index 41aecd0..861ee99 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -362,9 +362,9 @@ $(document).ready(function() { while( curr_rows < target_rows ) { /** - * @var last_row Object referring to the last row + * @var $last_row Object referring to the last row */ - var last_row = $("#insertForm").find(".insertRowTable:last"); + var $last_row = $("#insertForm").find(".insertRowTable:last"); // need to access this at more than one level // (also needs improvement because it should be calculated @@ -372,12 +372,13 @@ $(document).ready(function() { var new_row_index = 0; //Clone the insert tables - $(last_row) + $last_row .clone() .insertBefore("#actions_panel") .find('input[name*=multi_edit],select[name*=multi_edit]') .each(function() { + var $this_element = $(this); /** * Extract the index from the name attribute for all input/select fields and increment it * name is of format funcs[multi_edit][10][<long random string of alphanum chars>] @@ -386,7 +387,7 @@ $(document).ready(function() { /** * @var this_name String containing name of the input/select elements */ - var this_name = $(this).attr('name'); + var this_name = $this_element.attr('name'); /** split {@link this_name} at [10], so we have the parts that can be concatenated later */ var name_parts = this_name.split(/\[\d+\]/); /** extract the [10] from {@link name_parts} */ @@ -400,9 +401,10 @@ $(document).ready(function() { var new_name = name_parts[0] + '[' + new_row_index + ']' + name_parts[1]; var hashed_field = name_parts[1].match(/\[(.+)\]/)[1]; - $(this).attr('name', new_name); + $this_element.attr('name', new_name); - $(this).filter('.textfield') + if ($this_element.is('.textfield')) { + $this_element .attr('value', '') .unbind('change') .attr('onchange', null) @@ -410,22 +412,23 @@ $(document).ready(function() { Validator( hashed_field, new_row_index, - $(this).closest('tr').find('span.column_type').html() + $this_element.closest('tr').find('span.column_type').html() ); - }) - .end(); + }); + } - $(this).filter('.checkbox_null') + if ($this_element.is('.checkbox_null')) { + $this_element .bind('click', function(e) { nullify( - $(this).siblings('.nullify_code').val(), - $(this).closest('tr').find('input:hidden').first().val(), + $this_element.siblings('.nullify_code').val(), + $this_element.closest('tr').find('input:hidden').first().val(), hashed_field, '[multi_edit][' + new_row_index + ']' ); - }) - .end(); - }) + }); + } + }) // end each .end() .find('.foreign_values_anchor') .each(function() { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. ae38d7acd5c13d62c1fa47916daebc4f76402dde
by Michal Čihař 01 Jan '11

01 Jan '11

The branch, master has been updated via ae38d7acd5c13d62c1fa47916daebc4f76402dde (commit) via 8072bf74543aa4dd134c9317c46f065491d9d5a2 (commit) via 3c5a15fff0e6e5dd4c2051e5c09937409e9f9d4f (commit) via 728e29a4cbd32d8d523e59c03bc498e7b7002f7b (commit) via cb2f068030626a46d37992eb4476e09fda3d529f (commit) via 351fa7cf5c87e62f4c3292eb5784946580ec40bf (commit) via 71c813f395cad4d3cf09c1d1b856bce2c6a83f97 (commit) via 863027617a913949ea6543d4d15ca3caa308b7e1 (commit) via 8311d63096de2ef02ee4c7c27f2ab0262b8600b6 (commit) via a0babe4b12e1d2db5fee9408936eb1b66272351a (commit) via 9801ade988a1056aae005dff493a7a58ff43287f (commit) via 3b845d8a0c0f3e57b12843dde5883bdfd37e6979 (commit) via ae906296119c1da7c443e7755c59ba0c778fe827 (commit) via 13b82742881915978bf209298d72a3fecd521dd1 (commit) via 6c8e5d6794037d4446f6f252990c96661f91487f (commit) via 2c3c4db59e4e22afd202d71c0237a77f66221694 (commit) via 6c31bf3c69edf9a8018f722d4573484044202d0d (commit) via 418e75d9020700ef5c1f319d11e1de0ad1be7efd (commit) via 37ebf51e345fb80f916c4f7e3a985145a08fe784 (commit) via f5212843cbecfc7409c7cec90f26c2ce02ca84aa (commit) via eda94ec423349aaea5efbd6fc780b9fee5e47a2c (commit) via c1c0ed72e11e01513cc6e59c668ad79a26e20dcf (commit) via 07fe92d8509d9dc1dc37f0f0788d3fe6b5eaaca2 (commit) via 5b9f01befef770225c1399328dab497b52d75c14 (commit) via 0eb802b21db097c932127d4f39bb27286c71d012 (commit) via 9c37fdd20c252bbc876dcbdc86093b5c1f708373 (commit) via 299454e2d3c3f2b9f1b5c1c61a9bce4e9c80bc5d (commit) via 484c3ae57a3917cbb5f798a512470cf2de1c8194 (commit) via 10fc961643ab7a08be2c4994252148a6ba810b7e (commit) via 00ccb3dbc9609de7a78dd4965512900286102bf6 (commit) via 28c6f2df9d5183ee7b6e4bc4d1656f3633e468fc (commit) via 485c005eff89759a329f2020748e38c13ea651f1 (commit) via c97b228e46ed3278ede022fd69d87009223eb51b (commit) via 83e7bcbf4ab1c234b0f7b7db8525dd260fa113f5 (commit) via 0f748dbf8b40653466e1911c563d2e876e7a061e (commit) via 8283a5d05cfa339c8eea07c39472744cefc20c13 (commit) via 5beb9c69bc6198970f8fccbac512519d79fbbe14 (commit) via 2e9096d9b185fcc848271435b7e0f2dad5e996f1 (commit) via 80ba68252a39f106ad30bf553c855f383f6c8edf (commit) via b3e47be5a080d9ef1561929dfd57b9cbe6054c61 (commit) via b4944be5e03489f0083b45374645a08cb2f14b87 (commit) via f7e438056240e3a6fa854ecc708c9166be669e91 (commit) via e9224152822c99d5acfc447f74f5b21b75f6bb84 (commit) via d0e6030523b278ebaddf611c403cdb290a770991 (commit) via 7b2f8e6d9923fffa6951cdb9f9896195aa313bab (commit) via f9e0b57c3ce2cf4d711ca56c231685c050ec1121 (commit) via 7cfc5517c79f498114ab675414dbe073afa2bdb7 (commit) from 7067db1516b1abcfbfb8671794c7076b428de64b (commit) - Log ----------------------------------------------------------------- commit ae38d7acd5c13d62c1fa47916daebc4f76402dde Author: Michal Čihař <michal(a)cihar.com> Date: Sat Jan 1 15:32:33 2011 +0100 Generate docs commit 8072bf74543aa4dd134c9317c46f065491d9d5a2 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:52:10 2011 +0200 Translation update done using Pootle. commit 3c5a15fff0e6e5dd4c2051e5c09937409e9f9d4f Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:51:58 2011 +0200 Translation update done using Pootle. commit 728e29a4cbd32d8d523e59c03bc498e7b7002f7b Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:51:41 2011 +0200 Translation update done using Pootle. commit cb2f068030626a46d37992eb4476e09fda3d529f Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:51:38 2011 +0200 Translation update done using Pootle. commit 351fa7cf5c87e62f4c3292eb5784946580ec40bf Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:51:30 2011 +0200 Translation update done using Pootle. commit 71c813f395cad4d3cf09c1d1b856bce2c6a83f97 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:51:23 2011 +0200 Translation update done using Pootle. commit 863027617a913949ea6543d4d15ca3caa308b7e1 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:51:16 2011 +0200 Translation update done using Pootle. commit 8311d63096de2ef02ee4c7c27f2ab0262b8600b6 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:51:06 2011 +0200 Translation update done using Pootle. commit a0babe4b12e1d2db5fee9408936eb1b66272351a Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:50:58 2011 +0200 Translation update done using Pootle. commit 9801ade988a1056aae005dff493a7a58ff43287f Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:50:50 2011 +0200 Translation update done using Pootle. commit 3b845d8a0c0f3e57b12843dde5883bdfd37e6979 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:50:40 2011 +0200 Translation update done using Pootle. commit ae906296119c1da7c443e7755c59ba0c778fe827 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:50:31 2011 +0200 Translation update done using Pootle. commit 13b82742881915978bf209298d72a3fecd521dd1 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:50:25 2011 +0200 Translation update done using Pootle. commit 6c8e5d6794037d4446f6f252990c96661f91487f Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:50:22 2011 +0200 Translation update done using Pootle. commit 2c3c4db59e4e22afd202d71c0237a77f66221694 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:50:19 2011 +0200 Translation update done using Pootle. commit 6c31bf3c69edf9a8018f722d4573484044202d0d Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:50:16 2011 +0200 Translation update done using Pootle. commit 418e75d9020700ef5c1f319d11e1de0ad1be7efd Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:50:10 2011 +0200 Translation update done using Pootle. commit 37ebf51e345fb80f916c4f7e3a985145a08fe784 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:50:06 2011 +0200 Translation update done using Pootle. commit f5212843cbecfc7409c7cec90f26c2ce02ca84aa Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:50:02 2011 +0200 Translation update done using Pootle. commit eda94ec423349aaea5efbd6fc780b9fee5e47a2c Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:49:58 2011 +0200 Translation update done using Pootle. commit c1c0ed72e11e01513cc6e59c668ad79a26e20dcf Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:49:53 2011 +0200 Translation update done using Pootle. commit 07fe92d8509d9dc1dc37f0f0788d3fe6b5eaaca2 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:49:43 2011 +0200 Translation update done using Pootle. commit 5b9f01befef770225c1399328dab497b52d75c14 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:49:20 2011 +0200 Translation update done using Pootle. commit 0eb802b21db097c932127d4f39bb27286c71d012 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:49:13 2011 +0200 Translation update done using Pootle. commit 9c37fdd20c252bbc876dcbdc86093b5c1f708373 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:48:50 2011 +0200 Translation update done using Pootle. commit 299454e2d3c3f2b9f1b5c1c61a9bce4e9c80bc5d Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:47:55 2011 +0200 Translation update done using Pootle. commit 484c3ae57a3917cbb5f798a512470cf2de1c8194 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:47:47 2011 +0200 Translation update done using Pootle. commit 10fc961643ab7a08be2c4994252148a6ba810b7e Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:47:36 2011 +0200 Translation update done using Pootle. commit 00ccb3dbc9609de7a78dd4965512900286102bf6 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:47:28 2011 +0200 Translation update done using Pootle. commit 28c6f2df9d5183ee7b6e4bc4d1656f3633e468fc Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:47:21 2011 +0200 Translation update done using Pootle. commit 485c005eff89759a329f2020748e38c13ea651f1 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:47:12 2011 +0200 Translation update done using Pootle. commit c97b228e46ed3278ede022fd69d87009223eb51b Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:47:04 2011 +0200 Translation update done using Pootle. commit 83e7bcbf4ab1c234b0f7b7db8525dd260fa113f5 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:46:59 2011 +0200 Translation update done using Pootle. commit 0f748dbf8b40653466e1911c563d2e876e7a061e Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:46:52 2011 +0200 Translation update done using Pootle. commit 8283a5d05cfa339c8eea07c39472744cefc20c13 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:46:44 2011 +0200 Translation update done using Pootle. commit 5beb9c69bc6198970f8fccbac512519d79fbbe14 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:46:38 2011 +0200 Translation update done using Pootle. commit 2e9096d9b185fcc848271435b7e0f2dad5e996f1 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:46:31 2011 +0200 Translation update done using Pootle. commit 80ba68252a39f106ad30bf553c855f383f6c8edf Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:46:24 2011 +0200 Translation update done using Pootle. commit b3e47be5a080d9ef1561929dfd57b9cbe6054c61 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:46:18 2011 +0200 Translation update done using Pootle. commit b4944be5e03489f0083b45374645a08cb2f14b87 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:46:06 2011 +0200 Translation update done using Pootle. commit f7e438056240e3a6fa854ecc708c9166be669e91 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:45:48 2011 +0200 Translation update done using Pootle. commit e9224152822c99d5acfc447f74f5b21b75f6bb84 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:45:30 2011 +0200 Translation update done using Pootle. commit d0e6030523b278ebaddf611c403cdb290a770991 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:45:26 2011 +0200 Translation update done using Pootle. commit 7b2f8e6d9923fffa6951cdb9f9896195aa313bab Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:45:11 2011 +0200 Translation update done using Pootle. commit f9e0b57c3ce2cf4d711ca56c231685c050ec1121 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:44:54 2011 +0200 Translation update done using Pootle. commit 7cfc5517c79f498114ab675414dbe073afa2bdb7 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:44:44 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: output/en_GB/Documentation.html | 26 +++--- output/en_GB/README | 2 +- po/en_GB.po | 225 ++++++++++++++++----------------------- 3 files changed, 104 insertions(+), 149 deletions(-) diff --git a/output/en_GB/Documentation.html b/output/en_GB/Documentation.html index 70706c3..eaf37ab 100644 --- a/output/en_GB/Documentation.html +++ b/output/en_GB/Documentation.html @@ -1822,20 +1822,20 @@ have problems with long URLs. Default is <code>1000</code>. </dd> <dt><span id="cfg_NaviBackground">$cfg['NaviBackground']</span> string [CSS -color for background]<br /> +colour for background]<br /> <span id="cfg_MainBackground">$cfg['MainBackground']</span> string [CSS -color for background] +colour for background] </dt> <dd>The background styles used for both the frames. See <tt>themes/themename/layout.inc.php</tt>.</dd> - <dt id="cfg_NaviPointerBackground">$cfg['NaviPointerBackground'] string [CSS color for background]<br /> + <dt id="cfg_NaviPointerBackground">$cfg['NaviPointerBackground'] string [CSS colour for background]<br /> <span id="cfg_NaviPointerColor">$cfg['NaviPointerColor']</span> string [CSS -color]</dt> +colour]</dt> <dd>The style used for the pointer in the navi frame. See <tt>themes/themename/layout.inc.php</tt>.</dd> - <dt id="cfg_NaviDatabaseNameColor">$cfg['NaviDatabaseNameColor'] string [CSS color]<br /> + <dt id="cfg_NaviDatabaseNameColor">$cfg['NaviDatabaseNameColor'] string [CSS colour]<br /> </dt> <dd>The colour used for the database name in the navi frame. See <tt>themes/themename/layout.inc.php</tt>.</dd> @@ -1848,29 +1848,29 @@ color]</dt> <dd>The size of a table's border. See <tt>themes/themename/layout.inc.php</tt>. </dd> - <dt id="cfg_ThBackground">$cfg['ThBackground'] string [CSS color for background]<br /> - <span id="cfg_ThColor">$cfg['ThColor']</span> string [CSS color]</dt> + <dt id="cfg_ThBackground">$cfg['ThBackground'] string [CSS colour for background]<br /> + <span id="cfg_ThColor">$cfg['ThColor']</span> string [CSS colour]</dt> <dd>The style used for table headers. See <tt>themes/themename/layout.inc.php</tt>.</dd> - <dt id="cfg_BgcolorOne">$cfg['BgOne'] string [CSS color]</dt> + <dt id="cfg_BgcolorOne">$cfg['BgOne'] string [CSS colour]</dt> <dd>The colour (HTML) #1 for table rows. See <tt>themes/themename/layout.inc.php</tt>. </dd> - <dt id="cfg_BgcolorTwo">$cfg['BgTwo'] string [CSS color]</dt> + <dt id="cfg_BgcolorTwo">$cfg['BgTwo'] string [CSS colour]</dt> <dd>The colour (HTML) #2 for table rows. See <tt>themes/themename/layout.inc.php</tt>. </dd> <dt><span id="cfg_BrowsePointerBackground">$cfg['BrowsePointerBackground'] -</span>string [CSS color]<br /> +</span>string [CSS colour]<br /> <span id="cfg_BrowsePointerColor">$cfg['BrowsePointerColor'] </span>string -[CSS color]<br /> +[CSS colour]<br /> <span id="cfg_BrowseMarkerBackground">$cfg['BrowseMarkerBackground'] -</span>string [CSS color]<br /> +</span>string [CSS colour]<br /> <span id="cfg_BrowseMarkerColor">$cfg['BrowseMarkerColor'] </span>string -[CSS color] +[CSS colour] </dt> <dd>The colours (HTML) uses for the pointer and the marker in browse mode.<br /> The former feature highlights the row over which your mouse is passing and diff --git a/output/en_GB/README b/output/en_GB/README index 5901d75..83a4398 100644 --- a/output/en_GB/README +++ b/output/en_GB/README @@ -77,7 +77,7 @@ The phpMyAdmin Devel team PS: -Please, don't send us emails with question like "How do I compile PHP with +Please, don't send us e-mails with question like "How do I compile PHP with MySQL-support". We just don't have the time to be your free help desk. Please send your questions to the appropriate mailing lists / forums. diff --git a/po/en_GB.po b/po/en_GB.po index 55fd7c3..2b820fe 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-31 15:54+0100\n" -"PO-Revision-Date: 2010-10-22 10:25+0200\n" +"PO-Revision-Date: 2011-01-01 10:52+0200\n" "Last-Translator: Robert Readman <robert_readman(a)hotmail.com>\n" "Language-Team: none\n" "Language: en_GB\n" @@ -20,19 +20,17 @@ msgstr "" #. type: Content of: <html><head><title> #: orig-docs/Documentation.html:12 -#, fuzzy msgid "phpMyAdmin @@VER@@ - Documentation" -msgstr "phpMyAdmin documentation" +msgstr "phpMyAdmin @@VER@@ - Documentation" #. type: Content of: <html><body><div><h1> #: orig-docs/Documentation.html:19 -#, fuzzy msgid "" "<a href=\"http://www.phpmyadmin.net/\">php<span class=\"myadmin\">MyAdmin</" "span></a> @@VER@@ Documentation" msgstr "" -"<a href=\"http://www.phpmyadmin.net/\">php<span class=\"myadmin\">MyAdmin</" -"span></a> 3.4.0-dev Documentation" +"<a href=\"http://www.phpmyadmin.net/\">php<span " +"class=\"myadmin\">MyAdmin</span></a> @@VER@@ Documentation" #. type: Content of: <html><body><ul><li> #: orig-docs/Documentation.html:27 @@ -397,12 +395,13 @@ msgstr "" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:140 -#, fuzzy msgid "" "communicate in <a href=\"http://www.phpmyadmin.net/home_page/translations.php" "\">62 different languages</a>" msgstr "" -"communicate in <a href=\"./translators.html\">58 different languages</a>" +"communicate in <a " +"href=\"http://www.phpmyadmin.net/home_page/translations.php\">62 different " +"languages</a>" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:142 @@ -2200,16 +2199,16 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:840 -#, fuzzy msgid "" "Regular expression for hiding some databases from unprivileged users. This " "only hides them from listing, but a user is still able to access them " "(using, for example, the SQL query area). To limit access, use the MySQL " "privilege system." msgstr "" -"Regular expression for hiding some databases. This only hides them from " -"listing, but a user is still able to access them (using, for example, the " -"SQL query area). To limit access, use the MySQL privilege system." +"Regular expression for hiding some databases from unprivileged users. This " +"only hides them from listing, but a user is still able to access them " +"(using, for example, the SQL query area). To limit access, use the MySQL " +"privilege system." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:845 @@ -4007,20 +4006,19 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1488 -#, fuzzy msgid "$cfg['LeftDisplayTableFilterMinimum'] integer" -msgstr "$cfg['LeftDisplayTableFilter'] boolean" +msgstr "$cfg['LeftDisplayTableFilterMinimum'] integer" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1490 -#, fuzzy msgid "" "Defines the minimum number of tables to display a JavaScript filter box " "above the list of tables in the left frame. Defaults to <tt>30</tt>. To " "disable the filter completely some high number can he used (e.g. 9999)" msgstr "" -"Defines whether or not to display a JavaScript filter box above the list of " -"tables in the left frame. Defaults to <tt>TRUE</tt>." +"Defines the minimum number of tables to display a JavaScript filter box " +"above the list of tables in the left frame. Defaults to <tt>30</tt>. To " +"disable the filter completely some high number can he used (e.g. 9999)" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1495 @@ -4924,23 +4922,21 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1789 -#, fuzzy msgid "" "<span id=\"cfg_NaviBackground\">$cfg['NaviBackground']</span> string [CSS " "color for background]" msgstr "" -"<span id=\"cfg_NaviBackground\">$cfg['NaviBackground']</span> string [valid " -"css code for background]" +"<span id=\"cfg_NaviBackground\">$cfg['NaviBackground']</span> string [CSS " +"colour for background]" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1790 -#, fuzzy msgid "" "<span id=\"cfg_MainBackground\">$cfg['MainBackground']</span> string [CSS " "color for background]" msgstr "" -"<span id=\"cfg_MainBackground\">$cfg['MainBackground']</span> string [valid " -"css code for background]" +"<span id=\"cfg_MainBackground\">$cfg['MainBackground']</span> string [CSS " +"colour for background]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1792 @@ -4953,19 +4949,17 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1795 -#, fuzzy msgid "$cfg['NaviPointerBackground'] string [CSS color for background]" -msgstr "$cfg['NaviPointerBackground'] string [valid css code for background]" +msgstr "$cfg['NaviPointerBackground'] string [CSS colour for background]" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1796 -#, fuzzy msgid "" "<span id=\"cfg_NaviPointerColor\">$cfg['NaviPointerColor']</span> string " "[CSS color]" msgstr "" -"<span id=\"cfg_NaviPointerColor\">$cfg['NaviPointerColor']</span> string " -"[valid css color]" +"<span id=\"cfg_NaviPointerColor\">$cfg['NaviPointerColor']</span> string [CSS " +"colour]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1797 @@ -4978,9 +4972,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1800 -#, fuzzy msgid "$cfg['NaviDatabaseNameColor'] string [CSS color]" -msgstr "$cfg['NaviDatabaseNameColor'] string [valid css code]" +msgstr "$cfg['NaviDatabaseNameColor'] string [CSS colour]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1802 @@ -5019,16 +5012,13 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1813 -#, fuzzy msgid "$cfg['ThBackground'] string [CSS color for background]" -msgstr "$cfg['ThBackground'] string [valid css code for background]" +msgstr "$cfg['ThBackground'] string [CSS colour for background]" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1814 -#, fuzzy msgid "<span id=\"cfg_ThColor\">$cfg['ThColor']</span> string [CSS color]" -msgstr "" -"<span id=\"cfg_ThColor\">$cfg['ThColor']</span> string [valid css color]" +msgstr "<span id=\"cfg_ThColor\">$cfg['ThColor']</span> string [CSS colour]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1815 @@ -5041,9 +5031,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1818 -#, fuzzy msgid "$cfg['BgOne'] string [CSS color]" -msgstr "$cfg['BgOne'] string [HTML color]" +msgstr "$cfg['BgOne'] string [CSS colour]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1819 @@ -5056,9 +5045,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1822 -#, fuzzy msgid "$cfg['BgTwo'] string [CSS color]" -msgstr "$cfg['BgTwo'] string [HTML color]" +msgstr "$cfg['BgTwo'] string [CSS colour]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1823 @@ -5071,43 +5059,39 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1826 -#, fuzzy msgid "" "<span id=\"cfg_BrowsePointerBackground\">$cfg['BrowsePointerBackground'] </" "span>string [CSS color]" msgstr "" -"<span id=\"cfg_BrowsePointerBackground\">$cfg['BrowsePointerBackground'] </" -"span>string [HTML color]" +"<span id=\"cfg_BrowsePointerBackground\">$cfg['BrowsePointerBackground'] " +"</span>string [CSS colour]" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1827 -#, fuzzy msgid "" "<span id=\"cfg_BrowsePointerColor\">$cfg['BrowsePointerColor'] </span>string " "[CSS color]" msgstr "" "<span id=\"cfg_BrowsePointerColor\">$cfg['BrowsePointerColor'] </span>string " -"[HTML color]" +"[CSS colour]" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1828 -#, fuzzy msgid "" "<span id=\"cfg_BrowseMarkerBackground\">$cfg['BrowseMarkerBackground'] </" "span>string [CSS color]" msgstr "" -"<span id=\"cfg_BrowseMarkerBackground\">$cfg['BrowseMarkerBackground'] </" -"span>string [HTML color]" +"<span id=\"cfg_BrowseMarkerBackground\">$cfg['BrowseMarkerBackground'] " +"</span>string [CSS colour]" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1829 -#, fuzzy msgid "" "<span id=\"cfg_BrowseMarkerColor\">$cfg['BrowseMarkerColor'] </span>string " "[CSS color]" msgstr "" "<span id=\"cfg_BrowseMarkerColor\">$cfg['BrowseMarkerColor'] </span>string " -"[HTML color]" +"[CSS colour]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1831 @@ -5116,7 +5100,6 @@ msgstr "The colours (HTML) uses for the pointer and the marker in browse mode." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1832 -#, fuzzy msgid "" "The former feature highlights the row over which your mouse is passing and " "the latter lets you visually mark/unmark rows by clicking on them. " @@ -5124,7 +5107,9 @@ msgid "" "column's header (outside of the text)." msgstr "" "The former feature highlights the row over which your mouse is passing and " -"the latter lets you visually mark/unmark rows by clicking on them." +"the latter lets you visually mark/unmark rows by clicking on them. " +"Highlighting / marking a column is done by hovering over / clicking the " +"column's header (outside of the text)." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1836 orig-docs/Documentation.html:1842 @@ -7461,13 +7446,12 @@ msgstr "" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2679 -#, fuzzy msgid "" "The MySQL manual explains how to <a href=\"http://dev.mysql.com/doc/mysql/en/" "resetting-permissions.html\"> reset the permissions</a>." msgstr "" -"The MySQL manual explains how to <a href=\"http://www.mysql.com/doc/R/e/" -"Resetting_permissions.html\"> reset the permissions</a>." +"The MySQL manual explains how to <a href=\"http://dev.mysql.com/doc/mysql/en" +"/resetting-permissions.html\"> reset the permissions</a>." #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:2684 @@ -7593,7 +7577,6 @@ msgstr "" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2735 -#, fuzzy msgid "" "Since phpMyAdmin 3.0.x, only MySQL 5.0.1 and newer are supported. For older " "MySQL versions, you need to use the latest 2.x branch. phpMyAdmin can " @@ -7603,15 +7586,15 @@ msgid "" "latter one should be used unless you have good reason not to do so." msgstr "" "Since phpMyAdmin 3.0.x, only MySQL 5.0.1 and newer are supported. For older " -"MySQL versions, you need to use 2.8.x branch. phpMyAdmin can connect to your " -"MySQL server using PHP's classic <a href=\"http://php.net/mysql\">MySQL " -"extension</a> as well as the <a href=\"http://php.net/mysqli\">improved " -"MySQL extension (MySQLi)</a> that is available in php 5.0. The latter one " -"should be used unless you have good reason not to do so." +"MySQL versions, you need to use the latest 2.x branch. phpMyAdmin can " +"connect to your MySQL server using PHP's classic <a " +"href=\"http://php.net/mysql\">MySQL extension</a> as well as the <a " +"href=\"http://php.net/mysqli\">improved MySQL extension (MySQLi)</a> that is " +"available in php 5.0. The latter one should be used unless you have good " +"reason not to do so." #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2742 -#, fuzzy msgid "" "When compiling php, we strongly recommend that you manually link the MySQL " "extension of your choice to a MySQL client library of at least the same " @@ -7622,12 +7605,8 @@ msgstr "" "When compiling php, we strongly recommend that you manually link the MySQL " "extension of your choice to a MySQL client library of at least the same " "minor version since the one that is bundled with some PHP distributions is " -"rather old and might cause problems <a href=\"#faq1_17a\"> (see <abbr title=" -"\"Frequently Asked Questions\">FAQ</abbr> 1.17a)</a>. If your webserver is " -"running on a windows system, you might want to try MySQL's <a href=\"http://" -"dev.mysql.com/downloads/connector/php/\">Connector/PHP</a> instead of the " -"MySQL / MySQLi extensions that are bundled with the official php Win32 " -"builds." +"rather old and might cause problems <a href=\"#faq1_17a\"> (see <abbr " +"title=\"Frequently Asked Questions\">FAQ</abbr> 1.17a)</a>." #. type: Content of: <html><body><div><h5> #: orig-docs/Documentation.html:2749 @@ -8667,14 +8646,13 @@ msgstr "" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3138 -#, fuzzy msgid "" "Have also a look at the <a href=\"http://dev.mysql.com/doc/en/can-not-" "connect-to-server.html\"> corresponding section of the MySQL documentation</" "a>." msgstr "" -"Have also a look at the <a href=\"http://www.mysql.com/doc/C/a/" -"Can_not_connect_to_server.html\"> corresponding section of the MySQL " +"Have also a look at the <a href=\"http://dev.mysql.com/doc/en/can-not-" +"connect-to-server.html\"> corresponding section of the MySQL " "documentation</a>." #. type: Content of: <html><body><div><h4> @@ -9264,7 +9242,6 @@ msgstr "" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3371 -#, fuzzy msgid "" "When MySQL is running in ANSI-compatibility mode, there are some major " "differences in how <abbr title=\"structured query language\">SQL</abbr> is " @@ -9280,15 +9257,14 @@ msgid "" msgstr "" "When MySQL is running in ANSI-compatibility mode, there are some major " "differences in how <abbr title=\"structured query language\">SQL</abbr> is " -"structured (see <a href=\"http://dev.mysql.com/doc/mysql/en/ANSI_mode.html" -"\"> http://dev.mysql.com/doc/mysql/en/ANSI_mode.html</a>). Most important of " -"all, the quote-character (\") is interpreted as an identifier quote " -"character and not as a string quote character, which makes many internal " -"phpMyAdmin operations into invalid <abbr title=\"structured query language" -"\">SQL</abbr> statements. There is no workaround to this behaviour. News to " -"this item will be posted in Bug report <a href=\"https://sourceforge.net/" -"tracker/index.php?func=detail&aid=816858&group_id=23067&" -"atid=377408\">#816858</a>" +"structured (see <a href=\"http://dev.mysql.com/doc/mysql/en/ansi-mode.html\"> " +"http://dev.mysql.com/doc/mysql/en/ansi-mode.html</a>). Most important of " +"all, the quote-character (\") is interpreted as an identifier quote character " +"and not as a string quote character, which makes many internal phpMyAdmin " +"operations into invalid <abbr title=\"structured query language\">SQL</abbr> " +"statements. There is no workaround to this behaviour. News to this item will " +"be posted in Bug report <a href=\"https://sourceforge.net/tracker/index.php?" +"func=detail&aid=816858&group_id=23067&atid=377408\">#816858</a>" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3384 @@ -10755,13 +10731,12 @@ msgstr "" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3960 -#, fuzzy msgid "" "No, it's MySQL that is doing <a href=\"http://dev.mysql.com/doc/en/silent-" "column-changes.html\">silent column type changing</a>." msgstr "" -"No, it's MySQL that is doing <a href=\"http://www.mysql.com/doc/S/i/" -"Silent_column_changes.html\">silent column type changing</a>." +"No, it's MySQL that is doing <a href=\"http://dev.mysql.com/doc/en/silent-" +"column-changes.html\">silent column type changing</a>." #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3965 @@ -13023,14 +12998,13 @@ msgstr "BLOBstreaming support with PBMS PHP extension" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:4839 -#, fuzzy msgid "Ankit Gupta (Google Summer of Code 2010)" -msgstr "Lori Lee (Google Summer of Code 2010)" +msgstr "Ankit Gupta (Google Summer of Code 2010)" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4841 msgid "Visual query builder" -msgstr "" +msgstr "Visual query builder" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:4848 @@ -13750,14 +13724,12 @@ msgstr "" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:5063 -#, fuzzy msgid "" "<a id=\"glossar_storage_engine\" href=\"http://dev.mysql.com/doc/en/storage-" "engines.html\">Storage Engines</a> - handlers for different table types" msgstr "" -"<a id=\"glossar_storage_engine\" href=\"http://dev.mysql.com/doc/refman/5.0/" -"en/storage-engines.html\">Storage Engines</a> - handlers for different table " -"types" +"<a id=\"glossar_storage_engine\" href=\"http://dev.mysql.com/doc/en/storage-" +"engines.html\">Storage Engines</a> - handlers for different table types" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:5065 @@ -13999,24 +13971,22 @@ msgstr "-->" #. type: Title = #: orig-docs/INSTALL:2 -#, fuzzy, no-wrap +#, no-wrap msgid "phpMyAdmin - Installation" -msgstr "phpMyAdmin - Installation\n" +msgstr "phpMyAdmin - Installation" #. type: Plain text #: orig-docs/INSTALL:5 -#, fuzzy msgid "" "Please have a look to the Documentation.txt or Documentation.html files." msgstr "" -"\tPlease have a look to the Documentation.txt or \n" -"\tDocumentation.html files.\n" +"Please have a look to the Documentation.txt or Documentation.html files." #. type: Title = #: orig-docs/TODO:2 -#, fuzzy, no-wrap +#, no-wrap msgid "phpMyAdmin - Todo" -msgstr "phpMyAdmin - Todo\n" +msgstr "phpMyAdmin - Todo" #. type: Plain text #: orig-docs/TODO:5 @@ -14036,15 +14006,14 @@ msgstr "-- swix/20010704" #. type: Title = #: orig-docs/README:2 -#, fuzzy, no-wrap +#, no-wrap msgid "phpMyAdmin - Readme" -msgstr "phpMyAdmin - Readme\n" +msgstr "phpMyAdmin - Readme" #. type: Plain text #: orig-docs/README:5 -#, fuzzy msgid "Version @@VER@@" -msgstr "Version" +msgstr "Version @@VER@@" #. type: Plain text #: orig-docs/README:7 @@ -14053,21 +14022,22 @@ msgstr "A set of PHP-scripts to manage MySQL over the web." #. type: Plain text #: orig-docs/README:9 -#, fuzzy msgid "http://www.phpmyadmin.net/" msgstr "http://www.phpmyadmin.net/" #. type: Plain text #: orig-docs/README:15 -#, fuzzy, no-wrap +#, no-wrap msgid "" "Copyright (C) 1998-2000\n" " Tobias Ratschiller <tobias_at_ratschiller.com>\n" -msgstr "Tobias Ratschiller <tobias_at_ratschiller.com>" +msgstr "" +"Copyright (C) 1998-2000\n" +" Tobias Ratschiller <tobias_at_ratschiller.com>\n" #. type: Plain text #: orig-docs/README:26 -#, fuzzy, no-wrap +#, no-wrap msgid "" "Copyright (C) 2001-2010\n" " Marc Delisle <marc_at_infomarc.info>\n" @@ -14080,9 +14050,7 @@ msgid "" " Sebastian Mendel <cybot_tm_at_users.sourceforge.net>\n" " [check Documentation.txt/.html file for more details]\n" msgstr "" -"Copyright (C) 1998-2000 \n" -" Tobias Ratschiller <tobias_at_ratschiller.com>\n" -"Copyright (C) 2001-2010 \n" +"Copyright (C) 2001-2010\n" " Marc Delisle <marc_at_infomarc.info>\n" " Olivier Müller <om_at_omnis.ch>\n" " Robin Johnson <robbat2_at_users.sourceforge.net>\n" @@ -14116,13 +14084,12 @@ msgstr "a web-browser (doh!)" #. type: Title - #: orig-docs/README:51 -#, fuzzy, no-wrap +#, no-wrap msgid "Summary" -msgstr "Summary\n" +msgstr "Summary" #. type: Plain text #: orig-docs/README:55 -#, fuzzy msgid "" "phpMyAdmin is intended to handle the administration of MySQL over the web. " "For a summary of features, please see the Documentation.txt/.html file." @@ -14144,9 +14111,9 @@ msgstr "You can get the newest version at http://www.phpmyadmin.net/." #. type: Title - #: orig-docs/README:62 -#, fuzzy, no-wrap +#, no-wrap msgid "More Information" -msgstr "Information" +msgstr "More Information" #. type: Plain text #: orig-docs/README:65 @@ -14156,9 +14123,9 @@ msgstr "Please see the Documentation.txt/.html file." #. type: Title - #: orig-docs/README:67 -#, fuzzy, no-wrap +#, no-wrap msgid "Support" -msgstr "Support\n" +msgstr "Support" #. type: Plain text #: orig-docs/README:70 @@ -14168,50 +14135,38 @@ msgstr "See reference about support forums under http://www.phpmyadmin.net/" #. type: Title - #: orig-docs/README:73 -#, fuzzy, no-wrap +#, no-wrap msgid "Enjoy!" -msgstr "Enjoy!\n" +msgstr "Enjoy!" #. type: Plain text #: orig-docs/README:76 -#, fuzzy msgid "The phpMyAdmin Devel team" msgstr "The phpMyAdmin Devel team" #. type: Plain text #: orig-docs/README:79 msgid "PS:" -msgstr "" +msgstr "PS:" #. type: Plain text #: orig-docs/README:82 -#, fuzzy msgid "" "Please, don't send us emails with question like \"How do I compile PHP with " "MySQL-support\". We just don't have the time to be your free help desk." msgstr "" -"PS: \n" -" Please, don't send us e-mails with question like \"How do I compile\n" -" PHP with MySQL-support\". We just don't have the time to be your\n" -" free helpdesk.\n" -" Please send your questions to the appropriate mailing-lists / forums.\n" -" Before contacting us, please read the Documentation.html (esp. the\n" -" FAQ part).\n" +"Please, don't send us e-mails with question like \"How do I compile PHP with " +"MySQL-support\". We just don't have the time to be your free help desk." #. type: Plain text #: orig-docs/README:85 -#, fuzzy msgid "" "Please send your questions to the appropriate mailing lists / forums. " "Before contacting us, please read the Documentation.html (esp. the FAQ part)." msgstr "" -"PS: \n" -" Please, don't send us e-mails with question like \"How do I compile\n" -" PHP with MySQL-support\". We just don't have the time to be your\n" -" free helpdesk.\n" -" Please send your questions to the appropriate mailing-lists / forums.\n" -" Before contacting us, please read the Documentation.html (esp. the\n" -" FAQ part).\n" +"Please send your questions to the appropriate mailing lists / forums. " +"Before contacting us, please read the Documentation.html (esp. the FAQ " +"part)." #~ msgid "<a href=\"translators.html\">Translators</a>" #~ msgstr "<a href=\"translators.html\">Translators</a>" hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1380-g20619dd
by Michal Čihař 01 Jan '11

01 Jan '11

The branch, master has been updated via 20619dd544b180f2040bb4068a2891e7fb8cc622 (commit) via 71a2f0fd2b45cbc102dd3595630e7ea61404bb88 (commit) via f5b5ec01b5c51074605b5e19d319e3a2bd2d567a (commit) via 1c63b1eb40a45c116dd24125778efdcbb961e750 (commit) via b9eb3a4f14d482e6724536642c2487e7d0f0ed6a (commit) via 7afe86c00da8218a292bb5f99b37572b61c72b91 (commit) via 9112f2406dab235d59fb15525eeed3aa9255f167 (commit) via 8f45948aae8f297ee00b2c5086837abaf86a2546 (commit) via a1eefd1d62f4bf807c36c2a981255fa323a6d53f (commit) from 70bc1761c35543d6f00bbf5d8df1b29d425997cc (commit) - Log ----------------------------------------------------------------- commit 20619dd544b180f2040bb4068a2891e7fb8cc622 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:21:00 2011 +0200 Translation update done using Pootle. commit 71a2f0fd2b45cbc102dd3595630e7ea61404bb88 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:20:18 2011 +0200 Translation update done using Pootle. commit f5b5ec01b5c51074605b5e19d319e3a2bd2d567a Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:20:07 2011 +0200 Translation update done using Pootle. commit 1c63b1eb40a45c116dd24125778efdcbb961e750 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:19:04 2011 +0200 Translation update done using Pootle. commit b9eb3a4f14d482e6724536642c2487e7d0f0ed6a Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:19:00 2011 +0200 Translation update done using Pootle. commit 7afe86c00da8218a292bb5f99b37572b61c72b91 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:18:18 2011 +0200 Translation update done using Pootle. commit 9112f2406dab235d59fb15525eeed3aa9255f167 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:16:19 2011 +0200 Translation update done using Pootle. commit 8f45948aae8f297ee00b2c5086837abaf86a2546 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:15:20 2011 +0200 Translation update done using Pootle. commit a1eefd1d62f4bf807c36c2a981255fa323a6d53f Author: Robert Readman <robert_readman(a)hotmail.com> Date: Sat Jan 1 10:15:07 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/en_GB.po | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 5914a92..d44ba48 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-29 08:42-0500\n" -"PO-Revision-Date: 2010-12-29 20:37+0200\n" -"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" +"PO-Revision-Date: 2011-01-01 10:21+0200\n" +"Last-Translator: Robert Readman <robert_readman(a)hotmail.com>\n" "Language-Team: english-gb <en_GB(a)li.org>\n" "Language: en_GB\n" "MIME-Version: 1.0\n" @@ -5073,7 +5073,7 @@ msgid "" "A \":\" delimited list of metadata headers to be used to initialize the " "pbms_metadata_header table when a database is created." msgstr "" -"A \":\" delimited list of metadata headers to be used to initialize the " +"A \":\" delimited list of metadata headers to be used to initialise the " "pbms_metadata_header table when a database is created." #: libraries/engines/pbxt.lib.php:22 @@ -5378,7 +5378,7 @@ msgstr "" msgid "" "Database system or older MySQL server to maximize output compatibility with:" msgstr "" -"Database system or older MySQL server to maximize output compatibility with:" +"Database system or older MySQL server to maximise output compatibility with:" #: libraries/export/sql.php:72 libraries/export/sql.php:105 #: libraries/export/sql.php:107 @@ -6424,7 +6424,8 @@ msgid "" "installed the necessary PHP extensions as described in the %sdocumentation%s." msgstr "" "The SQL validator could not be initialised. Please check if you have " -"installed the necessary PHP extensions as described in the %sdocumentation%s." +"installed the necessary PHP extensions as described in the %sdocumentation%" +"s." #: libraries/tbl_links.inc.php:106 libraries/tbl_links.inc.php:107 msgid "Table seems to be empty!" @@ -6720,7 +6721,7 @@ msgstr "Appearance Settings" #: main.php:135 msgid "Background color" -msgstr "Background color" +msgstr "Background colour" #: main.php:136 msgid "Choose..." @@ -8297,7 +8298,8 @@ msgid "" msgstr "" "The total cost of the last compiled query as computed by the query " "optimiser. Useful for comparing the cost of different query plans for the " -"same query. The default value of 0 means that no query has been compiled yet." +"same query. The default value of 0 means that no query has been compiled " +"yet." #: server_status.php:118 msgid "The number of rows waiting to be written in INSERT DELAYED queues." hooks/post-receive -- phpMyAdmin

1 0