[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_6RC1-14-g4a99b6a
by Marc Delisle 11 Oct '11
by Marc Delisle 11 Oct '11
11 Oct '11
The branch, QA_3_4 has been updated
via 4a99b6a4942c02d0b1121650dc9f93fb83a42dac (commit)
from 2d1b7bff0cc4a2f5a5937f2fd3df345561b2a67b (commit)
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
Documentation.html | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9ffe264..1cc2e3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog
- bug #3418849 [interface] Inline edit shows dropdowns even after closing
- bug [view] View renaming did not work
- bug [navi] Wrong icon for view (MySQL 5.5)
+- bug #3420229 [doc] Missing documentation section
3.4.6.0 (not yet released)
- patch #3404173 InnoDB comment display with tooltips/aliases
diff --git a/Documentation.html b/Documentation.html
index 2938a3b..e9390dd 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -2281,7 +2281,7 @@ setfacl -d -m "g:www-data:rwx" tmp
<dt id="cfg_DBG">$cfg['DBG']</dt>
<dd><b>DEVELOPERS ONLY!</b></dd>
- <dt id="cfg_DBG_enable_sql">$cfg['DBG']['sql'] boolean</dt>
+ <dt id="cfg_DBG_sql">$cfg['DBG']['sql'] boolean</dt>
<dd><b>DEVELOPERS ONLY!</b><br />
Enable logging queries and execution times to be displayed in the bottom
of main page (right frame).</dd>
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6RC1-20801-g37edc1d
by Rouslan Placella 11 Oct '11
by Rouslan Placella 11 Oct '11
11 Oct '11
The branch, master has been updated
via 37edc1dece4fadfa962db7c26e2f557a0ba49859 (commit)
from db29cfa25827fd6ef65198a8fc338d5c0a2238b9 (commit)
- Log -----------------------------------------------------------------
commit 37edc1dece4fadfa962db7c26e2f557a0ba49859
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Tue Oct 11 10:34:40 2011 +0100
Fix IE JS error in PMA_getImage()
-----------------------------------------------------------------------
Summary of changes:
js/get_image.js.php | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/js/get_image.js.php b/js/get_image.js.php
index 07ccc5e..40609d8 100644
--- a/js/get_image.js.php
+++ b/js/get_image.js.php
@@ -42,11 +42,13 @@ foreach ($sprites as $key => $value) {
* @param object attributes An associative array of other attributes
*
* @return Object The requested image, this object has two methods:
- * .toString() - Returns the IMG tag for the requested image
- * .attr(name) - Returns a particular attribute of the IMG
- * tag given it's name
+ * .toString() - Returns the IMG tag for the requested image
+ * .attr(name) - Returns a particular attribute of the IMG
+ * tag given it's name
+ * .attr(name, value) - Sets a particular attribute of the IMG
+ * tag to the given value
* And one property:
- * .isSprite - Whether the image is a sprite or not
+ * .isSprite - Whether the image is a sprite or not
*/
function PMA_getImage(image, alternate, attributes) {
var in_array = function (needle, haystack) {
@@ -69,11 +71,15 @@ function PMA_getImage(image, alternate, attributes) {
src: 'themes/dot.gif',
},
isSprite: true,
- attr: function (name) {
- if (this.data[name] == undefined) {
- return '';
+ attr: function (name, value) {
+ if (value == undefined) {
+ if (this.data[name] == undefined) {
+ return '';
+ } else {
+ return this.data[name];
+ }
} else {
- return this.data[name];
+ this.data[name] = value;
}
},
toString: function () {
@@ -94,25 +100,25 @@ function PMA_getImage(image, alternate, attributes) {
}
// set alt
if (attributes.alt != undefined) {
- retval.data.alt = attributes.alt;
+ retval.attr('alt', attributes.alt);
} else {
- retval.data.alt = alternate;
+ retval.attr('alt', alternate);
}
// set title
if (attributes.title != undefined) {
- retval.data.title = attributes.title;
+ retval.attr('title', attributes.title);
} else {
- retval.data.title = alternate;
+ retval.attr('title', alternate);
}
// set src
var klass = image.replace('.gif', '').replace('.png', '');
if (in_array(klass, sprites)) {
// it's an icon from a sprite
- retval.data.class = 'icon ic_' + klass;
+ retval.attr('class', 'icon ic_' + klass);
} else {
// it's an image file
retval.isSprite = false;
- retval.data.src = "<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>" + image;
+ retval.attr('src', "<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>" + image);
}
// set all other attrubutes
for (var i in attributes) {
@@ -120,9 +126,9 @@ function PMA_getImage(image, alternate, attributes) {
// do not allow to override the 'src' attribute
continue;
} else if (i == 'class') {
- retval.data[i] += ' ' + attributes[i];
+ retval.attr(i, retval.attr('class') + ' ' + attributes[i]);
} else {
- retval.data[i] = attributes[i];
+ retval.attr(i, attributes[i]);
}
}
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 17687467949aa462fdec70372b5326573a37a090
by Michal Čihař 11 Oct '11
by Michal Čihař 11 Oct '11
11 Oct '11
The branch, master has been updated
via 17687467949aa462fdec70372b5326573a37a090 (commit)
via 32a14582cc2f45e85cd401af9fb50592ece72f0c (commit)
via f32684a9ca220d28347d4b3a030691ab78bfc3e7 (commit)
via 59cd1e377b72e9e9970a51f8f4eda9b6a2aba790 (commit)
via 811b4b92a2afbf1ed2190442e2e473a68ed64bee (commit)
via 00f9176b2e1e6fb5a584e51c2f859f39759e3934 (commit)
via 979a423fd3133250b21a4e8adf53755fbcfa99ac (commit)
via 3de5391b46b43cc8f04663a865f8c4fb3c2df3f6 (commit)
via 5d5db15dee678cc72cfd2f96652c6a70ba469f8c (commit)
via 9fc3f9b32e819d76a8e4f2fde04772f96aa07168 (commit)
via 34b35ed7373fd32eaa84af61a875474e41bb945a (commit)
via 128d692b4946de7ab646ab8572d46a4d1cdf3086 (commit)
via 860020ef29fe61f7b344185c793f3c9e28bb7369 (commit)
via 8f141afa29a5a95c29a18832ba6ebe8f15a70f89 (commit)
via 377fcdc6cb30faf039e1e277ce8c04de4caf06e8 (commit)
via be984652236e63d2f9d5dc8e96a744a37dacf635 (commit)
via c08561c4fe4c05fb67a73da0a967f965cb405c85 (commit)
via c7792fac5fb0d7b4ec1694ac7f91d7c06d456b3e (commit)
via fe676d652f385258c8d45f19de3b50732e3b5446 (commit)
via 11bc2f1a9b8663f63b90680801818ff0c8634aea (commit)
via 5c4d5459435166c9b510c615de568fe55da42eea (commit)
via 7106725891e492fb512c5493732711b7130c4295 (commit)
via f311a4dd3f45d30474b4965d5e3042cb7d9bd918 (commit)
via 644e1dfa1c7c24b0e3ae1a9c72280e52b1931137 (commit)
via 68c1fb43c79791b0cdffb2dcc5a97a236dff8d5a (commit)
via 2abfbb8fe06da6f9f7a2f8fcb908f5517bcaf7fd (commit)
via 177d3ee48143447b7f714dc0c94e9d5fbd94d14c (commit)
via 7e4ebc0593e7c382e3ad1f52f08f093d18f06c40 (commit)
via 0d6a1dea966d49591fa33f7da71b2e19cf4d9b52 (commit)
via 3047b0a27fcb7275dc46467af38158b3382e8ef3 (commit)
via b9b87878b545b7babe8a53ad3f7485ee1332aeae (commit)
via e4d10e431b702b564d88024b109c8469a2e82b68 (commit)
via 0050f20205351f1e6ec4e664b81913d242633104 (commit)
via 8df897e733298af4b01fd7da8e900e44fd7e7ddd (commit)
via b2649e9f829dffb42bea00f643c717ceb58a9e9a (commit)
via 79c865fdbbb60dc87f897d211d63d3b77d511be5 (commit)
via 1e840bf55d2641608ece6b5a1e8bbfe5386cdc40 (commit)
via 9f2bff1c1796552025f447bedcda9ef562dde68a (commit)
via a0a44dde8d233640d5ef289cc0ee679f089c0434 (commit)
via c4df31c239fc67cf36df97a0406b38f7d26bd67c (commit)
via 8ac0007b2fc1937c0420f9e5886fc0dad0f5f192 (commit)
via 3a80f30f7a5ff84c96c86d8aabba6280b401f467 (commit)
via 6ac6998145115feb21d195668b05e4f3f16490e1 (commit)
via 5d7a39e1f1f4a923e18e1ef5e40821ff0d5c2bd3 (commit)
via 555e461c4a706f6ab78a0f5c1569df8b2f707b6e (commit)
via a6635383cfbb1e2cb2f4961543e9c40d41da1133 (commit)
via 0294022570cd3dbd5e88308e25efac7699f71632 (commit)
via f5589f009adaf7e78132b3b63387b0a848c2f2e7 (commit)
via 1e8437307a7bcebf28037d8ed20675ad2ba3c735 (commit)
via 3c8196f0cbb1ef9b5a8c39e4e00c81f3c9d30eae (commit)
via fd7c3f4cde01f77acfacfbdabf9a98b9c4a67202 (commit)
via 8aac97c37bccd76c295c48313ba6be374b05d59d (commit)
via ff13212649699c0ae567590daecf447f6aa31529 (commit)
via cdcf7832ed453a5216961385d8ba15c65800d3c3 (commit)
via 8fe7a354d10042db5c80626611286e5d2974597f (commit)
via 8d20fcd171bdca6a145bdfca2e3e87b005e5f499 (commit)
via 504f5b62eff34791e4d6ca7bd821271f9bd43b2c (commit)
via 38bb93dc69e83a7b78f44f8059ecf1b444be3b41 (commit)
via d80f3ac4c966a5b745180ab1c4e82a4572099f0c (commit)
via 99e94041207cb2df468608e076594f9f2c075543 (commit)
via 5a4e8cfe0e921007892c5e8439c3ea6df5f47a06 (commit)
via 92c95620dadc1b6e4fef0491708ed65d792b1f2e (commit)
via 5458bd4b463bf68c9740d4d724a60e0204d5123d (commit)
via 9f71eb0f34222d0e079a3a104c29535c42cf9853 (commit)
via 7ee26d0f14540a20e7b3c184a1543dfb388ceb07 (commit)
via cc9bffd4f4e1808360881310960691a4f6f6583c (commit)
via afc04b8aaf984784ae315546a87c101a3a429702 (commit)
via 6780d3b2e6d62760a624ba63eb4e46868a74644e (commit)
via e06de257b723302d1bde04d6d0e74ef0018e11bf (commit)
via 2611d9d9247c71e630c2f402782d68c07f608ffb (commit)
via e5620fc6c7441d6e2eb32a7f47975b99950c96d7 (commit)
via 6e5c22526c627d62eb9d8f96aad999591132e742 (commit)
via b3ce8584611b3346b410952e861fc1b090cd6fb1 (commit)
via 7d2be86ed0a5019b3efcf1812408a360cfa3e55e (commit)
via a96527e7c564292b398617f88ee60e4b7006801d (commit)
via 3e9b033940f2a82d3863aa1adbe611acbe0af74c (commit)
via ec182dab2c5f11a27fb2d916cdbbcfe2c6cef6e9 (commit)
via bc58346fe6894de9f601de8c63787eb3a167e03d (commit)
via e0ea3bf31f1e34b2a675c3fe84d7647b52d0a47d (commit)
via 17cf78d33234f481e4d10b65c9514a6d5cd5e139 (commit)
via ea35fd69afd3c855adabaad28ff32c8403cb3510 (commit)
via 14a11b8963bda729b418f294325bc2439085d073 (commit)
via 6388dc3976ca2a3ca7f38cb79bfae705b2791fd7 (commit)
via d9fd88252c01b75ddb19fec02577c7c0c692a871 (commit)
via 64ad78343a803634f468e27c3701ae8578001d08 (commit)
from 7a454f210e64133e58c70f94e375aaefb88482f5 (commit)
- Log -----------------------------------------------------------------
commit 17687467949aa462fdec70372b5326573a37a090
Author: Michal Čihař <michal(a)cihar.com>
Date: Tue Oct 11 09:04:04 2011 +0200
Update generated files
commit 32a14582cc2f45e85cd401af9fb50592ece72f0c
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Mon Oct 10 12:54:45 2011 +0200
Translation update done using Pootle.
commit f32684a9ca220d28347d4b3a030691ab78bfc3e7
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Mon Oct 10 12:54:20 2011 +0200
Translation update done using Pootle.
commit 59cd1e377b72e9e9970a51f8f4eda9b6a2aba790
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Mon Oct 10 12:53:17 2011 +0200
Translation update done using Pootle.
commit 811b4b92a2afbf1ed2190442e2e473a68ed64bee
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Mon Oct 10 12:52:02 2011 +0200
Translation update done using Pootle.
commit 00f9176b2e1e6fb5a584e51c2f859f39759e3934
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Mon Oct 10 12:49:36 2011 +0200
Translation update done using Pootle.
commit 979a423fd3133250b21a4e8adf53755fbcfa99ac
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Mon Oct 10 12:49:17 2011 +0200
Translation update done using Pootle.
commit 3de5391b46b43cc8f04663a865f8c4fb3c2df3f6
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Mon Oct 10 12:48:38 2011 +0200
Translation update done using Pootle.
commit 5d5db15dee678cc72cfd2f96652c6a70ba469f8c
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Mon Oct 10 12:47:58 2011 +0200
Translation update done using Pootle.
commit 9fc3f9b32e819d76a8e4f2fde04772f96aa07168
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Mon Oct 10 12:46:52 2011 +0200
Translation update done using Pootle.
commit 34b35ed7373fd32eaa84af61a875474e41bb945a
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Mon Oct 10 12:45:56 2011 +0200
Translation update done using Pootle.
commit 128d692b4946de7ab646ab8572d46a4d1cdf3086
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Mon Oct 10 12:44:55 2011 +0200
Translation update done using Pootle.
commit 860020ef29fe61f7b344185c793f3c9e28bb7369
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Mon Oct 10 12:43:52 2011 +0200
Translation update done using Pootle.
commit 8f141afa29a5a95c29a18832ba6ebe8f15a70f89
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Mon Oct 10 12:42:17 2011 +0200
Translation update done using Pootle.
commit 377fcdc6cb30faf039e1e277ce8c04de4caf06e8
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Mon Oct 10 12:41:30 2011 +0200
Translation update done using Pootle.
commit be984652236e63d2f9d5dc8e96a744a37dacf635
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Mon Oct 10 12:37:23 2011 +0200
Translation update done using Pootle.
commit c08561c4fe4c05fb67a73da0a967f965cb405c85
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Mon Oct 10 12:36:01 2011 +0200
Translation update done using Pootle.
commit c7792fac5fb0d7b4ec1694ac7f91d7c06d456b3e
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 13:29:50 2011 +0200
Translation update done using Pootle.
commit fe676d652f385258c8d45f19de3b50732e3b5446
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 13:28:51 2011 +0200
Translation update done using Pootle.
commit 11bc2f1a9b8663f63b90680801818ff0c8634aea
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 13:23:12 2011 +0200
Translation update done using Pootle.
commit 5c4d5459435166c9b510c615de568fe55da42eea
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 13:21:08 2011 +0200
Translation update done using Pootle.
commit 7106725891e492fb512c5493732711b7130c4295
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 13:15:10 2011 +0200
Translation update done using Pootle.
commit f311a4dd3f45d30474b4965d5e3042cb7d9bd918
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 13:05:16 2011 +0200
Translation update done using Pootle.
commit 644e1dfa1c7c24b0e3ae1a9c72280e52b1931137
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 13:04:10 2011 +0200
Translation update done using Pootle.
commit 68c1fb43c79791b0cdffb2dcc5a97a236dff8d5a
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 12:59:46 2011 +0200
Translation update done using Pootle.
commit 2abfbb8fe06da6f9f7a2f8fcb908f5517bcaf7fd
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 12:56:27 2011 +0200
Translation update done using Pootle.
commit 177d3ee48143447b7f714dc0c94e9d5fbd94d14c
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 12:56:02 2011 +0200
Translation update done using Pootle.
commit 7e4ebc0593e7c382e3ad1f52f08f093d18f06c40
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 12:49:40 2011 +0200
Translation update done using Pootle.
commit 0d6a1dea966d49591fa33f7da71b2e19cf4d9b52
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 12:48:29 2011 +0200
Translation update done using Pootle.
commit 3047b0a27fcb7275dc46467af38158b3382e8ef3
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 12:46:27 2011 +0200
Translation update done using Pootle.
commit b9b87878b545b7babe8a53ad3f7485ee1332aeae
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 12:46:11 2011 +0200
Translation update done using Pootle.
commit e4d10e431b702b564d88024b109c8469a2e82b68
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 12:45:25 2011 +0200
Translation update done using Pootle.
commit 0050f20205351f1e6ec4e664b81913d242633104
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 12:41:58 2011 +0200
Translation update done using Pootle.
commit 8df897e733298af4b01fd7da8e900e44fd7e7ddd
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 12:41:12 2011 +0200
Translation update done using Pootle.
commit b2649e9f829dffb42bea00f643c717ceb58a9e9a
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 12:39:37 2011 +0200
Translation update done using Pootle.
commit 79c865fdbbb60dc87f897d211d63d3b77d511be5
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 12:35:16 2011 +0200
Translation update done using Pootle.
commit 1e840bf55d2641608ece6b5a1e8bbfe5386cdc40
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 12:34:56 2011 +0200
Translation update done using Pootle.
commit 9f2bff1c1796552025f447bedcda9ef562dde68a
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 12:34:16 2011 +0200
Translation update done using Pootle.
commit a0a44dde8d233640d5ef289cc0ee679f089c0434
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 12:33:32 2011 +0200
Translation update done using Pootle.
commit c4df31c239fc67cf36df97a0406b38f7d26bd67c
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 12:31:55 2011 +0200
Translation update done using Pootle.
commit 8ac0007b2fc1937c0420f9e5886fc0dad0f5f192
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 12:30:14 2011 +0200
Translation update done using Pootle.
commit 3a80f30f7a5ff84c96c86d8aabba6280b401f467
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 12:29:23 2011 +0200
Translation update done using Pootle.
commit 6ac6998145115feb21d195668b05e4f3f16490e1
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 12:28:51 2011 +0200
Translation update done using Pootle.
commit 5d7a39e1f1f4a923e18e1ef5e40821ff0d5c2bd3
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 12:27:51 2011 +0200
Translation update done using Pootle.
commit 555e461c4a706f6ab78a0f5c1569df8b2f707b6e
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 12:18:10 2011 +0200
Translation update done using Pootle.
commit a6635383cfbb1e2cb2f4961543e9c40d41da1133
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 12:15:13 2011 +0200
Translation update done using Pootle.
commit 0294022570cd3dbd5e88308e25efac7699f71632
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 12:11:21 2011 +0200
Translation update done using Pootle.
commit f5589f009adaf7e78132b3b63387b0a848c2f2e7
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 12:04:12 2011 +0200
Translation update done using Pootle.
commit 1e8437307a7bcebf28037d8ed20675ad2ba3c735
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 12:03:23 2011 +0200
Translation update done using Pootle.
commit 3c8196f0cbb1ef9b5a8c39e4e00c81f3c9d30eae
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 12:00:29 2011 +0200
Translation update done using Pootle.
commit fd7c3f4cde01f77acfacfbdabf9a98b9c4a67202
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 11:58:36 2011 +0200
Translation update done using Pootle.
commit 8aac97c37bccd76c295c48313ba6be374b05d59d
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 11:49:25 2011 +0200
Translation update done using Pootle.
commit ff13212649699c0ae567590daecf447f6aa31529
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 11:47:33 2011 +0200
Translation update done using Pootle.
commit cdcf7832ed453a5216961385d8ba15c65800d3c3
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 11:47:04 2011 +0200
Translation update done using Pootle.
commit 8fe7a354d10042db5c80626611286e5d2974597f
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 11:46:04 2011 +0200
Translation update done using Pootle.
commit 8d20fcd171bdca6a145bdfca2e3e87b005e5f499
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 11:44:58 2011 +0200
Translation update done using Pootle.
commit 504f5b62eff34791e4d6ca7bd821271f9bd43b2c
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 11:23:02 2011 +0200
Translation update done using Pootle.
commit 38bb93dc69e83a7b78f44f8059ecf1b444be3b41
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 11:21:53 2011 +0200
Translation update done using Pootle.
commit d80f3ac4c966a5b745180ab1c4e82a4572099f0c
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 11:20:26 2011 +0200
Translation update done using Pootle.
commit 99e94041207cb2df468608e076594f9f2c075543
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 11:18:39 2011 +0200
Translation update done using Pootle.
commit 5a4e8cfe0e921007892c5e8439c3ea6df5f47a06
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 11:17:57 2011 +0200
Translation update done using Pootle.
commit 92c95620dadc1b6e4fef0491708ed65d792b1f2e
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 11:17:36 2011 +0200
Translation update done using Pootle.
commit 5458bd4b463bf68c9740d4d724a60e0204d5123d
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 11:17:12 2011 +0200
Translation update done using Pootle.
commit 9f71eb0f34222d0e079a3a104c29535c42cf9853
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 11:02:09 2011 +0200
Translation update done using Pootle.
commit 7ee26d0f14540a20e7b3c184a1543dfb388ceb07
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 11:01:10 2011 +0200
Translation update done using Pootle.
commit cc9bffd4f4e1808360881310960691a4f6f6583c
Author: Stanisław Krukowski <stankruk(a)neostrada.pl>
Date: Sun Oct 9 11:00:45 2011 +0200
Translation update done using Pootle.
commit afc04b8aaf984784ae315546a87c101a3a429702
Author: stefan <stefan(a)inkopsforum.se>
Date: Sun Oct 9 02:26:51 2011 +0200
Translation update done using Pootle.
commit 6780d3b2e6d62760a624ba63eb4e46868a74644e
Author: stefan <stefan(a)inkopsforum.se>
Date: Sun Oct 9 02:25:53 2011 +0200
Translation update done using Pootle.
commit e06de257b723302d1bde04d6d0e74ef0018e11bf
Author: stefan <stefan(a)inkopsforum.se>
Date: Sun Oct 9 02:24:43 2011 +0200
Translation update done using Pootle.
commit 2611d9d9247c71e630c2f402782d68c07f608ffb
Author: stefan <stefan(a)inkopsforum.se>
Date: Sun Oct 9 02:23:56 2011 +0200
Translation update done using Pootle.
commit e5620fc6c7441d6e2eb32a7f47975b99950c96d7
Author: stefan <stefan(a)inkopsforum.se>
Date: Sun Oct 9 02:23:06 2011 +0200
Translation update done using Pootle.
commit 6e5c22526c627d62eb9d8f96aad999591132e742
Author: stefan <stefan(a)inkopsforum.se>
Date: Sun Oct 9 02:19:48 2011 +0200
Translation update done using Pootle.
commit b3ce8584611b3346b410952e861fc1b090cd6fb1
Author: stefan <stefan(a)inkopsforum.se>
Date: Sun Oct 9 02:19:32 2011 +0200
Translation update done using Pootle.
commit 7d2be86ed0a5019b3efcf1812408a360cfa3e55e
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Thu Oct 6 16:21:02 2011 +0200
Translation update done using Pootle.
commit a96527e7c564292b398617f88ee60e4b7006801d
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Thu Oct 6 16:20:50 2011 +0200
Translation update done using Pootle.
commit 3e9b033940f2a82d3863aa1adbe611acbe0af74c
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Oct 6 12:39:22 2011 +0200
Translation update done using Pootle.
commit ec182dab2c5f11a27fb2d916cdbbcfe2c6cef6e9
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Oct 6 12:35:13 2011 +0200
Translation update done using Pootle.
commit bc58346fe6894de9f601de8c63787eb3a167e03d
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Oct 6 12:33:38 2011 +0200
Translation update done using Pootle.
commit e0ea3bf31f1e34b2a675c3fe84d7647b52d0a47d
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Oct 6 12:32:42 2011 +0200
Translation update done using Pootle.
commit 17cf78d33234f481e4d10b65c9514a6d5cd5e139
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Oct 6 12:31:44 2011 +0200
Translation update done using Pootle.
commit ea35fd69afd3c855adabaad28ff32c8403cb3510
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Oct 6 12:31:00 2011 +0200
Translation update done using Pootle.
commit 14a11b8963bda729b418f294325bc2439085d073
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Oct 6 12:30:09 2011 +0200
Translation update done using Pootle.
commit 6388dc3976ca2a3ca7f38cb79bfae705b2791fd7
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Oct 6 12:29:28 2011 +0200
Translation update done using Pootle.
commit d9fd88252c01b75ddb19fec02577c7c0c692a871
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Oct 6 09:42:33 2011 +0200
Translation update done using Pootle.
commit 64ad78343a803634f468e27c3701ae8578001d08
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Oct 6 09:41:48 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
addendum/html_credits.pl | 6 +-
addendum/html_head.pl | 11 +--
output/es/Documentation.html | 2 +-
output/ja/Documentation.html | 16 ++--
output/pl/Documentation.html | 180 +++++++++++++++++++--------------------
output/pl/README | 15 ++--
output/tr/Documentation.html | 2 +-
po/es.po | 8 +-
po/ja.po | 33 +++-----
po/pl.po | 193 ++++++++++++++++++++++++------------------
po/sv.po | 19 +++-
po/tr.po | 8 +-
12 files changed, 254 insertions(+), 239 deletions(-)
diff --git a/addendum/html_credits.pl b/addendum/html_credits.pl
index ac5eb7e..6deb72e 100644
--- a/addendum/html_credits.pl
+++ b/addendum/html_credits.pl
@@ -1,11 +1,9 @@
PO4A-HEADER:mode=before;position=<h2 id="glossary">
<p>
-To tłumaczenie jest <b>wspólną</b> pracą <b>różnych</b> tłumaczy, którzy
+ To tłumaczenie jest <b>wspólną</b> pracą <b>różnych</b> tłumaczy, którzy
pracowali nad tłumaczeniem, z języka angielskiego, dokumentacji phpMyAdmin
-- wersja 3.5.0-dev, na <a
href="https://l10n.cihar.com/projects/pmadoc/">serwerze tłumaczeń
(Pootle)</a>. Właśnie tutaj powinni oni podpisać się (w dowolnej
-kolejności):
-
--- Stanisław Krukowski --
+kolejności):< /br>-- Stanisław Krukowski --
</p>
diff --git a/addendum/html_head.pl b/addendum/html_head.pl
index d629e13..105c834 100644
--- a/addendum/html_head.pl
+++ b/addendum/html_head.pl
@@ -1,11 +1,10 @@
PO4A-HEADER:mode=after;position=<div id="body">;beginboundary=<ul>
<p>
-To jest (<b>częściowe</b>) tłumaczenie oficjalnej <a
+ To jest (<b>częściowe</b>) tłumaczenie oficjalnej <a
href="http://www.phpmyadmin.net /documentation/">dokumentacji programu
-phpMyAdmin -- wersja 3.5.0-dev</a>.
-
-Wszystkich sympatyków, zwolenników i użytkowników <b>Wolnego
-Oprogramowania</b> zapraszamy do wspólnego tłumaczenia tej
-dokumentacji. Nasz serwer tłumaczeń znajduje sie pod adresem: <a
+phpMyAdmin -- wersja 3.5.0-dev</a>.Wszystkich sympatyków, zwolenników i
+użytkowników <b>Wolnego Oprogramowania</b> zapraszamy do wspólnego
+tłumaczenia tej dokumentacji. Nasz serwer tłumaczeń znajduje sie pod
+adresem: <a
href="https://l10n.cihar.com/projects/pmadoc/">https://l10n.cihar.com/projects/pmadoc/</a>
</p>
diff --git a/output/es/Documentation.html b/output/es/Documentation.html
index 83b1cef..1fd34b0 100644
--- a/output/es/Documentation.html
+++ b/output/es/Documentation.html
@@ -4725,7 +4725,7 @@ lo contrario</dd>
<dt><code>@TABLE@</code></dt>
<dd>La tabla abierta actualmente</dd>
<dt><code>@COLUMNS@</code></dt>
- <dd>Columns of the currently opened table</dd>
+ <dd>Las columnas de la tabla abierta actualmente</dd>
<dt><code>@PHPMYADMIN@</code></dt>
<dd>phpMyAdmin con versión</dd>
</dl>
diff --git a/output/ja/Documentation.html b/output/ja/Documentation.html
index cefb347..ea4d943 100644
--- a/output/ja/Documentation.html
+++ b/output/ja/Documentation.html
@@ -596,7 +596,7 @@ Protocol">HTTP</abbr>／クッキー認証モード（あるいは、phpMyAdmin
アカウントの情報を提供する必要があります。このアカウントはログイン時にどのデータベースを表示するかチェックするのに利用されます。<br />
詳細は<a href="#setup">インストールの章</a>の「認証モードの使い方」をご覧ください。<br /><br />
- 2.2.5 より前の phpMyAdmin では「stduser/stdpass」という名前でした。</dd>
+ phpMyAdmin 2.2.5 より前では「stduser/stdpass」という名前でした。</dd>
<dt id="cfg_Servers_auth_type">$cfg['Servers'][$i]['auth_type'] 文字列 <tt>['<abbr title="HyperText Transfer
Protocol">HTTP</abbr>'|'http'|'cookie'|'config'|'signon']</tt></dt>
@@ -694,7 +694,7 @@ class="important">ほかのすべてのデータベースが使えなくなる
<dt><span id="cfg_Servers_hide_db">$cfg['Servers'][$i]['hide_db']</span> 文字列
</dt>
<dd>特権のないユーザからデータベースを隠します。正規表現で指定します。これはリストから見えなくするだけで、ユーザがそれらに（SQL
-クエリ使用するなどして）アクセスすることはできてしまいます。アクセスを制限するには、MySQL 特権システムを使用しています。
+クエリ使用するなどして）アクセスすることはできてしまいます。アクセスを制限するには、MySQL 特権システムを使用します。
<br /><br />
例えば、文字「a」で始まるすべてのデータベースを非表示にするには、<br />
<pre>$cfg['Servers'][$i]['hide_db'] = '^a';</pre>
@@ -2615,7 +2615,7 @@ RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L]
</pre>
<h4 id="faq1_36">
- <a href="#faq1_36">1.36 「サーバー内部エラー(500 Internal Server
+ <a href="#faq1_36">1.36 「サーバー内部エラー (500 Internal Server
Error)」というエラーが出ます。</a>
</h4>
<p>
@@ -3673,8 +3673,7 @@ class="configrule">$cfg['ForeignKeyMaxLimit']</a></tt></p>
<a href="#faq6_22">6.22
ブックマーク：テーブルの表示モードに入ったときに自動的にデフォルトのブックマークを実行するようにはできますか？</a></h4>
-<p> Yes. If a bookmark has the same label as a table name and it's not a public
-bookmark, it will be executed.
+<p> できます。ブックマークのラベルをテーブル名と同じにして、ブックマークを公開しないでおけば、実行されます。
</p>
<h4 id="faq6_23">
@@ -3744,7 +3743,7 @@ href="http://php.net/strftime">strftime</a>
<dt><code>@TABLE@</code></dt>
<dd>現在開いているテーブル</dd>
<dt><code>@COLUMNS@</code></dt>
- <dd>Columns of the currently opened table</dd>
+ <dd>現在開いているテーブルのカラム</dd>
<dt><code>@PHPMYADMIN@</code></dt>
<dd>バージョン番号付きの『phpMyAdmin』</dd>
</dl>
@@ -4395,7 +4394,8 @@ MySQL
<li>Dave Walton
<walton_at_nordicdms.com>。複数サーバサポートを追加してくださいました。バグフィックスをくださる常連でもあります。
</li>
- <li>Gabriel Ash <ga244_at_is8.nyu.edu>。2.0.6 のランダムアクセス機能を提供してくださいました。
+ <li>Gabriel Ash <ga244_at_is8.nyu.edu>。バージョン 2.0.6
+のランダムアクセス機能を提供してくださいました。
</li>
</ul>
<p>
@@ -4430,7 +4430,7 @@ href="http://ja.wikipedia.org/wiki/%E3%82%A6%E3%82%A7%E3%83%96%E3%83%96%E3%83%A9
- World Wide Web
上のウェブサイトでウェブページに一般的に置かれているテキスト、画像、その他の情報をユーザに対して表示や双方向通信することができるアプリケーション</li>
<li><a href="http://ja.wikipedia.org/wiki/Bzip2">bzip2</a> - Julian Seward
-により開発されたフリーソフトウェアでオープンソースのデータ圧縮アルゴリズムおよびプログラム</li>
+氏により開発されたフリーソフトウェアでオープンソースのデータ圧縮アルゴリズムおよびプログラム</li>
<li><a href="http://ja.wikipedia.org/wiki/Common_Gateway_Interface">CGI (Common
Gateway Interface)</a> -
ウェブサーバー上で実行されるプログラムでクライアントのウェブブラウザのデータを要求に応えることができる重要な World Wide Web 技術</li>
diff --git a/output/pl/Documentation.html b/output/pl/Documentation.html
index afeab65..86b7144 100644
--- a/output/pl/Documentation.html
+++ b/output/pl/Documentation.html
@@ -53,13 +53,12 @@ Questions">FAQ</abbr></a></li>
<div id="body">
<p>
-To jest (<b>częściowe</b>) tłumaczenie oficjalnej <a
+ To jest (<b>częściowe</b>) tłumaczenie oficjalnej <a
href="http://www.phpmyadmin.net /documentation/">dokumentacji programu
-phpMyAdmin -- wersja 3.5.0-dev</a>.
-
-Wszystkich sympatyków, zwolenników i użytkowników <b>Wolnego
-Oprogramowania</b> zapraszamy do wspólnego tłumaczenia tej
-dokumentacji. Nasz serwer tłumaczeń znajduje sie pod adresem: <a
+phpMyAdmin -- wersja 3.5.0-dev</a>.Wszystkich sympatyków, zwolenników i
+użytkowników <b>Wolnego Oprogramowania</b> zapraszamy do wspólnego
+tłumaczenia tej dokumentacji. Nasz serwer tłumaczeń znajduje sie pod
+adresem: <a
href="https://l10n.cihar.com/projects/pmadoc/">https://l10n.cihar.com/projects/pmadoc/</a>
</p>
<ul><li><a href="http://www.phpmyadmin.net/"> Strona domowa phpMyAdmin</a></li>
@@ -113,11 +112,11 @@ href="#faq6_25"> <abbr title="Frequently Asked Questions">FAQ</abbr>
<!-- INTRODUCTION -->
<h2 id="intro">Wprowadzenie</h2>
-<p> Za pomocą phpMyAdmin można zarządzać całym serwerem MySQL (administracja
+<p> Za pomocą phpMyAdmin można zarządzać całym serwerem MySQL (administracja
serwerem z konta root), jak również pojedynczą bazą danych. W tym ostatnim
przypadku pod warunkiem, że jest prawidłowo skonfigurowane konto użytkownika
-MySQL (włączenie odczytu/modyfikacji tylko określonej bazy danych).
-Do ciebie, Użytkowniku tej dokumentacji, należy odszukanie odpowiedniego
+MySQL (włączenie odczytu / modyfikacji tylko określonej bazy danych). Do
+ciebie, Użytkowniku tej dokumentacji, należy odszukanie odpowiedniego
fragmentu podręcznika MySQL, na temat tej kwestii.
</p>
@@ -179,26 +178,21 @@ Questions">FAQ</abbr> 9.1</a>,
</ul>
<h4>Kilka słów na temat Użytkowników:</h4>
-<p> Wiele osób ma trudności ze zrozumieniem koncepcji zarządzania użytkownikami
-w phpMyAdmin. Mechanizm tego zarządzania wygląda następująco:
-
+<p> Wiele osób ma trudności ze zrozumieniem koncepcji zarządzania
+użytkownikami w phpMyAdmin. Mechanizm tego zarządzania wygląda następująco:
1. aby zalogować się do phpMyAdmin, wszyscy użytkownicy muszą mieć wcześniej
-założone konta w MySQL,n\
-
-2. gdy użytkownik loguje się do phpMyAdmin, jego nazwa i hasło przesyłane są
-bezpośrednio do MySQL,
-
-3. zarządzanie użytkownikami w phpMyAdmin może odbywać się <b> wyłącznie</b>
-na zasadzie przetwarzania i/lub modyfikacji informacji o kontach
-użytkownika.</p>
+założone konta w MySQL. 2. gdy użytkownik loguje się do phpMyAdmin, jego
+nazwa i hasło przesyłane są bezpośrednio do MySQL. 3. zarządzanie
+użytkownikami w phpMyAdmin może odbywać się <strong> wyłącznie</strong> na
+zasadzie przetwarzania i/lub modyfikacji informacji o kontach użytkownika.</p>
<p class="footnote" id="footnote_1">
- <sup> 1 </sup> phpMyAdmin może kompresować kopie zapasowe w formatach: Zip,
-GZip -RFC 1952- lub Bzip2, i eksportować te kopie w formacie <abbr
-title="comma separated values">CSV </abbr>, jeśli użyje się do tego PHP z
-obsługą Zlib (<tt>--with-zlib</tt>) i/lub obsługą Bzip2
+ ----------------< /br><sup>1</sup>< /br>phpMyAdmin może kompresować kopie
+zapasowe w formatach: Zip, GZip -RFC 1952- lub Bzip2, i eksportować te kopie
+w formacie <abbr title="comma separated values">CSV </abbr>, jeśli użyje się
+do tego PHP z obsługą Zlib (<tt>--with-zlib</tt>) i/lub obsługą Bzip2
(<tt>--with-bz2</tt>). Właściwa obsługa kompresji może wiazać się także ze
-zmianami w pliku <tt>php.ini</tt>. </p>
+zmianami w pliku <tt>php.ini</tt>.</p>
<!-- INSTALLATION -->
@@ -212,8 +206,8 @@ zmianami w pliku <tt>php.ini</tt>. </p>
</ol>
<p class="important">
- phpMyAdmin nie stosuje żadnych specjalnych mechanizmów zabezpieczeń serwera
-MySQL. Przyznanie odpowiednich uprawnień do baz danych jest zadaniem
+ phpMyAdmin nie stosuje żadnych specjalnych mechanizmów zabezpieczeń
+serwera MySQL. Przyznanie odpowiednich uprawnień do baz danych jest zadaniem
administratora. Na stronie <b>Uprawnienia</b> interfejsu phpMyAdmin można
zabezpieczyć bazy, przydzielając lub odbierając określone uprawnienia
użytkownikom poszczególnych baz.
@@ -230,49 +224,44 @@ napisane w stylu Unix przed wysłaniem ich na serwer. Język PHP wydaje
się" nie lubić" znaków końca linii w stylu <tt>Mac</tt>.</p>
<h3 id="quick_install">Szybka instalacja</h3>
-<ol><li>Wybrać odpowiedni zestaw dystrybucyjny ze strony pobierania phpmyadmin.net.
-
-UWAGA: niektóre zestawy zawierają wiadomości tylko w języku angielskim, inne
-- zawierają wszystkie języki w formacie UTF-8 (w większości przypadków jest
-to wystarczające), jeszcze inne zawierają wszystkie języki z pełnym zestawem
-kodowania znaków. Zakładamy, że wybrany będzie zestaw podobny do tego:
-<tt>phpMyAdmin-x.x.x-all-languages.tar.gz</tt>.
+<ol><li>Wybrać odpowiedni zestaw dystrybucyjny ze strony pobierania
+phpmyadmin.net.<strong>UWAGA:</strong> niektóre zestawy zawierają wiadomości
+tylko w języku angielskim, inne -- zawierają wszystkie języki w formacie
+UTF-8 (w większości przypadków jest to wystarczające), jeszcze inne --
+zawierają wszystkie języki z pełnym zestawem kodowania znaków. Zakładamy, że
+wybrany będzie zestaw podobny do
+tego:<tt>phpMyAdmin-x.x.x-all-languages.tar.gz</tt>.
</li>
<li>Rozpakować zestaw za pomocą programów untar lub unzip (upewnić się, że
zostały rozpakowane również wszystkie podkatalogi) do katalogu root serwera
zdalnego:<tt>tar -xzvf phpMyAdmin_x.x.x-all-languages.tar.gz</tt> Jeżeli
brak bezpośredniego dostępu do tego katalogu -- umieścić pliki w jakimś
katalogu w maszynie lokalnej, i, po wykonaniu kroku 4, przesłać katalog na
-sewer za pomocą, na przykład, klienta FTP.</li>
+serwer za pomocą, na przykład, klienta FTP.</li>
<li>Upewnić się, że wszystkie skrypty mają odpowiedniego właściciela (jeśli PHP
pracuje w trybie bezpiecznym, posiadanie skryptów, mających innego
właściciela niż właściciel podstawowy, będzie powodować problemy). Zobacz
sugestie w: <a href="#faq4_2"> <abbr title="Frequently Asked
Questions">FAQ</abbr> 4.2</a> i <a href="#faq1_26"><abbr title="Frequently
Asked Questions">FAQ</abbr> 1.26.</a></li>
- <li>Skonfigurować instalację. Istnieją dwie metody, które można użyć w tym celu:
-
-1. Ręczna edycja kopii pliku <tt>config.inc.php</tt>,
-
-2. Instalacja za pomocą skryptu w stylu kreatora graficznego.
-
-Pierwsza metoda jest szybkim sposobem rozpoczęcia instalacji w trybie
-zaawansowanym, druga natomiast - jest dużym ułatwieniem dla tych, którzy
-preferują instalację w trybie graficznym.
+ <li>Skonfigurować instalację. Istnieją dwie metody, które można użyć w tym
+celu:<strong>-- ręczna edycja kopii pliku</strong><tt>config.inc.php</tt>,
+(szybki sposób na rozpoczęcie instalacji w tekstowym trybie dla użytkowników
+zaawansowanych), <strong>-- instalacja za pomocą skryptu (kreator
+graficzny).</strong>
<ul><li>Aby ręcznie utworzyć plik <tt>config.inc.php</tt>, trzeba w dowolnym
edytorze tekstowym utworzyć nowy plik o tej właśnie nazwie, a następnie
umieścić w nim odpowiednie wpisy (dyrektywy konfiguracyjne). Można też
skopiować do niego zawartość pliku <tt>config.sample.inc.php</tt>, który
zawiera minimalny zestaw konfiguracyjny; w tym przypadku plik z nową
zawartością należy skopiować do głównego katalogu phpMyAdmin (do katalogu, w
-którym znajduje się plik <tt>index.php</tt>).
-
-phpMyAdmin wczytuje najpierw plik <tt>libraries/config.default.php</tt>, a
-następnie nadpisuje umieszczoną w nim zawartość tym, co znajdzie w pliku
-<tt>config.inc.php</tt>. Jeśli wartość domyślna jest odpowiednio dobra dla
-określonych ustawień, nie ma potrzeby załączać jej do pliku
-<tt>config.inc.php</tt>, trzeba natomiast zastosować kilka dodatkowych
-dyrektyw; prosta konfiguracja może wyglądać następująco:
+którym znajduje się plik <tt>index.php</tt>). phpMyAdmin wczytuje najpierw
+plik<tt>libraries/config.default.php</tt>, a następnie nadpisuje umieszczoną
+w nim zawartość tym, co znajdzie w pliku <tt>config.inc.php</tt>. Jeśli
+wartość domyślna jest odpowiednio dobra dla określonych ustawień, nie ma
+potrzeby załączać jej do pliku <tt>config.inc.php</tt>, trzeba natomiast
+zastosować kilka dodatkowych dyrektyw; prosta konfiguracja może wyglądać
+następująco:
<pre>
<?php
$cfg['blowfish_secret'] = 'ba17c1ec07d65003'; // użyć dowolnej wartości
@@ -294,8 +283,8 @@ $cfg['Servers'][$i]['password'] = 'cbb74bc'; // wpisać swoje hasło
$cfg['Servers'][$i]['auth_type'] = 'config';
?>
</pre>
- Pełne wyjaśnienie możliwych wartości konfiguracyjnych dostępne jest w <a
-href="#config">Sekcji Konfiguracja</a> tego dokumentu.</li>
+ Pełne wyjaśnienie możliwych wartości konfiguracyjnych dostępne jest w sekcji
+<a href="#config">Konfiguracja</a></li>
<li id="setup_script">Zamiast ręcznej edycji pliku <tt>config.inc.php</tt>, można użyć <a
href="setup/">Skryptu instalacyjnego</a>. W tym celu trzeba ręcznie utworzyć
katalog <tt>config</tt> w katalogu głównym phpMyAdmin. Jest to podyktowane
@@ -308,47 +297,56 @@ chmod o+rw config # nadać mu uprawnienia do zapisu
</pre>
Aby wyedytować istniejącą konfigurację, trzeba ją najpierw skopiować:
<pre>
-cp config.inc.php config/ # skopiować bieżacą konfigurację
-chmod o+w config/config.inc.php # nadać jej uprawnienia do zapisu
+cp config.inc.php config/ # skopiować bieżacą konfigurację
+chmod o+w config/config.inc.php # nadać uprawnienia do zapisu
</pre>
Na innych platformach systemowych trzeba także utworzyć katalog
<tt>config</tt> i sprawdzić, czy serwer WWW ma ustawiony dostęp do odczytu i
zapisu. <a href="#faq1_26">Zobacz: FAQ 1.26</a><br /><br />
- Next, open <tt><a href="setup/">setup/</a> </tt>in your browser. Note that
-<strong>changes are not saved to disk until explicitly choose
-<tt>Save</tt></strong> from the <i>Configuration</i> area of the
-screen. Normally the script saves the new config.inc.php to the
-<tt>config/</tt> directory, but if the webserver does not have the proper
-permissions you may see the error "Cannot load or save configuration."
-Ensure that the <tt> config/</tt> directory exists and has the proper
-permissions - or use the <tt>Download</tt> link to save the config file
-locally and upload (via FTP or some similar means) to the proper location.<br /><br />
-
- Once the file has been saved, it must be moved out of the <tt> config/</tt>
-directory and the permissions must be reset, again as a security measure:
+ Następnie, klikamy w przeglądarce odnośnik <tt><a href="setup/">skrypt
+instalacyjny</a> </tt>, co uruchomi proces konfiguracyjny. Pojawia się
+najpierw okno z informacją: "phpMyAdmin Setup Script", gdzie, po kliknięciu
+odnośnika "phpMyAdmin Setup Script" możemy, alternatywnie, przejść na stronę
+WWW <strong>serwera demo phpMyAdmin</strong>, gdzie można kontynuować
+graficzny, zaawansowany, proces konfiguracji. Proszę zauważyć, że
+<strong>zmiany konfiguracji, dokonane w tym oknie będą zapisane dopiero
+wtedy, gdy klikniemy przycisk <tt>Zachowaj</tt></strong>. Zwykle, skrypt
+zapisuje nowy plik <tt>config.inc.php</tt> w katalogu
+<tt>config/</tt>. Jeśli jednak serwer WWW nie ma ustawionych uprawnień do
+zapisu, lub katalog <tt>config/</tt> nie istnieje, pojawia się komunikat:
+"Nie udało się załadować lub zapisać konfiguracji". Trzeba wtedy ustawić, na
+serwerze WWW, odpowiednie uprawnienia oraz sprawdzić, czy katalog
+<tt>config/</tt> faktycznie istnieje; można też kliknąć przycisk
+<tt>Ściągnij</tt> i zapisać plik na maszynie lokalnej, a następnie wysłać na
+serwer WWW za pomocą, na przykład, klienta FTP.<br /><br />
+
+ Jak tylko nasz plik zostanie zapisany, musimy go usunąć z katalogu
+<tt>config/</tt>; trzeba także <strong>ponownie zresetować
+uprawnienia</strong> -- jest to podyktowane względami bezpieczeństwa:
<pre>
-mv config/config.inc.php . # move file to current directory
-chmod o-rw config.inc.php # remove world read and write permissions
-rm -rf config # remove not needed directory
+mv config/config.inc.php . # przenieść plik do bieżacego katalogu
+chmod o-rw config.inc.php # usunać uprawnienia odczytu i zapisu dla innych
+rm -rf config # usunąć zbędny katalog
</pre>
- Now the file is ready to be used. You can choose to review or edit the file
-with your favorite editor, if you prefer to set some advanced options which
-the setup script does not provide.</li></ul></li>
- <li>If you are using the <tt>auth_type</tt> "config", it is suggested
-that you protect the phpMyAdmin installation directory because using config
-does not require a user to enter a password to access the phpMyAdmin
-installation. Use of an alternate authentication method is recommended, for
-example with HTTP–AUTH in a <a href="#glossary"><i>.htaccess</i></a>
-file or switch to using <tt>auth_type</tt> cookie or http. See the <a
-href="#faqmultiuser"> multi–user sub–section</a> of this <abbr
-title="Frequently Asked Questions">FAQ</abbr> for additional information,
-especially <a href="#faq4_4"> <abbr title="Frequently Asked
+ Teraz plik jest gotowy do użytku. Możemy go przeglądać lub edytować w
+dowolnym edytorze tekstowym, jeśli chcemy ustawić opcje, których brak w
+skrypcie instalacyjnym.</li></ul></li>
+ <li>W przypadku używania <tt>auth_type</tt> sugerujemy, aby zabezpieczyć katalog
+instalacyjny phpMyAdmin, ponieważ użycie trybu <tt>config</tt> nie nakłada
+na użytkownika obowiązku wprowadzenia hasła podczas dostępu do instalacji
+phpMyAdmin. Zalecane jest użycie jednej z alternatywnych metod
+uwierzytelnienia, na przykład za pomocą HTTP–AUTH w pliku <a
+href="#glossary"><i>.htaccess</i></a> lub przełączenie się na używanie pliku
+<ttt>cookie</tt> lub uwierzytelnienie za pomocą http
+<tt>auth_type</tt>. Zobacz też <a href="#faqmultiuser">podsekcję "tryb
+wieloużytkownikowy"</a><abbr title="Frequently Asked Questions">FAQ</abbr>,
+a szczególnie <a href="#faq4_4"><abbr title="Frequently Asked
Questions">FAQ</abbr> 4.4</a>.</li>
- <li>Open the <a href="index.php">main phpMyAdmin directory</a> in your
-browser. phpMyAdmin should now display a welcome screen and your databases,
-or a login dialog if using <abbr title="HyperText Transfer
-Protocol">HTTP</abbr> or cookie authentication mode.</li>
+ <li>Otworzyć <a href="index.php"> główny katalog phpMyAdmin</a> w przegladarce
+WWW -- phpMyAdmin powinien wyświetlić ekran powitalny i bazy danych, albo
+okno dialogowe logowania, jeśli używamy trybu uwierzytelnienia <abbr
+title="HyperText Transfer Protocol">HTTP</abbr> lub cookie.</li>
<li>You should deny access to the <tt>./libraries</tt> and <tt>./setup/lib</tt>
subfolders in your webserver configuration. For Apache you can use supplied
.htaccess file in that folder, for other webservers, you should configure
@@ -365,7 +363,7 @@ access by web server configuration. You can find example
</li>
</ol>
-<h3 id="linked-tables">phpMyAdmin configuration storage</h3>
+<h3 id="linked-tables">Przechowywanie konfiguracji phpMyAdmin</h3>
<p> For a whole set of new features (bookmarks, comments, <abbr
title="structured query language">SQL</abbr>-history, tracking mechanism,
@@ -5298,14 +5296,12 @@ and or just some feedback.
</p>
<p>
-To tłumaczenie jest <b>wspólną</b> pracą <b>różnych</b> tłumaczy, którzy
+ To tłumaczenie jest <b>wspólną</b> pracą <b>różnych</b> tłumaczy, którzy
pracowali nad tłumaczeniem, z języka angielskiego, dokumentacji phpMyAdmin
-- wersja 3.5.0-dev, na <a
href="https://l10n.cihar.com/projects/pmadoc/">serwerze tłumaczeń
(Pootle)</a>. Właśnie tutaj powinni oni podpisać się (w dowolnej
-kolejności):
-
--- Stanisław Krukowski --
+kolejności):< /br>-- Stanisław Krukowski --
</p>
<h2 id="glossary">Słownik</h2>
diff --git a/output/pl/README b/output/pl/README
index 71fa938..c1645ae 100644
--- a/output/pl/README
+++ b/output/pl/README
@@ -50,9 +50,9 @@ Wymagania
Podsumowanie
------------
-phpMyAdmin jest przeznaczony do obsługi MySQL poprzez sieć Web. Proszę
-przeczytać zawartość pliku documentation.txt/.html, aby zapoznać się z
-podsumowaniem charakterystyki phpMyAdmin.
+ phpMyAdmin jest przeznaczony do obsługi MySQL poprzez sieć Web. Proszę
+przeczytać zawartość pliku documentation.txt / documentation.html, aby
+zapoznać się z podsumowaniem charakterystyki phpMyAdmin.
Pobieranie
----------
@@ -80,12 +80,11 @@ Zespół deweloperów phpMyAdmin
PS:
-Proszę nie przysyłać do nas listów e-mail w rodzaju: "Jak skompilować PHP z
-obsługą MySQL". Po prostu nie mamy czasu, aby być Twoim (Waszym) darmowym
+ Proszę nie przysyłać do nas listów e-mail w rodzaju: "Jak skompilować PHP
+z obsługą MySQL". Po prostu nie mamy czasu, aby być Twoim (Waszym) darmowym
systemem obsługi zgłoszeń (systemem pomocy).
-Pytania, związane z dokumentacją i/lub programem phpMyAdmin, prosimy
+ Pytania, związane z dokumentacją i/lub programem phpMyAdmin, prosimy
przesyłać na odpowiednie listy dyskusyjne. Przed skontaktowaniem się z nami,
-prosimy o przeczytanie zawartości pliku Documentation.html (zwł. części
-FAQ).
+prosimy o przeczytanie zawartości pliku Documentation.html (zwł. części FAQ.
diff --git a/output/tr/Documentation.html b/output/tr/Documentation.html
index 53a1cf8..775fbaa 100644
--- a/output/tr/Documentation.html
+++ b/output/tr/Documentation.html
@@ -4575,7 +4575,7 @@ href="#cfg_Servers_verbose">server configuration</a></dd>
<dt><code>@TABLE@</code></dt>
<dd>Şu anda açık olan tablo</dd>
<dt><code>@COLUMNS@</code></dt>
- <dd>Columns of the currently opened table</dd>
+ <dd>Şu anda açık olan tablo sütunları</dd>
<dt><code>@PHPMYADMIN@</code></dt>
<dd>phpMyAdmin ile birlikte sürümü</dd>
</dl>
diff --git a/po/es.po b/po/es.po
index accdcea..23664ef 100644
--- a/po/es.po
+++ b/po/es.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: 2011-10-06 09:21+0300\n"
-"PO-Revision-Date: 2011-10-02 20:33+0200\n"
+"PO-Revision-Date: 2011-10-06 16:21+0200\n"
"Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n"
"Language-Team: none\n"
"Language: es\n"
@@ -12074,15 +12074,13 @@ msgstr "La tabla abierta actualmente"
#. type: Content of: <html><body><div><dl><dt>
#: orig-docs/Documentation.html:4344
-#, fuzzy
msgid "<code>@COLUMNS@</code>"
-msgstr "<code>@FIELDS@</code>"
+msgstr "<code>@COLUMNS@</code>"
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:4345
-#, fuzzy
msgid "Columns of the currently opened table"
-msgstr "Los campos de la tabla abierta actualmente"
+msgstr "Las columnas de la tabla abierta actualmente"
#. type: Content of: <html><body><div><dl><dt>
#: orig-docs/Documentation.html:4346
diff --git a/po/ja.po b/po/ja.po
index fd061ab..081ba30 100644
--- a/po/ja.po
+++ b/po/ja.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: 2011-10-06 09:20+0300\n"
-"PO-Revision-Date: 2011-09-24 12:01+0200\n"
+"PO-Revision-Date: 2011-10-06 12:39+0200\n"
"Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n"
"Language-Team: Japan <jp(a)li.org>\n"
"Language: ja\n"
@@ -1954,7 +1954,7 @@ msgstr ""
msgid ""
"In phpMyAdmin versions before 2.2.5, those were called "stduser/"
"stdpass"."
-msgstr "2.2.5 より前の phpMyAdmin では「stduser/stdpass」という名前でした。"
+msgstr "phpMyAdmin 2.2.5 より前では「stduser/stdpass」という名前でした。"
#. type: Content of: <html><body><div><dl><dt>
#: orig-docs/Documentation.html:740
@@ -2230,10 +2230,8 @@ msgid ""
"(using, for example, the SQL query area). To limit access, use the MySQL "
"privilege system."
msgstr ""
-"特権のないユーザからデータベースを隠します。正規表現で指定します。これはリス"
-"トから見えなくするだけで、ユーザがそれらに（SQL クエリ使用するなどして）アク"
-"セスすることはできてしまいます。アクセスを制限するには、MySQL 特権システムを"
-"使用しています。"
+"特権のないユーザからデータベースを隠します。正規表現で指定します。これはリストから見えなくするだけで、ユーザがそれらに（SQL "
+"クエリ使用するなどして）アクセスすることはできてしまいます。アクセスを制限するには、MySQL 特権システムを使用します。"
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:854
@@ -8464,8 +8462,8 @@ msgid ""
"<a href=\"#faq1_36\">1.36 I get an error "500 Internal Server "
"Error".</a>"
msgstr ""
-"<a href=\"#faq1_36\">1.36 「サーバー内部エラー(500 Internal Server Error)」と"
-"いうエラーが出ます。</a>"
+"<a href=\"#faq1_36\">1.36 「サーバー内部エラー (500 Internal Server "
+"Error)」というエラーが出ます。</a>"
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:3078
@@ -11545,12 +11543,10 @@ msgstr ""
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:4274
-#, fuzzy
msgid ""
"Yes. If a bookmark has the same label as a table name and it's not a public "
"bookmark, it will be executed."
-msgstr ""
-"できます。ブックマークのラベルがテーブル名と同じにしておくと実行されます。"
+msgstr "できます。ブックマークのラベルをテーブル名と同じにして、ブックマークを公開しないでおけば、実行されます。"
#. type: Content of: <html><body><div><h4>
#: orig-docs/Documentation.html:4278
@@ -11788,15 +11784,13 @@ msgstr "現在開いているテーブル"
#. type: Content of: <html><body><div><dl><dt>
#: orig-docs/Documentation.html:4344
-#, fuzzy
msgid "<code>@COLUMNS@</code>"
-msgstr "<code>@FIELDS@</code>"
+msgstr "<code>@COLUMNS@</code>"
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:4345
-#, fuzzy
msgid "Columns of the currently opened table"
-msgstr "現在開いているテーブルのフィールド"
+msgstr "現在開いているテーブルのカラム"
#. type: Content of: <html><body><div><dl><dt>
#: orig-docs/Documentation.html:4346
@@ -13540,8 +13534,8 @@ msgid ""
"Gabriel Ash <ga244_at_is8.nyu.edu> contributed the random access "
"features for 2.0.6."
msgstr ""
-"Gabriel Ash <ga244_at_is8.nyu.edu>。2.0.6 のランダムアクセス機能を提供"
-"してくださいました。"
+"Gabriel Ash <ga244_at_is8.nyu.edu>。バージョン 2.0.6 "
+"のランダムアクセス機能を提供してくださいました。"
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:5062
@@ -13623,9 +13617,8 @@ msgid ""
"open source data compression algorithm and program developed by Julian "
"Seward."
msgstr ""
-"<a href=\"http://ja.wikipedia.org/wiki/Bzip2\">bzip2</a> - Julian Seward によ"
-"り開発されたフリーソフトウェアでオープンソースのデータ圧縮アルゴリズムおよび"
-"プログラム"
+"<a href=\"http://ja.wikipedia.org/wiki/Bzip2\">bzip2</a> - Julian Seward "
+"氏により開発されたフリーソフトウェアでオープンソースのデータ圧縮アルゴリズムおよびプログラム"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:5092
diff --git a/po/pl.po b/po/pl.po
index 502ec32..2eb296f 100644
--- a/po/pl.po
+++ b/po/pl.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: 2011-10-06 09:20+0300\n"
-"PO-Revision-Date: 2011-10-05 20:22+0200\n"
+"PO-Revision-Date: 2011-10-10 12:54+0200\n"
"Last-Translator: Stanisław Krukowski <stankruk(a)neostrada.pl>\n"
"Language-Team: Polish <pl(a)li.org>\n"
"Language: pl\n"
@@ -242,11 +242,11 @@ msgid ""
"MySQL user who can read/write only the desired database. It's up to you to "
"look up the appropriate part in the MySQL manual."
msgstr ""
-"Za pomocą phpMyAdmin można zarządzać całym serwerem MySQL (administracja "
+" Za pomocą phpMyAdmin można zarządzać całym serwerem MySQL (administracja "
"serwerem z konta root), jak również pojedynczą bazą danych. W tym ostatnim "
"przypadku pod warunkiem, że jest prawidłowo skonfigurowane konto użytkownika "
-"MySQL (włączenie odczytu/modyfikacji tylko określonej bazy danych).\n"
-"Do ciebie, Użytkowniku tej dokumentacji, należy odszukanie odpowiedniego "
+"MySQL (włączenie odczytu / modyfikacji tylko określonej bazy danych). Do "
+"ciebie, Użytkowniku tej dokumentacji, należy odszukanie odpowiedniego "
"fragmentu podręcznika MySQL, na temat tej kwestii."
#. type: Content of: <html><body><div><h3>
@@ -444,17 +444,14 @@ msgid ""
"management on its own (other than allowing one to manipulate the MySQL user "
"account information); all users must be valid MySQL users."
msgstr ""
-"Wiele osób ma trudności ze zrozumieniem koncepcji zarządzania użytkownikami "
-"w phpMyAdmin. Mechanizm tego zarządzania wygląda następująco:\n"
-"\n"
-"1. aby zalogować się do phpMyAdmin, wszyscy użytkownicy muszą mieć wcześniej "
-"założone konta w MySQL,n\\ \n"
-"\n"
-"2. gdy użytkownik loguje się do phpMyAdmin, jego nazwa i hasło przesyłane są "
-"bezpośrednio do MySQL,\n"
-"\n"
-"3. zarządzanie użytkownikami w phpMyAdmin może odbywać się <b> wyłącznie</b> "
-"na zasadzie przetwarzania i/lub modyfikacji informacji o kontach użytkownika."
+" Wiele osób ma trudności ze zrozumieniem koncepcji zarządzania "
+"użytkownikami w phpMyAdmin. Mechanizm tego zarządzania wygląda następująco: "
+" 1. aby zalogować się do phpMyAdmin, wszyscy użytkownicy muszą mieć "
+"wcześniej założone konta w MySQL. 2. gdy użytkownik loguje się do "
+"phpMyAdmin, jego nazwa i hasło przesyłane są bezpośrednio do MySQL. 3. "
+"zarządzanie użytkownikami w phpMyAdmin może odbywać się <strong> "
+"wyłącznie</strong> na zasadzie przetwarzania i/lub modyfikacji informacji o "
+"kontach użytkownika."
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:159
@@ -465,12 +462,12 @@ msgid ""
"support (<tt>--with-bz2</tt>). Proper support may also need changes in "
"<tt>php.ini</tt>."
msgstr ""
-"<sup> 1 </sup> phpMyAdmin może kompresować kopie zapasowe w formatach: Zip, "
-"GZip -RFC 1952- lub Bzip2, i eksportować te kopie w formacie <abbr title="
-"\"comma separated values\">CSV </abbr>, jeśli użyje się do tego PHP z "
-"obsługą Zlib (<tt>--with-zlib</tt>) i/lub obsługą Bzip2 (<tt>--with-bz2</"
-"tt>). Właściwa obsługa kompresji może wiazać się także ze zmianami w pliku "
-"<tt>php.ini</tt>. "
+"----------------< /br><sup>1</sup>< /br>phpMyAdmin może kompresować kopie "
+"zapasowe w formatach: Zip, GZip -RFC 1952- lub Bzip2, i eksportować te kopie "
+" w formacie <abbr title=\"comma separated values\">CSV </abbr>, jeśli użyje "
+"się do tego PHP z obsługą Zlib (<tt>--with-zlib</tt>) i/lub obsługą Bzip2 "
+"(<tt>--with-bz2</tt>). Właściwa obsługa kompresji może wiazać się także ze "
+"zmianami w pliku <tt>php.ini</tt>."
#. type: Content of: <html><body><div><h2>
#: orig-docs/Documentation.html:166
@@ -510,8 +507,8 @@ msgid ""
"the MySQL databases properly. phpMyAdmin's "Privileges" page can "
"be used for this."
msgstr ""
-"phpMyAdmin nie stosuje żadnych specjalnych mechanizmów zabezpieczeń serwera "
-"MySQL. Przyznanie odpowiednich uprawnień do baz danych jest zadaniem "
+" phpMyAdmin nie stosuje żadnych specjalnych mechanizmów zabezpieczeń "
+"serwera MySQL. Przyznanie odpowiednich uprawnień do baz danych jest zadaniem "
"administratora. Na stronie <b>Uprawnienia</b> interfejsu phpMyAdmin można "
"zabezpieczyć bazy, przydzielając lub odbierając określone uprawnienia "
"użytkownikom poszczególnych baz."
@@ -562,13 +559,13 @@ msgid ""
"contain all languages and all character sets. We'll assume you chose a kit "
"whose name looks like <tt>phpMyAdmin-x.x.x-all-languages.tar.gz</tt>."
msgstr ""
-"Wybrać odpowiedni zestaw dystrybucyjny ze strony pobierania phpmyadmin.net.\n"
-"\n"
-"UWAGA: niektóre zestawy zawierają wiadomości tylko w języku angielskim, inne "
-"- zawierają wszystkie języki w formacie UTF-8 (w większości przypadków jest "
-"to wystarczające), jeszcze inne zawierają wszystkie języki z pełnym zestawem "
-"kodowania znaków. Zakładamy, że wybrany będzie zestaw podobny do tego:\n"
-"<tt>phpMyAdmin-x.x.x-all-languages.tar.gz</tt>."
+"Wybrać odpowiedni zestaw dystrybucyjny ze strony pobierania "
+"phpmyadmin.net.<strong>UWAGA:</strong> niektóre zestawy zawierają wiadomości "
+"tylko w języku angielskim, inne -- zawierają wszystkie języki w formacie "
+"UTF-8 (w większości przypadków jest to wystarczające), jeszcze inne -- "
+"zawierają wszystkie języki z pełnym zestawem kodowania znaków. Zakładamy, że "
+"wybrany będzie zestaw podobny do tego:<tt>phpMyAdmin-x.x.x-all-"
+"languages.tar.gz</tt>."
#. type: Content of: <html><body><div><ol><li>
#: orig-docs/Documentation.html:201
@@ -584,7 +581,7 @@ msgstr ""
"zdalnego:<tt>tar -xzvf phpMyAdmin_x.x.x-all-languages.tar.gz</tt> Jeżeli "
"brak bezpośredniego dostępu do tego katalogu -- umieścić pliki w jakimś "
"katalogu w maszynie lokalnej, i, po wykonaniu kroku 4, przesłać katalog na "
-"sewer za pomocą, na przykład, klienta FTP."
+"serwer za pomocą, na przykład, klienta FTP."
#. type: Content of: <html><body><div><ol><li>
#: orig-docs/Documentation.html:206
@@ -599,9 +596,9 @@ msgstr ""
"Upewnić się, że wszystkie skrypty mają odpowiedniego właściciela (jeśli PHP "
"pracuje w trybie bezpiecznym, posiadanie skryptów, mających innego "
"właściciela niż właściciel podstawowy, będzie powodować problemy). Zobacz "
-"sugestie w: <a href=\"#faq4_2\"> <abbr title=\"Frequently Asked Questions"
-"\">FAQ</abbr> 4.2</a> i <a href=\"#faq1_26\"><abbr title=\"Frequently Asked "
-"Questions\">FAQ</abbr> 1.26.</a>"
+"sugestie w: <a href=\"#faq4_2\"> <abbr title=\"Frequently Asked "
+"Questions\">FAQ</abbr> 4.2</a> i <a href=\"#faq1_26\"><abbr title=\"Frequently "
+"Asked Questions\">FAQ</abbr> 1.26.</a>"
#. type: Content of: <html><body><div><ol><li>
#: orig-docs/Documentation.html:213
@@ -613,15 +610,10 @@ msgid ""
"way to get started and needed for some advanced features."
msgstr ""
"Skonfigurować instalację. Istnieją dwie metody, które można użyć w tym "
-"celu:\n"
-"\n"
-"1. Ręczna edycja kopii pliku <tt>config.inc.php</tt>,\n"
-"\n"
-"2. Instalacja za pomocą skryptu w stylu kreatora graficznego.\n"
-"\n"
-"Pierwsza metoda jest szybkim sposobem rozpoczęcia instalacji w trybie "
-"zaawansowanym, druga natomiast - jest dużym ułatwieniem dla tych, którzy "
-"preferują instalację w trybie graficznym."
+"celu:<strong>-- ręczna edycja kopii pliku</strong><tt>config.inc.php</tt>, "
+"(szybki sposób na rozpoczęcie instalacji w tekstowym trybie dla użytkowników "
+"zaawansowanych), <strong>-- instalacja za pomocą skryptu (kreator "
+"graficzny).</strong>"
#. type: Content of: <html><body><div><ol><li><ul><li>
#: orig-docs/Documentation.html:218
@@ -642,14 +634,13 @@ msgstr ""
"skopiować do niego zawartość pliku <tt>config.sample.inc.php</tt>, który "
"zawiera minimalny zestaw konfiguracyjny; w tym przypadku plik z nową "
"zawartością należy skopiować do głównego katalogu phpMyAdmin (do katalogu, w "
-"którym znajduje się plik <tt>index.php</tt>).\n"
-"\n"
-"phpMyAdmin wczytuje najpierw plik <tt>libraries/config.default.php</tt>, a "
-"następnie nadpisuje umieszczoną w nim zawartość tym, co znajdzie w pliku "
+"którym znajduje się plik <tt>index.php</tt>). phpMyAdmin wczytuje najpierw "
+"plik<tt>libraries/config.default.php</tt>, a następnie nadpisuje "
+"umieszczoną w nim zawartość tym, co znajdzie w pliku "
"<tt>config.inc.php</tt>. Jeśli wartość domyślna jest odpowiednio dobra dla "
-"określonych ustawień, nie ma potrzeby załączać jej do pliku <tt>config.inc."
-"php</tt>, trzeba natomiast zastosować kilka dodatkowych dyrektyw; prosta "
-"konfiguracja może wyglądać następująco:"
+"określonych ustawień, nie ma potrzeby załączać jej do pliku "
+"<tt>config.inc.php</tt>, trzeba natomiast zastosować kilka dodatkowych "
+"dyrektyw; prosta konfiguracja może wyglądać następująco:"
#. type: Content of: <html><body><div><ol><li><ul><li><pre>
#: orig-docs/Documentation.html:230
@@ -706,8 +697,8 @@ msgid ""
"For a full explanation of possible configuration values, see the <a href="
"\"#config\">Configuration Section</a> of this document."
msgstr ""
-"Pełne wyjaśnienie możliwych wartości konfiguracyjnych dostępne jest w <a "
-"href=\"#config\">Sekcji Konfiguracja</a> tego dokumentu."
+"Pełne wyjaśnienie możliwych wartości konfiguracyjnych dostępne jest w sekcji "
+"<a href=\"#config\">Konfiguracja</a>"
#. type: Content of: <html><body><div><ol><li><ul><li>
#: orig-docs/Documentation.html:251
@@ -717,8 +708,8 @@ msgid ""
"<tt>config</tt> in the phpMyAdmin directory. This is a security measure. On "
"a Linux/Unix system you can use the following commands:"
msgstr ""
-"Zamiast ręcznej edycji pliku <tt>config.inc.php</tt>, można użyć <a href="
-"\"setup/\">Skryptu instalacyjnego</a>. W tym celu trzeba ręcznie utworzyć "
+"Zamiast ręcznej edycji pliku <tt>config.inc.php</tt>, można użyć <a "
+"href=\"setup/\">Skryptu instalacyjnego</a>. W tym celu trzeba ręcznie utworzyć "
"katalog <tt>config</tt> w katalogu głównym phpMyAdmin. Jest to podyktowane "
"koniecznymi środkami bezpieczeństwa. W systemie Linux/Unix można użyć "
"następujących poleceń:"
@@ -747,8 +738,8 @@ msgid ""
"cp config.inc.php config/ # copy current configuration for editing\n"
"chmod o+w config/config.inc.php # give it world writable permissions\n"
msgstr ""
-"cp config.inc.php config/ # skopiować bieżacą konfigurację\n"
-"chmod o+w config/config.inc.php # nadać jej uprawnienia do zapisu\n"
+"cp config.inc.php config/ # skopiować bieżacą konfigurację\n"
+"chmod o+w config/config.inc.php # nadać uprawnienia do zapisu\n"
#. type: Content of: <html><body><div><ol><li><ul><li>
#: orig-docs/Documentation.html:267
@@ -774,6 +765,22 @@ msgid ""
"tt> link to save the config file locally and upload (via FTP or some similar "
"means) to the proper location."
msgstr ""
+"Następnie, klikamy w przeglądarce odnośnik <tt><a href=\"setup/\">skrypt "
+"instalacyjny</a> </tt>, co uruchomi proces konfiguracyjny. Pojawia się "
+"najpierw okno z informacją: \"phpMyAdmin Setup Script\", gdzie, po kliknięciu "
+"odnośnika \"phpMyAdmin Setup Script\" możemy, alternatywnie, przejść na stronę "
+"WWW <strong>serwera demo phpMyAdmin</strong>, gdzie można kontynuować "
+"graficzny, zaawansowany, proces konfiguracji. Proszę zauważyć, że "
+"<strong>zmiany konfiguracji, dokonane w tym oknie będą zapisane dopiero "
+"wtedy, gdy klikniemy przycisk <tt>Zachowaj</tt></strong>. Zwykle, skrypt "
+"zapisuje nowy plik <tt>config.inc.php</tt> w katalogu <tt>config/</tt>. "
+"Jeśli jednak serwer WWW nie ma ustawionych uprawnień do zapisu, lub katalog "
+"<tt>config/</tt> nie istnieje, pojawia się komunikat: \"Nie udało się "
+"załadować lub zapisać konfiguracji\". Trzeba wtedy ustawić, na serwerze WWW, "
+"odpowiednie uprawnienia oraz sprawdzić, czy katalog <tt>config/</tt> "
+"faktycznie istnieje; można też kliknąć przycisk <tt>Ściągnij</tt> i zapisać "
+"plik na maszynie lokalnej, a następnie wysłać na serwer WWW za pomocą, na "
+"przykład, klienta FTP."
#. type: Content of: <html><body><div><ol><li><ul><li>
#: orig-docs/Documentation.html:282
@@ -781,6 +788,9 @@ msgid ""
"Once the file has been saved, it must be moved out of the <tt> config/</tt> "
"directory and the permissions must be reset, again as a security measure:"
msgstr ""
+"Jak tylko nasz plik zostanie zapisany, musimy go usunąć z katalogu "
+"<tt>config/</tt>; trzeba także <strong>ponownie zresetować "
+"uprawnienia</strong> -- jest to podyktowane względami bezpieczeństwa:"
#. type: Content of: <html><body><div><ol><li><ul><li><pre>
#: orig-docs/Documentation.html:286
@@ -790,6 +800,10 @@ msgid ""
"chmod o-rw config.inc.php # remove world read and write permissions\n"
"rm -rf config # remove not needed directory\n"
msgstr ""
+"mv config/config.inc.php . # przenieść plik do bieżacego katalogu\n"
+"chmod o-rw config.inc.php # usunać uprawnienia odczytu i zapisu dla "
+"innych\n"
+"rm -rf config # usunąć zbędny katalog\n"
#. type: Content of: <html><body><div><ol><li><ul><li>
#: orig-docs/Documentation.html:290
@@ -798,6 +812,9 @@ msgid ""
"with your favorite editor, if you prefer to set some advanced options which "
"the setup script does not provide."
msgstr ""
+"Teraz plik jest gotowy do użytku. Możemy go przeglądać lub edytować w "
+"dowolnym edytorze tekstowym, jeśli chcemy ustawić opcje, których brak w "
+"skrypcie instalacyjnym."
#. type: Content of: <html><body><div><ol><li>
#: orig-docs/Documentation.html:293
@@ -813,20 +830,30 @@ msgid ""
"especially <a href=\"#faq4_4\"> <abbr title=\"Frequently Asked Questions"
"\">FAQ</abbr> 4.4</a>."
msgstr ""
+"W przypadku używania <tt>auth_type</tt> sugerujemy, aby zabezpieczyć katalog "
+"instalacyjny phpMyAdmin, ponieważ użycie trybu <tt>config</tt> nie nakłada "
+"na użytkownika obowiązku wprowadzenia hasła podczas dostępu do instalacji "
+"phpMyAdmin. Zalecane jest użycie jednej z alternatywnych metod "
+"uwierzytelnienia, na przykład za pomocą HTTP–AUTH w pliku <a "
+"href=\"#glossary\"><i>.htaccess</i></a> lub przełączenie się na używanie pliku "
+"<ttt>cookie</tt> lub uwierzytelnienie za pomocą http <tt>auth_type</tt>. "
+"Zobacz też <a href=\"#faqmultiuser\">podsekcję \"tryb "
+"wieloużytkownikowy\"</a><abbr title=\"Frequently Asked Questions\">FAQ</abbr>, "
+"a szczególnie <a href=\"#faq4_4\"><abbr title=\"Frequently Asked "
+"Questions\">FAQ</abbr> 4.4</a>."
#. type: Content of: <html><body><div><ol><li>
#: orig-docs/Documentation.html:305
-#, fuzzy
msgid ""
"Open the <a href=\"index.php\">main phpMyAdmin directory</a> in your "
"browser. phpMyAdmin should now display a welcome screen and your databases, "
"or a login dialog if using <abbr title=\"HyperText Transfer Protocol\">HTTP</"
"abbr> or cookie authentication mode."
msgstr ""
-"Otwórz plik <i><www.twój-host.com>/<twój-katalog-instalacyjny>/"
-"index.php3</i> w przeglądarce. phpMyAdmin powinien wyświetlić ekran "
-"powitalny i Twoją bazę danych lub - w przypadku trybu uwierzytelniania HTTP "
-"lub cookie - okno logowania ."
+"Otworzyć <a href=\"index.php\"> główny katalog phpMyAdmin</a> w przegladarce "
+"WWW -- phpMyAdmin powinien wyświetlić ekran powitalny i bazy danych, albo "
+"okno dialogowe logowania, jeśli używamy trybu uwierzytelnienia <abbr "
+"title=\"HyperText Transfer Protocol\">HTTP</abbr> lub cookie."
#. type: Content of: <html><body><div><ol><li>
#: orig-docs/Documentation.html:310
@@ -852,9 +879,8 @@ msgstr ""
#. type: Content of: <html><body><div><h3>
#: orig-docs/Documentation.html:326
-#, fuzzy
msgid "phpMyAdmin configuration storage"
-msgstr "Dokumentacja phpMyAdmina"
+msgstr "Przechowywanie konfiguracji phpMyAdmin"
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:328
@@ -13570,14 +13596,13 @@ msgid ""
"our <a href=\"https://l10n.cihar.com/projects/pmadoc/\">translation server</"
"a>."
msgstr ""
-"To jest (<b>częściowe</b>) tłumaczenie oficjalnej <a href=\"http://www."
-"phpmyadmin.net /documentation/\">dokumentacji programu phpMyAdmin -- wersja "
-"3.5.0-dev</a>.\n"
-"\n"
-"Wszystkich sympatyków, zwolenników i użytkowników <b>Wolnego Oprogramowania</"
-"b> zapraszamy do wspólnego tłumaczenia tej dokumentacji. Nasz serwer "
-"tłumaczeń znajduje sie pod adresem: <a href=\"https://l10n.cihar.com/"
-"projects/pmadoc/\">https://l10n.cihar.com/pr =\"https://l10n.cihar.com/" wania</" タ圧縮アルゴリズムおよびプログラム" �実行されます。" ��。" に（SQL " > �アプリケーション</li> ����� ����� k0��* 6 � � ! � ! P���� ����� x�L��* ����� ��/��* �0��* P���� `�/��* ����� �����* u�/��* ����* ش���* �����* �1��* x�L��* ����� ����� k0��* �! �! P���� ����� H�,��* ����� ��/��* �0��* P���� `�/��* ����� ����� x���� 8Q��* �p� ����� u�/��* �1��* ����� `���� k0��* G H I J K M N O P P���� ����� HE��* 0���� ��/��* �0��* P���� 0����* u�/��* �L��* �y���* ����* ش���* �����* �1��* HE��* 0���� p���� k0��* 8E��* 0���� ����� k0��* (E��* 0���� ����� k0��* E��* 0���� ���� k0��* �����* u�/��* �����* ����� �����* e�/��* ش���* ����� y����* e�/��* ����* ����� Z����* e�/��* �t���* �L��* �y���* ����* ��L��* ش���* �����* �1��* 8Q��* =���* ����� p ���* ����� P���� k0��* 5 6 7 8 : < = > ? @ B D P���� ����� �=���* ����� u�/��* Q��* ���� =���* e�/��* Q��* �_@f �S Q��l�� �Sx��* ����� �=���* ����� `���� k0��* u]�� 4Q��U^Qʉ� �u������*ēvP���� ����� H�u��* Ա��* ���� ����* ����* �&���* ����� ����� x���� ����� �L��* u�/��* ��L��* @���� ����* ���� ����� ������������* ����� ojects/pmadoc/</a>"
+" To jest (<b>częściowe</b>) tłumaczenie oficjalnej <a "
+"href=\"http://www.phpmyadmin.net /documentation/\">dokumentacji programu "
+"phpMyAdmin -- wersja 3.5.0-dev</a>.Wszystkich sympatyków, zwolenników i "
+"użytkowników <b>Wolnego Oprogramowania</b> zapraszamy do wspólnego "
+"tłumaczenia tej dokumentacji. Nasz serwer tłumaczeń znajduje sie pod "
+"adresem: <a href=\"https://l10n.cihar.com/projects/pmadoc/\">https://l10n.ciha"
+"r.com/projects/pmadoc/</a>"
#. type: Content of: <p>
#: addendum/credits.html:2
@@ -13586,13 +13611,12 @@ msgid ""
"\"https://l10n.cihar.com/projects/pmadoc/\">translation server</a>. They "
"should have written their names here."
msgstr ""
-"To tłumaczenie jest <b>wspólną</b> pracą <b>różnych</b> tłumaczy, którzy "
+" To tłumaczenie jest <b>wspólną</b> pracą <b>różnych</b> tłumaczy, którzy "
"pracowali nad tłumaczeniem, z języka angielskiego, dokumentacji phpMyAdmin "
-"-- wersja 3.5.0-dev, na <a href=\"https://l10n.cihar.com/projects/pmadoc/"
-"\">serwerze tłumaczeń (Pootle)</a>. Właśnie tutaj powinni oni podpisać się "
-"(w dowolnej kolejności):\n"
-"\n"
-"-- Stanisław Krukowski --"
+"-- wersja 3.5.0-dev, na <a "
+"href=\"https://l10n.cihar.com/projects/pmadoc/\">serwerze tłumaczeń "
+"(Pootle)</a>. Właśnie tutaj powinni oni podpisać się (w dowolnej "
+"kolejności):< /br>-- Stanisław Krukowski --"
#. type: Plain text
#: addendum/comment.html:2
@@ -13746,9 +13770,9 @@ 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."
msgstr ""
-"phpMyAdmin jest przeznaczony do obsługi MySQL poprzez sieć Web. Proszę "
-"przeczytać zawartość pliku documentation.txt/.html, aby zapoznać się z "
-"podsumowaniem charakterystyki phpMyAdmin."
+" phpMyAdmin jest przeznaczony do obsługi MySQL poprzez sieć Web. Proszę "
+"przeczytać zawartość pliku documentation.txt / documentation.html, aby "
+"zapoznać się z podsumowaniem charakterystyki phpMyAdmin."
#. type: Title -
#: orig-docs/README:57
@@ -13809,8 +13833,8 @@ 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 ""
-"Proszę nie przysyłać do nas listów e-mail w rodzaju: \"Jak skompilować PHP z "
-"obsługą MySQL\". Po prostu nie mamy czasu, aby być Twoim (Waszym) darmowym "
+" Proszę nie przysyłać do nas listów e-mail w rodzaju: \"Jak skompilować PHP "
+"z obsługą MySQL\". Po prostu nie mamy czasu, aby być Twoim (Waszym) darmowym "
"systemem obsługi zgłoszeń (systemem pomocy)."
#. type: Plain text
@@ -13819,9 +13843,10 @@ msgid ""
"Please send your questions to the appropriate mailing lists / forums. "
"Before contacting us, please read the Documentation.html (esp. the FAQ part)."
msgstr ""
-"Pytania, związane z dokumentacją i/lub programem phpMyAdmin, prosimy "
+" Pytania, związane z dokumentacją i/lub programem phpMyAdmin, prosimy "
"przesyłać na odpowiednie listy dyskusyjne. Przed skontaktowaniem się z nami, "
-"prosimy o przeczytanie zawartości pliku Documentation.html (zwł. części FAQ)."
+"prosimy o przeczytanie zawartości pliku Documentation.html (zwł. części "
+"FAQ."
#~ msgid "This feature requires PHP >= 4.3.0."
#~ msgstr "Funkcja ta wymaga PHP >= 4.3.0."
diff --git a/po/sv.po b/po/sv.po
index 2972068..7bebfae 100644
--- a/po/sv.po
+++ b/po/sv.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: 2011-10-06 09:20+0300\n"
-"PO-Revision-Date: 2011-07-31 21:40+0200\n"
+"PO-Revision-Date: 2011-10-09 02:26+0200\n"
"Last-Translator: <stefan(a)inkopsforum.se>\n"
"Language-Team: none\n"
"Language: sv\n"
@@ -213,12 +213,12 @@ msgstr ""
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:88
msgid "<b>Web browser</b> with cookies enabled."
-msgstr ""
+msgstr "<b>Webbläsare</b> med cookies aktiverade."
#. type: Content of: <html><body><div><h2>
#: orig-docs/Documentation.html:92
msgid "Introduction"
-msgstr ""
+msgstr "Inledning"
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:94
@@ -228,22 +228,29 @@ msgid ""
"MySQL user who can read/write only the desired database. It's up to you to "
"look up the appropriate part in the MySQL manual."
msgstr ""
+"phpMyAdmin kan hantera en hel MySQL-server (behöver en super-user) såväl som "
+"en enda databas. För att åstadkomma det senare behöver du en MySQL-"
+"användare med rätt privilegier som kan läsa / skriva i enbart den önskade "
+"databasen. Det är upp till dig att leta upp den tillämpliga delen i MySQL "
+"manualen."
#. type: Content of: <html><body><div><h3>
#: orig-docs/Documentation.html:100
msgid "Currently phpMyAdmin can:"
-msgstr ""
+msgstr "För närvarande kan phpMyAdmin:"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:102
msgid "browse and drop databases, tables, views, columns and indexes"
-msgstr ""
+msgstr "bläddra och ta bort databaser, tabeller, vyer, kolumner och index"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:103
msgid ""
"create, copy, drop, rename and alter databases, tables, columns and indexes"
msgstr ""
+"skapa, kopiera, ta bort, byta namn och ändra databaser, tabeller, kolumner "
+"och index"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:105
@@ -251,6 +258,8 @@ msgid ""
"maintenance server, databases and tables, with proposals on server "
"configuration"
msgstr ""
+"underhålla server, databaser och tabeller, med förslag på "
+"serverkonfigurationen"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:107
diff --git a/po/tr.po b/po/tr.po
index 75bc318..e0f04ee 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: 2011-10-06 09:21+0300\n"
-"PO-Revision-Date: 2011-09-19 20:50+0200\n"
+"PO-Revision-Date: 2011-10-06 09:42+0200\n"
"Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n"
"Language-Team: none\n"
"Language: tr\n"
@@ -10658,15 +10658,13 @@ msgstr "Şu anda açık olan tablo"
#. type: Content of: <html><body><div><dl><dt>
#: orig-docs/Documentation.html:4344
-#, fuzzy
msgid "<code>@COLUMNS@</code>"
-msgstr "<code>@FIELDS@</code>"
+msgstr "<code>@COLUMNS@</code>"
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:4345
-#, fuzzy
msgid "Columns of the currently opened table"
-msgstr "Şu anda açık olan tablo alanı"
+msgstr "Şu anda açık olan tablo sütunları"
#. type: Content of: <html><body><div><dl><dt>
#: orig-docs/Documentation.html:4346
hooks/post-receive
--
phpMyAdmin localized documentation
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6RC1-20800-gdb29cfa
by Michal Čihař 11 Oct '11
by Michal Čihař 11 Oct '11
11 Oct '11
The branch, master has been updated
via db29cfa25827fd6ef65198a8fc338d5c0a2238b9 (commit)
via 98745585488a16e4f1fa20df4d95ce3f21760b09 (commit)
via 2c1f16f55005f64ca24c994446b74bb109354620 (commit)
via 87d1dc8674d299ffd7c4715136e2f73f3deb0dc3 (commit)
via 74c6436bdc148ba5fff66811cfbbd54b2f91c6f9 (commit)
via 288e5dfc6295078bcc576bbd464977928d42452b (commit)
via df6a684b346ebbf1a172eb636209f89b81f750b3 (commit)
via cba98caec708600f39cdeefa5891f92a22678760 (commit)
via 142d80f0f9445b0b9624acc08ad8a57bee1385e0 (commit)
via 0718561a90ba6d9d6f954975bce5bf9d6a3acc40 (commit)
via 2b7b504399a774803f3fa30dd830238ced193076 (commit)
via c767b8f51c2a54feddeb660896b162d6a1822b60 (commit)
via dc33eb7c16ef9b759034bcb22f6ad5a585aaf9a2 (commit)
via e87cf4ed6eadf1bec564ee9f3c9fd06c1bf872e2 (commit)
from 9d0c410b3667b65438b0cc07c224f2cf0fde24f6 (commit)
- Log -----------------------------------------------------------------
commit db29cfa25827fd6ef65198a8fc338d5c0a2238b9
Merge: 9d0c410 9874558
Author: Michal Čihař <michal(a)cihar.com>
Date: Tue Oct 11 08:46:22 2011 +0200
Merge remote-tracking branch 'pootle/master'
Conflicts:
po/el.po
po/es.po
po/sl.po
po/sv.po
po/tr.po
commit 98745585488a16e4f1fa20df4d95ce3f21760b09
Author: stefan <stefan(a)inkopsforum.se>
Date: Thu Oct 6 21:57:13 2011 +0200
Translation update done using Pootle.
commit 2c1f16f55005f64ca24c994446b74bb109354620
Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com>
Date: Thu Oct 6 21:35:04 2011 +0200
Translation update done using Pootle.
commit 87d1dc8674d299ffd7c4715136e2f73f3deb0dc3
Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com>
Date: Thu Oct 6 21:34:20 2011 +0200
Translation update done using Pootle.
commit 74c6436bdc148ba5fff66811cfbbd54b2f91c6f9
Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com>
Date: Thu Oct 6 21:33:31 2011 +0200
Translation update done using Pootle.
commit 288e5dfc6295078bcc576bbd464977928d42452b
Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com>
Date: Thu Oct 6 21:32:31 2011 +0200
Translation update done using Pootle.
commit df6a684b346ebbf1a172eb636209f89b81f750b3
Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com>
Date: Thu Oct 6 21:31:44 2011 +0200
Translation update done using Pootle.
commit cba98caec708600f39cdeefa5891f92a22678760
Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com>
Date: Thu Oct 6 21:30:30 2011 +0200
Translation update done using Pootle.
commit 142d80f0f9445b0b9624acc08ad8a57bee1385e0
Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com>
Date: Thu Oct 6 21:29:45 2011 +0200
Translation update done using Pootle.
commit 0718561a90ba6d9d6f954975bce5bf9d6a3acc40
Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com>
Date: Thu Oct 6 21:28:34 2011 +0200
Translation update done using Pootle.
commit 2b7b504399a774803f3fa30dd830238ced193076
Author: Domen <dbc334(a)gmail.com>
Date: Thu Oct 6 18:47:30 2011 +0200
Translation update done using Pootle.
commit c767b8f51c2a54feddeb660896b162d6a1822b60
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Thu Oct 6 16:20:25 2011 +0200
Translation update done using Pootle.
commit dc33eb7c16ef9b759034bcb22f6ad5a585aaf9a2
Merge: e87cf4e da4783a
Author: Pootle server <pootle(a)cihar.com>
Date: Thu Oct 6 10:40:06 2011 +0200
Merge remote-tracking branch 'origin/master'
commit e87cf4ed6eadf1bec564ee9f3c9fd06c1bf872e2
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Oct 6 09:39:47 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/el.po | 20 +++++++++++++++++---
po/es.po | 6 +++---
po/sl.po | 12 ++++++------
po/sv.po | 10 +++++-----
po/tr.po | 6 +++---
5 files changed, 34 insertions(+), 20 deletions(-)
diff --git a/po/el.po b/po/el.po
index d8ed289..9ac8d50 100644
--- a/po/el.po
+++ b/po/el.po
@@ -4,13 +4,13 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-10-08 06:43-0400\n"
-"PO-Revision-Date: 2011-09-26 13:10+0200\n"
+"PO-Revision-Date: 2011-10-06 21:35+0200\n"
"Last-Translator: Panagiotis Papazoglou <papaz_p(a)yahoo.com>\n"
"Language-Team: greek <el(a)li.org>\n"
+"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -11921,7 +11921,7 @@ msgstr "Πρόσθετα κριτήρια αναζήτησης"
#: tbl_zoom_select.php:276
msgid "Use this column to label each point"
-msgstr ""
+msgstr "Χρησιμοποιήστε αυτή τη στήλη για την ετικέτα κάθε σημείου"
#: tbl_zoom_select.php:296
msgid "Maximum rows to plot"
@@ -11990,6 +11990,8 @@ msgid ""
"To have more accurate averages it is recommended to let the server run for "
"longer than a day before running this analyzer"
msgstr ""
+"Για να έχετε πιο ακριβείς μέσους όρους προτείνεται ο διακομιστής να "
+"λειτουργεί περισσότερο από μια ημέρα πριν εκτελέσετε αυτόν τον αναλυτή"
#: po/advisory_rules.php:8
#, php-format
@@ -12005,12 +12007,16 @@ msgid ""
"Fewer than 1,000 questions have been run against this server. The "
"recommendations may not be accurate."
msgstr ""
+"Λιγότερες από 1.000 ερωτήσεις έχουν εκτελεστεί στο διακομιστή. Οι προτάσεις "
+"ίσως να μην είναι ακριβείς."
#: po/advisory_rules.php:12
msgid ""
"Let the server run for a longer time until it has executed a greater amount "
"of queries."
msgstr ""
+"Αφήστε τον διακομιστή να εκτελείται για περισσότερο χρόνο μέχρι να "
+"εκτελεστεί μεγαλύτερος αριθμός ερωτημάτων."
#: po/advisory_rules.php:13
#, php-format
@@ -12025,17 +12031,23 @@ msgstr "Ποσοστό αργών ερωτημάτων"
msgid ""
"There is a lot of slow queries compared to the overall amount of Queries."
msgstr ""
+"Υπάρχει σημαντικός αριθμός αργών ερωτημάτων σε σχέση με τον συνολικό αριθμό "
+"των Ερωτημάτων."
#: po/advisory_rules.php:17 po/advisory_rules.php:22
msgid ""
"You might want to increase {long_query_time} or optimize the queries listed "
"in the slow query log"
msgstr ""
+"Ίσως να θέλετε να αυξήσετε το {long_query_time} ή να βελτιστοποιήσετε τα "
+"ερωτήματα που εμφανίζονται στην καταγραφή των αργών ερωτημάτων"
#: po/advisory_rules.php:18
#, php-format
msgid "The slow query rate should be below 5%%, your value is %s%%."
msgstr ""
+"Το ποσοστό των αργών ερωτημάτων πρέπει να είναι κάτω από 5%%, η τιμή σας "
+"είναι %s%%."
#: po/advisory_rules.php:20
msgid "Slow query rate"
@@ -12045,6 +12057,8 @@ msgstr "Βαθμός αργών ερωτημάτων"
msgid ""
"There is a high percentage of slow queries compared to the server uptime."
msgstr ""
+"Υπάρχει ένα υψηλό ποσοστό αργών ερωτημάτων σε σχέση με το χρόνο λειτουργίας "
+"του διακομιστή."
#: po/advisory_rules.php:23
#, php-format
diff --git a/po/es.po b/po/es.po
index 301120e..5da500d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -4,13 +4,13 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-10-08 06:43-0400\n"
-"PO-Revision-Date: 2011-10-03 15:56+0200\n"
+"PO-Revision-Date: 2011-10-06 16:20+0200\n"
"Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n"
"Language-Team: spanish <es(a)li.org>\n"
+"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -12746,7 +12746,7 @@ msgstr ""
"refman/5.5/en/internal-temporary-tables.html\\\">documentación de MySQL</a>"
#: po/advisory_rules.php:158
-#, fuzzy, php-format
+#, php-format
#| msgid ""
#| "Rate of temporay tables being written to disk: %s, this value should be "
#| "less than 1 per hour"
diff --git a/po/sl.po b/po/sl.po
index 0235b98..222e5a9 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,15 +4,15 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-10-08 06:43-0400\n"
-"PO-Revision-Date: 2011-10-01 19:12+0200\n"
+"PO-Revision-Date: 2011-10-06 18:47+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 js/messages.php:320
@@ -12532,7 +12532,7 @@ msgstr ""
"en/internal-temporary-tables.html\\\">dokumentaciji MySQL</a>"
#: po/advisory_rules.php:158
-#, fuzzy, php-format
+#, php-format
#| msgid ""
#| "Rate of temporay tables being written to disk: %s, this value should be "
#| "less than 1 per hour"
@@ -12540,7 +12540,7 @@ msgid ""
"Rate of temporary tables being written to disk: %s, this value should be "
"less than 1 per hour"
msgstr ""
-"Delež začasnih tabel, zapisanih na disk: %s; ta vrednost bi morala biti manj "
+"Delež začasnih tabel, pisanih na disk: %s; ta vrednost bi morala biti manj "
"kot 1 na uro"
#: po/advisory_rules.php:160
diff --git a/po/sv.po b/po/sv.po
index ad81999..6f9b602 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -4,13 +4,13 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-10-08 06:43-0400\n"
-"PO-Revision-Date: 2011-09-30 21:07+0200\n"
+"PO-Revision-Date: 2011-10-06 21:57+0200\n"
"Last-Translator: <stefan(a)inkopsforum.se>\n"
"Language-Team: swedish <sv(a)li.org>\n"
+"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -12479,7 +12479,7 @@ msgstr ""
"internal-temporary-tables.html\\\">MySQL Documentation</a>"
#: po/advisory_rules.php:158
-#, fuzzy, php-format
+#, php-format
#| msgid ""
#| "Rate of temporay tables being written to disk: %s, this value should be "
#| "less than 1 per hour"
@@ -12487,8 +12487,8 @@ msgid ""
"Rate of temporary tables being written to disk: %s, this value should be "
"less than 1 per hour"
msgstr ""
-"Andel temporay tabeller skrivs disk:%s, detta värde bör vara mindre än 1 per "
-"timme"
+"Andelen temporära tabeller som skrivs till disk: %s, detta värde bör vara "
+"mindre än 1 per timme"
#: po/advisory_rules.php:160
msgid "MyISAM key buffer size"
diff --git a/po/tr.po b/po/tr.po
index 099b9eb..04a1e42 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,13 +4,13 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-10-08 06:43-0400\n"
-"PO-Revision-Date: 2011-09-29 12:00+0200\n"
+"PO-Revision-Date: 2011-10-06 09:39+0200\n"
"Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n"
"Language-Team: turkish <tr(a)li.org>\n"
+"Language: tr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: tr\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Pootle 2.0.5\n"
@@ -12539,7 +12539,7 @@ msgstr ""
"bakımından sorgularınızı yeniden yazmak zorunda kalacaksınız"
#: po/advisory_rules.php:158
-#, fuzzy, php-format
+#, php-format
#| msgid ""
#| "Rate of temporay tables being written to disk: %s, this value should be "
#| "less than 1 per hour"
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6RC1-20786-g9d0c410
by Piotr Przybylski 11 Oct '11
by Piotr Przybylski 11 Oct '11
11 Oct '11
The branch, master has been updated
via 9d0c410b3667b65438b0cc07c224f2cf0fde24f6 (commit)
from 021e0225cc9c0eca1b1e2f2cfc0e763c1a912140 (commit)
- Log -----------------------------------------------------------------
commit 9d0c410b3667b65438b0cc07c224f2cf0fde24f6
Author: Piotr Przybylski <piotrprz(a)gmail.com>
Date: Tue Oct 11 02:08:09 2011 +0200
New create table dialog: fix resize event
-----------------------------------------------------------------------
Summary of changes:
js/functions.js | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/js/functions.js b/js/functions.js
index e8b869d..ce2dac6 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1521,11 +1521,12 @@ function PMA_createTableDialog( div, url , target)
position: ['left','top'],
width: window.innerWidth-10,
height: window.innerHeight-10,
- open: function(event) {
+ open: function() {
+ var $dialog = $(this);
$(window).bind('resize.dialog-resizer', function() {
clearTimeout(timeout);
timeout = setTimeout(function() {
- $(this).dialog('option', {
+ $dialog.dialog('option', {
width: window.innerWidth-10,
height: window.innerHeight-10
});
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6RC1-20785-g021e022
by Piotr Przybylski 11 Oct '11
by Piotr Przybylski 11 Oct '11
11 Oct '11
The branch, master has been updated
via 021e0225cc9c0eca1b1e2f2cfc0e763c1a912140 (commit)
via 4a5cb00df5cf14019842d4c4745079f204726c17 (commit)
from de64133959d929da177ae1357901d67c573fc9f4 (commit)
- Log -----------------------------------------------------------------
commit 021e0225cc9c0eca1b1e2f2cfc0e763c1a912140
Author: Piotr Przybylski <piotrprz(a)gmail.com>
Date: Tue Oct 11 02:05:43 2011 +0200
jQueryUI: move style customizations to theme's CSS
We have simple customizations, let's keep library's CSS clean
commit 4a5cb00df5cf14019842d4c4745079f204726c17
Author: Piotr Przybylski <piotrprz(a)gmail.com>
Date: Tue Oct 11 02:00:45 2011 +0200
Fix jQuery UI version number
It's 1.8.16, not 1.8.6
-----------------------------------------------------------------------
Summary of changes:
db_create.php | 2 +-
db_events.php | 2 +-
db_operations.php | 2 +-
db_routines.php | 2 +-
db_structure.php | 2 +-
db_tracking.php | 2 +-
db_triggers.php | 2 +-
...-1.8.6.custom.js => jquery-ui-1.8.16.custom.js} | 0
libraries/common.inc.php | 2 +-
main.php | 2 +-
navigation.php | 2 +-
server_plugins.php | 2 +-
server_privileges.php | 2 +-
server_status.php | 2 +-
setup/index.php | 2 +-
sql.php | 2 +-
tbl_change.php | 2 +-
tbl_operations.php | 2 +-
tbl_replace.php | 2 +-
tbl_select.php | 2 +-
tbl_structure.php | 2 +-
tbl_zoom_select.php | 2 +-
themes/original/css/theme_right.css.php | 4 ++++
themes/original/jquery/jquery-ui-1.8.16.custom.css | 2 +-
themes/pmahomme/css/theme_right.css.php | 4 ++++
themes/pmahomme/jquery/jquery-ui-1.8.16.custom.css | 2 +-
26 files changed, 31 insertions(+), 23 deletions(-)
rename js/jquery/{jquery-ui-1.8.6.custom.js => jquery-ui-1.8.16.custom.js} (100%)
diff --git a/db_create.php b/db_create.php
index c4465b0..fe86dc9 100644
--- a/db_create.php
+++ b/db_create.php
@@ -10,7 +10,7 @@
*/
require_once './libraries/common.inc.php';
$GLOBALS['js_include'][] = 'functions.js';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
require_once './libraries/mysql_charsets.lib.php';
if (!PMA_DRIZZLE) {
diff --git a/db_events.php b/db_events.php
index e08663d..6d18641 100644
--- a/db_events.php
+++ b/db_events.php
@@ -15,7 +15,7 @@ require_once './libraries/common.lib.php';
/**
* Include JavaScript libraries
*/
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
$GLOBALS['js_include'][] = 'jquery/timepicker.js';
$GLOBALS['js_include'][] = 'rte/common.js';
$GLOBALS['js_include'][] = 'rte/events.js';
diff --git a/db_operations.php b/db_operations.php
index 9a4c7ff..6589587 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -23,7 +23,7 @@ require_once "./libraries/blobstreaming.lib.php";
// add a javascript file for jQuery functions to handle Ajax actions
// also add jQueryUI
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
$GLOBALS['js_include'][] = 'db_operations.js';
/**
diff --git a/db_routines.php b/db_routines.php
index 004d372..633a848 100644
--- a/db_routines.php
+++ b/db_routines.php
@@ -21,7 +21,7 @@ if (PMA_DRIZZLE) {
/**
* Include JavaScript libraries
*/
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
$GLOBALS['js_include'][] = 'jquery/timepicker.js';
$GLOBALS['js_include'][] = 'rte/common.js';
$GLOBALS['js_include'][] = 'rte/routines.js';
diff --git a/db_structure.php b/db_structure.php
index 897a664..e486ce8 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -10,7 +10,7 @@
*/
require_once './libraries/common.inc.php';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
$GLOBALS['js_include'][] = 'db_structure.js';
$GLOBALS['js_include'][] = 'tbl_change.js';
$GLOBALS['js_include'][] = 'jquery/timepicker.js';
diff --git a/db_tracking.php b/db_tracking.php
index 89bcca2..d00d106 100644
--- a/db_tracking.php
+++ b/db_tracking.php
@@ -10,7 +10,7 @@
require_once './libraries/common.inc.php';
//Get some js files needed for Ajax requests
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
$GLOBALS['js_include'][] = 'db_structure.js';
/**
diff --git a/db_triggers.php b/db_triggers.php
index b9f3562..66a1085 100644
--- a/db_triggers.php
+++ b/db_triggers.php
@@ -15,7 +15,7 @@ require_once './libraries/common.lib.php';
/**
* Include JavaScript libraries
*/
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
$GLOBALS['js_include'][] = 'rte/common.js';
$GLOBALS['js_include'][] = 'rte/triggers.js';
$GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
diff --git a/js/jquery/jquery-ui-1.8.6.custom.js b/js/jquery/jquery-ui-1.8.16.custom.js
similarity index 100%
rename from js/jquery/jquery-ui-1.8.6.custom.js
rename to js/jquery/jquery-ui-1.8.16.custom.js
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 1a1dd23..65d63d4 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -555,7 +555,7 @@ $_REQUEST['js_frame'] = PMA_ifSetOr($_REQUEST['js_frame'], '');
*/
$GLOBALS['js_include'] = array();
$GLOBALS['js_include'][] = 'jquery/jquery-1.6.2.js';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
$GLOBALS['js_include'][] = 'update-location.js';
/**
diff --git a/main.php b/main.php
index 23e555f..30d9589 100644
--- a/main.php
+++ b/main.php
@@ -10,7 +10,7 @@
*/
require_once './libraries/common.inc.php';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
$GLOBALS['js_include'][] = 'jquery/jquery.sprintf.js';
// Handles some variables that may have been sent by the calling script
diff --git a/navigation.php b/navigation.php
index 4edf490..dffa557 100644
--- a/navigation.php
+++ b/navigation.php
@@ -106,7 +106,7 @@ require_once './libraries/header_http.inc.php';
href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&js_frame=left&nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" />
<?php
echo PMA_includeJS('jquery/jquery-1.6.2.js');
- echo PMA_includeJS('jquery/jquery-ui-1.8.6.custom.js');
+ echo PMA_includeJS('jquery/jquery-ui-1.8.16.custom.js');
echo PMA_includeJS('jquery/jquery.qtip-1.0.0-rc3.js');
echo PMA_includeJS('navigation.js');
echo PMA_includeJS('functions.js');
diff --git a/server_plugins.php b/server_plugins.php
index 2b7650c..93a5f63 100644
--- a/server_plugins.php
+++ b/server_plugins.php
@@ -21,7 +21,7 @@ require_once './libraries/common.inc.php';
/**
* JS includes
*/
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
$GLOBALS['js_include'][] = 'jquery/jquery.cookie.js';
$GLOBALS['js_include'][] = 'jquery/jquery.tablesorter.js';
$GLOBALS['js_include'][] = 'server_plugins.js';
diff --git a/server_privileges.php b/server_privileges.php
index 2dbcb3d..b626cae 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -15,7 +15,7 @@ require_once './libraries/common.inc.php';
*/
$GLOBALS['js_include'][] = 'server_privileges.js';
$GLOBALS['js_include'][] = 'functions.js';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
$_add_user_error = false;
require './libraries/server_common.inc.php';
diff --git a/server_status.php b/server_status.php
index b314ef7..02e3a7f 100644
--- a/server_status.php
+++ b/server_status.php
@@ -413,7 +413,7 @@ if (PMA_DRIZZLE) {
*/
$GLOBALS['js_include'][] = 'server_status.js';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
$GLOBALS['js_include'][] = 'jquery/jquery.tablesorter.js';
$GLOBALS['js_include'][] = 'jquery/jquery.cookie.js'; // For tab persistence
// Charting
diff --git a/setup/index.php b/setup/index.php
index 115e9ed..14cf030 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -38,7 +38,7 @@ require './libraries/header_http.inc.php';
<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.6.2.js"></script>
-<script type="text/javascript" src="../js/jquery/jquery-ui-1.8.6.custom.js"></script>
+<script type="text/javascript" src="../js/jquery/jquery-ui-1.8.16.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>
<script type="text/javascript" src="scripts.js"></script>
diff --git a/sql.php b/sql.php
index 4d7e30e..05b80b6 100644
--- a/sql.php
+++ b/sql.php
@@ -14,7 +14,7 @@ require_once './libraries/Table.class.php';
require_once './libraries/check_user_privileges.lib.php';
require_once './libraries/bookmark.lib.php';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
$GLOBALS['js_include'][] = 'jquery/timepicker.js';
$GLOBALS['js_include'][] = 'tbl_change.js';
$GLOBALS['js_include'][] = 'gis_data_editor.js';
diff --git a/tbl_change.php b/tbl_change.php
index f2ad519..004c30a 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -120,7 +120,7 @@ if ($GLOBALS['cfg']['ShowPropertyComments']) {
*/
$GLOBALS['js_include'][] = 'functions.js';
$GLOBALS['js_include'][] = 'tbl_change.js';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
$GLOBALS['js_include'][] = 'jquery/timepicker.js';
$GLOBALS['js_include'][] = 'gis_data_editor.js';
diff --git a/tbl_operations.php b/tbl_operations.php
index 14c7873..1f44315 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -32,7 +32,7 @@ require_once './libraries/StorageEngine.class.php';
// add a javascript file for jQuery functions to handle Ajax actions
// also add jQueryUI
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
/**
* Class for partition management
diff --git a/tbl_replace.php b/tbl_replace.php
index 74edd00..79c21c3 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -568,7 +568,7 @@ if (isset($return_to_sql_query)) {
$GLOBALS['js_include'][] = 'tbl_change.js';
// in case we call sql.php which needs those:
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
$active_page = $goto_include;
diff --git a/tbl_select.php b/tbl_select.php
index 0aedc74..0762677 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -21,7 +21,7 @@ $GLOBALS['js_include'][] = 'makegrid.js';
$GLOBALS['js_include'][] = 'sql.js';
$GLOBALS['js_include'][] = 'tbl_select.js';
$GLOBALS['js_include'][] = 'tbl_change.js';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
$GLOBALS['js_include'][] = 'jquery/timepicker.js';
$GLOBALS['js_include'][] = 'gis_data_editor.js';
diff --git a/tbl_structure.php b/tbl_structure.php
index 24df77c..0385b26 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -12,7 +12,7 @@
require_once './libraries/common.inc.php';
require_once './libraries/mysql_charsets.lib.php';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
$GLOBALS['js_include'][] = 'tbl_structure.js';
$GLOBALS['js_include'][] = 'indexes.js';
/**
diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php
index 3242fb2..739a509 100644
--- a/tbl_zoom_select.php
+++ b/tbl_zoom_select.php
@@ -26,7 +26,7 @@ $GLOBALS['js_include'][] = 'highcharts/highcharts.js';
/* Files required for chart exporting */
$GLOBALS['js_include'][] = 'highcharts/exporting.js';
$GLOBALS['js_include'][] = 'canvg/canvg.js';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
$GLOBALS['js_include'][] = 'jquery/timepicker.js';
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index fba8c4d..be8d933 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -2917,6 +2917,10 @@ input.btn {
background-color: #D0DCE0;
}
+body .ui-widget {
+ font-size: 1em;
+}
+
.ui-dialog fieldset legend a {
color: #0000FF;
}
diff --git a/themes/original/jquery/jquery-ui-1.8.16.custom.css b/themes/original/jquery/jquery-ui-1.8.16.custom.css
index 8295059..a712408 100644
--- a/themes/original/jquery/jquery-ui-1.8.16.custom.css
+++ b/themes/original/jquery/jquery-ui-1.8.16.custom.css
@@ -56,7 +56,7 @@
/* Component containers
----------------------------------*/
-.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
+.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
.ui-widget .ui-widget { font-size: 1em; }
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 8f09feb..358b71b 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -3340,6 +3340,10 @@ input.btn {
background-color: #D0DCE0;
}
+body .ui-widget {
+ font-size: 1em;
+}
+
.ui-dialog fieldset legend a {
color: #235A81;
}
diff --git a/themes/pmahomme/jquery/jquery-ui-1.8.16.custom.css b/themes/pmahomme/jquery/jquery-ui-1.8.16.custom.css
index 8295059..a712408 100644
--- a/themes/pmahomme/jquery/jquery-ui-1.8.16.custom.css
+++ b/themes/pmahomme/jquery/jquery-ui-1.8.16.custom.css
@@ -56,7 +56,7 @@
/* Component containers
----------------------------------*/
-.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
+.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
.ui-widget .ui-widget { font-size: 1em; }
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6RC1-20783-gde64133
by Rouslan Placella 11 Oct '11
by Rouslan Placella 11 Oct '11
11 Oct '11
The branch, master has been updated
via de64133959d929da177ae1357901d67c573fc9f4 (commit)
from d424a797d5dd9e25a3c4a0923d45efdcf9005981 (commit)
- Log -----------------------------------------------------------------
commit de64133959d929da177ae1357901d67c573fc9f4
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Tue Oct 11 00:05:54 2011 +0100
Fixed font sizes for jQuery dialogs
-----------------------------------------------------------------------
Summary of changes:
themes/original/jquery/jquery-ui-1.8.16.custom.css | 4 ++--
themes/pmahomme/jquery/jquery-ui-1.8.16.custom.css | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/themes/original/jquery/jquery-ui-1.8.16.custom.css b/themes/original/jquery/jquery-ui-1.8.16.custom.css
index 0f1a7e7..8295059 100644
--- a/themes/original/jquery/jquery-ui-1.8.16.custom.css
+++ b/themes/original/jquery/jquery-ui-1.8.16.custom.css
@@ -56,7 +56,7 @@
/* Component containers
----------------------------------*/
-.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
+.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
.ui-widget .ui-widget { font-size: 1em; }
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
@@ -565,4 +565,4 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
* http://docs.jquery.com/UI/Progressbar#theming
*/
.ui-progressbar { height:2em; text-align: left; }
-.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
\ No newline at end of file
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
diff --git a/themes/pmahomme/jquery/jquery-ui-1.8.16.custom.css b/themes/pmahomme/jquery/jquery-ui-1.8.16.custom.css
index 0f1a7e7..8295059 100644
--- a/themes/pmahomme/jquery/jquery-ui-1.8.16.custom.css
+++ b/themes/pmahomme/jquery/jquery-ui-1.8.16.custom.css
@@ -56,7 +56,7 @@
/* Component containers
----------------------------------*/
-.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
+.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
.ui-widget .ui-widget { font-size: 1em; }
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
@@ -565,4 +565,4 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
* http://docs.jquery.com/UI/Progressbar#theming
*/
.ui-progressbar { height:2em; text-align: left; }
-.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
\ No newline at end of file
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6RC1-20782-gd424a79
by Piotr Przybylski 10 Oct '11
by Piotr Przybylski 10 Oct '11
10 Oct '11
The branch, master has been updated
via d424a797d5dd9e25a3c4a0923d45efdcf9005981 (commit)
via ac365e0262fa2323dc830bb563e8e97de3694781 (commit)
from 4cef030dd4372e22f9ee791189b84bf0e68a6b77 (commit)
- Log -----------------------------------------------------------------
commit d424a797d5dd9e25a3c4a0923d45efdcf9005981
Author: Piotr Przybylski <piotrprz(a)gmail.com>
Date: Mon Oct 10 22:37:27 2011 +0200
Make Create table dialog take up entire viewport
The only scrollbars that now appear should be the ones around dialog's content
commit ac365e0262fa2323dc830bb563e8e97de3694781
Author: Piotr Przybylski <piotrprz(a)gmail.com>
Date: Mon Oct 10 22:35:36 2011 +0200
Upgrade jQuery UI to 1.8.6
-----------------------------------------------------------------------
Summary of changes:
db_create.php | 2 +-
db_events.php | 2 +-
db_operations.php | 2 +-
db_routines.php | 2 +-
db_structure.php | 2 +-
db_tracking.php | 2 +-
db_triggers.php | 2 +-
js/functions.js | 53 +-
...-ui-1.8.custom.js => jquery-ui-1.8.6.custom.js} | 4610 ++++++++++++--------
libraries/common.inc.php | 2 +-
libraries/header_meta_style.inc.php | 2 +-
main.php | 2 +-
navigation.php | 2 +-
server_plugins.php | 2 +-
server_privileges.php | 2 +-
server_status.php | 2 +-
setup/index.php | 2 +-
sql.php | 2 +-
tbl_change.php | 2 +-
tbl_operations.php | 2 +-
tbl_replace.php | 2 +-
tbl_select.php | 2 +-
tbl_structure.php | 2 +-
tbl_zoom_select.php | 2 +-
themes/original/css/theme_right.css.php | 4 +
...-1.8.custom.css => jquery-ui-1.8.16.custom.css} | 240 +-
themes/pmahomme/css/theme_right.css.php | 4 +
.../jquery/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 87 -> 180 bytes
.../jquery/images/ui-bg_flat_75_ffffff_40x100.png | Bin 87 -> 178 bytes
.../jquery/images/ui-bg_glass_65_ffffff_1x400.png | Bin 99 -> 105 bytes
.../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 86 -> 101 bytes
.../jquery/images/ui-icons_222222_256x240.png | Bin 4193 -> 4369 bytes
.../jquery/images/ui-icons_2e83ff_256x240.png | Bin 4193 -> 4369 bytes
.../jquery/images/ui-icons_454545_256x240.png | Bin 4193 -> 4369 bytes
.../jquery/images/ui-icons_888888_256x240.png | Bin 4193 -> 4369 bytes
.../jquery/images/ui-icons_cd0a0a_256x240.png | Bin 4193 -> 4369 bytes
...-1.8.custom.css => jquery-ui-1.8.16.custom.css} | 240 +-
37 files changed, 3136 insertions(+), 2059 deletions(-)
rename js/jquery/{jquery-ui-1.8.custom.js => jquery-ui-1.8.6.custom.js} (73%)
rename themes/original/jquery/{jquery-ui-1.8.custom.css => jquery-ui-1.8.16.custom.css} (71%)
rename themes/pmahomme/jquery/{jquery-ui-1.8.custom.css => jquery-ui-1.8.16.custom.css} (71%)
diff --git a/db_create.php b/db_create.php
index 3548f8f..c4465b0 100644
--- a/db_create.php
+++ b/db_create.php
@@ -10,7 +10,7 @@
*/
require_once './libraries/common.inc.php';
$GLOBALS['js_include'][] = 'functions.js';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
require_once './libraries/mysql_charsets.lib.php';
if (!PMA_DRIZZLE) {
diff --git a/db_events.php b/db_events.php
index 9991f83..e08663d 100644
--- a/db_events.php
+++ b/db_events.php
@@ -15,7 +15,7 @@ require_once './libraries/common.lib.php';
/**
* Include JavaScript libraries
*/
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
$GLOBALS['js_include'][] = 'jquery/timepicker.js';
$GLOBALS['js_include'][] = 'rte/common.js';
$GLOBALS['js_include'][] = 'rte/events.js';
diff --git a/db_operations.php b/db_operations.php
index fa0f108..9a4c7ff 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -23,7 +23,7 @@ require_once "./libraries/blobstreaming.lib.php";
// add a javascript file for jQuery functions to handle Ajax actions
// also add jQueryUI
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
$GLOBALS['js_include'][] = 'db_operations.js';
/**
diff --git a/db_routines.php b/db_routines.php
index da92c22..004d372 100644
--- a/db_routines.php
+++ b/db_routines.php
@@ -21,7 +21,7 @@ if (PMA_DRIZZLE) {
/**
* Include JavaScript libraries
*/
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
$GLOBALS['js_include'][] = 'jquery/timepicker.js';
$GLOBALS['js_include'][] = 'rte/common.js';
$GLOBALS['js_include'][] = 'rte/routines.js';
diff --git a/db_structure.php b/db_structure.php
index faa5e02..897a664 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -10,7 +10,7 @@
*/
require_once './libraries/common.inc.php';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
$GLOBALS['js_include'][] = 'db_structure.js';
$GLOBALS['js_include'][] = 'tbl_change.js';
$GLOBALS['js_include'][] = 'jquery/timepicker.js';
diff --git a/db_tracking.php b/db_tracking.php
index 2f5645a..89bcca2 100644
--- a/db_tracking.php
+++ b/db_tracking.php
@@ -10,7 +10,7 @@
require_once './libraries/common.inc.php';
//Get some js files needed for Ajax requests
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
$GLOBALS['js_include'][] = 'db_structure.js';
/**
diff --git a/db_triggers.php b/db_triggers.php
index 4911f36..b9f3562 100644
--- a/db_triggers.php
+++ b/db_triggers.php
@@ -15,7 +15,7 @@ require_once './libraries/common.lib.php';
/**
* Include JavaScript libraries
*/
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
$GLOBALS['js_include'][] = 'rte/common.js';
$GLOBALS['js_include'][] = 'rte/triggers.js';
$GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
diff --git a/js/functions.js b/js/functions.js
index f9a2494..e8b869d 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1433,6 +1433,8 @@ function PMA_ajaxRemoveMessage($this_msgbox)
// due to a bug in qtip's implementation we can
// only hide it without throwing JS errors.
$this_msgbox.qtip('hide');
+ } else {
+ $this_msgbox.remove();
}
}
}
@@ -1485,10 +1487,10 @@ function PMA_createTableDialog( div, url , target)
*/
var button_options = {};
// in the following function we need to use $(this)
- button_options[PMA_messages['strCancel']] = function() {$(this).parent().dialog('close').remove();}
+ button_options[PMA_messages['strCancel']] = function() {$(this).closest('.ui-dialog-content').dialog('close').remove();}
var button_options_error = {};
- button_options_error[PMA_messages['strOK']] = function() {$(this).parent().dialog('close').remove();}
+ button_options_error[PMA_messages['strOK']] = function() {$(this).closest('.ui-dialog-content').dialog('close').remove();}
var $msgbox = PMA_ajaxShowMessage();
@@ -1507,23 +1509,52 @@ function PMA_createTableDialog( div, url , target)
//remove the redundant [Back] link in the error message.
.find('fieldset').remove();
} else {
+ var timeout;
div
.append(data)
.dialog({
title: PMA_messages['strCreateTable'],
- /*
- * Use a little less than the current value, otherwise there is i
- * some overlap; 16 is a value found by experimenting
- */
- height: $(window.document).height() - 16,
- width: $(window.document).width() - 16,
- open: PMA_verifyTypeOfAllColumns,
- buttons : button_options
+ resizable: false,
+ draggable: false,
+ modal: true,
+ stack: false,
+ position: ['left','top'],
+ width: window.innerWidth-10,
+ height: window.innerHeight-10,
+ open: function(event) {
+ $(window).bind('resize.dialog-resizer', function() {
+ clearTimeout(timeout);
+ timeout = setTimeout(function() {
+ $(this).dialog('option', {
+ width: window.innerWidth-10,
+ height: window.innerHeight-10
+ });
+ }, 50);
+ });
+
+ var $wrapper = $('<div>', {'id': 'content-hide'}).hide();
+ $('body > *:not(.ui-dialog)').wrapAll($wrapper);
+
+ $(this).closest('.ui-dialog').css({
+ left: 0,
+ top: 0
+ });
+
+ // for Chrome
+ $(this).scrollTop(0);
+
+ PMA_verifyTypeOfAllColumns();
+ },
+ close: function() {
+ $(window).unbind('resize.dialog-resizer');
+ $('#content-hide > *').unwrap();
+ },
+ buttons: button_options
}); // end dialog options
}
PMA_convertFootnotesToTooltips($(div));
PMA_ajaxRemoveMessage($msgbox);
- }) // end $.get()
+ }); // end $.get()
}
diff --git a/js/jquery/jquery-ui-1.8.custom.js b/js/jquery/jquery-ui-1.8.6.custom.js
similarity index 73%
rename from js/jquery/jquery-ui-1.8.custom.js
rename to js/jquery/jquery-ui-1.8.6.custom.js
index 1c7f364..fc8d9d1 100644
--- a/js/jquery/jquery-ui-1.8.custom.js
+++ b/js/jquery/jquery-ui-1.8.6.custom.js
@@ -1,78 +1,33 @@
/*!
- * jQuery UI 1.8
+ * jQuery UI 1.8.16
*
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
*
* http://docs.jquery.com/UI
*/
-;jQuery.ui || (function($) {
+(function( $, undefined ) {
-//Helper functions and ui object
-$.ui = {
- version: "1.8",
-
- // $.ui.plugin is deprecated. Use the proxy pattern instead.
- plugin: {
- add: function(module, option, set) {
- var proto = $.ui[module].prototype;
- for(var i in set) {
- proto.plugins[i] = proto.plugins[i] || [];
- proto.plugins[i].push([option, set[i]]);
- }
- },
- call: function(instance, name, args) {
- var set = instance.plugins[name];
- if(!set || !instance.element[0].parentNode) { return; }
-
- for (var i = 0; i < set.length; i++) {
- if (instance.options[set[i][0]]) {
- set[i][1].apply(instance.element, args);
- }
- }
- }
- },
-
- contains: function(a, b) {
- return document.compareDocumentPosition
- ? a.compareDocumentPosition(b) & 16
- : a !== b && a.contains(b);
- },
-
- hasScroll: function(el, a) {
-
- //If overflow is hidden, the element might have extra content, but the user wants to hide it
- if ($(el).css('overflow') == 'hidden') { return false; }
-
- var scroll = (a && a == 'left') ? 'scrollLeft' : 'scrollTop',
- has = false;
-
- if (el[scroll] > 0) { return true; }
-
- // TODO: determine which cases actually cause this to happen
- // if the element doesn't have the scroll set, see if it's possible to
- // set the scroll
- el[scroll] = 1;
- has = (el[scroll] > 0);
- el[scroll] = 0;
- return has;
- },
-
- isOverAxis: function(x, reference, size) {
- //Determines when x coordinate is over "b" element axis
- return (x > reference) && (x < (reference + size));
- },
+// prevent duplicate loading
+// this is only a problem because we proxy existing functions
+// and we don't want to double proxy them
+$.ui = $.ui || {};
+if ( $.ui.version ) {
+ return;
+}
- isOver: function(y, x, top, left, height, width) {
- //Determines when x, y coordinates is over "b" element
- return $.ui.isOverAxis(y, top, height) && $.ui.isOverAxis(x, left, width);
- },
+$.extend( $.ui, {
+ version: "1.8.16",
keyCode: {
+ ALT: 18,
BACKSPACE: 8,
CAPS_LOCK: 20,
COMMA: 188,
+ COMMAND: 91,
+ COMMAND_LEFT: 91, // COMMAND
+ COMMAND_RIGHT: 93,
CONTROL: 17,
DELETE: 46,
DOWN: 40,
@@ -82,6 +37,7 @@ $.ui = {
HOME: 36,
INSERT: 45,
LEFT: 37,
+ MENU: 93, // COMMAND_RIGHT
NUMPAD_ADD: 107,
NUMPAD_DECIMAL: 110,
NUMPAD_DIVIDE: 111,
@@ -95,42 +51,33 @@ $.ui = {
SHIFT: 16,
SPACE: 32,
TAB: 9,
- UP: 38
+ UP: 38,
+ WINDOWS: 91 // COMMAND
}
-};
+});
-//jQuery plugins
+// plugins
$.fn.extend({
+ propAttr: $.fn.prop || $.fn.attr,
+
_focus: $.fn.focus,
- focus: function(delay, fn) {
- return typeof delay === 'number'
- ? this.each(function() {
+ focus: function( delay, fn ) {
+ return typeof delay === "number" ?
+ this.each(function() {
var elem = this;
setTimeout(function() {
- $(elem).focus();
- (fn && fn.call(elem));
- }, delay);
- })
- : this._focus.apply(this, arguments);
- },
-
- enableSelection: function() {
- return this
- .attr('unselectable', 'off')
- .css('MozUserSelect', '')
- .unbind('selectstart.ui');
- },
-
- disableSelection: function() {
- return this
- .attr('unselectable', 'on')
- .css('MozUserSelect', 'none')
- .bind('selectstart.ui', function() { return false; });
+ $( elem ).focus();
+ if ( fn ) {
+ fn.call( elem );
+ }
+ }, delay );
+ }) :
+ this._focus.apply( this, arguments );
},
scrollParent: function() {
var scrollParent;
- if(($.browser.msie && (/(static|relative)/).test(this.css('position'))) || (/absolute/).test(this.css('position'))) {
+ if (($.browser.msie && (/(static|relative)/).test(this.css('position'))) || (/absolute/).test(this.css('position'))) {
scrollParent = this.parents().filter(function() {
return (/(relative|absolute|fixed)/).test($.curCSS(this,'position',1)) && (/(auto|scroll)/).test($.curCSS(this,'overflow',1)+$.curCSS(this,'overflow-y',1)+$.curCSS(this,'overflow-x',1));
}).eq(0);
@@ -143,26 +90,25 @@ $.fn.extend({
return (/fixed/).test(this.css('position')) || !scrollParent.length ? $(document) : scrollParent;
},
- zIndex: function(zIndex) {
- if (zIndex !== undefined) {
- return this.css('zIndex', zIndex);
+ zIndex: function( zIndex ) {
+ if ( zIndex !== undefined ) {
+ return this.css( "zIndex", zIndex );
}
-
- if (this.length) {
- var elem = $(this[0]), position, value;
- while (elem.length && elem[0] !== document) {
+
+ if ( this.length ) {
+ var elem = $( this[ 0 ] ), position, value;
+ while ( elem.length && elem[ 0 ] !== document ) {
// Ignore z-index if position is set to a value where z-index is ignored by the browser
// This makes behavior of this function consistent across browsers
// WebKit always returns auto if the element is positioned
- position = elem.css('position');
- if (position == 'absolute' || position == 'relative' || position == 'fixed')
- {
+ position = elem.css( "position" );
+ if ( position === "absolute" || position === "relative" || position === "fixed" ) {
// IE returns 0 when zIndex is not specified
// other browsers return a string
// we ignore the case of nested elements with an explicit value of 0
// <div style="z-index: -10;"><div style="z-index: 0;"></div></div>
- value = parseInt(elem.css('zIndex'));
- if (!isNaN(value) && value != 0) {
+ value = parseInt( elem.css( "zIndex" ), 10 );
+ if ( !isNaN( value ) && value !== 0 ) {
return value;
}
}
@@ -171,61 +117,242 @@ $.fn.extend({
}
return 0;
+ },
+
+ disableSelection: function() {
+ return this.bind( ( $.support.selectstart ? "selectstart" : "mousedown" ) +
+ ".ui-disableSelection", function( event ) {
+ event.preventDefault();
+ });
+ },
+
+ enableSelection: function() {
+ return this.unbind( ".ui-disableSelection" );
+ }
+});
+
+$.each( [ "Width", "Height" ], function( i, name ) {
+ var side = name === "Width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ],
+ type = name.toLowerCase(),
+ orig = {
+ innerWidth: $.fn.innerWidth,
+ innerHeight: $.fn.innerHeight,
+ outerWidth: $.fn.outerWidth,
+ outerHeight: $.fn.outerHeight
+ };
+
+ function reduce( elem, size, border, margin ) {
+ $.each( side, function() {
+ size -= parseFloat( $.curCSS( elem, "padding" + this, true) ) || 0;
+ if ( border ) {
+ size -= parseFloat( $.curCSS( elem, "border" + this + "Width", true) ) || 0;
+ }
+ if ( margin ) {
+ size -= parseFloat( $.curCSS( elem, "margin" + this, true) ) || 0;
+ }
+ });
+ return size;
}
+
+ $.fn[ "inner" + name ] = function( size ) {
+ if ( size === undefined ) {
+ return orig[ "inner" + name ].call( this );
+ }
+
+ return this.each(function() {
+ $( this ).css( type, reduce( this, size ) + "px" );
+ });
+ };
+
+ $.fn[ "outer" + name] = function( size, margin ) {
+ if ( typeof size !== "number" ) {
+ return orig[ "outer" + name ].call( this, size );
+ }
+
+ return this.each(function() {
+ $( this).css( type, reduce( this, size, true, margin ) + "px" );
+ });
+ };
});
+// selectors
+function focusable( element, isTabIndexNotNaN ) {
+ var nodeName = element.nodeName.toLowerCase();
+ if ( "area" === nodeName ) {
+ var map = element.parentNode,
+ mapName = map.name,
+ img;
+ if ( !element.href || !mapName || map.nodeName.toLowerCase() !== "map" ) {
+ return false;
+ }
+ img = $( "img[usemap=#" + mapName + "]" )[0];
+ return !!img && visible( img );
+ }
+ return ( /input|select|textarea|button|object/.test( nodeName )
+ ? !element.disabled
+ : "a" == nodeName
+ ? element.href || isTabIndexNotNaN
+ : isTabIndexNotNaN)
+ // the element and all of its ancestors must be visible
+ && visible( element );
+}
+
+function visible( element ) {
+ return !$( element ).parents().andSelf().filter(function() {
+ return $.curCSS( this, "visibility" ) === "hidden" ||
+ $.expr.filters.hidden( this );
+ }).length;
+}
-//Additional selectors
-$.extend($.expr[':'], {
- data: function(elem, i, match) {
- return !!$.data(elem, match[3]);
+$.extend( $.expr[ ":" ], {
+ data: function( elem, i, match ) {
+ return !!$.data( elem, match[ 3 ] );
},
- focusable: function(element) {
- var nodeName = element.nodeName.toLowerCase(),
- tabIndex = $.attr(element, 'tabindex');
- return (/input|select|textarea|button|object/.test(nodeName)
- ? !element.disabled
- : 'a' == nodeName || 'area' == nodeName
- ? element.href || !isNaN(tabIndex)
- : !isNaN(tabIndex))
- // the element and all of its ancestors must be visible
- // the browser may report that the area is hidden
- && !$(element)['area' == nodeName ? 'parents' : 'closest'](':hidden').length;
+ focusable: function( element ) {
+ return focusable( element, !isNaN( $.attr( element, "tabindex" ) ) );
},
- tabbable: function(element) {
- var tabIndex = $.attr(element, 'tabindex');
- return (isNaN(tabIndex) || tabIndex >= 0) && $(element).is(':focusable');
+ tabbable: function( element ) {
+ var tabIndex = $.attr( element, "tabindex" ),
+ isTabIndexNaN = isNaN( tabIndex );
+ return ( isTabIndexNaN || tabIndex >= 0 ) && focusable( element, !isTabIndexNaN );
}
});
-})(jQuery);
+// support
+$(function() {
+ var body = document.body,
+ div = body.appendChild( div = document.createElement( "div" ) );
+
+ $.extend( div.style, {
+ minHeight: "100px",
+ height: "auto",
+ padding: 0,
+ borderWidth: 0
+ });
+
+ $.support.minHeight = div.offsetHeight === 100;
+ $.support.selectstart = "onselectstart" in div;
+
+ // set display to none to avoid a layout bug in IE
+ // http://dev.jquery.com/ticket/4014
+ body.removeChild( div ).style.display = "none";
+});
+
+
+
+
+
+// deprecated
+$.extend( $.ui, {
+ // $.ui.plugin is deprecated. Use the proxy pattern instead.
+ plugin: {
+ add: function( module, option, set ) {
+ var proto = $.ui[ module ].prototype;
+ for ( var i in set ) {
+ proto.plugins[ i ] = proto.plugins[ i ] || [];
+ proto.plugins[ i ].push( [ option, set[ i ] ] );
+ }
+ },
+ call: function( instance, name, args ) {
+ var set = instance.plugins[ name ];
+ if ( !set || !instance.element[ 0 ].parentNode ) {
+ return;
+ }
+
+ for ( var i = 0; i < set.length; i++ ) {
+ if ( instance.options[ set[ i ][ 0 ] ] ) {
+ set[ i ][ 1 ].apply( instance.element, args );
+ }
+ }
+ }
+ },
+
+ // will be deprecated when we switch to jQuery 1.4 - use jQuery.contains()
+ contains: function( a, b ) {
+ return document.compareDocumentPosition ?
+ a.compareDocumentPosition( b ) & 16 :
+ a !== b && a.contains( b );
+ },
+
+ // only used by resizable
+ hasScroll: function( el, a ) {
+
+ //If overflow is hidden, the element might have extra content, but the user wants to hide it
+ if ( $( el ).css( "overflow" ) === "hidden") {
+ return false;
+ }
+
+ var scroll = ( a && a === "left" ) ? "scrollLeft" : "scrollTop",
+ has = false;
+
+ if ( el[ scroll ] > 0 ) {
+ return true;
+ }
+
+ // TODO: determine which cases actually cause this to happen
+ // if the element doesn't have the scroll set, see if it's possible to
+ // set the scroll
+ el[ scroll ] = 1;
+ has = ( el[ scroll ] > 0 );
+ el[ scroll ] = 0;
+ return has;
+ },
+
+ // these are odd functions, fix the API or move into individual plugins
+ isOverAxis: function( x, reference, size ) {
+ //Determines when x coordinate is over "b" element axis
+ return ( x > reference ) && ( x < ( reference + size ) );
+ },
+ isOver: function( y, x, top, left, height, width ) {
+ //Determines when x, y coordinates is over "b" element
+ return $.ui.isOverAxis( y, top, height ) && $.ui.isOverAxis( x, left, width );
+ }
+});
+
+})( jQuery );
/*!
- * jQuery UI Widget 1.8
+ * jQuery UI Widget 1.8.16
*
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
*
* http://docs.jquery.com/UI/Widget
*/
-(function( $ ) {
-
-var _remove = $.fn.remove;
+(function( $, undefined ) {
-$.fn.remove = function( selector, keepData ) {
- return this.each(function() {
- if ( !keepData ) {
- if ( !selector || $.filter( selector, [ this ] ).length ) {
- $( "*", this ).add( this ).each(function() {
- $( this ).triggerHandler( "remove" );
- });
- }
+// jQuery 1.4+
+if ( $.cleanData ) {
+ var _cleanData = $.cleanData;
+ $.cleanData = function( elems ) {
+ for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+ try {
+ $( elem ).triggerHandler( "remove" );
+ // http://bugs.jquery.com/ticket/8235
+ } catch( e ) {}
}
- return _remove.call( $(this), selector, keepData );
- });
-};
+ _cleanData( elems );
+ };
+} else {
+ var _remove = $.fn.remove;
+ $.fn.remove = function( selector, keepData ) {
+ return this.each(function() {
+ if ( !keepData ) {
+ if ( !selector || $.filter( selector, [ this ] ).length ) {
+ $( "*", this ).add( [ this ] ).each(function() {
+ try {
+ $( this ).triggerHandler( "remove" );
+ // http://bugs.jquery.com/ticket/8235
+ } catch( e ) {}
+ });
+ }
+ }
+ return _remove.call( $(this), selector, keepData );
+ });
+ };
+}
$.widget = function( name, base, prototype ) {
var namespace = name.split( "." )[ 0 ],
@@ -260,7 +387,7 @@ $.widget = function( name, base, prototype ) {
// basePrototype[ key ] = $.extend( {}, val );
// }
// });
- basePrototype.options = $.extend( {}, basePrototype.options );
+ basePrototype.options = $.extend( true, {}, basePrototype.options );
$[ namespace ][ name ].prototype = $.extend( true, basePrototype, {
namespace: namespace,
widgetName: name,
@@ -283,7 +410,7 @@ $.widget.bridge = function( name, object ) {
options;
// prevent calls to internal methods
- if ( isMethodCall && options.substring( 0, 1 ) === "_" ) {
+ if ( isMethodCall && options.charAt( 0 ) === "_" ) {
return returnValue;
}
@@ -293,6 +420,15 @@ $.widget.bridge = function( name, object ) {
methodValue = instance && $.isFunction( instance[options] ) ?
instance[ options ].apply( instance, args ) :
instance;
+ // TODO: add this back in 1.9 and use $.error() (see #5972)
+// if ( !instance ) {
+// throw "cannot call methods on " + name + " prior to initialization; " +
+// "attempted to call method '" + options + "'";
+// }
+// if ( !$.isFunction( instance[options] ) ) {
+// throw "no such method '" + options + "' for " + name + " widget instance";
+// }
+// var methodValue = instance[ options ].apply( instance, args );
if ( methodValue !== instance && methodValue !== undefined ) {
returnValue = methodValue;
return false;
@@ -302,10 +438,7 @@ $.widget.bridge = function( name, object ) {
this.each(function() {
var instance = $.data( this, name );
if ( instance ) {
- if ( options ) {
- instance.option( options );
- }
- instance._init();
+ instance.option( options || {} )._init();
} else {
$.data( this, name, new object( options, this ) );
}
@@ -332,10 +465,11 @@ $.Widget.prototype = {
_createWidget: function( options, element ) {
// $.widget.bridge stores the plugin instance, but we do it anyway
// so that it's stored even before the _create function runs
- this.element = $( element ).data( this.widgetName, this );
+ $.data( element, this.widgetName, this );
+ this.element = $( element );
this.options = $.extend( true, {},
this.options,
- $.metadata && $.metadata.get( element )[ this.widgetName ],
+ this._getCreateOptions(),
options );
var self = this;
@@ -344,8 +478,12 @@ $.Widget.prototype = {
});
this._create();
+ this._trigger( "create" );
this._init();
},
+ _getCreateOptions: function() {
+ return $.metadata && $.metadata.get( this.element[0] )[ this.widgetName ];
+ },
_create: function() {},
_init: function() {},
@@ -358,7 +496,7 @@ $.Widget.prototype = {
.removeAttr( "aria-disabled" )
.removeClass(
this.widgetBaseClass + "-disabled " +
- this.namespace + "-state-disabled" );
+ "ui-state-disabled" );
},
widget: function() {
@@ -366,12 +504,11 @@ $.Widget.prototype = {
},
option: function( key, value ) {
- var options = key,
- self = this;
+ var options = key;
if ( arguments.length === 0 ) {
// don't return a reference to the internal hash
- return $.extend( {}, self.options );
+ return $.extend( {}, this.options );
}
if (typeof key === "string" ) {
@@ -382,11 +519,17 @@ $.Widget.prototype = {
options[ key ] = value;
}
+ this._setOptions( options );
+
+ return this;
+ },
+ _setOptions: function( options ) {
+ var self = this;
$.each( options, function( key, value ) {
self._setOption( key, value );
});
- return self;
+ return this;
},
_setOption: function( key, value ) {
this.options[ key ] = value;
@@ -395,7 +538,7 @@ $.Widget.prototype = {
this.widget()
[ value ? "addClass" : "removeClass"](
this.widgetBaseClass + "-disabled" + " " +
- this.namespace + "-state-disabled" )
+ "ui-state-disabled" )
.attr( "aria-disabled", value );
}
@@ -438,18 +581,23 @@ $.Widget.prototype = {
})( jQuery );
/*!
- * jQuery UI Mouse 1.8
+ * jQuery UI Mouse 1.8.16
*
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
*
* http://docs.jquery.com/UI/Mouse
*
* Depends:
* jquery.ui.widget.js
*/
-(function($) {
+(function( $, undefined ) {
+
+var mouseHandled = false;
+$( document ).mouseup( function( e ) {
+ mouseHandled = false;
+});
$.widget("ui.mouse", {
options: {
@@ -465,8 +613,8 @@ $.widget("ui.mouse", {
return self._mouseDown(event);
})
.bind('click.'+this.widgetName, function(event) {
- if(self._preventClickEvent) {
- self._preventClickEvent = false;
+ if (true === $.data(event.target, self.widgetName + '.preventClickEvent')) {
+ $.removeData(event.target, self.widgetName + '.preventClickEvent');
event.stopImmediatePropagation();
return false;
}
@@ -483,9 +631,7 @@ $.widget("ui.mouse", {
_mouseDown: function(event) {
// don't let more than one widget handle mouseStart
- // TODO: figure out why we have to use originalEvent
- event.originalEvent = event.originalEvent || {};
- if (event.originalEvent.mouseHandled) { return; }
+ if( mouseHandled ) { return };
// we may have missed mouseup (out of window)
(this._mouseStarted && this._mouseUp(event));
@@ -494,7 +640,9 @@ $.widget("ui.mouse", {
var self = this,
btnIsLeft = (event.which == 1),
- elIsCancel = (typeof this.options.cancel == "string" ? $(event.target).parents().add(event.target).filter(this.options.cancel).length : false);
+ // event.target.nodeName works around a bug in IE 8 with
+ // disabled inputs (#7620)
+ elIsCancel = (typeof this.options.cancel == "string" && event.target.nodeName ? $(event.target).closest(this.options.cancel).length : false);
if (!btnIsLeft || elIsCancel || !this._mouseCapture(event)) {
return true;
}
@@ -514,6 +662,11 @@ $.widget("ui.mouse", {
}
}
+ // Click event may never have fired (Gecko & Opera)
+ if (true === $.data(event.target, this.widgetName + '.preventClickEvent')) {
+ $.removeData(event.target, this.widgetName + '.preventClickEvent');
+ }
+
// these delegates are required to keep context
this._mouseMoveDelegate = function(event) {
return self._mouseMove(event);
@@ -525,18 +678,15 @@ $.widget("ui.mouse", {
.bind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
.bind('mouseup.'+this.widgetName, this._mouseUpDelegate);
- // preventDefault() is used to prevent the selection of text here -
- // however, in Safari, this causes select boxes not to be selectable
- // anymore, so this fix is needed
- ($.browser.safari || event.preventDefault());
-
- event.originalEvent.mouseHandled = true;
+ event.preventDefault();
+
+ mouseHandled = true;
return true;
},
_mouseMove: function(event) {
// IE mouseup check - mouseup happened when mouse was out of window
- if ($.browser.msie && !event.button) {
+ if ($.browser.msie && !(document.documentMode >= 9) && !event.button) {
return this._mouseUp(event);
}
@@ -561,7 +711,11 @@ $.widget("ui.mouse", {
if (this._mouseStarted) {
this._mouseStarted = false;
- this._preventClickEvent = (event.target == this._mouseDownEvent.target);
+
+ if (event.target == this._mouseDownEvent.target) {
+ $.data(event.target, this.widgetName + '.preventClickEvent', true);
+ }
+
this._mouseStop(event);
}
@@ -589,22 +743,21 @@ $.widget("ui.mouse", {
})(jQuery);
/*
- * jQuery UI Position 1.8
+ * jQuery UI Position 1.8.16
*
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
*
* http://docs.jquery.com/UI/Position
*/
-(function( $ ) {
+(function( $, undefined ) {
$.ui = $.ui || {};
var horizontalPositions = /left|center|right/,
- horizontalDefault = "center",
verticalPositions = /top|center|bottom/,
- verticalDefault = "center",
+ center = "center",
_position = $.fn.position,
_offset = $.fn.offset;
@@ -617,21 +770,23 @@ $.fn.position = function( options ) {
options = $.extend( {}, options );
var target = $( options.of ),
+ targetElem = target[0],
collision = ( options.collision || "flip" ).split( " " ),
offset = options.offset ? options.offset.split( " " ) : [ 0, 0 ],
targetWidth,
targetHeight,
basePosition;
- if ( options.of.nodeType === 9 ) {
+ if ( targetElem.nodeType === 9 ) {
targetWidth = target.width();
targetHeight = target.height();
basePosition = { top: 0, left: 0 };
- } else if ( options.of.scrollTo && options.of.document ) {
+ // TODO: use $.isWindow() in 1.9
+ } else if ( targetElem.setTimeout ) {
targetWidth = target.width();
targetHeight = target.height();
basePosition = { top: target.scrollTop(), left: target.scrollLeft() };
- } else if ( options.of.preventDefault ) {
+ } else if ( targetElem.preventDefault ) {
// force left top to allow flipping
options.at = "left top";
targetWidth = targetHeight = 0;
@@ -648,13 +803,13 @@ $.fn.position = function( options ) {
var pos = ( options[this] || "" ).split( " " );
if ( pos.length === 1) {
pos = horizontalPositions.test( pos[0] ) ?
- pos.concat( [verticalDefault] ) :
+ pos.concat( [center] ) :
verticalPositions.test( pos[0] ) ?
- [ horizontalDefault ].concat( pos ) :
- [ horizontalDefault, verticalDefault ];
+ [ center ].concat( pos ) :
+ [ center, center ];
}
- pos[ 0 ] = horizontalPositions.test( pos[0] ) ? pos[ 0 ] : horizontalDefault;
- pos[ 1 ] = verticalPositions.test( pos[1] ) ? pos[ 1 ] : verticalDefault;
+ pos[ 0 ] = horizontalPositions.test( pos[0] ) ? pos[ 0 ] : center;
+ pos[ 1 ] = verticalPositions.test( pos[1] ) ? pos[ 1 ] : center;
options[ this ] = pos;
});
@@ -672,13 +827,13 @@ $.fn.position = function( options ) {
if ( options.at[0] === "right" ) {
basePosition.left += targetWidth;
- } else if (options.at[0] === horizontalDefault ) {
+ } else if ( options.at[0] === center ) {
basePosition.left += targetWidth / 2;
}
if ( options.at[1] === "bottom" ) {
basePosition.top += targetHeight;
- } else if ( options.at[1] === verticalDefault ) {
+ } else if ( options.at[1] === center ) {
basePosition.top += targetHeight / 2;
}
@@ -689,20 +844,36 @@ $.fn.position = function( options ) {
var elem = $( this ),
elemWidth = elem.outerWidth(),
elemHeight = elem.outerHeight(),
- position = $.extend( {}, basePosition );
+ marginLeft = parseInt( $.curCSS( this, "marginLeft", true ) ) || 0,
+ marginTop = parseInt( $.curCSS( this, "marginTop", true ) ) || 0,
+ collisionWidth = elemWidth + marginLeft +
+ ( parseInt( $.curCSS( this, "marginRight", true ) ) || 0 ),
+ collisionHeight = elemHeight + marginTop +
+ ( parseInt( $.curCSS( this, "marginBottom", true ) ) || 0 ),
+ position = $.extend( {}, basePosition ),
+ collisionPosition;
if ( options.my[0] === "right" ) {
position.left -= elemWidth;
- } else if ( options.my[0] === horizontalDefault ) {
+ } else if ( options.my[0] === center ) {
position.left -= elemWidth / 2;
}
if ( options.my[1] === "bottom" ) {
position.top -= elemHeight;
- } else if ( options.my[1] === verticalDefault ) {
+ } else if ( options.my[1] === center ) {
position.top -= elemHeight / 2;
}
+ // prevent fractions (see #5280)
+ position.left = Math.round( position.left );
+ position.top = Math.round( position.top );
+
+ collisionPosition = {
+ left: position.left - marginLeft,
+ top: position.top - marginTop
+ };
+
$.each( [ "left", "top" ], function( i, dir ) {
if ( $.ui.position[ collision[i] ] ) {
$.ui.position[ collision[i] ][ dir ]( position, {
@@ -710,6 +881,9 @@ $.fn.position = function( options ) {
targetHeight: targetHeight,
elemWidth: elemWidth,
elemHeight: elemHeight,
+ collisionPosition: collisionPosition,
+ collisionWidth: collisionWidth,
+ collisionHeight: collisionHeight,
offset: offset,
my: options.my,
at: options.at
@@ -728,41 +902,44 @@ $.ui.position = {
fit: {
left: function( position, data ) {
var win = $( window ),
- over = position.left + data.elemWidth - win.width() - win.scrollLeft();
- position.left = over > 0 ? position.left - over : Math.max( 0, position.left );
+ over = data.collisionPosition.left + data.collisionWidth - win.width() - win.scrollLeft();
+ position.left = over > 0 ? position.left - over : Math.max( position.left - data.collisionPosition.left, position.left );
},
top: function( position, data ) {
var win = $( window ),
- over = position.top + data.elemHeight - win.height() - win.scrollTop();
- position.top = over > 0 ? position.top - over : Math.max( 0, position.top );
+ over = data.collisionPosition.top + data.collisionHeight - win.height() - win.scrollTop();
+ position.top = over > 0 ? position.top - over : Math.max( position.top - data.collisionPosition.top, position.top );
}
},
flip: {
left: function( position, data ) {
- if ( data.at[0] === "center" ) {
+ if ( data.at[0] === center ) {
return;
}
var win = $( window ),
- over = position.left + data.elemWidth - win.width() - win.scrollLeft(),
+ over = data.collisionPosition.left + data.collisionWidth - win.width() - win.scrollLeft(),
myOffset = data.my[ 0 ] === "left" ?
-data.elemWidth :
data.my[ 0 ] === "right" ?
data.elemWidth :
0,
+ atOffset = data.at[ 0 ] === "left" ?
+ data.targetWidth :
+ -data.targetWidth,
offset = -2 * data.offset[ 0 ];
- position.left += position.left < 0 ?
- myOffset + data.targetWidth + offset :
+ position.left += data.collisionPosition.left < 0 ?
+ myOffset + atOffset + offset :
over > 0 ?
- myOffset - data.targetWidth + offset :
+ myOffset + atOffset + offset :
0;
},
top: function( position, data ) {
- if ( data.at[1] === "center" ) {
+ if ( data.at[1] === center ) {
return;
}
var win = $( window ),
- over = position.top + data.elemHeight - win.height() - win.scrollTop(),
+ over = data.collisionPosition.top + data.collisionHeight - win.height() - win.scrollTop(),
myOffset = data.my[ 1 ] === "top" ?
-data.elemHeight :
data.my[ 1 ] === "bottom" ?
@@ -772,8 +949,8 @@ $.ui.position = {
data.targetHeight :
-data.targetHeight,
offset = -2 * data.offset[ 1 ];
- position.top += position.top < 0 ?
- myOffset + data.targetHeight + offset :
+ position.top += data.collisionPosition.top < 0 ?
+ myOffset + atOffset + offset :
over > 0 ?
myOffset + atOffset + offset :
0;
@@ -818,11 +995,11 @@ if ( !$.offset.setOffset ) {
}( jQuery ));
/*
- * jQuery UI Draggable 1.8
+ * jQuery UI Draggable 1.8.16
*
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
*
* http://docs.jquery.com/UI/Draggables
*
@@ -831,7 +1008,7 @@ if ( !$.offset.setOffset ) {
* jquery.ui.mouse.js
* jquery.ui.widget.js
*/
-(function($) {
+(function( $, undefined ) {
$.widget("ui.draggable", $.ui.mouse, {
widgetEventPrefix: "drag",
@@ -898,6 +1075,18 @@ $.widget("ui.draggable", $.ui.mouse, {
this.handle = this._getHandle(event);
if (!this.handle)
return false;
+
+ if ( o.iframeFix ) {
+ $(o.iframeFix === true ? "iframe" : o.iframeFix).each(function() {
+ $('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>')
+ .css({
+ width: this.offsetWidth+"px", height: this.offsetHeight+"px",
+ position: "absolute", opacity: "0.001", zIndex: 1000
+ })
+ .css($(this).offset())
+ .appendTo("body");
+ });
+ }
return true;
@@ -972,6 +1161,10 @@ $.widget("ui.draggable", $.ui.mouse, {
this.helper.addClass("ui-draggable-dragging");
this._mouseDrag(event, true); //Execute the drag once - this causes the helper not to be visible before getting its correct position
+
+ //If the ddmanager is used for droppables, inform the manager that dragging has started (see #5003)
+ if ( $.ui.ddmanager ) $.ui.ddmanager.dragStart(this, event);
+
return true;
},
@@ -1011,8 +1204,8 @@ $.widget("ui.draggable", $.ui.mouse, {
this.dropped = false;
}
- //if the original element is removed, don't bother to continue
- if(!this.element[0] || !this.element[0].parentNode)
+ //if the original element is removed, don't bother to continue if helper is set to "original"
+ if((!this.element[0] || !this.element[0].parentNode) && this.options.helper == "original")
return false;
if((this.options.revert == "invalid" && !dropped) || (this.options.revert == "valid" && dropped) || this.options.revert === true || ($.isFunction(this.options.revert) && this.options.revert.call(this.element, dropped))) {
@@ -1031,6 +1224,19 @@ $.widget("ui.draggable", $.ui.mouse, {
return false;
},
+ _mouseUp: function(event) {
+ if (this.options.iframeFix === true) {
+ $("div.ui-draggable-iframeFix").each(function() {
+ this.parentNode.removeChild(this);
+ }); //Remove frame helpers
+ }
+
+ //If the ddmanager is used for droppables, inform the manager that dragging has stopped (see #5003)
+ if( $.ui.ddmanager ) $.ui.ddmanager.dragStop(this, event);
+
+ return $.ui.mouse.prototype._mouseUp.call(this, event);
+ },
+
cancel: function() {
if(this.helper.is(".ui-draggable-dragging")) {
@@ -1060,7 +1266,7 @@ $.widget("ui.draggable", $.ui.mouse, {
_createHelper: function(event) {
var o = this.options;
- var helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event])) : (o.helper == 'clone' ? this.element.clone() : this.element);
+ var helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event])) : (o.helper == 'clone' ? this.element.clone().removeAttr('id') : this.element);
if(!helper.parents('body').length)
helper.appendTo((o.appendTo == 'parent' ? this.element[0].parentNode : o.appendTo));
@@ -1136,7 +1342,9 @@ $.widget("ui.draggable", $.ui.mouse, {
_cacheMargins: function() {
this.margins = {
left: (parseInt(this.element.css("marginLeft"),10) || 0),
- top: (parseInt(this.element.css("marginTop"),10) || 0)
+ top: (parseInt(this.element.css("marginTop"),10) || 0),
+ right: (parseInt(this.element.css("marginRight"),10) || 0),
+ bottom: (parseInt(this.element.css("marginBottom"),10) || 0)
};
},
@@ -1152,23 +1360,26 @@ $.widget("ui.draggable", $.ui.mouse, {
var o = this.options;
if(o.containment == 'parent') o.containment = this.helper[0].parentNode;
if(o.containment == 'document' || o.containment == 'window') this.containment = [
- 0 - this.offset.relative.left - this.offset.parent.left,
- 0 - this.offset.relative.top - this.offset.parent.top,
- $(o.containment == 'document' ? document : window).width() - this.helperProportions.width - this.margins.left,
- ($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
+ o.containment == 'document' ? 0 : $(window).scrollLeft() - this.offset.relative.left - this.offset.parent.left,
+ o.containment == 'document' ? 0 : $(window).scrollTop() - this.offset.relative.top - this.offset.parent.top,
+ (o.containment == 'document' ? 0 : $(window).scrollLeft()) + $(o.containment == 'document' ? document : window).width() - this.helperProportions.width - this.margins.left,
+ (o.containment == 'document' ? 0 : $(window).scrollTop()) + ($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
];
if(!(/^(document|window|parent)$/).test(o.containment) && o.containment.constructor != Array) {
- var ce = $(o.containment)[0]; if(!ce) return;
- var co = $(o.containment).offset();
+ var c = $(o.containment);
+ var ce = c[0]; if(!ce) return;
+ var co = c.offset();
var over = ($(ce).css("overflow") != 'hidden');
this.containment = [
- co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0) - this.margins.left,
- co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0) - this.margins.top,
- co.left+(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left,
- co.top+(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top
+ (parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0),
+ (parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0),
+ (over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left - this.margins.right,
+ (over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top - this.margins.bottom
];
+ this.relative_container = c;
+
} else if(o.containment.constructor == Array) {
this.containment = o.containment;
}
@@ -1210,20 +1421,32 @@ $.widget("ui.draggable", $.ui.mouse, {
*/
if(this.originalPosition) { //If we are not dragging yet, we won't check for options
-
- if(this.containment) {
- if(event.pageX - this.offset.click.left < this.containment[0]) pageX = this.containment[0] + this.offset.click.left;
- if(event.pageY - this.offset.click.top < this.containment[1]) pageY = this.containment[1] + this.offset.click.top;
- if(event.pageX - this.offset.click.left > this.containment[2]) pageX = this.containment[2] + this.offset.click.left;
- if(event.pageY - this.offset.click.top > this.containment[3]) pageY = this.containment[3] + this.offset.click.top;
+ var containment;
+ if(this.containment) {
+ if (this.relative_container){
+ var co = this.relative_container.offset();
+ containment = [ this.containment[0] + co.left,
+ this.containment[1] + co.top,
+ this.containment[2] + co.left,
+ this.containment[3] + co.top ];
+ }
+ else {
+ containment = this.containment;
+ }
+
+ if(event.pageX - this.offset.click.left < containment[0]) pageX = containment[0] + this.offset.click.left;
+ if(event.pageY - this.offset.click.top < containment[1]) pageY = containment[1] + this.offset.click.top;
+ if(event.pageX - this.offset.click.left > containment[2]) pageX = containment[2] + this.offset.click.left;
+ if(event.pageY - this.offset.click.top > containment[3]) pageY = containment[3] + this.offset.click.top;
}
if(o.grid) {
- var top = this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1];
- pageY = this.containment ? (!(top - this.offset.click.top < this.containment[1] || top - this.offset.click.top > this.containment[3]) ? top : (!(top - this.offset.click.top < this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
+ //Check for grid elements set to 0 to prevent divide by 0 error causing invalid argument errors in IE (see ticket #6950)
+ var top = o.grid[1] ? this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1] : this.originalPageY;
+ pageY = containment ? (!(top - this.offset.click.top < containment[1] || top - this.offset.click.top > containment[3]) ? top : (!(top - this.offset.click.top < containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
- var left = this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0];
- pageX = this.containment ? (!(left - this.offset.click.left < this.containment[0] || left - this.offset.click.left > this.containment[2]) ? left : (!(left - this.offset.click.left < this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
+ var left = o.grid[0] ? this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0] : this.originalPageX;
+ pageX = containment ? (!(left - this.offset.click.left < containment[0] || left - this.offset.click.left > containment[2]) ? left : (!(left - this.offset.click.left < containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
}
}
@@ -1278,7 +1501,7 @@ $.widget("ui.draggable", $.ui.mouse, {
});
$.extend($.ui.draggable, {
- version: "1.8"
+ version: "1.8.16"
});
$.ui.plugin.add("draggable", "connectToSortable", {
@@ -1294,7 +1517,7 @@ $.ui.plugin.add("draggable", "connectToSortable", {
instance: sortable,
shouldRevert: sortable.options.revert
});
- sortable._refreshItems(); //Do a one-time refresh at start to refresh the containerCache
+ sortable.refreshPositions(); // Call the sortable's refreshPositions at drag start to refresh the containerCache since the sortable container cache is used in drag and needs to be up to date (this will ensure it's initialised as well as being kept in step with any changes that might have happened on the page).
sortable._trigger("activate", event, uiSortable);
}
});
@@ -1363,7 +1586,7 @@ $.ui.plugin.add("draggable", "connectToSortable", {
//Now we fake the start of dragging for the sortable instance,
//by cloning the list group item, appending it to the sortable and using it as inst.currentItem
//We can then fire the start event of the sortable with our passed browser event, and our own helper (so it doesn't create a new one)
- this.instance.currentItem = $(self).clone().appendTo(this.instance.element).data("sortable-item", true);
+ this.instance.currentItem = $(self).clone().removeAttr('id').appendTo(this.instance.element).data("sortable-item", true);
this.instance.options._helper = this.instance.options.helper; //Store helper option to later restore it
this.instance.options.helper = function() { return ui.helper[0]; };
@@ -1433,24 +1656,6 @@ $.ui.plugin.add("draggable", "cursor", {
}
});
-$.ui.plugin.add("draggable", "iframeFix", {
- start: function(event, ui) {
- var o = $(this).data('draggable').options;
- $(o.iframeFix === true ? "iframe" : o.iframeFix).each(function() {
- $('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>')
- .css({
- width: this.offsetWidth+"px", height: this.offsetHeight+"px",
- position: "absolute", opacity: "0.001", zIndex: 1000
- })
- .css($(this).offset())
- .appendTo("body");
- });
- },
- stop: function(event, ui) {
- $("div.ui-draggable-iframeFix").each(function() { this.parentNode.removeChild(this); }); //Remove frame helpers
- }
-});
-
$.ui.plugin.add("draggable", "opacity", {
start: function(event, ui) {
var t = $(ui.helper), o = $(this).data('draggable').options;
@@ -1615,11 +1820,11 @@ $.ui.plugin.add("draggable", "zIndex", {
})(jQuery);
/*
- * jQuery UI Droppable 1.8
+ * jQuery UI Droppable 1.8.16
*
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
*
* http://docs.jquery.com/UI/Droppables
*
@@ -1629,7 +1834,7 @@ $.ui.plugin.add("draggable", "zIndex", {
* jquery.ui.mouse.js
* jquery.ui.draggable.js
*/
-(function($) {
+(function( $, undefined ) {
$.widget("ui.droppable", {
widgetEventPrefix: "drop",
@@ -1763,7 +1968,7 @@ $.widget("ui.droppable", {
});
$.extend($.ui.droppable, {
- version: "1.8"
+ version: "1.8.16"
});
$.ui.intersect = function(draggable, droppable, toleranceMode) {
@@ -1777,8 +1982,8 @@ $.ui.intersect = function(draggable, droppable, toleranceMode) {
switch (toleranceMode) {
case 'fit':
- return (l < x1 && x2 < r
- && t < y1 && y2 < b);
+ return (l <= x1 && x2 <= r
+ && t <= y1 && y2 <= b);
break;
case 'intersect':
return (l < x1 + (draggable.helperProportions.width / 2) // Right Half
@@ -1828,11 +2033,11 @@ $.ui.ddmanager = {
for (var j=0; j < list.length; j++) { if(list[j] == m[i].element[0]) { m[i].proportions.height = 0; continue droppablesLoop; } }; //Filter out elements in the current dragged item
m[i].visible = m[i].element.css("display") != "none"; if(!m[i].visible) continue; //If the element is not visible, continue
+ if(type == "mousedown") m[i]._activate.call(m[i], event); //Activate the droppable if used directly from draggables
+
m[i].offset = m[i].element.offset();
m[i].proportions = { width: m[i].element[0].offsetWidth, height: m[i].element[0].offsetHeight };
- if(type == "mousedown") m[i]._activate.call(m[i], event); //Activate the droppable if used directly from draggables
-
}
},
@@ -1854,6 +2059,12 @@ $.ui.ddmanager = {
return dropped;
},
+ dragStart: function( draggable, event ) {
+ //Listen for scrolling so that if the dragging causes scrolling the position of the droppables can be recalculated (see #5003)
+ draggable.element.parents( ":not(body,html)" ).bind( "scroll.droppable", function() {
+ if( !draggable.options.refreshPositions ) $.ui.ddmanager.prepareOffsets( draggable, event );
+ });
+ },
drag: function(draggable, event) {
//If you have a highly dynamic page, you might try this option. It renders positions every time you move the mouse.
@@ -1895,16 +2106,21 @@ $.ui.ddmanager = {
}
});
+ },
+ dragStop: function( draggable, event ) {
+ draggable.element.parents( ":not(body,html)" ).unbind( "scroll.droppable" );
+ //Call prepareOffsets one final time since IE does not fire return scroll events when overflow was caused by drag (see #5003)
+ if( !draggable.options.refreshPositions ) $.ui.ddmanager.prepareOffsets( draggable, event );
}
};
})(jQuery);
/*
- * jQuery UI Resizable 1.8
+ * jQuery UI Resizable 1.8.16
*
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
*
* http://docs.jquery.com/UI/Resizables
*
@@ -1913,7 +2129,7 @@ $.ui.ddmanager = {
* jquery.ui.mouse.js
* jquery.ui.widget.js
*/
-(function($) {
+(function( $, undefined ) {
$.widget("ui.resizable", $.ui.mouse, {
widgetEventPrefix: "resize",
@@ -2077,10 +2293,12 @@ $.widget("ui.resizable", $.ui.mouse, {
$(this.element)
.addClass("ui-resizable-autohide")
.hover(function() {
+ if (o.disabled) return;
$(this).removeClass("ui-resizable-autohide");
self._handles.show();
},
function(){
+ if (o.disabled) return;
if (!self.resizing) {
$(this).addClass("ui-resizable-autohide");
self._handles.hide();
@@ -2192,6 +2410,8 @@ $.widget("ui.resizable", $.ui.mouse, {
// Calculate the attrs that will be change
var data = trigger.apply(this, [event, dx, dy]), ie6 = $.browser.msie && $.browser.version < 7, csdif = this.sizeDiff;
+ // Put this in the mouseDrag handler since the user can start pressing shift while resizing
+ this._updateVirtualBoundaries(event.shiftKey);
if (this._aspectRatio || event.shiftKey)
data = this._updateRatio(data, event);
@@ -2223,10 +2443,10 @@ $.widget("ui.resizable", $.ui.mouse, {
if(this._helper) {
var pr = this._proportionallyResizeElements, ista = pr.length && (/textarea/i).test(pr[0].nodeName),
- soffseth = ista && $.ui.hasScroll(pr[0], 'left') /* TODO - jump height */ ? 0 : self.sizeDiff.height,
- soffsetw = ista ? 0 : self.sizeDiff.width;
+ soffseth = ista && $.ui.hasScroll(pr[0], 'left') /* TODO - jump height */ ? 0 : self.sizeDiff.height,
+ soffsetw = ista ? 0 : self.sizeDiff.width;
- var s = { width: (self.size.width - soffsetw), height: (self.size.height - soffseth) },
+ var s = { width: (self.helper.width() - soffsetw), height: (self.helper.height() - soffseth) },
left = (parseInt(self.element.css('left'), 10) + (self.position.left - self.originalPosition.left)) || null,
top = (parseInt(self.element.css('top'), 10) + (self.position.top - self.originalPosition.top)) || null;
@@ -2250,6 +2470,32 @@ $.widget("ui.resizable", $.ui.mouse, {
},
+ _updateVirtualBoundaries: function(forceAspectRatio) {
+ var o = this.options, pMinWidth, pMaxWidth, pMinHeight, pMaxHeight, b;
+
+ b = {
+ minWidth: isNumber(o.minWidth) ? o.minWidth : 0,
+ maxWidth: isNumber(o.maxWidth) ? o.maxWidth : Infinity,
+ minHeight: isNumber(o.minHeight) ? o.minHeight : 0,
+ maxHeight: isNumber(o.maxHeight) ? o.maxHeight : Infinity
+ };
+
+ if(this._aspectRatio || forceAspectRatio) {
+ // We want to create an enclosing box whose aspect ration is the requested one
+ // First, compute the "projected" size for each dimension based on the aspect ratio and other dimension
+ pMinWidth = b.minHeight * this.aspectRatio;
+ pMinHeight = b.minWidth / this.aspectRatio;
+ pMaxWidth = b.maxHeight * this.aspectRatio;
+ pMaxHeight = b.maxWidth / this.aspectRatio;
+
+ if(pMinWidth > b.minWidth) b.minWidth = pMinWidth;
+ if(pMinHeight > b.minHeight) b.minHeight = pMinHeight;
+ if(pMaxWidth < b.maxWidth) b.maxWidth = pMaxWidth;
+ if(pMaxHeight < b.maxHeight) b.maxHeight = pMaxHeight;
+ }
+ this._vBoundaries = b;
+ },
+
_updateCache: function(data) {
var o = this.options;
this.offset = this.helper.offset();
@@ -2263,8 +2509,8 @@ $.widget("ui.resizable", $.ui.mouse, {
var o = this.options, cpos = this.position, csize = this.size, a = this.axis;
- if (data.height) data.width = (csize.height * this.aspectRatio);
- else if (data.width) data.height = (csize.width / this.aspectRatio);
+ if (isNumber(data.height)) data.width = (data.height * this.aspectRatio);
+ else if (isNumber(data.width)) data.height = (data.width / this.aspectRatio);
if (a == 'sw') {
data.left = cpos.left + (csize.width - data.width);
@@ -2280,7 +2526,7 @@ $.widget("ui.resizable", $.ui.mouse, {
_respectSize: function(data, event) {
- var el = this.helper, o = this.options, pRatio = this._aspectRatio || event.shiftKey, a = this.axis,
+ var el = this.helper, o = this._vBoundaries, pRatio = this._aspectRatio || event.shiftKey, a = this.axis,
ismaxw = isNumber(data.width) && o.maxWidth && (o.maxWidth < data.width), ismaxh = isNumber(data.height) && o.maxHeight && (o.maxHeight < data.height),
isminw = isNumber(data.width) && o.minWidth && (o.minWidth > data.width), isminh = isNumber(data.height) && o.minHeight && (o.minHeight > data.height);
@@ -2420,7 +2666,7 @@ $.widget("ui.resizable", $.ui.mouse, {
});
$.extend($.ui.resizable, {
- version: "1.8"
+ version: "1.8.16"
});
/*
@@ -2429,28 +2675,29 @@ $.extend($.ui.resizable, {
$.ui.plugin.add("resizable", "alsoResize", {
- start: function(event, ui) {
-
+ start: function (event, ui) {
var self = $(this).data("resizable"), o = self.options;
- var _store = function(exp) {
+ var _store = function (exp) {
$(exp).each(function() {
- $(this).data("resizable-alsoresize", {
- width: parseInt($(this).width(), 10), height: parseInt($(this).height(), 10),
- left: parseInt($(this).css('left'), 10), top: parseInt($(this).css('top'), 10)
+ var el = $(this);
+ el.data("resizable-alsoresize", {
+ width: parseInt(el.width(), 10), height: parseInt(el.height(), 10),
+ left: parseInt(el.css('left'), 10), top: parseInt(el.css('top'), 10),
+ position: el.css('position') // to reset Opera on stop()
});
});
};
if (typeof(o.alsoResize) == 'object' && !o.alsoResize.parentNode) {
- if (o.alsoResize.length) { o.alsoResize = o.alsoResize[0]; _store(o.alsoResize); }
- else { $.each(o.alsoResize, function(exp, c) { _store(exp); }); }
+ if (o.alsoResize.length) { o.alsoResize = o.alsoResize[0]; _store(o.alsoResize); }
+ else { $.each(o.alsoResize, function (exp) { _store(exp); }); }
}else{
_store(o.alsoResize);
}
},
- resize: function(event, ui){
+ resize: function (event, ui) {
var self = $(this).data("resizable"), o = self.options, os = self.originalSize, op = self.originalPosition;
var delta = {
@@ -2458,18 +2705,19 @@ $.ui.plugin.add("resizable", "alsoResize", {
top: (self.position.top - op.top) || 0, left: (self.position.left - op.left) || 0
},
- _alsoResize = function(exp, c) {
+ _alsoResize = function (exp, c) {
$(exp).each(function() {
- var el = $(this), start = $(this).data("resizable-alsoresize"), style = {}, css = c && c.length ? c : ['width', 'height', 'top', 'left'];
+ var el = $(this), start = $(this).data("resizable-alsoresize"), style = {},
+ css = c && c.length ? c : el.parents(ui.originalElement[0]).length ? ['width', 'height'] : ['width', 'height', 'top', 'left'];
- $.each(css || ['width', 'height', 'top', 'left'], function(i, prop) {
+ $.each(css, function (i, prop) {
var sum = (start[prop]||0) + (delta[prop]||0);
if (sum && sum >= 0)
style[prop] = sum || null;
});
- //Opera fixing relative position
- if (/relative/.test(el.css('position')) && $.browser.opera) {
+ // Opera fixing relative position
+ if ($.browser.opera && /relative/.test(el.css('position'))) {
self._revertToRelativePosition = true;
el.css({ position: 'absolute', top: 'auto', left: 'auto' });
}
@@ -2479,22 +2727,33 @@ $.ui.plugin.add("resizable", "alsoResize", {
};
if (typeof(o.alsoResize) == 'object' && !o.alsoResize.nodeType) {
- $.each(o.alsoResize, function(exp, c) { _alsoResize(exp, c); });
+ $.each(o.alsoResize, function (exp, c) { _alsoResize(exp, c); });
}else{
_alsoResize(o.alsoResize);
}
},
- stop: function(event, ui){
- var self = $(this).data("resizable");
+ stop: function (event, ui) {
+ var self = $(this).data("resizable"), o = self.options;
- //Opera fixing relative position
- if (self._revertToRelativePosition && $.browser.opera) {
+ var _reset = function (exp) {
+ $(exp).each(function() {
+ var el = $(this);
+ // reset position for Opera - no need to verify it was changed
+ el.css({ position: el.data("resizable-alsoresize").position });
+ });
+ };
+
+ if (self._revertToRelativePosition) {
self._revertToRelativePosition = false;
- el.css({ position: 'relative' });
+ if (typeof(o.alsoResize) == 'object' && !o.alsoResize.nodeType) {
+ $.each(o.alsoResize, function (exp) { _reset(exp); });
+ }else{
+ _reset(o.alsoResize);
+ }
}
- $(this).removeData("resizable-alsoresize-start");
+ $(this).removeData("resizable-alsoresize");
}
});
@@ -2699,11 +2958,11 @@ var isNumber = function(value) {
})(jQuery);
/*
- * jQuery UI Selectable 1.8
+ * jQuery UI Selectable 1.8.16
*
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
*
* http://docs.jquery.com/UI/Selectables
*
@@ -2712,7 +2971,7 @@ var isNumber = function(value) {
* jquery.ui.mouse.js
* jquery.ui.widget.js
*/
-(function($) {
+(function( $, undefined ) {
$.widget("ui.selectable", $.ui.mouse, {
options: {
@@ -2756,9 +3015,7 @@ $.widget("ui.selectable", $.ui.mouse, {
this._mouseInit();
- this.helper = $(document.createElement('div'))
- .css({border:'1px dotted black'})
- .addClass("ui-selectable-helper");
+ this.helper = $("<div class='ui-selectable-helper'></div>");
},
destroy: function() {
@@ -2791,8 +3048,6 @@ $.widget("ui.selectable", $.ui.mouse, {
$(options.appendTo).append(this.helper);
// position helper (lasso)
this.helper.css({
- "z-index": 100,
- "position": "absolute",
"left": event.clientX,
"top": event.clientY,
"width": 0,
@@ -2821,14 +3076,23 @@ $.widget("ui.selectable", $.ui.mouse, {
$(event.target).parents().andSelf().each(function() {
var selectee = $.data(this, "selectable-item");
if (selectee) {
- selectee.$element.removeClass("ui-unselecting").addClass('ui-selecting');
- selectee.unselecting = false;
- selectee.selecting = true;
- selectee.selected = true;
- // selectable SELECTING callback
- self._trigger("selecting", event, {
- selecting: selectee.element
- });
+ var doSelect = !event.metaKey || !selectee.$element.hasClass('ui-selected');
+ selectee.$element
+ .removeClass(doSelect ? "ui-unselecting" : "ui-selected")
+ .addClass(doSelect ? "ui-selecting" : "ui-unselecting");
+ selectee.unselecting = !doSelect;
+ selectee.selecting = doSelect;
+ selectee.selected = doSelect;
+ // selectable (UN)SELECTING callback
+ if (doSelect) {
+ self._trigger("selecting", event, {
+ selecting: selectee.element
+ });
+ } else {
+ self._trigger("unselecting", event, {
+ unselecting: selectee.element
+ });
+ }
return false;
}
});
@@ -2955,16 +3219,16 @@ $.widget("ui.selectable", $.ui.mouse, {
});
$.extend($.ui.selectable, {
- version: "1.8"
+ version: "1.8.16"
});
})(jQuery);
/*
- * jQuery UI Sortable 1.8
+ * jQuery UI Sortable 1.8.16
*
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
*
* http://docs.jquery.com/UI/Sortables
*
@@ -2973,7 +3237,7 @@ $.extend($.ui.selectable, {
* jquery.ui.mouse.js
* jquery.ui.widget.js
*/
-(function($) {
+(function( $, undefined ) {
$.widget("ui.sortable", $.ui.mouse, {
widgetEventPrefix: "sort",
@@ -3010,8 +3274,8 @@ $.widget("ui.sortable", $.ui.mouse, {
//Get the items
this.refresh();
- //Let's determine if the items are floating
- this.floating = this.items.length ? (/left|right/).test(this.items[0].item.css('float')) : false;
+ //Let's determine if the items are being displayed horizontally
+ this.floating = this.items.length ? o.axis === 'x' || (/left|right/).test(this.items[0].item.css('float')) || (/inline|table-cell/).test(this.items[0].item.css('display')) : false;
//Let's determine the parent's offset
this.offset = this.element.offset();
@@ -3034,6 +3298,18 @@ $.widget("ui.sortable", $.ui.mouse, {
return this;
},
+ _setOption: function(key, value){
+ if ( key === "disabled" ) {
+ this.options[ key ] = value;
+
+ this.widget()
+ [ value ? "addClass" : "removeClass"]( "ui-sortable-disabled" );
+ } else {
+ // Don't call widget base _setOption for disable as it adds ui-state-disabled class
+ $.Widget.prototype._setOption.apply(this, arguments);
+ }
+ },
+
_mouseCapture: function(event, overrideHandle) {
if (this.reverting) {
@@ -3309,7 +3585,7 @@ $.widget("ui.sortable", $.ui.mouse, {
if(this.dragging) {
- this._mouseUp();
+ this._mouseUp({ target: null });
if(this.options.helper == "original")
this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
@@ -3327,21 +3603,23 @@ $.widget("ui.sortable", $.ui.mouse, {
}
- //$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
- if(this.placeholder[0].parentNode) this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
- if(this.options.helper != "original" && this.helper && this.helper[0].parentNode) this.helper.remove();
+ if (this.placeholder) {
+ //$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
+ if(this.placeholder[0].parentNode) this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
+ if(this.options.helper != "original" && this.helper && this.helper[0].parentNode) this.helper.remove();
- $.extend(this, {
- helper: null,
- dragging: false,
- reverting: false,
- _noFinalSort: null
- });
+ $.extend(this, {
+ helper: null,
+ dragging: false,
+ reverting: false,
+ _noFinalSort: null
+ });
- if(this.domPosition.prev) {
- $(this.domPosition.prev).after(this.currentItem);
- } else {
- $(this.domPosition.parent).prepend(this.currentItem);
+ if(this.domPosition.prev) {
+ $(this.domPosition.prev).after(this.currentItem);
+ } else {
+ $(this.domPosition.parent).prepend(this.currentItem);
+ }
}
return this;
@@ -3358,6 +3636,10 @@ $.widget("ui.sortable", $.ui.mouse, {
if(res) str.push((o.key || res[1]+'[]')+'='+(o.key && o.expression ? res[1] : res[2]));
});
+ if(!str.length && o.key) {
+ str.push(o.key + '=');
+ }
+
return str.join('&');
},
@@ -3558,6 +3840,10 @@ $.widget("ui.sortable", $.ui.mouse, {
for (var i = this.items.length - 1; i >= 0; i--){
var item = this.items[i];
+ //We ignore calculating positions of all connected containers when we're not over them
+ if(item.instance != this.currentContainer && this.currentContainer && item.item[0] != this.currentItem[0])
+ continue;
+
var t = this.options.toleranceElement ? $(this.options.toleranceElement, item.item) : item.item;
if (!fast) {
@@ -3923,7 +4209,7 @@ $.widget("ui.sortable", $.ui.mouse, {
// We first have to update the dom position of the actual currentItem
// Note: don't do it if the current item is already removed (by a user), or it gets reappended (see #4088)
- if(!this._noFinalSort && this.currentItem[0].parentNode) this.placeholder.before(this.currentItem);
+ if(!this._noFinalSort && this.currentItem.parent().length) this.placeholder.before(this.currentItem);
this._noFinalSort = null;
if(this.helper[0] == this.currentItem[0]) {
@@ -4010,16 +4296,16 @@ $.widget("ui.sortable", $.ui.mouse, {
});
$.extend($.ui.sortable, {
- version: "1.8"
+ version: "1.8.16"
});
})(jQuery);
/*
- * jQuery UI Accordion 1.8
+ * jQuery UI Accordion 1.8.16
*
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
*
* http://docs.jquery.com/UI/Accordion
*
@@ -4027,12 +4313,12 @@ $.extend($.ui.sortable, {
* jquery.ui.core.js
* jquery.ui.widget.js
*/
-(function($) {
+(function( $, undefined ) {
-$.widget("ui.accordion", {
+$.widget( "ui.accordion", {
options: {
active: 0,
- animated: 'slide',
+ animated: "slide",
autoHeight: true,
clearStyle: false,
collapsible: false,
@@ -4045,329 +4331,398 @@ $.widget("ui.accordion", {
},
navigation: false,
navigationFilter: function() {
- return this.href.toLowerCase() == location.href.toLowerCase();
+ return this.href.toLowerCase() === location.href.toLowerCase();
}
},
- _create: function() {
- var o = this.options, self = this;
- this.running = 0;
+ _create: function() {
+ var self = this,
+ options = self.options;
- this.element.addClass("ui-accordion ui-widget ui-helper-reset");
-
- // in lack of child-selectors in CSS we need to mark top-LIs in a UL-accordion for some IE-fix
- if (this.element[0].nodeName == "UL") {
- this.element.children("li").addClass("ui-accordion-li-fix");
- }
+ self.running = 0;
- this.headers = this.element.find(o.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all")
- .bind("mouseenter.accordion", function(){ $(this).addClass('ui-state-hover'); })
- .bind("mouseleave.accordion", function(){ $(this).removeClass('ui-state-hover'); })
- .bind("focus.accordion", function(){ $(this).addClass('ui-state-focus'); })
- .bind("blur.accordion", function(){ $(this).removeClass('ui-state-focus'); });
+ self.element
+ .addClass( "ui-accordion ui-widget ui-helper-reset" )
+ // in lack of child-selectors in CSS
+ // we need to mark top-LIs in a UL-accordion for some IE-fix
+ .children( "li" )
+ .addClass( "ui-accordion-li-fix" );
+
+ self.headers = self.element.find( options.header )
+ .addClass( "ui-accordion-header ui-helper-reset ui-state-default ui-corner-all" )
+ .bind( "mouseenter.accordion", function() {
+ if ( options.disabled ) {
+ return;
+ }
+ $( this ).addClass( "ui-state-hover" );
+ })
+ .bind( "mouseleave.accordion", function() {
+ if ( options.disabled ) {
+ return;
+ }
+ $( this ).removeClass( "ui-state-hover" );
+ })
+ .bind( "focus.accordion", function() {
+ if ( options.disabled ) {
+ return;
+ }
+ $( this ).addClass( "ui-state-focus" );
+ })
+ .bind( "blur.accordion", function() {
+ if ( options.disabled ) {
+ return;
+ }
+ $( this ).removeClass( "ui-state-focus" );
+ });
- this.headers
- .next()
- .addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom");
+ self.headers.next()
+ .addClass( "ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom" );
- if ( o.navigation ) {
- var current = this.element.find("a").filter(o.navigationFilter);
+ if ( options.navigation ) {
+ var current = self.element.find( "a" ).filter( options.navigationFilter ).eq( 0 );
if ( current.length ) {
- var header = current.closest(".ui-accordion-header");
+ var header = current.closest( ".ui-accordion-header" );
if ( header.length ) {
// anchor within header
- this.active = header;
+ self.active = header;
} else {
// anchor within content
- this.active = current.closest(".ui-accordion-content").prev();
+ self.active = current.closest( ".ui-accordion-content" ).prev();
}
}
}
- this.active = this._findActive(this.active || o.active).toggleClass("ui-state-default").toggleClass("ui-state-active").toggleClass("ui-corner-all").toggleClass("ui-corner-top");
- this.active.next().addClass('ui-accordion-content-active');
-
- //Append icon elements
- this._createIcons();
-
- // IE7-/Win - Extra vertical space in lists fixed
- if ($.browser.msie) {
- this.element.find('a').css('zoom', '1');
- }
+ self.active = self._findActive( self.active || options.active )
+ .addClass( "ui-state-default ui-state-active" )
+ .toggleClass( "ui-corner-all" )
+ .toggleClass( "ui-corner-top" );
+ self.active.next().addClass( "ui-accordion-content-active" );
- this.resize();
-
- //ARIA
- this.element.attr('role','tablist');
+ self._createIcons();
+ self.resize();
+
+ // ARIA
+ self.element.attr( "role", "tablist" );
- this.headers
- .attr('role','tab')
- .bind('keydown', function(event) { return self._keydown(event); })
+ self.headers
+ .attr( "role", "tab" )
+ .bind( "keydown.accordion", function( event ) {
+ return self._keydown( event );
+ })
.next()
- .attr('role','tabpanel');
+ .attr( "role", "tabpanel" );
- this.headers
- .not(this.active || "")
- .attr('aria-expanded','false')
- .attr("tabIndex", "-1")
+ self.headers
+ .not( self.active || "" )
+ .attr({
+ "aria-expanded": "false",
+ "aria-selected": "false",
+ tabIndex: -1
+ })
.next()
- .hide();
+ .hide();
// make sure at least one header is in the tab order
- if (!this.active.length) {
- this.headers.eq(0).attr('tabIndex','0');
+ if ( !self.active.length ) {
+ self.headers.eq( 0 ).attr( "tabIndex", 0 );
} else {
- this.active
- .attr('aria-expanded','true')
- .attr('tabIndex', '0');
+ self.active
+ .attr({
+ "aria-expanded": "true",
+ "aria-selected": "true",
+ tabIndex: 0
+ });
}
- // only need links in taborder for Safari
- if (!$.browser.safari)
- this.headers.find('a').attr('tabIndex','-1');
+ // only need links in tab order for Safari
+ if ( !$.browser.safari ) {
+ self.headers.find( "a" ).attr( "tabIndex", -1 );
+ }
- if (o.event) {
- this.headers.bind((o.event) + ".accordion", function(event) {
- self._clickHandler.call(self, event, this);
+ if ( options.event ) {
+ self.headers.bind( options.event.split(" ").join(".accordion ") + ".accordion", function(event) {
+ self._clickHandler.call( self, event, this );
event.preventDefault();
});
}
-
},
-
+
_createIcons: function() {
- var o = this.options;
- if (o.icons) {
- $("<span/>").addClass("ui-icon " + o.icons.header).prependTo(this.headers);
- this.active.find(".ui-icon").toggleClass(o.icons.header).toggleClass(o.icons.headerSelected);
- this.element.addClass("ui-accordion-icons");
+ var options = this.options;
+ if ( options.icons ) {
+ $( "<span></span>" )
+ .addClass( "ui-icon " + options.icons.header )
+ .prependTo( this.headers );
+ this.active.children( ".ui-icon" )
+ .toggleClass(options.icons.header)
+ .toggleClass(options.icons.headerSelected);
+ this.element.addClass( "ui-accordion-icons" );
}
},
-
+
_destroyIcons: function() {
- this.headers.children(".ui-icon").remove();
- this.element.removeClass("ui-accordion-icons");
+ this.headers.children( ".ui-icon" ).remove();
+ this.element.removeClass( "ui-accordion-icons" );
},
destroy: function() {
- var o = this.options;
+ var options = this.options;
this.element
- .removeClass("ui-accordion ui-widget ui-helper-reset")
- .removeAttr("role")
- .unbind('.accordion')
- .removeData('accordion');
+ .removeClass( "ui-accordion ui-widget ui-helper-reset" )
+ .removeAttr( "role" );
this.headers
- .unbind(".accordion")
- .removeClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-corner-top")
- .removeAttr("role").removeAttr("aria-expanded").removeAttr("tabindex");
+ .unbind( ".accordion" )
+ .removeClass( "ui-accordion-header ui-accordion-disabled ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top" )
+ .removeAttr( "role" )
+ .removeAttr( "aria-expanded" )
+ .removeAttr( "aria-selected" )
+ .removeAttr( "tabIndex" );
- this.headers.find("a").removeAttr("tabindex");
+ this.headers.find( "a" ).removeAttr( "tabIndex" );
this._destroyIcons();
- var contents = this.headers.next().css("display", "").removeAttr("role").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active");
- if (o.autoHeight || o.fillHeight) {
- contents.css("height", "");
+ var contents = this.headers.next()
+ .css( "display", "" )
+ .removeAttr( "role" )
+ .removeClass( "ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-accordion-disabled ui-state-disabled" );
+ if ( options.autoHeight || options.fillHeight ) {
+ contents.css( "height", "" );
}
- return this;
+ return $.Widget.prototype.destroy.call( this );
},
-
- _setOption: function(key, value) {
- $.Widget.prototype._setOption.apply(this, arguments);
+
+ _setOption: function( key, value ) {
+ $.Widget.prototype._setOption.apply( this, arguments );
- if (key == "active") {
- this.activate(value);
+ if ( key == "active" ) {
+ this.activate( value );
}
- if (key == "icons") {
+ if ( key == "icons" ) {
this._destroyIcons();
- if (value) {
+ if ( value ) {
this._createIcons();
}
}
-
+ // #5332 - opacity doesn't cascade to positioned elements in IE
+ // so we need to add the disabled class to the headers and panels
+ if ( key == "disabled" ) {
+ this.headers.add(this.headers.next())
+ [ value ? "addClass" : "removeClass" ](
+ "ui-accordion-disabled ui-state-disabled" );
+ }
},
- _keydown: function(event) {
-
- var o = this.options, keyCode = $.ui.keyCode;
-
- if (o.disabled || event.altKey || event.ctrlKey)
+ _keydown: function( event ) {
+ if ( this.options.disabled || event.altKey || event.ctrlKey ) {
return;
+ }
- var length = this.headers.length;
- var currentIndex = this.headers.index(event.target);
- var toFocus = false;
+ var keyCode = $.ui.keyCode,
+ length = this.headers.length,
+ currentIndex = this.headers.index( event.target ),
+ toFocus = false;
- switch(event.keyCode) {
+ switch ( event.keyCode ) {
case keyCode.RIGHT:
case keyCode.DOWN:
- toFocus = this.headers[(currentIndex + 1) % length];
+ toFocus = this.headers[ ( currentIndex + 1 ) % length ];
break;
case keyCode.LEFT:
case keyCode.UP:
- toFocus = this.headers[(currentIndex - 1 + length) % length];
+ toFocus = this.headers[ ( currentIndex - 1 + length ) % length ];
break;
case keyCode.SPACE:
case keyCode.ENTER:
- this._clickHandler({ target: event.target }, event.target);
+ this._clickHandler( { target: event.target }, event.target );
event.preventDefault();
}
- if (toFocus) {
- $(event.target).attr('tabIndex','-1');
- $(toFocus).attr('tabIndex','0');
+ if ( toFocus ) {
+ $( event.target ).attr( "tabIndex", -1 );
+ $( toFocus ).attr( "tabIndex", 0 );
toFocus.focus();
return false;
}
return true;
-
},
resize: function() {
+ var options = this.options,
+ maxHeight;
- var o = this.options, maxHeight;
-
- if (o.fillSpace) {
-
- if($.browser.msie) { var defOverflow = this.element.parent().css('overflow'); this.element.parent().css('overflow', 'hidden'); }
+ if ( options.fillSpace ) {
+ if ( $.browser.msie ) {
+ var defOverflow = this.element.parent().css( "overflow" );
+ this.element.parent().css( "overflow", "hidden");
+ }
maxHeight = this.element.parent().height();
- if($.browser.msie) { this.element.parent().css('overflow', defOverflow); }
-
+ if ($.browser.msie) {
+ this.element.parent().css( "overflow", defOverflow );
+ }
+
this.headers.each(function() {
- maxHeight -= $(this).outerHeight(true);
+ maxHeight -= $( this ).outerHeight( true );
});
- this.headers.next().each(function() {
- $(this).height(Math.max(0, maxHeight - $(this).innerHeight() + $(this).height()));
- }).css('overflow', 'auto');
-
- } else if ( o.autoHeight ) {
+ this.headers.next()
+ .each(function() {
+ $( this ).height( Math.max( 0, maxHeight -
+ $( this ).innerHeight() + $( this ).height() ) );
+ })
+ .css( "overflow", "auto" );
+ } else if ( options.autoHeight ) {
maxHeight = 0;
- this.headers.next().each(function() {
- maxHeight = Math.max(maxHeight, $(this).height());
- }).height(maxHeight);
+ this.headers.next()
+ .each(function() {
+ maxHeight = Math.max( maxHeight, $( this ).height( "" ).height() );
+ })
+ .height( maxHeight );
}
return this;
},
- activate: function(index) {
+ activate: function( index ) {
// TODO this gets called on init, changing the option without an explicit call for that
this.options.active = index;
// call clickHandler with custom event
- var active = this._findActive(index)[0];
- this._clickHandler({ target: active }, active);
+ var active = this._findActive( index )[ 0 ];
+ this._clickHandler( { target: active }, active );
return this;
},
- _findActive: function(selector) {
+ _findActive: function( selector ) {
return selector
- ? typeof selector == "number"
- ? this.headers.filter(":eq(" + selector + ")")
- : this.headers.not(this.headers.not(selector))
+ ? typeof selector === "number"
+ ? this.headers.filter( ":eq(" + selector + ")" )
+ : this.headers.not( this.headers.not( selector ) )
: selector === false
- ? $([])
- : this.headers.filter(":eq(0)");
+ ? $( [] )
+ : this.headers.filter( ":eq(0)" );
},
- // TODO isn't event.target enough? why the seperate target argument?
- _clickHandler: function(event, target) {
-
- var o = this.options;
- if (o.disabled)
+ // TODO isn't event.target enough? why the separate target argument?
+ _clickHandler: function( event, target ) {
+ var options = this.options;
+ if ( options.disabled ) {
return;
+ }
// called only when using activate(false) to close all parts programmatically
- if (!event.target) {
- if (!o.collapsible)
+ if ( !event.target ) {
+ if ( !options.collapsible ) {
return;
- this.active.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all")
- .find(".ui-icon").removeClass(o.icons.headerSelected).addClass(o.icons.header);
- this.active.next().addClass('ui-accordion-content-active');
+ }
+ this.active
+ .removeClass( "ui-state-active ui-corner-top" )
+ .addClass( "ui-state-default ui-corner-all" )
+ .children( ".ui-icon" )
+ .removeClass( options.icons.headerSelected )
+ .addClass( options.icons.header );
+ this.active.next().addClass( "ui-accordion-content-active" );
var toHide = this.active.next(),
data = {
- options: o,
- newHeader: $([]),
- oldHeader: o.active,
- newContent: $([]),
+ options: options,
+ newHeader: $( [] ),
+ oldHeader: options.active,
+ newContent: $( [] ),
oldContent: toHide
},
- toShow = (this.active = $([]));
- this._toggle(toShow, toHide, data);
+ toShow = ( this.active = $( [] ) );
+ this._toggle( toShow, toHide, data );
return;
}
// get the click target
- var clicked = $(event.currentTarget || target);
- var clickedIsActive = clicked[0] == this.active[0];
-
+ var clicked = $( event.currentTarget || target ),
+ clickedIsActive = clicked[0] === this.active[0];
+
// TODO the option is changed, is that correct?
// TODO if it is correct, shouldn't that happen after determining that the click is valid?
- o.active = o.collapsible && clickedIsActive ? false : $('.ui-accordion-header', this.element).index(clicked);
+ options.active = options.collapsible && clickedIsActive ?
+ false :
+ this.headers.index( clicked );
// if animations are still active, or the active header is the target, ignore click
- if (this.running || (!o.collapsible && clickedIsActive)) {
+ if ( this.running || ( !options.collapsible && clickedIsActive ) ) {
return;
}
- // switch classes
- this.active.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all")
- .find(".ui-icon").removeClass(o.icons.headerSelected).addClass(o.icons.header);
- if (!clickedIsActive) {
- clicked.removeClass("ui-state-default ui-corner-all").addClass("ui-state-active ui-corner-top")
- .find(".ui-icon").removeClass(o.icons.header).addClass(o.icons.headerSelected);
- clicked.next().addClass('ui-accordion-content-active');
- }
-
// find elements to show and hide
- var toShow = clicked.next(),
+ var active = this.active,
+ toShow = clicked.next(),
toHide = this.active.next(),
data = {
- options: o,
- newHeader: clickedIsActive && o.collapsible ? $([]) : clicked,
+ options: options,
+ newHeader: clickedIsActive && options.collapsible ? $([]) : clicked,
oldHeader: this.active,
- newContent: clickedIsActive && o.collapsible ? $([]) : toShow,
+ newContent: clickedIsActive && options.collapsible ? $([]) : toShow,
oldContent: toHide
},
down = this.headers.index( this.active[0] ) > this.headers.index( clicked[0] );
+ // when the call to ._toggle() comes after the class changes
+ // it causes a very odd bug in IE 8 (see #6720)
this.active = clickedIsActive ? $([]) : clicked;
- this._toggle(toShow, toHide, data, clickedIsActive, down);
+ this._toggle( toShow, toHide, data, clickedIsActive, down );
- return;
+ // switch classes
+ active
+ .removeClass( "ui-state-active ui-corner-top" )
+ .addClass( "ui-state-default ui-corner-all" )
+ .children( ".ui-icon" )
+ .removeClass( options.icons.headerSelected )
+ .addClass( options.icons.header );
+ if ( !clickedIsActive ) {
+ clicked
+ .removeClass( "ui-state-default ui-corner-all" )
+ .addClass( "ui-state-active ui-corner-top" )
+ .children( ".ui-icon" )
+ .removeClass( options.icons.header )
+ .addClass( options.icons.headerSelected );
+ clicked
+ .next()
+ .addClass( "ui-accordion-content-active" );
+ }
+ return;
},
- _toggle: function(toShow, toHide, data, clickedIsActive, down) {
-
- var o = this.options, self = this;
+ _toggle: function( toShow, toHide, data, clickedIsActive, down ) {
+ var self = this,
+ options = self.options;
- this.toShow = toShow;
- this.toHide = toHide;
- this.data = data;
+ self.toShow = toShow;
+ self.toHide = toHide;
+ self.data = data;
- var complete = function() { if(!self) return; return self._completed.apply(self, arguments); };
+ var complete = function() {
+ if ( !self ) {
+ return;
+ }
+ return self._completed.apply( self, arguments );
+ };
// trigger changestart event
- this._trigger("changestart", null, this.data);
+ self._trigger( "changestart", null, self.data );
// count elements to animate
- this.running = toHide.size() === 0 ? toShow.size() : toHide.size();
-
- if (o.animated) {
+ self.running = toHide.size() === 0 ? toShow.size() : toHide.size();
+ if ( options.animated ) {
var animOptions = {};
- if ( o.collapsible && clickedIsActive ) {
+ if ( options.collapsible && clickedIsActive ) {
animOptions = {
- toShow: $([]),
+ toShow: $( [] ),
toHide: toHide,
complete: complete,
down: down,
- autoHeight: o.autoHeight || o.fillSpace
+ autoHeight: options.autoHeight || options.fillSpace
};
} else {
animOptions = {
@@ -4375,101 +4730,120 @@ $.widget("ui.accordion", {
toHide: toHide,
complete: complete,
down: down,
- autoHeight: o.autoHeight || o.fillSpace
+ autoHeight: options.autoHeight || options.fillSpace
};
}
- if (!o.proxied) {
- o.proxied = o.animated;
+ if ( !options.proxied ) {
+ options.proxied = options.animated;
}
- if (!o.proxiedDuration) {
- o.proxiedDuration = o.duration;
+ if ( !options.proxiedDuration ) {
+ options.proxiedDuration = options.duration;
}
- o.animated = $.isFunction(o.proxied) ?
- o.proxied(animOptions) : o.proxied;
+ options.animated = $.isFunction( options.proxied ) ?
+ options.proxied( animOptions ) :
+ options.proxied;
- o.duration = $.isFunction(o.proxiedDuration) ?
- o.proxiedDuration(animOptions) : o.proxiedDuration;
+ options.duration = $.isFunction( options.proxiedDuration ) ?
+ options.proxiedDuration( animOptions ) :
+ options.proxiedDuration;
var animations = $.ui.accordion.animations,
- duration = o.duration,
- easing = o.animated;
+ duration = options.duration,
+ easing = options.animated;
- if (easing && !animations[easing] && !$.easing[easing]) {
- easing = 'slide';
+ if ( easing && !animations[ easing ] && !$.easing[ easing ] ) {
+ easing = "slide";
}
- if (!animations[easing]) {
- animations[easing] = function(options) {
- this.slide(options, {
+ if ( !animations[ easing ] ) {
+ animations[ easing ] = function( options ) {
+ this.slide( options, {
easing: easing,
duration: duration || 700
});
};
}
- animations[easing](animOptions);
-
+ animations[ easing ]( animOptions );
} else {
-
- if (o.collapsible && clickedIsActive) {
+ if ( options.collapsible && clickedIsActive ) {
toShow.toggle();
} else {
toHide.hide();
toShow.show();
}
- complete(true);
-
+ complete( true );
}
// TODO assert that the blur and focus triggers are really necessary, remove otherwise
- toHide.prev().attr('aria-expanded','false').attr("tabIndex", "-1").blur();
- toShow.prev().attr('aria-expanded','true').attr("tabIndex", "0").focus();
-
+ toHide.prev()
+ .attr({
+ "aria-expanded": "false",
+ "aria-selected": "false",
+ tabIndex: -1
+ })
+ .blur();
+ toShow.prev()
+ .attr({
+ "aria-expanded": "true",
+ "aria-selected": "true",
+ tabIndex: 0
+ })
+ .focus();
},
- _completed: function(cancel) {
-
- var o = this.options;
-
+ _completed: function( cancel ) {
this.running = cancel ? 0 : --this.running;
- if (this.running) return;
+ if ( this.running ) {
+ return;
+ }
- if (o.clearStyle) {
- this.toShow.add(this.toHide).css({
+ if ( this.options.clearStyle ) {
+ this.toShow.add( this.toHide ).css({
height: "",
overflow: ""
});
}
-
+
// other classes are removed before the animation; this one needs to stay until completed
- this.toHide.removeClass("ui-accordion-content-active");
+ this.toHide.removeClass( "ui-accordion-content-active" );
+ // Work around for rendering bug in IE (#5421)
+ if ( this.toHide.length ) {
+ this.toHide.parent()[0].className = this.toHide.parent()[0].className;
+ }
- this._trigger('change', null, this.data);
+ this._trigger( "change", null, this.data );
}
-
});
-
-$.extend($.ui.accordion, {
- version: "1.8",
+$.extend( $.ui.accordion, {
+ version: "1.8.16",
animations: {
- slide: function(options, additions) {
+ slide: function( options, additions ) {
options = $.extend({
easing: "swing",
duration: 300
- }, options, additions);
+ }, options, additions );
if ( !options.toHide.size() ) {
- options.toShow.animate({height: "show"}, options);
+ options.toShow.animate({
+ height: "show",
+ paddingTop: "show",
+ paddingBottom: "show"
+ }, options );
return;
}
if ( !options.toShow.size() ) {
- options.toHide.animate({height: "hide"}, options);
+ options.toHide.animate({
+ height: "hide",
+ paddingTop: "hide",
+ paddingBottom: "hide"
+ }, options );
return;
}
- var overflow = options.toShow.css('overflow'),
+ var overflow = options.toShow.css( "overflow" ),
percentDone = 0,
showProps = {},
hideProps = {},
@@ -4478,45 +4852,57 @@ $.extend($.ui.accordion, {
// fix width before calculating height of hidden element
var s = options.toShow;
originalWidth = s[0].style.width;
- s.width( parseInt(s.parent().width(),10) - parseInt(s.css("paddingLeft"),10) - parseInt(s.css("paddingRight"),10) - (parseInt(s.css("borderLeftWidth"),10) || 0) - (parseInt(s.css("borderRightWidth"),10) || 0) );
-
- $.each(fxAttrs, function(i, prop) {
- hideProps[prop] = 'hide';
-
- var parts = ('' + $.css(options.toShow[0], prop)).match(/^([\d+-.]+)(.*)$/);
- showProps[prop] = {
- value: parts[1],
- unit: parts[2] || 'px'
+ s.width( parseInt( s.parent().width(), 10 )
+ - parseInt( s.css( "paddingLeft" ), 10 )
+ - parseInt( s.css( "paddingRight" ), 10 )
+ - ( parseInt( s.css( "borderLeftWidth" ), 10 ) || 0 )
+ - ( parseInt( s.css( "borderRightWidth" ), 10) || 0 ) );
+
+ $.each( fxAttrs, function( i, prop ) {
+ hideProps[ prop ] = "hide";
+
+ var parts = ( "" + $.css( options.toShow[0], prop ) ).match( /^([\d+-.]+)(.*)$/ );
+ showProps[ prop ] = {
+ value: parts[ 1 ],
+ unit: parts[ 2 ] || "px"
};
});
- options.toShow.css({ height: 0, overflow: 'hidden' }).show();
- options.toHide.filter(":hidden").each(options.complete).end().filter(":visible").animate(hideProps,{
- step: function(now, settings) {
+ options.toShow.css({ height: 0, overflow: "hidden" }).show();
+ options.toHide
+ .filter( ":hidden" )
+ .each( options.complete )
+ .end()
+ .filter( ":visible" )
+ .animate( hideProps, {
+ step: function( now, settings ) {
// only calculate the percent when animating height
// IE gets very inconsistent results when animating elements
// with small values, which is common for padding
- if (settings.prop == 'height') {
+ if ( settings.prop == "height" ) {
percentDone = ( settings.end - settings.start === 0 ) ? 0 :
- (settings.now - settings.start) / (settings.end - settings.start);
+ ( settings.now - settings.start ) / ( settings.end - settings.start );
}
-
- options.toShow[0].style[settings.prop] =
- (percentDone * showProps[settings.prop].value) + showProps[settings.prop].unit;
+
+ options.toShow[ 0 ].style[ settings.prop ] =
+ ( percentDone * showProps[ settings.prop ].value )
+ + showProps[ settings.prop ].unit;
},
duration: options.duration,
easing: options.easing,
complete: function() {
if ( !options.autoHeight ) {
- options.toShow.css("height", "");
+ options.toShow.css( "height", "" );
}
- options.toShow.css("width", originalWidth);
- options.toShow.css({overflow: overflow});
+ options.toShow.css({
+ width: originalWidth,
+ overflow: overflow
+ });
options.complete();
}
});
},
- bounceslide: function(options) {
- this.slide(options, {
+ bounceslide: function( options ) {
+ this.slide( options, {
easing: options.down ? "easeOutBounce" : "swing",
duration: options.down ? 1000 : 200
});
@@ -4524,13 +4910,13 @@ $.extend($.ui.accordion, {
}
});
-})(jQuery);
+})( jQuery );
/*
- * jQuery UI Autocomplete 1.8
+ * jQuery UI Autocomplete 1.8.16
*
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
*
* http://docs.jquery.com/UI/Autocomplete
*
@@ -4539,16 +4925,32 @@ $.extend($.ui.accordion, {
* jquery.ui.widget.js
* jquery.ui.position.js
*/
-(function( $ ) {
+(function( $, undefined ) {
+
+// used to prevent race conditions with remote data sources
+var requestIndex = 0;
$.widget( "ui.autocomplete", {
options: {
+ appendTo: "body",
+ autoFocus: false,
+ delay: 300,
minLength: 1,
- delay: 300
+ position: {
+ my: "left top",
+ at: "left bottom",
+ collision: "none"
+ },
+ source: null
},
+
+ pending: 0,
+
_create: function() {
var self = this,
- doc = this.element[ 0 ].ownerDocument;
+ doc = this.element[ 0 ].ownerDocument,
+ suppressKeyPress;
+
this.element
.addClass( "ui-autocomplete-input" )
.attr( "autocomplete", "off" )
@@ -4559,6 +4961,11 @@ $.widget( "ui.autocomplete", {
"aria-haspopup": "true"
})
.bind( "keydown.autocomplete", function( event ) {
+ if ( self.options.disabled || self.element.propAttr( "readOnly" ) ) {
+ return;
+ }
+
+ suppressKeyPress = false;
var keyCode = $.ui.keyCode;
switch( event.keyCode ) {
case keyCode.PAGE_UP:
@@ -4578,8 +4985,12 @@ $.widget( "ui.autocomplete", {
event.preventDefault();
break;
case keyCode.ENTER:
- // when menu is open or has focus
+ case keyCode.NUMPAD_ENTER:
+ // when menu is open and has focus
if ( self.menu.active ) {
+ // #6055 - Opera still allows the keypress to occur
+ // which causes forms to submit
+ suppressKeyPress = true;
event.preventDefault();
}
//passthrough - ENTER and TAB both select the current element
@@ -4587,35 +4998,49 @@ $.widget( "ui.autocomplete", {
if ( !self.menu.active ) {
return;
}
- self.menu.select();
+ self.menu.select( event );
break;
case keyCode.ESCAPE:
self.element.val( self.term );
self.close( event );
break;
- case keyCode.SHIFT:
- case keyCode.CONTROL:
- case 18:
- // ignore metakeys (shift, ctrl, alt)
- break;
default:
// keypress is triggered before the input value is changed
clearTimeout( self.searching );
self.searching = setTimeout(function() {
- self.search( null, event );
+ // only search if the value has changed
+ if ( self.term != self.element.val() ) {
+ self.selectedItem = null;
+ self.search( null, event );
+ }
}, self.options.delay );
break;
}
})
+ .bind( "keypress.autocomplete", function( event ) {
+ if ( suppressKeyPress ) {
+ suppressKeyPress = false;
+ event.preventDefault();
+ }
+ })
.bind( "focus.autocomplete", function() {
+ if ( self.options.disabled ) {
+ return;
+ }
+
+ self.selectedItem = null;
self.previous = self.element.val();
})
.bind( "blur.autocomplete", function( event ) {
+ if ( self.options.disabled ) {
+ return;
+ }
+
clearTimeout( self.searching );
// clicks on the menu (or a button to trigger a search) will cause a blur event
- // TODO try to implement this without a timeout, see clearTimeout in search()
self.closing = setTimeout(function() {
self.close( event );
+ self._change( event );
}, 150 );
});
this._initSource();
@@ -4624,29 +5049,73 @@ $.widget( "ui.autocomplete", {
};
this.menu = $( "<ul></ul>" )
.addClass( "ui-autocomplete" )
- .appendTo( "body", doc )
+ .appendTo( $( this.options.appendTo || "body", doc )[0] )
+ // prevent the close-on-blur in case of a "slow" click on the menu (long mousedown)
+ .mousedown(function( event ) {
+ // clicking on the scrollbar causes focus to shift to the body
+ // but we can't detect a mouseup or a click immediately afterward
+ // so we have to track the next mousedown and close the menu if
+ // the user clicks somewhere outside of the autocomplete
+ var menuElement = self.menu.element[ 0 ];
+ if ( !$( event.target ).closest( ".ui-menu-item" ).length ) {
+ setTimeout(function() {
+ $( document ).one( 'mousedown', function( event ) {
+ if ( event.target !== self.element[ 0 ] &&
+ event.target !== menuElement &&
+ !$.ui.contains( menuElement, event.target ) ) {
+ self.close();
+ }
+ });
+ }, 1 );
+ }
+
+ // use another timeout to make sure the blur-event-handler on the input was already triggered
+ setTimeout(function() {
+ clearTimeout( self.closing );
+ }, 13);
+ })
.menu({
focus: function( event, ui ) {
var item = ui.item.data( "item.autocomplete" );
- if ( false !== self._trigger( "focus", null, { item: item } ) ) {
- // use value to match what will end up in the input
- self.element.val( item.value );
+ if ( false !== self._trigger( "focus", event, { item: item } ) ) {
+ // use value to match what will end up in the input, if it was a key event
+ if ( /^key/.test(event.originalEvent.type) ) {
+ self.element.val( item.value );
+ }
}
},
selected: function( event, ui ) {
- var item = ui.item.data( "item.autocomplete" );
- if ( false !== self._trigger( "select", event, { item: item } ) ) {
- self.element.val( item.value );
- }
- self.close( event );
- self.previous = self.element.val();
+ var item = ui.item.data( "item.autocomplete" ),
+ previous = self.previous;
+
// only trigger when focus was lost (click on menu)
if ( self.element[0] !== doc.activeElement ) {
self.element.focus();
+ self.previous = previous;
+ // #6109 - IE triggers two focus events and the second
+ // is asynchronous, so we need to reset the previous
+ // term synchronously and asynchronously :-(
+ setTimeout(function() {
+ self.previous = previous;
+ self.selectedItem = item;
+ }, 1);
+ }
+
+ if ( false !== self._trigger( "select", event, { item: item } ) ) {
+ self.element.val( item.value );
}
+ // reset the term after the select event
+ // this allows custom select handling to work properly
+ self.term = self.element.val();
+
+ self.close( event );
+ self.selectedItem = item;
},
blur: function( event, ui ) {
- if ( self.menu.element.is(":visible") ) {
+ // don't set the value of the text field if it's already correct
+ // this prevents moving the cursor unnecessarily
+ if ( self.menu.element.is(":visible") &&
+ ( self.element.val() !== self.term ) ) {
self.element.val( self.term );
}
}
@@ -4663,7 +5132,7 @@ $.widget( "ui.autocomplete", {
destroy: function() {
this.element
- .removeClass( "ui-autocomplete-input ui-widget ui-widget-content" )
+ .removeClass( "ui-autocomplete-input" )
.removeAttr( "autocomplete" )
.removeAttr( "role" )
.removeAttr( "aria-autocomplete" )
@@ -4672,29 +5141,50 @@ $.widget( "ui.autocomplete", {
$.Widget.prototype.destroy.call( this );
},
- _setOption: function( key ) {
+ _setOption: function( key, value ) {
$.Widget.prototype._setOption.apply( this, arguments );
if ( key === "source" ) {
this._initSource();
}
+ if ( key === "appendTo" ) {
+ this.menu.element.appendTo( $( value || "body", this.element[0].ownerDocument )[0] )
+ }
+ if ( key === "disabled" && value && this.xhr ) {
+ this.xhr.abort();
+ }
},
_initSource: function() {
- var array,
+ var self = this,
+ array,
url;
if ( $.isArray(this.options.source) ) {
array = this.options.source;
this.source = function( request, response ) {
- // escape regex characters
- var matcher = new RegExp( $.ui.autocomplete.escapeRegex(request.term), "i" );
- response( $.grep( array, function(value) {
- return matcher.test( value.label || value.value || value );
- }) );
+ response( $.ui.autocomplete.filter(array, request.term) );
};
} else if ( typeof this.options.source === "string" ) {
url = this.options.source;
this.source = function( request, response ) {
- $.getJSON( url, request, response );
+ if ( self.xhr ) {
+ self.xhr.abort();
+ }
+ self.xhr = $.ajax({
+ url: url,
+ data: request,
+ dataType: "json",
+ autocompleteRequest: ++requestIndex,
+ success: function( data, status ) {
+ if ( this.autocompleteRequest === requestIndex ) {
+ response( data );
+ }
+ },
+ error: function() {
+ if ( this.autocompleteRequest === requestIndex ) {
+ response( [] );
+ }
+ }
+ });
};
} else {
this.source = this.options.source;
@@ -4703,12 +5193,16 @@ $.widget( "ui.autocomplete", {
search: function( value, event ) {
value = value != null ? value : this.element.val();
+
+ // always save the actual value, not the one passed as an argument
+ this.term = this.element.val();
+
if ( value.length < this.options.minLength ) {
return this.close( event );
}
clearTimeout( this.closing );
- if ( this._trigger("search") === false ) {
+ if ( this._trigger( "search", event ) === false ) {
return;
}
@@ -4716,34 +5210,38 @@ $.widget( "ui.autocomplete", {
},
_search: function( value ) {
- this.term = this.element
- .addClass( "ui-autocomplete-loading" )
- // always save the actual value, not the one passed as an argument
- .val();
+ this.pending++;
+ this.element.addClass( "ui-autocomplete-loading" );
this.source( { term: value }, this.response );
},
_response: function( content ) {
- if ( content.length ) {
+ if ( !this.options.disabled && content && content.length ) {
content = this._normalize( content );
this._suggest( content );
this._trigger( "open" );
} else {
this.close();
}
- this.element.removeClass( "ui-autocomplete-loading" );
+ this.pending--;
+ if ( !this.pending ) {
+ this.element.removeClass( "ui-autocomplete-loading" );
+ }
},
close: function( event ) {
clearTimeout( this.closing );
if ( this.menu.element.is(":visible") ) {
- this._trigger( "close", event );
this.menu.element.hide();
this.menu.deactivate();
+ this._trigger( "close", event );
}
+ },
+
+ _change: function( event ) {
if ( this.previous !== this.element.val() ) {
- this._trigger( "change", event );
+ this._trigger( "change", event, { item: this.selectedItem } );
}
},
@@ -4768,26 +5266,33 @@ $.widget( "ui.autocomplete", {
_suggest: function( items ) {
var ul = this.menu.element
- .empty()
- .zIndex( this.element.zIndex() + 1 ),
- menuWidth,
- textWidth;
+ .empty()
+ .zIndex( this.element.zIndex() + 1 );
this._renderMenu( ul, items );
// TODO refresh should check if the active item is still in the dom, removing the need for a manual deactivate
this.menu.deactivate();
this.menu.refresh();
- this.menu.element.show().position({
- my: "left top",
- at: "left bottom",
- of: this.element,
- collision: "none"
- });
- menuWidth = ul.width( "" ).width();
- textWidth = this.element.width();
- ul.width( Math.max( menuWidth, textWidth ) );
+ // size and position menu
+ ul.show();
+ this._resizeMenu();
+ ul.position( $.extend({
+ of: this.element
+ }, this.options.position ));
+
+ if ( this.options.autoFocus ) {
+ this.menu.next( new $.Event("mouseover") );
+ }
},
-
+
+ _resizeMenu: function() {
+ var ul = this.menu.element;
+ ul.outerWidth( Math.max(
+ ul.width( "" ).outerWidth(),
+ this.element.outerWidth()
+ ) );
+ },
+
_renderMenu: function( ul, items ) {
var self = this;
$.each( items, function( index, item ) {
@@ -4798,7 +5303,7 @@ $.widget( "ui.autocomplete", {
_renderItem: function( ul, item) {
return $( "<li></li>" )
.data( "item.autocomplete", item )
- .append( "<a>" + item.label + "</a>" )
+ .append( $( "<a></a>" ).text( item.label ) )
.appendTo( ul );
},
@@ -4813,7 +5318,7 @@ $.widget( "ui.autocomplete", {
this.menu.deactivate();
return;
}
- this.menu[ direction ]();
+ this.menu[ direction ]( event );
},
widget: function() {
@@ -4823,7 +5328,13 @@ $.widget( "ui.autocomplete", {
$.extend( $.ui.autocomplete, {
escapeRegex: function( value ) {
- return value.replace( /([\^\$\(\)\[\]\{\}\*\.\+\?\|\\])/gi, "\\$1" );
+ return value.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
+ },
+ filter: function(array, term) {
+ var matcher = new RegExp( $.ui.autocomplete.escapeRegex(term), "i" );
+ return $.grep( array, function(value) {
+ return matcher.test( value.label || value.value || value );
+ });
}
});
@@ -4836,9 +5347,9 @@ $.extend( $.ui.autocomplete, {
* it for the next release. You're welcome to give it a try anyway and give us feedback,
* as long as you're okay with migrating your code later on. We can help with that, too.
*
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
*
* http://docs.jquery.com/UI/Menu
*
@@ -4857,10 +5368,13 @@ $.widget("ui.menu", {
role: "listbox",
"aria-activedescendant": "ui-active-menuitem"
})
- .click(function(e) {
+ .click(function( event ) {
+ if ( !$( event.target ).closest( ".ui-menu-item a" ).length ) {
+ return;
+ }
// temporary
- e.preventDefault();
- self.select();
+ event.preventDefault();
+ self.select( event );
});
this.refresh();
},
@@ -4877,24 +5391,24 @@ $.widget("ui.menu", {
.addClass("ui-corner-all")
.attr("tabindex", -1)
// mouseenter doesn't work with event delegation
- .mouseenter(function() {
- self.activate($(this).parent());
+ .mouseenter(function( event ) {
+ self.activate( event, $(this).parent() );
})
.mouseleave(function() {
self.deactivate();
});
},
- activate: function(item) {
+ activate: function( event, item ) {
this.deactivate();
if (this.hasScroll()) {
var offset = item.offset().top - this.element.offset().top,
- scroll = this.element.attr("scrollTop"),
+ scroll = this.element.scrollTop(),
elementHeight = this.element.height();
if (offset < 0) {
- this.element.attr("scrollTop", scroll + offset);
- } else if (offset > elementHeight) {
- this.element.attr("scrollTop", scroll + offset - elementHeight + item.height());
+ this.element.scrollTop( scroll + offset);
+ } else if (offset >= elementHeight) {
+ this.element.scrollTop( scroll + offset - elementHeight + item.height());
}
}
this.active = item.eq(0)
@@ -4902,7 +5416,7 @@ $.widget("ui.menu", {
.addClass("ui-state-hover")
.attr("id", "ui-active-menuitem")
.end();
- this._trigger("focus", null, { item: item });
+ this._trigger("focus", event, { item: item });
},
deactivate: function() {
@@ -4915,46 +5429,46 @@ $.widget("ui.menu", {
this.active = null;
},
- next: function() {
- this.move("next", "li:first");
+ next: function(event) {
+ this.move("next", ".ui-menu-item:first", event);
},
- previous: function() {
- this.move("prev", "li:last");
+ previous: function(event) {
+ this.move("prev", ".ui-menu-item:last", event);
},
first: function() {
- return this.active && !this.active.prev().length;
+ return this.active && !this.active.prevAll(".ui-menu-item").length;
},
last: function() {
- return this.active && !this.active.next().length;
+ return this.active && !this.active.nextAll(".ui-menu-item").length;
},
- move: function(direction, edge) {
+ move: function(direction, edge, event) {
if (!this.active) {
- this.activate(this.element.children(edge));
+ this.activate(event, this.element.children(edge));
return;
}
- var next = this.active[direction]();
+ var next = this.active[direction + "All"](".ui-menu-item").eq(0);
if (next.length) {
- this.activate(next);
+ this.activate(event, next);
} else {
- this.activate(this.element.children(edge));
+ this.activate(event, this.element.children(edge));
}
},
// TODO merge with previousPage
- nextPage: function() {
+ nextPage: function(event) {
if (this.hasScroll()) {
// TODO merge with no-scroll-else
if (!this.active || this.last()) {
- this.activate(this.element.children(":first"));
+ this.activate(event, this.element.children(".ui-menu-item:first"));
return;
}
var base = this.active.offset().top,
height = this.element.height(),
- result = this.element.children("li").filter(function() {
+ result = this.element.children(".ui-menu-item").filter(function() {
var close = $(this).offset().top - base - height + $(this).height();
// TODO improve approximation
return close < 10 && close > -10;
@@ -4962,26 +5476,27 @@ $.widget("ui.menu", {
// TODO try to catch this earlier when scrollTop indicates the last page anyway
if (!result.length) {
- result = this.element.children(":last");
+ result = this.element.children(".ui-menu-item:last");
}
- this.activate(result);
+ this.activate(event, result);
} else {
- this.activate(this.element.children(!this.active || this.last() ? ":first" : ":last"));
+ this.activate(event, this.element.children(".ui-menu-item")
+ .filter(!this.active || this.last() ? ":first" : ":last"));
}
},
// TODO merge with nextPage
- previousPage: function() {
+ previousPage: function(event) {
if (this.hasScroll()) {
// TODO merge with no-scroll-else
if (!this.active || this.first()) {
- this.activate(this.element.children(":last"));
+ this.activate(event, this.element.children(".ui-menu-item:last"));
return;
}
var base = this.active.offset().top,
height = this.element.height();
- result = this.element.children("li").filter(function() {
+ result = this.element.children(".ui-menu-item").filter(function() {
var close = $(this).offset().top - base + height - $(this).height();
// TODO improve approximation
return close < 10 && close > -10;
@@ -4989,30 +5504,31 @@ $.widget("ui.menu", {
// TODO try to catch this earlier when scrollTop indicates the last page anyway
if (!result.length) {
- result = this.element.children(":first");
+ result = this.element.children(".ui-menu-item:first");
}
- this.activate(result);
+ this.activate(event, result);
} else {
- this.activate(this.element.children(!this.active || this.first() ? ":last" : ":first"));
+ this.activate(event, this.element.children(".ui-menu-item")
+ .filter(!this.active || this.first() ? ":last" : ":first"));
}
},
hasScroll: function() {
- return this.element.height() < this.element.attr("scrollHeight");
+ return this.element.height() < this.element[ $.fn.prop ? "prop" : "attr" ]("scrollHeight");
},
- select: function() {
- this._trigger("selected", null, { item: this.active });
+ select: function( event ) {
+ this._trigger("selected", event, { item: this.active });
}
});
}(jQuery));
/*
- * jQuery UI Button 1.8
+ * jQuery UI Button 1.8.16
*
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
*
* http://docs.jquery.com/UI/Button
*
@@ -5020,19 +5536,17 @@ $.widget("ui.menu", {
* jquery.ui.core.js
* jquery.ui.widget.js
*/
-(function( $ ) {
+(function( $, undefined ) {
-var lastActive,
+var lastActive, startXPos, startYPos, clickDragged,
baseClasses = "ui-button ui-widget ui-state-default ui-corner-all",
- otherClasses = "ui-state-hover ui-state-active " +
- "ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon ui-button-text-only",
- formResetHandler = function( event ) {
- $( ":ui-button", event.target.form ).each(function() {
- var inst = $( this ).data( "button" );
- setTimeout(function() {
- inst.refresh();
- }, 1 );
- });
+ stateClasses = "ui-state-hover ui-state-active ",
+ typeClasses = "ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",
+ formResetHandler = function() {
+ var buttons = $( this ).find( ":ui-button" );
+ setTimeout(function() {
+ buttons.button( "refresh" );
+ }, 1 );
},
radioGroup = function( radio ) {
var name = radio.name,
@@ -5053,6 +5567,7 @@ var lastActive,
$.widget( "ui.button", {
options: {
+ disabled: null,
text: true,
label: null,
icons: {
@@ -5065,6 +5580,10 @@ $.widget( "ui.button", {
.unbind( "reset.button" )
.bind( "reset.button", formResetHandler );
+ if ( typeof this.options.disabled !== "boolean" ) {
+ this.options.disabled = this.element.propAttr( "disabled" );
+ }
+
this._determineButtonType();
this.hasTitle = !!this.buttonElement.attr( "title" );
@@ -5100,23 +5619,54 @@ $.widget( "ui.button", {
}
$( this ).removeClass( hoverClass );
})
+ .bind( "click.button", function( event ) {
+ if ( options.disabled ) {
+ event.preventDefault();
+ event.stopImmediatePropagation();
+ }
+ });
+
+ this.element
.bind( "focus.button", function() {
// no need to check disabled, focus won't be triggered anyway
- $( this ).addClass( focusClass );
+ self.buttonElement.addClass( focusClass );
})
.bind( "blur.button", function() {
- $( this ).removeClass( focusClass );
+ self.buttonElement.removeClass( focusClass );
});
if ( toggleButton ) {
this.element.bind( "change.button", function() {
+ if ( clickDragged ) {
+ return;
+ }
self.refresh();
});
+ // if mouse moves between mousedown and mouseup (drag) set clickDragged flag
+ // prevents issue where button state changes but checkbox/radio checked state
+ // does not in Firefox (see ticket #6970)
+ this.buttonElement
+ .bind( "mousedown.button", function( event ) {
+ if ( options.disabled ) {
+ return;
+ }
+ clickDragged = false;
+ startXPos = event.pageX;
+ startYPos = event.pageY;
+ })
+ .bind( "mouseup.button", function( event ) {
+ if ( options.disabled ) {
+ return;
+ }
+ if ( startXPos !== event.pageX || startYPos !== event.pageY ) {
+ clickDragged = true;
+ }
+ });
}
if ( this.type === "checkbox" ) {
this.buttonElement.bind( "click.button", function() {
- if ( options.disabled ) {
+ if ( options.disabled || clickDragged ) {
return false;
}
$( this ).toggleClass( "ui-state-active" );
@@ -5124,11 +5674,11 @@ $.widget( "ui.button", {
});
} else if ( this.type === "radio" ) {
this.buttonElement.bind( "click.button", function() {
- if ( options.disabled ) {
+ if ( options.disabled || clickDragged ) {
return false;
}
$( this ).addClass( "ui-state-active" );
- self.buttonElement.attr( "aria-pressed", true );
+ self.buttonElement.attr( "aria-pressed", "true" );
var radio = self.element[ 0 ];
radioGroup( radio )
@@ -5137,7 +5687,7 @@ $.widget( "ui.button", {
return $( this ).button( "widget" )[ 0 ];
})
.removeClass( "ui-state-active" )
- .attr( "aria-pressed", false );
+ .attr( "aria-pressed", "false" );
});
} else {
this.buttonElement
@@ -5183,29 +5733,34 @@ $.widget( "ui.button", {
// $.Widget.prototype._setOptionDisabled so it's easy to proxy and can
// be overridden by individual plugins
this._setOption( "disabled", options.disabled );
+ this._resetButton();
},
_determineButtonType: function() {
-
+
if ( this.element.is(":checkbox") ) {
this.type = "checkbox";
+ } else if ( this.element.is(":radio") ) {
+ this.type = "radio";
+ } else if ( this.element.is("input") ) {
+ this.type = "input";
} else {
- if ( this.element.is(":radio") ) {
- this.type = "radio";
- } else {
- if ( this.element.is("input") ) {
- this.type = "input";
- } else {
- this.type = "button";
- }
- }
+ this.type = "button";
}
-
+
if ( this.type === "checkbox" || this.type === "radio" ) {
// we don't search against the document in case the element
// is disconnected from the DOM
- this.buttonElement = this.element.parents().last()
- .find( "[for=" + this.element.attr("id") + "]" );
+ var ancestor = this.element.parents().filter(":last"),
+ labelSelector = "label[for='" + this.element.attr("id") + "']";
+ this.buttonElement = ancestor.find( labelSelector );
+ if ( !this.buttonElement.length ) {
+ ancestor = ancestor.length ? ancestor.siblings() : this.element.siblings();
+ this.buttonElement = ancestor.filter( labelSelector );
+ if ( !this.buttonElement.length ) {
+ this.buttonElement = ancestor.find( labelSelector );
+ }
+ }
this.element.addClass( "ui-helper-hidden-accessible" );
var checked = this.element.is( ":checked" );
@@ -5226,7 +5781,7 @@ $.widget( "ui.button", {
this.element
.removeClass( "ui-helper-hidden-accessible" );
this.buttonElement
- .removeClass( baseClasses + " " + otherClasses )
+ .removeClass( baseClasses + " " + stateClasses + " " + typeClasses )
.removeAttr( "role" )
.removeAttr( "aria-pressed" )
.html( this.buttonElement.find(".ui-button-text").html() );
@@ -5242,10 +5797,11 @@ $.widget( "ui.button", {
$.Widget.prototype._setOption.apply( this, arguments );
if ( key === "disabled" ) {
if ( value ) {
- this.element.attr( "disabled", true );
+ this.element.propAttr( "disabled", true );
} else {
- this.element.removeAttr( "disabled" );
+ this.element.propAttr( "disabled", false );
}
+ return;
}
this._resetButton();
},
@@ -5260,22 +5816,22 @@ $.widget( "ui.button", {
if ( $( this ).is( ":checked" ) ) {
$( this ).button( "widget" )
.addClass( "ui-state-active" )
- .attr( "aria-pressed", true );
+ .attr( "aria-pressed", "true" );
} else {
$( this ).button( "widget" )
.removeClass( "ui-state-active" )
- .attr( "aria-pressed", false );
+ .attr( "aria-pressed", "false" );
}
});
} else if ( this.type === "checkbox" ) {
if ( this.element.is( ":checked" ) ) {
this.buttonElement
.addClass( "ui-state-active" )
- .attr( "aria-pressed", true );
+ .attr( "aria-pressed", "true" );
} else {
this.buttonElement
.removeClass( "ui-state-active" )
- .attr( "aria-pressed", false );
+ .attr( "aria-pressed", "false" );
}
}
},
@@ -5287,41 +5843,50 @@ $.widget( "ui.button", {
}
return;
}
- var buttonElement = this.buttonElement,
+ var buttonElement = this.buttonElement.removeClass( typeClasses ),
buttonText = $( "<span></span>" )
.addClass( "ui-button-text" )
.html( this.options.label )
.appendTo( buttonElement.empty() )
.text(),
icons = this.options.icons,
- multipleIcons = icons.primary && icons.secondary;
+ multipleIcons = icons.primary && icons.secondary,
+ buttonClasses = [];
+
if ( icons.primary || icons.secondary ) {
- buttonElement.addClass( "ui-button-text-icon" +
- ( multipleIcons ? "s" : "" ) );
+ if ( this.options.text ) {
+ buttonClasses.push( "ui-button-text-icon" + ( multipleIcons ? "s" : ( icons.primary ? "-primary" : "-secondary" ) ) );
+ }
+
if ( icons.primary ) {
buttonElement.prepend( "<span class='ui-button-icon-primary ui-icon " + icons.primary + "'></span>" );
}
+
if ( icons.secondary ) {
buttonElement.append( "<span class='ui-button-icon-secondary ui-icon " + icons.secondary + "'></span>" );
}
+
if ( !this.options.text ) {
- buttonElement
- .addClass( multipleIcons ? "ui-button-icons-only" : "ui-button-icon-only" )
- .removeClass( "ui-button-text-icons ui-button-text-icon" );
+ buttonClasses.push( multipleIcons ? "ui-button-icons-only" : "ui-button-icon-only" );
+
if ( !this.hasTitle ) {
buttonElement.attr( "title", buttonText );
}
}
} else {
- buttonElement.addClass( "ui-button-text-only" );
+ buttonClasses.push( "ui-button-text-only" );
}
+ buttonElement.addClass( buttonClasses.join( " " ) );
}
});
$.widget( "ui.buttonset", {
+ options: {
+ items: ":button, :submit, :reset, :checkbox, :radio, a, :data(button)"
+ },
+
_create: function() {
this.element.addClass( "ui-buttonset" );
- this._init();
},
_init: function() {
@@ -5337,7 +5902,9 @@ $.widget( "ui.buttonset", {
},
refresh: function() {
- this.buttons = this.element.find( ":button, :submit, :reset, :checkbox, :radio, a, :data(button)" )
+ var ltr = this.element.css( "direction" ) === "ltr";
+
+ this.buttons = this.element.find( this.options.items )
.filter( ":ui-button" )
.button( "refresh" )
.end()
@@ -5349,10 +5916,10 @@ $.widget( "ui.buttonset", {
})
.removeClass( "ui-corner-all ui-corner-left ui-corner-right" )
.filter( ":first" )
- .addClass( "ui-corner-left" )
+ .addClass( ltr ? "ui-corner-left" : "ui-corner-right" )
.end()
.filter( ":last" )
- .addClass( "ui-corner-right" )
+ .addClass( ltr ? "ui-corner-right" : "ui-corner-left" )
.end()
.end();
},
@@ -5365,7 +5932,7 @@ $.widget( "ui.buttonset", {
})
.removeClass( "ui-corner-left ui-corner-right" )
.end()
- .button( "destroy" )
+ .button( "destroy" );
$.Widget.prototype.destroy.call( this );
}
@@ -5373,11 +5940,11 @@ $.widget( "ui.buttonset", {
}( jQuery ) );
/*
- * jQuery UI Dialog 1.8
+ * jQuery UI Dialog 1.8.16
*
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
*
* http://docs.jquery.com/UI/Dialog
*
@@ -5390,13 +5957,40 @@ $.widget( "ui.buttonset", {
* jquery.ui.position.js
* jquery.ui.resizable.js
*/
-(function($) {
+(function( $, undefined ) {
var uiDialogClasses =
- 'ui-dialog ' +
- 'ui-widget ' +
- 'ui-widget-content ' +
- 'ui-corner-all ';
+ 'ui-dialog ' +
+ 'ui-widget ' +
+ 'ui-widget-content ' +
+ 'ui-corner-all ',
+ sizeRelatedOptions = {
+ buttons: true,
+ height: true,
+ maxHeight: true,
+ maxWidth: true,
+ minHeight: true,
+ minWidth: true,
+ width: true
+ },
+ resizableRelatedOptions = {
+ maxHeight: true,
+ maxWidth: true,
+ minHeight: true,
+ minWidth: true
+ },
+ // support for jQuery 1.3.2 - handle common attrFn methods for dialog
+ attrFn = $.attrFn || {
+ val: true,
+ css: true,
+ html: true,
+ text: true,
+ data: true,
+ width: true,
+ height: true,
+ offset: true,
+ click: true
+ };
$.widget("ui.dialog", {
options: {
@@ -5413,7 +6007,18 @@ $.widget("ui.dialog", {
minHeight: 150,
minWidth: 150,
modal: false,
- position: 'center',
+ position: {
+ my: 'center',
+ at: 'center',
+ collision: 'fit',
+ // ensure that the titlebar is never outside the document
+ using: function(pos) {
+ var topOffset = $(this).css(pos).offset().top;
+ if (topOffset < 0) {
+ $(this).css('top', pos.top - topOffset);
+ }
+ }
+ },
resizable: true,
show: null,
stack: true,
@@ -5421,13 +6026,19 @@ $.widget("ui.dialog", {
width: 300,
zIndex: 1000
},
+
_create: function() {
this.originalTitle = this.element.attr('title');
+ // #5742 - .attr() might return a DOMElement
+ if ( typeof this.originalTitle !== "string" ) {
+ this.originalTitle = "";
+ }
+ this.options.title = this.options.title || this.originalTitle;
var self = this,
options = self.options,
- title = options.title || self.originalTitle || ' ',
+ title = options.title || ' ',
titleId = $.ui.dialog.getTitleId(self.element),
uiDialog = (self.uiDialog = $('<div></div>'))
@@ -5440,7 +6051,7 @@ $.widget("ui.dialog", {
// setting tabIndex makes the div focusable
// setting outline to 0 prevents a border on focus in Mozilla
.attr('tabIndex', -1).css('outline', 0).keydown(function(event) {
- if (options.closeOnEscape && event.keyCode &&
+ if (options.closeOnEscape && !event.isDefaultPrevented() && event.keyCode &&
event.keyCode === $.ui.keyCode.ESCAPE) {
self.close(event);
@@ -5535,6 +6146,7 @@ $.widget("ui.dialog", {
uiDialog.bgiframe();
}
},
+
_init: function() {
if ( this.options.autoOpen ) {
this.open();
@@ -5561,14 +6173,14 @@ $.widget("ui.dialog", {
return self;
},
-
+
widget: function() {
return this.uiDialog;
},
close: function(event) {
var self = this,
- maxZ;
+ maxZ, thisZ;
if (false === self._trigger('beforeClose', event)) {
return;
@@ -5597,7 +6209,10 @@ $.widget("ui.dialog", {
maxZ = 0;
$('.ui-dialog').each(function() {
if (this !== self.uiDialog[0]) {
- maxZ = Math.max(maxZ, $(this).css('z-index'));
+ thisZ = $(this).css('z-index');
+ if(!isNaN(thisZ)) {
+ maxZ = Math.max(maxZ, thisZ);
+ }
}
});
$.ui.dialog.maxZ = maxZ;
@@ -5616,12 +6231,12 @@ $.widget("ui.dialog", {
var self = this,
options = self.options,
saveScroll;
-
+
if ((options.modal && !force) ||
(!options.stack && !options.modal)) {
return self._trigger('focus', event);
}
-
+
if (options.zIndex > $.ui.dialog.maxZ) {
$.ui.dialog.maxZ = options.zIndex;
}
@@ -5632,7 +6247,7 @@ $.widget("ui.dialog", {
//Save and then restore scroll since Opera 9.5+ resets when parent z-Index is changed.
// http://ui.jquery.com/bugs/ticket/3193
- saveScroll = { scrollTop: self.element.attr('scrollTop'), scrollLeft: self.element.attr('scrollLeft') };
+ saveScroll = { scrollTop: self.element.scrollTop(), scrollLeft: self.element.scrollLeft() };
$.ui.dialog.maxZ += 1;
self.uiDialog.css('z-index', $.ui.dialog.maxZ);
self.element.attr(saveScroll);
@@ -5649,9 +6264,6 @@ $.widget("ui.dialog", {
uiDialog = self.uiDialog;
self.overlay = options.modal ? new $.ui.dialog.overlay(self) : null;
- if (uiDialog.next().length) {
- uiDialog.appendTo('body');
- }
self._size();
self._position(options.position);
uiDialog.show(options.show);
@@ -5663,11 +6275,11 @@ $.widget("ui.dialog", {
if (event.keyCode !== $.ui.keyCode.TAB) {
return;
}
-
+
var tabbables = $(':tabbable', this),
first = tabbables.filter(':first'),
last = tabbables.filter(':last');
-
+
if (event.target === last[0] && !event.shiftKey) {
first.focus(1);
return false;
@@ -5680,15 +6292,12 @@ $.widget("ui.dialog", {
// set focus to the first tabbable element in the content area or the first button
// if there are no tabbable elements, set focus on the dialog itself
- $([])
- .add(uiDialog.find('.ui-dialog-content :tabbable:first'))
- .add(uiDialog.find('.ui-dialog-buttonpane :tabbable:first'))
- .add(uiDialog)
- .filter(':first')
- .focus();
+ $(self.element.find(':tabbable').get().concat(
+ uiDialog.find('.ui-dialog-buttonpane :tabbable').get().concat(
+ uiDialog.get()))).eq(0).focus();
- self._trigger('open');
self._isOpen = true;
+ self._trigger('open');
return self;
},
@@ -5701,7 +6310,10 @@ $.widget("ui.dialog", {
'ui-dialog-buttonpane ' +
'ui-widget-content ' +
'ui-helper-clearfix'
- );
+ ),
+ uiButtonSet = $( "<div></div>" )
+ .addClass( "ui-dialog-buttonset" )
+ .appendTo( uiDialogButtonPane );
// if we already have a button pane, remove it
self.uiDialog.find('.ui-dialog-buttonpane').remove();
@@ -5712,11 +6324,26 @@ $.widget("ui.dialog", {
});
}
if (hasButtons) {
- $.each(buttons, function(name, fn) {
+ $.each(buttons, function(name, props) {
+ props = $.isFunction( props ) ?
+ { click: props, text: name } :
+ props;
var button = $('<button type="button"></button>')
- .text(name)
- .click(function() { fn.apply(self.element[0], arguments); })
- .appendTo(uiDialogButtonPane);
+ .click(function() {
+ props.click.apply(self.element[0], arguments);
+ })
+ .appendTo(uiButtonSet);
+ // can't use .attr( props, true ) with jQuery 1.3.2.
+ $.each( props, function( key, value ) {
+ if ( key === "click" ) {
+ return;
+ }
+ if ( key in attrFn ) {
+ button[ key ]( value );
+ } else {
+ button.attr( key, value );
+ }
+ });
if ($.fn.button) {
button.button();
}
@@ -5824,40 +6451,34 @@ $.widget("ui.dialog", {
offset = [0, 0],
isVisible;
- position = position || $.ui.dialog.prototype.options.position;
+ if (position) {
+ // deep extending converts arrays to objects in jQuery <= 1.3.2 :-(
+ // if (typeof position == 'string' || $.isArray(position)) {
+ // myAt = $.isArray(position) ? position : position.split(' ');
- // deep extending converts arrays to objects in jQuery <= 1.3.2 :-(
-// if (typeof position == 'string' || $.isArray(position)) {
-// myAt = $.isArray(position) ? position : position.split(' ');
+ if (typeof position === 'string' || (typeof position === 'object' && '0' in position)) {
+ myAt = position.split ? position.split(' ') : [position[0], position[1]];
+ if (myAt.length === 1) {
+ myAt[1] = myAt[0];
+ }
- if (typeof position === 'string' || (typeof position === 'object' && '0' in position)) {
- myAt = position.split ? position.split(' ') : [position[0], position[1]];
- if (myAt.length === 1) {
- myAt[1] = myAt[0];
- }
+ $.each(['left', 'top'], function(i, offsetPosition) {
+ if (+myAt[i] === myAt[i]) {
+ offset[i] = myAt[i];
+ myAt[i] = offsetPosition;
+ }
+ });
- $.each(['left', 'top'], function(i, offsetPosition) {
- if (+myAt[i] === myAt[i]) {
- offset[i] = myAt[i];
- myAt[i] = offsetPosition;
- }
- });
- } else if (typeof position === 'object') {
- if ('left' in position) {
- myAt[0] = 'left';
- offset[0] = position.left;
- } else if ('right' in position) {
- myAt[0] = 'right';
- offset[0] = -position.right;
- }
+ position = {
+ my: myAt.join(" "),
+ at: myAt.join(" "),
+ offset: offset.join(" ")
+ };
+ }
- if ('top' in position) {
- myAt[1] = 'top';
- offset[1] = position.top;
- } else if ('bottom' in position) {
- myAt[1] = 'bottom';
- offset[1] = -position.bottom;
- }
+ position = $.extend({}, $.ui.dialog.prototype.options.position, position);
+ } else {
+ position = $.ui.dialog.prototype.options.position;
}
// need to show the dialog to get the actual offset in the position plugin
@@ -5868,31 +6489,40 @@ $.widget("ui.dialog", {
this.uiDialog
// workaround for jQuery bug #5781 http://dev.jquery.com/ticket/5781
.css({ top: 0, left: 0 })
- .position({
- my: myAt.join(' '),
- at: myAt.join(' '),
- offset: offset.join(' '),
- of: window,
- collision: 'fit',
- // ensure that the titlebar is never outside the document
- using: function(pos) {
- var topOffset = $(this).css(pos).offset().top;
- if (topOffset < 0) {
- $(this).css('top', pos.top - topOffset);
- }
- }
- });
+ .position($.extend({ of: window }, position));
if (!isVisible) {
this.uiDialog.hide();
}
},
- _setOption: function(key, value){
+ _setOptions: function( options ) {
var self = this,
- uiDialog = self.uiDialog,
- isResizable = uiDialog.is(':data(resizable)'),
+ resizableOptions = {},
resize = false;
-
+
+ $.each( options, function( key, value ) {
+ self._setOption( key, value );
+
+ if ( key in sizeRelatedOptions ) {
+ resize = true;
+ }
+ if ( key in resizableRelatedOptions ) {
+ resizableOptions[ key ] = value;
+ }
+ });
+
+ if ( resize ) {
+ this._size();
+ }
+ if ( this.uiDialog.is( ":data(resizable)" ) ) {
+ this.uiDialog.resizable( "option", resizableOptions );
+ }
+ },
+
+ _setOption: function(key, value){
+ var self = this,
+ uiDialog = self.uiDialog;
+
switch (key) {
//handling of deprecated beforeclose (vs beforeClose) option
//Ticket #4669 http://dev.jqueryui.com/ticket/4669
@@ -5904,7 +6534,7 @@ $.widget("ui.dialog", {
self._createButtons(value);
break;
case "closeText":
- // convert whatever was passed in to a string, for text() to not throw up
+ // ensure that we always pass a string
self.uiDialogTitlebarCloseText.text("" + value);
break;
case "dialogClass":
@@ -5920,44 +6550,21 @@ $.widget("ui.dialog", {
}
break;
case "draggable":
- if (value) {
- self._makeDraggable();
- } else {
- uiDialog.draggable('destroy');
- }
- break;
- case "height":
- resize = true;
- break;
- case "maxHeight":
- if (isResizable) {
- uiDialog.resizable('option', 'maxHeight', value);
+ var isDraggable = uiDialog.is( ":data(draggable)" );
+ if ( isDraggable && !value ) {
+ uiDialog.draggable( "destroy" );
}
- resize = true;
- break;
- case "maxWidth":
- if (isResizable) {
- uiDialog.resizable('option', 'maxWidth', value);
- }
- resize = true;
- break;
- case "minHeight":
- if (isResizable) {
- uiDialog.resizable('option', 'minHeight', value);
- }
- resize = true;
- break;
- case "minWidth":
- if (isResizable) {
- uiDialog.resizable('option', 'minWidth', value);
+
+ if ( !isDraggable && value ) {
+ self._makeDraggable();
}
- resize = true;
break;
case "position":
self._position(value);
break;
case "resizable":
// currently resizable, becoming non-resizable
+ var isResizable = uiDialog.is( ":data(resizable)" );
if (isResizable && !value) {
uiDialog.resizable('destroy');
}
@@ -5976,15 +6583,9 @@ $.widget("ui.dialog", {
// convert whatever was passed in o a string, for html() to not throw up
$(".ui-dialog-title", self.uiDialogTitlebar).html("" + (value || ' '));
break;
- case "width":
- resize = true;
- break;
}
$.Widget.prototype._setOption.apply(self, arguments);
- if (resize) {
- self._size();
- }
},
_size: function() {
@@ -5992,12 +6593,20 @@ $.widget("ui.dialog", {
* divs will both have width and height set, so we need to reset them
*/
var options = this.options,
- nonContentHeight;
+ nonContentHeight,
+ minContentHeight,
+ isVisible = this.uiDialog.is( ":visible" );
// reset content sizing
- // hide for non content measurement because height: 0 doesn't work in IE quirks mode (see #4350)
- this.element.css('width', 'auto')
- .hide();
+ this.element.show().css({
+ width: 'auto',
+ minHeight: 0,
+ height: 0
+ });
+
+ if (options.minWidth > options.width) {
+ options.width = options.minWidth;
+ }
// reset wrapper sizing
// determine the height of all the non-content elements
@@ -6006,16 +6615,26 @@ $.widget("ui.dialog", {
width: options.width
})
.height();
-
- this.element
- .css(options.height === 'auto' ? {
- minHeight: Math.max(options.minHeight - nonContentHeight, 0),
- height: 'auto'
- } : {
- minHeight: 0,
- height: Math.max(options.height - nonContentHeight, 0)
- })
- .show();
+ minContentHeight = Math.max( 0, options.minHeight - nonContentHeight );
+
+ if ( options.height === "auto" ) {
+ // only needed for IE6 support
+ if ( $.support.minHeight ) {
+ this.element.css({
+ minHeight: minContentHeight,
+ height: "auto"
+ });
+ } else {
+ this.uiDialog.show();
+ var autoHeight = this.element.css( "height", "auto" ).height();
+ if ( !isVisible ) {
+ this.uiDialog.hide();
+ }
+ this.element.height( Math.max( autoHeight, minContentHeight ) );
+ }
+ } else {
+ this.element.height( Math.max( options.height - nonContentHeight, 0 ) );
+ }
if (this.uiDialog.is(':data(resizable)')) {
this.uiDialog.resizable('option', 'minHeight', this._minHeight());
@@ -6024,7 +6643,7 @@ $.widget("ui.dialog", {
});
$.extend($.ui.dialog, {
- version: "1.8",
+ version: "1.8.16",
uuid: 0,
maxZ: 0,
@@ -6060,14 +6679,17 @@ $.extend($.ui.dialog.overlay, {
if ($.ui.dialog.overlay.instances.length) {
$(document).bind($.ui.dialog.overlay.events, function(event) {
// stop events if the z-index of the target is < the z-index of the overlay
- return ($(event.target).zIndex() >= $.ui.dialog.overlay.maxZ);
+ // we cannot return true when we don't want to cancel the event (#3523)
+ if ($(event.target).zIndex() < $.ui.dialog.overlay.maxZ) {
+ return false;
+ }
});
}
}, 1);
// allow closing by pressing the escape key
$(document).bind('keydown.dialog-overlay', function(event) {
- if (dialog.options.closeOnEscape && event.keyCode &&
+ if (dialog.options.closeOnEscape && !event.isDefaultPrevented() && event.keyCode &&
event.keyCode === $.ui.keyCode.ESCAPE) {
dialog.close(event);
@@ -6095,7 +6717,10 @@ $.extend($.ui.dialog.overlay, {
},
destroy: function($el) {
- this.oldInstances.push(this.instances.splice($.inArray($el, this.instances), 1)[0]);
+ var indexOf = $.inArray($el, this.instances);
+ if (indexOf != -1){
+ this.oldInstances.push(this.instances.splice(indexOf, 1)[0]);
+ }
if (this.instances.length === 0) {
$([document, window]).unbind('.dialog-overlay');
@@ -6139,8 +6764,8 @@ $.extend($.ui.dialog.overlay, {
width: function() {
var scrollWidth,
offsetWidth;
- // handle IE 6
- if ($.browser.msie && $.browser.version < 7) {
+ // handle IE
+ if ( $.browser.msie ) {
scrollWidth = Math.max(
document.documentElement.scrollWidth,
document.body.scrollWidth
@@ -6193,11 +6818,11 @@ $.extend($.ui.dialog.overlay.prototype, {
}(jQuery));
/*
- * jQuery UI Slider 1.8
+ * jQuery UI Slider 1.8.16
*
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
*
* http://docs.jquery.com/UI/Slider
*
@@ -6206,29 +6831,36 @@ $.extend($.ui.dialog.overlay.prototype, {
* jquery.ui.mouse.js
* jquery.ui.widget.js
*/
-
-(function($) {
+(function( $, undefined ) {
// number of pages in a slider
// (how many times can you page up/down to go through the whole range)
var numPages = 5;
-$.widget("ui.slider", $.ui.mouse, {
+$.widget( "ui.slider", $.ui.mouse, {
+
widgetEventPrefix: "slide",
+
options: {
animate: false,
distance: 0,
max: 100,
min: 0,
- orientation: 'horizontal',
+ orientation: "horizontal",
range: false,
step: 1,
value: 0,
values: null
},
+
_create: function() {
+ var self = this,
+ o = this.options,
+ existingHandles = this.element.find( ".ui-slider-handle" ).addClass( "ui-state-default ui-corner-all" ),
+ handle = "<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>",
+ handleCount = ( o.values && o.values.length ) || 1,
+ handles = [];
- var self = this, o = this.options;
this._keySliding = false;
this._mouseSliding = false;
this._animateOff = true;
@@ -6237,197 +6869,196 @@ $.widget("ui.slider", $.ui.mouse, {
this._mouseInit();
this.element
- .addClass("ui-slider"
- + " ui-slider-" + this.orientation
- + " ui-widget"
- + " ui-widget-content"
- + " ui-corner-all");
-
- if (o.disabled) {
- this.element.addClass('ui-slider-disabled ui-disabled');
- }
+ .addClass( "ui-slider" +
+ " ui-slider-" + this.orientation +
+ " ui-widget" +
+ " ui-widget-content" +
+ " ui-corner-all" +
+ ( o.disabled ? " ui-slider-disabled ui-disabled" : "" ) );
this.range = $([]);
- if (o.range) {
-
- if (o.range === true) {
- this.range = $('<div></div>');
- if (!o.values) o.values = [this._valueMin(), this._valueMin()];
- if (o.values.length && o.values.length != 2) {
- o.values = [o.values[0], o.values[0]];
+ if ( o.range ) {
+ if ( o.range === true ) {
+ if ( !o.values ) {
+ o.values = [ this._valueMin(), this._valueMin() ];
+ }
+ if ( o.values.length && o.values.length !== 2 ) {
+ o.values = [ o.values[0], o.values[0] ];
}
- } else {
- this.range = $('<div></div>');
- }
-
- this.range
- .appendTo(this.element)
- .addClass("ui-slider-range");
-
- if (o.range == "min" || o.range == "max") {
- this.range.addClass("ui-slider-range-" + o.range);
}
- // note: this isn't the most fittingly semantic framework class for this element,
- // but worked best visually with a variety of themes
- this.range.addClass("ui-widget-header");
-
+ this.range = $( "<div></div>" )
+ .appendTo( this.element )
+ .addClass( "ui-slider-range" +
+ // note: this isn't the most fittingly semantic framework class for this element,
+ // but worked best visually with a variety of themes
+ " ui-widget-header" +
+ ( ( o.range === "min" || o.range === "max" ) ? " ui-slider-range-" + o.range : "" ) );
}
- if ($(".ui-slider-handle", this.element).length == 0)
- $('<a href="#"></a>')
- .appendTo(this.element)
- .addClass("ui-slider-handle");
-
- if (o.values && o.values.length) {
- while ($(".ui-slider-handle", this.element).length < o.values.length)
- $('<a href="#"></a>')
- .appendTo(this.element)
- .addClass("ui-slider-handle");
+ for ( var i = existingHandles.length; i < handleCount; i += 1 ) {
+ handles.push( handle );
}
- this.handles = $(".ui-slider-handle", this.element)
- .addClass("ui-state-default"
- + " ui-corner-all");
+ this.handles = existingHandles.add( $( handles.join( "" ) ).appendTo( self.element ) );
- this.handle = this.handles.eq(0);
+ this.handle = this.handles.eq( 0 );
- this.handles.add(this.range).filter("a")
- .click(function(event) {
+ this.handles.add( this.range ).filter( "a" )
+ .click(function( event ) {
event.preventDefault();
})
.hover(function() {
- if (!o.disabled) {
- $(this).addClass('ui-state-hover');
+ if ( !o.disabled ) {
+ $( this ).addClass( "ui-state-hover" );
}
}, function() {
- $(this).removeClass('ui-state-hover');
+ $( this ).removeClass( "ui-state-hover" );
})
.focus(function() {
- if (!o.disabled) {
- $(".ui-slider .ui-state-focus").removeClass('ui-state-focus'); $(this).addClass('ui-state-focus');
+ if ( !o.disabled ) {
+ $( ".ui-slider .ui-state-focus" ).removeClass( "ui-state-focus" );
+ $( this ).addClass( "ui-state-focus" );
} else {
- $(this).blur();
+ $( this ).blur();
}
})
.blur(function() {
- $(this).removeClass('ui-state-focus');
+ $( this ).removeClass( "ui-state-focus" );
});
- this.handles.each(function(i) {
- $(this).data("index.ui-slider-handle", i);
+ this.handles.each(function( i ) {
+ $( this ).data( "index.ui-slider-handle", i );
});
- this.handles.keydown(function(event) {
-
- var ret = true;
-
- var index = $(this).data("index.ui-slider-handle");
-
- if (self.options.disabled)
- return;
-
- switch (event.keyCode) {
- case $.ui.keyCode.HOME:
- case $.ui.keyCode.END:
- case $.ui.keyCode.PAGE_UP:
- case $.ui.keyCode.PAGE_DOWN:
- case $.ui.keyCode.UP:
- case $.ui.keyCode.RIGHT:
- case $.ui.keyCode.DOWN:
- case $.ui.keyCode.LEFT:
- ret = false;
- if (!self._keySliding) {
- self._keySliding = true;
- $(this).addClass("ui-state-active");
- self._start(event, index);
- }
- break;
- }
-
- var curVal, newVal, step = self._step();
- if (self.options.values && self.options.values.length) {
- curVal = newVal = self.values(index);
- } else {
- curVal = newVal = self.value();
- }
-
- switch (event.keyCode) {
- case $.ui.keyCode.HOME:
- newVal = self._valueMin();
- break;
- case $.ui.keyCode.END:
- newVal = self._valueMax();
- break;
- case $.ui.keyCode.PAGE_UP:
- newVal = curVal + ((self._valueMax() - self._valueMin()) / numPages);
- break;
- case $.ui.keyCode.PAGE_DOWN:
- newVal = curVal - ((self._valueMax() - self._valueMin()) / numPages);
- break;
- case $.ui.keyCode.UP:
- case $.ui.keyCode.RIGHT:
- if(curVal == self._valueMax()) return;
- newVal = curVal + step;
- break;
- case $.ui.keyCode.DOWN:
- case $.ui.keyCode.LEFT:
- if(curVal == self._valueMin()) return;
- newVal = curVal - step;
- break;
- }
-
- self._slide(event, index, newVal);
-
- return ret;
-
- }).keyup(function(event) {
-
- var index = $(this).data("index.ui-slider-handle");
-
- if (self._keySliding) {
- self._keySliding = false;
- self._stop(event, index);
- self._change(event, index);
- $(this).removeClass("ui-state-active");
- }
-
- });
+ this.handles
+ .keydown(function( event ) {
+ var ret = true,
+ index = $( this ).data( "index.ui-slider-handle" ),
+ allowed,
+ curVal,
+ newVal,
+ step;
+
+ if ( self.options.disabled ) {
+ return;
+ }
+
+ switch ( event.keyCode ) {
+ case $.ui.keyCode.HOME:
+ case $.ui.keyCode.END:
+ case $.ui.keyCode.PAGE_UP:
+ case $.ui.keyCode.PAGE_DOWN:
+ case $.ui.keyCode.UP:
+ case $.ui.keyCode.RIGHT:
+ case $.ui.keyCode.DOWN:
+ case $.ui.keyCode.LEFT:
+ ret = false;
+ if ( !self._keySliding ) {
+ self._keySliding = true;
+ $( this ).addClass( "ui-state-active" );
+ allowed = self._start( event, index );
+ if ( allowed === false ) {
+ return;
+ }
+ }
+ break;
+ }
+
+ step = self.options.step;
+ if ( self.options.values && self.options.values.length ) {
+ curVal = newVal = self.values( index );
+ } else {
+ curVal = newVal = self.value();
+ }
+
+ switch ( event.keyCode ) {
+ case $.ui.keyCode.HOME:
+ newVal = self._valueMin();
+ break;
+ case $.ui.keyCode.END:
+ newVal = self._valueMax();
+ break;
+ case $.ui.keyCode.PAGE_UP:
+ newVal = self._trimAlignValue( curVal + ( (self._valueMax() - self._valueMin()) / numPages ) );
+ break;
+ case $.ui.keyCode.PAGE_DOWN:
+ newVal = self._trimAlignValue( curVal - ( (self._valueMax() - self._valueMin()) / numPages ) );
+ break;
+ case $.ui.keyCode.UP:
+ case $.ui.keyCode.RIGHT:
+ if ( curVal === self._valueMax() ) {
+ return;
+ }
+ newVal = self._trimAlignValue( curVal + step );
+ break;
+ case $.ui.keyCode.DOWN:
+ case $.ui.keyCode.LEFT:
+ if ( curVal === self._valueMin() ) {
+ return;
+ }
+ newVal = self._trimAlignValue( curVal - step );
+ break;
+ }
+
+ self._slide( event, index, newVal );
+
+ return ret;
+
+ })
+ .keyup(function( event ) {
+ var index = $( this ).data( "index.ui-slider-handle" );
+
+ if ( self._keySliding ) {
+ self._keySliding = false;
+ self._stop( event, index );
+ self._change( event, index );
+ $( this ).removeClass( "ui-state-active" );
+ }
+
+ });
this._refreshValue();
this._animateOff = false;
-
},
destroy: function() {
-
this.handles.remove();
this.range.remove();
this.element
- .removeClass("ui-slider"
- + " ui-slider-horizontal"
- + " ui-slider-vertical"
- + " ui-slider-disabled"
- + " ui-widget"
- + " ui-widget-content"
- + " ui-corner-all")
- .removeData("slider")
- .unbind(".slider");
+ .removeClass( "ui-slider" +
+ " ui-slider-horizontal" +
+ " ui-slider-vertical" +
+ " ui-slider-disabled" +
+ " ui-widget" +
+ " ui-widget-content" +
+ " ui-corner-all" )
+ .removeData( "slider" )
+ .unbind( ".slider" );
this._mouseDestroy();
return this;
},
- _mouseCapture: function(event) {
+ _mouseCapture: function( event ) {
+ var o = this.options,
+ position,
+ normValue,
+ distance,
+ closestHandle,
+ self,
+ index,
+ allowed,
+ offset,
+ mouseOverHandle;
- var o = this.options;
-
- if (o.disabled)
+ if ( o.disabled ) {
return false;
+ }
this.elementSize = {
width: this.element.outerWidth(),
@@ -6435,16 +7066,15 @@ $.widget("ui.slider", $.ui.mouse, {
};
this.elementOffset = this.element.offset();
- var position = { x: event.pageX, y: event.pageY };
- var normValue = this._normValueFromMouse(position);
-
- var distance = this._valueMax() - this._valueMin() + 1, closestHandle;
- var self = this, index;
- this.handles.each(function(i) {
- var thisDistance = Math.abs(normValue - self.values(i));
- if (distance > thisDistance) {
+ position = { x: event.pageX, y: event.pageY };
+ normValue = this._normValueFromMouse( position );
+ distance = this._valueMax() - this._valueMin() + 1;
+ self = this;
+ this.handles.each(function( i ) {
+ var thisDistance = Math.abs( normValue - self.values(i) );
+ if ( distance > thisDistance ) {
distance = thisDistance;
- closestHandle = $(this);
+ closestHandle = $( this );
index = i;
}
});
@@ -6452,216 +7082,221 @@ $.widget("ui.slider", $.ui.mouse, {
// workaround for bug #3736 (if both handles of a range are at 0,
// the first is always used as the one with least distance,
// and moving it is obviously prevented by preventing negative ranges)
- if(o.range == true && this.values(1) == o.min) {
- closestHandle = $(this.handles[++index]);
+ if( o.range === true && this.values(1) === o.min ) {
+ index += 1;
+ closestHandle = $( this.handles[index] );
}
- this._start(event, index);
+ allowed = this._start( event, index );
+ if ( allowed === false ) {
+ return false;
+ }
this._mouseSliding = true;
self._handleIndex = index;
closestHandle
- .addClass("ui-state-active")
+ .addClass( "ui-state-active" )
.focus();
- var offset = closestHandle.offset();
- var mouseOverHandle = !$(event.target).parents().andSelf().is('.ui-slider-handle');
+ offset = closestHandle.offset();
+ mouseOverHandle = !$( event.target ).parents().andSelf().is( ".ui-slider-handle" );
this._clickOffset = mouseOverHandle ? { left: 0, top: 0 } : {
- left: event.pageX - offset.left - (closestHandle.width() / 2),
- top: event.pageY - offset.top
- - (closestHandle.height() / 2)
- - (parseInt(closestHandle.css('borderTopWidth'),10) || 0)
- - (parseInt(closestHandle.css('borderBottomWidth'),10) || 0)
- + (parseInt(closestHandle.css('marginTop'),10) || 0)
+ left: event.pageX - offset.left - ( closestHandle.width() / 2 ),
+ top: event.pageY - offset.top -
+ ( closestHandle.height() / 2 ) -
+ ( parseInt( closestHandle.css("borderTopWidth"), 10 ) || 0 ) -
+ ( parseInt( closestHandle.css("borderBottomWidth"), 10 ) || 0) +
+ ( parseInt( closestHandle.css("marginTop"), 10 ) || 0)
};
- normValue = this._normValueFromMouse(position);
- this._slide(event, index, normValue);
+ if ( !this.handles.hasClass( "ui-state-hover" ) ) {
+ this._slide( event, index, normValue );
+ }
this._animateOff = true;
return true;
-
},
- _mouseStart: function(event) {
+ _mouseStart: function( event ) {
return true;
},
- _mouseDrag: function(event) {
-
- var position = { x: event.pageX, y: event.pageY };
- var normValue = this._normValueFromMouse(position);
+ _mouseDrag: function( event ) {
+ var position = { x: event.pageX, y: event.pageY },
+ normValue = this._normValueFromMouse( position );
- this._slide(event, this._handleIndex, normValue);
+ this._slide( event, this._handleIndex, normValue );
return false;
-
},
- _mouseStop: function(event) {
-
- this.handles.removeClass("ui-state-active");
+ _mouseStop: function( event ) {
+ this.handles.removeClass( "ui-state-active" );
this._mouseSliding = false;
- this._stop(event, this._handleIndex);
- this._change(event, this._handleIndex);
+
+ this._stop( event, this._handleIndex );
+ this._change( event, this._handleIndex );
+
this._handleIndex = null;
this._clickOffset = null;
-
this._animateOff = false;
- return false;
+ return false;
},
_detectOrientation: function() {
- this.orientation = this.options.orientation == 'vertical' ? 'vertical' : 'horizontal';
+ this.orientation = ( this.options.orientation === "vertical" ) ? "vertical" : "horizontal";
},
- _normValueFromMouse: function(position) {
+ _normValueFromMouse: function( position ) {
+ var pixelTotal,
+ pixelMouse,
+ percentMouse,
+ valueTotal,
+ valueMouse;
- var pixelTotal, pixelMouse;
- if ('horizontal' == this.orientation) {
+ if ( this.orientation === "horizontal" ) {
pixelTotal = this.elementSize.width;
- pixelMouse = position.x - this.elementOffset.left - (this._clickOffset ? this._clickOffset.left : 0);
+ pixelMouse = position.x - this.elementOffset.left - ( this._clickOffset ? this._clickOffset.left : 0 );
} else {
pixelTotal = this.elementSize.height;
- pixelMouse = position.y - this.elementOffset.top - (this._clickOffset ? this._clickOffset.top : 0);
+ pixelMouse = position.y - this.elementOffset.top - ( this._clickOffset ? this._clickOffset.top : 0 );
}
- var percentMouse = (pixelMouse / pixelTotal);
- if (percentMouse > 1) percentMouse = 1;
- if (percentMouse < 0) percentMouse = 0;
- if ('vertical' == this.orientation)
+ percentMouse = ( pixelMouse / pixelTotal );
+ if ( percentMouse > 1 ) {
+ percentMouse = 1;
+ }
+ if ( percentMouse < 0 ) {
+ percentMouse = 0;
+ }
+ if ( this.orientation === "vertical" ) {
percentMouse = 1 - percentMouse;
+ }
- var valueTotal = this._valueMax() - this._valueMin(),
- valueMouse = percentMouse * valueTotal,
- valueMouseModStep = valueMouse % this.options.step,
- normValue = this._valueMin() + valueMouse - valueMouseModStep;
-
- if (valueMouseModStep > (this.options.step / 2))
- normValue += this.options.step;
-
- // Since JavaScript has problems with large floats, round
- // the final value to 5 digits after the decimal point (see #4124)
- return parseFloat(normValue.toFixed(5));
+ valueTotal = this._valueMax() - this._valueMin();
+ valueMouse = this._valueMin() + percentMouse * valueTotal;
+ return this._trimAlignValue( valueMouse );
},
- _start: function(event, index) {
+ _start: function( event, index ) {
var uiHash = {
- handle: this.handles[index],
+ handle: this.handles[ index ],
value: this.value()
};
- if (this.options.values && this.options.values.length) {
- uiHash.value = this.values(index);
+ if ( this.options.values && this.options.values.length ) {
+ uiHash.value = this.values( index );
uiHash.values = this.values();
}
- this._trigger("start", event, uiHash);
+ return this._trigger( "start", event, uiHash );
},
- _slide: function(event, index, newVal) {
-
- var handle = this.handles[index];
-
- if (this.options.values && this.options.values.length) {
+ _slide: function( event, index, newVal ) {
+ var otherVal,
+ newValues,
+ allowed;
- var otherVal = this.values(index ? 0 : 1);
+ if ( this.options.values && this.options.values.length ) {
+ otherVal = this.values( index ? 0 : 1 );
- if ((this.options.values.length == 2 && this.options.range === true) &&
- ((index == 0 && newVal > otherVal) || (index == 1 && newVal < otherVal))){
- newVal = otherVal;
+ if ( ( this.options.values.length === 2 && this.options.range === true ) &&
+ ( ( index === 0 && newVal > otherVal) || ( index === 1 && newVal < otherVal ) )
+ ) {
+ newVal = otherVal;
}
- if (newVal != this.values(index)) {
- var newValues = this.values();
- newValues[index] = newVal;
+ if ( newVal !== this.values( index ) ) {
+ newValues = this.values();
+ newValues[ index ] = newVal;
// A slide can be canceled by returning false from the slide callback
- var allowed = this._trigger("slide", event, {
- handle: this.handles[index],
+ allowed = this._trigger( "slide", event, {
+ handle: this.handles[ index ],
value: newVal,
values: newValues
- });
- var otherVal = this.values(index ? 0 : 1);
- if (allowed !== false) {
- this.values(index, newVal, true);
+ } );
+ otherVal = this.values( index ? 0 : 1 );
+ if ( allowed !== false ) {
+ this.values( index, newVal, true );
}
}
-
} else {
-
- if (newVal != this.value()) {
+ if ( newVal !== this.value() ) {
// A slide can be canceled by returning false from the slide callback
- var allowed = this._trigger("slide", event, {
- handle: this.handles[index],
+ allowed = this._trigger( "slide", event, {
+ handle: this.handles[ index ],
value: newVal
- });
- if (allowed !== false) {
- this.value(newVal);
+ } );
+ if ( allowed !== false ) {
+ this.value( newVal );
}
-
}
-
}
-
},
- _stop: function(event, index) {
+ _stop: function( event, index ) {
var uiHash = {
- handle: this.handles[index],
+ handle: this.handles[ index ],
value: this.value()
};
- if (this.options.values && this.options.values.length) {
- uiHash.value = this.values(index);
+ if ( this.options.values && this.options.values.length ) {
+ uiHash.value = this.values( index );
uiHash.values = this.values();
}
- this._trigger("stop", event, uiHash);
+
+ this._trigger( "stop", event, uiHash );
},
- _change: function(event, index) {
- if (!this._keySliding && !this._mouseSliding) {
+ _change: function( event, index ) {
+ if ( !this._keySliding && !this._mouseSliding ) {
var uiHash = {
- handle: this.handles[index],
+ handle: this.handles[ index ],
value: this.value()
};
- if (this.options.values && this.options.values.length) {
- uiHash.value = this.values(index);
+ if ( this.options.values && this.options.values.length ) {
+ uiHash.value = this.values( index );
uiHash.values = this.values();
}
- this._trigger("change", event, uiHash);
+
+ this._trigger( "change", event, uiHash );
}
},
- value: function(newValue) {
-
- if (arguments.length) {
- this.options.value = this._trimValue(newValue);
+ value: function( newValue ) {
+ if ( arguments.length ) {
+ this.options.value = this._trimAlignValue( newValue );
this._refreshValue();
- this._change(null, 0);
+ this._change( null, 0 );
+ return;
}
return this._value();
-
},
- values: function(index, newValue) {
+ values: function( index, newValue ) {
+ var vals,
+ newValues,
+ i;
- if (arguments.length > 1) {
- this.options.values[index] = this._trimValue(newValue);
+ if ( arguments.length > 1 ) {
+ this.options.values[ index ] = this._trimAlignValue( newValue );
this._refreshValue();
- this._change(null, index);
+ this._change( null, index );
+ return;
}
- if (arguments.length) {
- if ($.isArray(arguments[0])) {
- var vals = this.options.values, newValues = arguments[0];
- for (var i = 0, l = vals.length; i < l; i++) {
- vals[i] = this._trimValue(newValues[i]);
- this._change(null, i);
+ if ( arguments.length ) {
+ if ( $.isArray( arguments[ 0 ] ) ) {
+ vals = this.options.values;
+ newValues = arguments[ 0 ];
+ for ( i = 0; i < vals.length; i += 1 ) {
+ vals[ i ] = this._trimAlignValue( newValues[ i ] );
+ this._change( null, i );
}
this._refreshValue();
} else {
- if (this.options.values && this.options.values.length) {
- return this._values(index);
+ if ( this.options.values && this.options.values.length ) {
+ return this._values( index );
} else {
return this.value();
}
@@ -6669,164 +7304,191 @@ $.widget("ui.slider", $.ui.mouse, {
} else {
return this._values();
}
-
},
- _setOption: function(key, value) {
-
+ _setOption: function( key, value ) {
var i,
valsLength = 0;
- if ( jQuery.isArray(this.options.values) ) {
+
+ if ( $.isArray( this.options.values ) ) {
valsLength = this.options.values.length;
- };
+ }
- $.Widget.prototype._setOption.apply(this, arguments);
+ $.Widget.prototype._setOption.apply( this, arguments );
- switch (key) {
- case 'disabled':
- if (value) {
- this.handles.filter(".ui-state-focus").blur();
- this.handles.removeClass("ui-state-hover");
- this.handles.attr("disabled", "disabled");
- this.element.addClass("ui-disabled");
+ switch ( key ) {
+ case "disabled":
+ if ( value ) {
+ this.handles.filter( ".ui-state-focus" ).blur();
+ this.handles.removeClass( "ui-state-hover" );
+ this.handles.propAttr( "disabled", true );
+ this.element.addClass( "ui-disabled" );
} else {
- this.handles.removeAttr("disabled");
- this.element.removeClass("ui-disabled");
+ this.handles.propAttr( "disabled", false );
+ this.element.removeClass( "ui-disabled" );
}
- case 'orientation':
-
+ break;
+ case "orientation":
this._detectOrientation();
-
this.element
- .removeClass("ui-slider-horizontal ui-slider-vertical")
- .addClass("ui-slider-" + this.orientation);
+ .removeClass( "ui-slider-horizontal ui-slider-vertical" )
+ .addClass( "ui-slider-" + this.orientation );
this._refreshValue();
break;
- case 'value':
+ case "value":
this._animateOff = true;
this._refreshValue();
- this._change(null, 0);
+ this._change( null, 0 );
this._animateOff = false;
break;
- case 'values':
+ case "values":
this._animateOff = true;
this._refreshValue();
- for (i = 0; i < valsLength; i++) {
- this._change(null, i);
+ for ( i = 0; i < valsLength; i += 1 ) {
+ this._change( null, i );
}
this._animateOff = false;
break;
}
-
- },
-
- _step: function() {
- var step = this.options.step;
- return step;
},
+ //internal value getter
+ // _value() returns value trimmed by min and max, aligned by step
_value: function() {
- //internal value getter
- // _value() returns value trimmed by min and max
var val = this.options.value;
- val = this._trimValue(val);
+ val = this._trimAlignValue( val );
return val;
},
- _values: function(index) {
- //internal values getter
- // _values() returns array of values trimmed by min and max
- // _values(index) returns single value trimmed by min and max
+ //internal values getter
+ // _values() returns array of values trimmed by min and max, aligned by step
+ // _values( index ) returns single value trimmed by min and max, aligned by step
+ _values: function( index ) {
+ var val,
+ vals,
+ i;
- if (arguments.length) {
- var val = this.options.values[index];
- val = this._trimValue(val);
+ if ( arguments.length ) {
+ val = this.options.values[ index ];
+ val = this._trimAlignValue( val );
return val;
} else {
// .slice() creates a copy of the array
// this copy gets trimmed by min and max and then returned
- var vals = this.options.values.slice();
- for (var i = 0, l = vals.length; i < l; i++) {
- vals[i] = this._trimValue(vals[i]);
+ vals = this.options.values.slice();
+ for ( i = 0; i < vals.length; i+= 1) {
+ vals[ i ] = this._trimAlignValue( vals[ i ] );
}
return vals;
}
-
},
- _trimValue: function(val) {
- if (val < this._valueMin()) val = this._valueMin();
- if (val > this._valueMax()) val = this._valueMax();
+ // returns the step-aligned value that val is closest to, between (inclusive) min and max
+ _trimAlignValue: function( val ) {
+ if ( val <= this._valueMin() ) {
+ return this._valueMin();
+ }
+ if ( val >= this._valueMax() ) {
+ return this._valueMax();
+ }
+ var step = ( this.options.step > 0 ) ? this.options.step : 1,
+ valModStep = (val - this._valueMin()) % step,
+ alignValue = val - valModStep;
- return val;
+ if ( Math.abs(valModStep) * 2 >= step ) {
+ alignValue += ( valModStep > 0 ) ? step : ( -step );
+ }
+
+ // Since JavaScript has problems with large floats, round
+ // the final value to 5 digits after the decimal point (see #4124)
+ return parseFloat( alignValue.toFixed(5) );
},
_valueMin: function() {
- var valueMin = this.options.min;
- return valueMin;
+ return this.options.min;
},
_valueMax: function() {
- var valueMax = this.options.max;
- return valueMax;
+ return this.options.max;
},
_refreshValue: function() {
-
- var oRange = this.options.range, o = this.options, self = this;
- var animate = (!this._animateOff) ? o.animate : false;
-
- if (this.options.values && this.options.values.length) {
- var vp0, vp1;
- this.handles.each(function(i, j) {
- var valPercent = (self.values(i) - self._valueMin()) / (self._valueMax() - self._valueMin()) * 100;
- var _set = {}; _set[self.orientation == 'horizontal' ? 'left' : 'bottom'] = valPercent + '%';
- $(this).stop(1,1)[animate ? 'animate' : 'css'](_set, o.animate);
- if (self.options.range === true) {
- if (self.orientation == 'horizontal') {
- (i == 0) && self.range.stop(1,1)[animate ? 'animate' : 'css']({ left: valPercent + '%' }, o.animate);
- (i == 1) && self.range[animate ? 'animate' : 'css']({ width: (valPercent - lastValPercent) + '%' }, { queue: false, duration: o.animate });
+ var oRange = this.options.range,
+ o = this.options,
+ self = this,
+ animate = ( !this._animateOff ) ? o.animate : false,
+ valPercent,
+ _set = {},
+ lastValPercent,
+ value,
+ valueMin,
+ valueMax;
+
+ if ( this.options.values && this.options.values.length ) {
+ this.handles.each(function( i, j ) {
+ valPercent = ( self.values(i) - self._valueMin() ) / ( self._valueMax() - self._valueMin() ) * 100;
+ _set[ self.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
+ $( this ).stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
+ if ( self.options.range === true ) {
+ if ( self.orientation === "horizontal" ) {
+ if ( i === 0 ) {
+ self.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { left: valPercent + "%" }, o.animate );
+ }
+ if ( i === 1 ) {
+ self.range[ animate ? "animate" : "css" ]( { width: ( valPercent - lastValPercent ) + "%" }, { queue: false, duration: o.animate } );
+ }
} else {
- (i == 0) && self.range.stop(1,1)[animate ? 'animate' : 'css']({ bottom: (valPercent) + '%' }, o.animate);
- (i == 1) && self.range[animate ? 'animate' : 'css']({ height: (valPercent - lastValPercent) + '%' }, { queue: false, duration: o.animate });
+ if ( i === 0 ) {
+ self.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { bottom: ( valPercent ) + "%" }, o.animate );
+ }
+ if ( i === 1 ) {
+ self.range[ animate ? "animate" : "css" ]( { height: ( valPercent - lastValPercent ) + "%" }, { queue: false, duration: o.animate } );
+ }
}
}
lastValPercent = valPercent;
});
} else {
- var value = this.value(),
- valueMin = this._valueMin(),
- valueMax = this._valueMax(),
- valPercent = valueMax != valueMin
- ? (value - valueMin) / (valueMax - valueMin) * 100
- : 0;
- var _set = {}; _set[self.orientation == 'horizontal' ? 'left' : 'bottom'] = valPercent + '%';
- this.handle.stop(1,1)[animate ? 'animate' : 'css'](_set, o.animate);
+ value = this.value();
+ valueMin = this._valueMin();
+ valueMax = this._valueMax();
+ valPercent = ( valueMax !== valueMin ) ?
+ ( value - valueMin ) / ( valueMax - valueMin ) * 100 :
+ 0;
+ _set[ self.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
+ this.handle.stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
- (oRange == "min") && (this.orientation == "horizontal") && this.range.stop(1,1)[animate ? 'animate' : 'css']({ width: valPercent + '%' }, o.animate);
- (oRange == "max") && (this.orientation == "horizontal") && this.range[animate ? 'animate' : 'css']({ width: (100 - valPercent) + '%' }, { queue: false, duration: o.animate });
- (oRange == "min") && (this.orientation == "vertical") && this.range.stop(1,1)[animate ? 'animate' : 'css']({ height: valPercent + '%' }, o.animate);
- (oRange == "max") && (this.orientation == "vertical") && this.range[animate ? 'animate' : 'css']({ height: (100 - valPercent) + '%' }, { queue: false, duration: o.animate });
+ if ( oRange === "min" && this.orientation === "horizontal" ) {
+ this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { width: valPercent + "%" }, o.animate );
+ }
+ if ( oRange === "max" && this.orientation === "horizontal" ) {
+ this.range[ animate ? "animate" : "css" ]( { width: ( 100 - valPercent ) + "%" }, { queue: false, duration: o.animate } );
+ }
+ if ( oRange === "min" && this.orientation === "vertical" ) {
+ this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { height: valPercent + "%" }, o.animate );
+ }
+ if ( oRange === "max" && this.orientation === "vertical" ) {
+ this.range[ animate ? "animate" : "css" ]( { height: ( 100 - valPercent ) + "%" }, { queue: false, duration: o.animate } );
+ }
}
-
}
-
+
});
-$.extend($.ui.slider, {
- version: "1.8"
+$.extend( $.ui.slider, {
+ version: "1.8.16"
});
-})(jQuery);
+}(jQuery));
/*
- * jQuery UI Tabs 1.8
+ * jQuery UI Tabs 1.8.16
*
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
*
* http://docs.jquery.com/UI/Tabs
*
@@ -6834,12 +7496,20 @@ $.extend($.ui.slider, {
* jquery.ui.core.js
* jquery.ui.widget.js
*/
-(function($) {
+(function( $, undefined ) {
var tabId = 0,
listId = 0;
-$.widget("ui.tabs", {
+function getNextTabId() {
+ return ++tabId;
+}
+
+function getNextListId() {
+ return ++listId;
+}
+
+$.widget( "ui.tabs", {
options: {
add: null,
ajaxOptions: null,
@@ -6849,619 +7519,650 @@ $.widget("ui.tabs", {
disable: null,
disabled: [],
enable: null,
- event: 'click',
+ event: "click",
fx: null, // e.g. { height: 'toggle', opacity: 'toggle', duration: 200 }
- idPrefix: 'ui-tabs-',
+ idPrefix: "ui-tabs-",
load: null,
- panelTemplate: '<div></div>',
+ panelTemplate: "<div></div>",
remove: null,
select: null,
show: null,
- spinner: '<em>Loading…</em>',
- tabTemplate: '<li><a href="#{href}"><span>#{label}</span></a></li>'
+ spinner: "<em>Loading…</em>",
+ tabTemplate: "<li><a href='#{href}'><span>#{label}</span></a></li>"
},
+
_create: function() {
- this._tabify(true);
+ this._tabify( true );
},
- _setOption: function(key, value) {
- if (key == 'selected') {
- if (this.options.collapsible && value == this.options.selected) {
+ _setOption: function( key, value ) {
+ if ( key == "selected" ) {
+ if (this.options.collapsible && value == this.options.selected ) {
return;
}
- this.select(value);
- }
- else {
- this.options[key] = value;
+ this.select( value );
+ } else {
+ this.options[ key ] = value;
this._tabify();
}
},
- _tabId: function(a) {
- return a.title && a.title.replace(/\s/g, '_').replace(/[^A-Za-z0-9\-_:\.]/g, '') ||
- this.options.idPrefix + (++tabId);
+ _tabId: function( a ) {
+ return a.title && a.title.replace( /\s/g, "_" ).replace( /[^\w\u00c0-\uFFFF-]/g, "" ) ||
+ this.options.idPrefix + getNextTabId();
},
- _sanitizeSelector: function(hash) {
- return hash.replace(/:/g, '\\:'); // we need this because an id may contain a ":"
+ _sanitizeSelector: function( hash ) {
+ // we need this because an id may contain a ":"
+ return hash.replace( /:/g, "\\:" );
},
_cookie: function() {
- var cookie = this.cookie || (this.cookie = this.options.cookie.name || 'ui-tabs-' + (++listId));
- return $.cookie.apply(null, [cookie].concat($.makeArray(arguments)));
+ var cookie = this.cookie ||
+ ( this.cookie = this.options.cookie.name || "ui-tabs-" + getNextListId() );
+ return $.cookie.apply( null, [ cookie ].concat( $.makeArray( arguments ) ) );
},
- _ui: function(tab, panel) {
+ _ui: function( tab, panel ) {
return {
tab: tab,
panel: panel,
- index: this.anchors.index(tab)
+ index: this.anchors.index( tab )
};
},
_cleanup: function() {
// restore all former loading tabs labels
- this.lis.filter('.ui-state-processing').removeClass('ui-state-processing')
- .find('span:data(label.tabs)')
+ this.lis.filter( ".ui-state-processing" )
+ .removeClass( "ui-state-processing" )
+ .find( "span:data(label.tabs)" )
.each(function() {
- var el = $(this);
- el.html(el.data('label.tabs')).removeData('label.tabs');
+ var el = $( this );
+ el.html( el.data( "label.tabs" ) ).removeData( "label.tabs" );
});
},
- _tabify: function(init) {
-
- this.list = this.element.find('ol,ul').eq(0);
- this.lis = $('li:has(a[href])', this.list);
- this.anchors = this.lis.map(function() { return $('a', this)[0]; });
- this.panels = $([]);
-
- var self = this, o = this.options;
+ _tabify: function( init ) {
+ var self = this,
+ o = this.options,
+ fragmentId = /^#.+/; // Safari 2 reports '#' for an empty hash
- var fragmentId = /^#.+/; // Safari 2 reports '#' for an empty hash
- this.anchors.each(function(i, a) {
- var href = $(a).attr('href');
+ this.list = this.element.find( "ol,ul" ).eq( 0 );
+ this.lis = $( " > li:has(a[href])", this.list );
+ this.anchors = this.lis.map(function() {
+ return $( "a", this )[ 0 ];
+ });
+ this.panels = $( [] );
+ this.anchors.each(function( i, a ) {
+ var href = $( a ).attr( "href" );
// For dynamically created HTML that contains a hash as href IE < 8 expands
// such href to the full page url with hash and then misinterprets tab as ajax.
// Same consideration applies for an added tab with a fragment identifier
// since a[href=#fragment-identifier] does unexpectedly not match.
// Thus normalize href attribute...
- var hrefBase = href.split('#')[0], baseEl;
- if (hrefBase && (hrefBase === location.toString().split('#')[0] ||
- (baseEl = $('base')[0]) && hrefBase === baseEl.href)) {
+ var hrefBase = href.split( "#" )[ 0 ],
+ baseEl;
+ if ( hrefBase && ( hrefBase === location.toString().split( "#" )[ 0 ] ||
+ ( baseEl = $( "base" )[ 0 ]) && hrefBase === baseEl.href ) ) {
href = a.hash;
a.href = href;
}
// inline tab
- if (fragmentId.test(href)) {
- self.panels = self.panels.add(self._sanitizeSelector(href));
- }
-
+ if ( fragmentId.test( href ) ) {
+ self.panels = self.panels.add( self.element.find( self._sanitizeSelector( href ) ) );
// remote tab
- else if (href != '#') { // prevent loading the page itself if href is just "#"
- $.data(a, 'href.tabs', href); // required for restore on destroy
+ // prevent loading the page itself if href is just "#"
+ } else if ( href && href !== "#" ) {
+ // required for restore on destroy
+ $.data( a, "href.tabs", href );
// TODO until #3808 is fixed strip fragment identifier from url
// (IE fails to load from such url)
- $.data(a, 'load.tabs', href.replace(/#.*$/, '')); // mutable data
-
- var id = self._tabId(a);
- a.href = '#' + id;
- var $panel = $('#' + id);
- if (!$panel.length) {
- $panel = $(o.panelTemplate).attr('id', id).addClass('ui-tabs-panel ui-widget-content ui-corner-bottom')
- .insertAfter(self.panels[i - 1] || self.list);
- $panel.data('destroy.tabs', true);
+ $.data( a, "load.tabs", href.replace( /#.*$/, "" ) );
+
+ var id = self._tabId( a );
+ a.href = "#" + id;
+ var $panel = self.element.find( "#" + id );
+ if ( !$panel.length ) {
+ $panel = $( o.panelTemplate )
+ .attr( "id", id )
+ .addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" )
+ .insertAfter( self.panels[ i - 1 ] || self.list );
+ $panel.data( "destroy.tabs", true );
}
- self.panels = self.panels.add($panel);
- }
-
+ self.panels = self.panels.add( $panel );
// invalid tab href
- else {
- o.disabled.push(i);
+ } else {
+ o.disabled.push( i );
}
});
// initialization from scratch
- if (init) {
-
+ if ( init ) {
// attach necessary classes for styling
- this.element.addClass('ui-tabs ui-widget ui-widget-content ui-corner-all');
- this.list.addClass('ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all');
- this.lis.addClass('ui-state-default ui-corner-top');
- this.panels.addClass('ui-tabs-panel ui-widget-content ui-corner-bottom');
+ this.element.addClass( "ui-tabs ui-widget ui-widget-content ui-corner-all" );
+ this.list.addClass( "ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all" );
+ this.lis.addClass( "ui-state-default ui-corner-top" );
+ this.panels.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" );
// Selected tab
// use "selected" option or try to retrieve:
// 1. from fragment identifier in url
// 2. from cookie
// 3. from selected class attribute on <li>
- if (o.selected === undefined) {
- if (location.hash) {
- this.anchors.each(function(i, a) {
- if (a.hash == location.hash) {
+ if ( o.selected === undefined ) {
+ if ( location.hash ) {
+ this.anchors.each(function( i, a ) {
+ if ( a.hash == location.hash ) {
o.selected = i;
- return false; // break
+ return false;
}
});
}
- if (typeof o.selected != 'number' && o.cookie) {
- o.selected = parseInt(self._cookie(), 10);
+ if ( typeof o.selected !== "number" && o.cookie ) {
+ o.selected = parseInt( self._cookie(), 10 );
}
- if (typeof o.selected != 'number' && this.lis.filter('.ui-tabs-selected').length) {
- o.selected = this.lis.index(this.lis.filter('.ui-tabs-selected'));
+ if ( typeof o.selected !== "number" && this.lis.filter( ".ui-tabs-selected" ).length ) {
+ o.selected = this.lis.index( this.lis.filter( ".ui-tabs-selected" ) );
}
- o.selected = o.selected || (this.lis.length ? 0 : -1);
- }
- else if (o.selected === null) { // usage of null is deprecated, TODO remove in next release
+ o.selected = o.selected || ( this.lis.length ? 0 : -1 );
+ } else if ( o.selected === null ) { // usage of null is deprecated, TODO remove in next release
o.selected = -1;
}
// sanity check - default to first tab...
- o.selected = ((o.selected >= 0 && this.anchors[o.selected]) || o.selected < 0) ? o.selected : 0;
+ o.selected = ( ( o.selected >= 0 && this.anchors[ o.selected ] ) || o.selected < 0 )
+ ? o.selected
+ : 0;
// Take disabling tabs via class attribute from HTML
// into account and update option properly.
// A selected tab cannot become disabled.
- o.disabled = $.unique(o.disabled.concat(
- $.map(this.lis.filter('.ui-state-disabled'),
- function(n, i) { return self.lis.index(n); } )
- )).sort();
+ o.disabled = $.unique( o.disabled.concat(
+ $.map( this.lis.filter( ".ui-state-disabled" ), function( n, i ) {
+ return self.lis.index( n );
+ })
+ ) ).sort();
- if ($.inArray(o.selected, o.disabled) != -1) {
- o.disabled.splice($.inArray(o.selected, o.disabled), 1);
+ if ( $.inArray( o.selected, o.disabled ) != -1 ) {
+ o.disabled.splice( $.inArray( o.selected, o.disabled ), 1 );
}
// highlight selected tab
- this.panels.addClass('ui-tabs-hide');
- this.lis.removeClass('ui-tabs-selected ui-state-active');
- if (o.selected >= 0 && this.anchors.length) { // check for length avoids error when initializing empty list
- this.panels.eq(o.selected).removeClass('ui-tabs-hide');
- this.lis.eq(o.selected).addClass('ui-tabs-selected ui-state-active');
+ this.panels.addClass( "ui-tabs-hide" );
+ this.lis.removeClass( "ui-tabs-selected ui-state-active" );
+ // check for length avoids error when initializing empty list
+ if ( o.selected >= 0 && this.anchors.length ) {
+ self.element.find( self._sanitizeSelector( self.anchors[ o.selected ].hash ) ).removeClass( "ui-tabs-hide" );
+ this.lis.eq( o.selected ).addClass( "ui-tabs-selected ui-state-active" );
// seems to be expected behavior that the show callback is fired
- self.element.queue("tabs", function() {
- self._trigger('show', null, self._ui(self.anchors[o.selected], self.panels[o.selected]));
+ self.element.queue( "tabs", function() {
+ self._trigger( "show", null,
+ self._ui( self.anchors[ o.selected ], self.element.find( self._sanitizeSelector( self.anchors[ o.selected ].hash ) )[ 0 ] ) );
});
-
- this.load(o.selected);
+
+ this.load( o.selected );
}
// clean up to avoid memory leaks in certain versions of IE 6
- $(window).bind('unload', function() {
- self.lis.add(self.anchors).unbind('.tabs');
+ // TODO: namespace this event
+ $( window ).bind( "unload", function() {
+ self.lis.add( self.anchors ).unbind( ".tabs" );
self.lis = self.anchors = self.panels = null;
});
-
- }
// update selected after add/remove
- else {
- o.selected = this.lis.index(this.lis.filter('.ui-tabs-selected'));
+ } else {
+ o.selected = this.lis.index( this.lis.filter( ".ui-tabs-selected" ) );
}
// update collapsible
- this.element[o.collapsible ? 'addClass' : 'removeClass']('ui-tabs-collapsible');
+ // TODO: use .toggleClass()
+ this.element[ o.collapsible ? "addClass" : "removeClass" ]( "ui-tabs-collapsible" );
// set or update cookie after init and add/remove respectively
- if (o.cookie) {
- this._cookie(o.selected, o.cookie);
+ if ( o.cookie ) {
+ this._cookie( o.selected, o.cookie );
}
// disable tabs
- for (var i = 0, li; (li = this.lis[i]); i++) {
- $(li)[$.inArray(i, o.disabled) != -1 &&
- !$(li).hasClass('ui-tabs-selected') ? 'addClass' : 'removeClass']('ui-state-disabled');
+ for ( var i = 0, li; ( li = this.lis[ i ] ); i++ ) {
+ $( li )[ $.inArray( i, o.disabled ) != -1 &&
+ // TODO: use .toggleClass()
+ !$( li ).hasClass( "ui-tabs-selected" ) ? "addClass" : "removeClass" ]( "ui-state-disabled" );
}
// reset cache if switching from cached to not cached
- if (o.cache === false) {
- this.anchors.removeData('cache.tabs');
+ if ( o.cache === false ) {
+ this.anchors.removeData( "cache.tabs" );
}
// remove all handlers before, tabify may run on existing tabs after add or option change
- this.lis.add(this.anchors).unbind('.tabs');
+ this.lis.add( this.anchors ).unbind( ".tabs" );
- if (o.event != 'mouseover') {
- var addState = function(state, el) {
- if (el.is(':not(.ui-state-disabled)')) {
- el.addClass('ui-state-' + state);
+ if ( o.event !== "mouseover" ) {
+ var addState = function( state, el ) {
+ if ( el.is( ":not(.ui-state-disabled)" ) ) {
+ el.addClass( "ui-state-" + state );
}
};
- var removeState = function(state, el) {
- el.removeClass('ui-state-' + state);
+ var removeState = function( state, el ) {
+ el.removeClass( "ui-state-" + state );
};
- this.lis.bind('mouseover.tabs', function() {
- addState('hover', $(this));
+ this.lis.bind( "mouseover.tabs" , function() {
+ addState( "hover", $( this ) );
});
- this.lis.bind('mouseout.tabs', function() {
- removeState('hover', $(this));
+ this.lis.bind( "mouseout.tabs", function() {
+ removeState( "hover", $( this ) );
});
- this.anchors.bind('focus.tabs', function() {
- addState('focus', $(this).closest('li'));
+ this.anchors.bind( "focus.tabs", function() {
+ addState( "focus", $( this ).closest( "li" ) );
});
- this.anchors.bind('blur.tabs', function() {
- removeState('focus', $(this).closest('li'));
+ this.anchors.bind( "blur.tabs", function() {
+ removeState( "focus", $( this ).closest( "li" ) );
});
}
// set up animations
var hideFx, showFx;
- if (o.fx) {
- if ($.isArray(o.fx)) {
- hideFx = o.fx[0];
- showFx = o.fx[1];
- }
- else {
+ if ( o.fx ) {
+ if ( $.isArray( o.fx ) ) {
+ hideFx = o.fx[ 0 ];
+ showFx = o.fx[ 1 ];
+ } else {
hideFx = showFx = o.fx;
}
}
// Reset certain styles left over from animation
// and prevent IE's ClearType bug...
- function resetStyle($el, fx) {
- $el.css({ display: '' });
- if (!$.support.opacity && fx.opacity) {
- $el[0].style.removeAttribute('filter');
+ function resetStyle( $el, fx ) {
+ $el.css( "display", "" );
+ if ( !$.support.opacity && fx.opacity ) {
+ $el[ 0 ].style.removeAttribute( "filter" );
}
}
// Show a tab...
- var showTab = showFx ?
- function(clicked, $show) {
- $(clicked).closest('li').addClass('ui-tabs-selected ui-state-active');
- $show.hide().removeClass('ui-tabs-hide') // avoid flicker that way
- .animate(showFx, showFx.duration || 'normal', function() {
- resetStyle($show, showFx);
- self._trigger('show', null, self._ui(clicked, $show[0]));
+ var showTab = showFx
+ ? function( clicked, $show ) {
+ $( clicked ).closest( "li" ).addClass( "ui-tabs-selected ui-state-active" );
+ $show.hide().removeClass( "ui-tabs-hide" ) // avoid flicker that way
+ .animate( showFx, showFx.duration || "normal", function() {
+ resetStyle( $show, showFx );
+ self._trigger( "show", null, self._ui( clicked, $show[ 0 ] ) );
});
- } :
- function(clicked, $show) {
- $(clicked).closest('li').addClass('ui-tabs-selected ui-state-active');
- $show.removeClass('ui-tabs-hide');
- self._trigger('show', null, self._ui(clicked, $show[0]));
+ }
+ : function( clicked, $show ) {
+ $( clicked ).closest( "li" ).addClass( "ui-tabs-selected ui-state-active" );
+ $show.removeClass( "ui-tabs-hide" );
+ self._trigger( "show", null, self._ui( clicked, $show[ 0 ] ) );
};
// Hide a tab, $show is optional...
- var hideTab = hideFx ?
- function(clicked, $hide) {
- $hide.animate(hideFx, hideFx.duration || 'normal', function() {
- self.lis.removeClass('ui-tabs-selected ui-state-active');
- $hide.addClass('ui-tabs-hide');
- resetStyle($hide, hideFx);
- self.element.dequeue("tabs");
+ var hideTab = hideFx
+ ? function( clicked, $hide ) {
+ $hide.animate( hideFx, hideFx.duration || "normal", function() {
+ self.lis.removeClass( "ui-tabs-selected ui-state-active" );
+ $hide.addClass( "ui-tabs-hide" );
+ resetStyle( $hide, hideFx );
+ self.element.dequeue( "tabs" );
});
- } :
- function(clicked, $hide, $show) {
- self.lis.removeClass('ui-tabs-selected ui-state-active');
- $hide.addClass('ui-tabs-hide');
- self.element.dequeue("tabs");
+ }
+ : function( clicked, $hide, $show ) {
+ self.lis.removeClass( "ui-tabs-selected ui-state-active" );
+ $hide.addClass( "ui-tabs-hide" );
+ self.element.dequeue( "tabs" );
};
// attach tab event handler, unbind to avoid duplicates from former tabifying...
- this.anchors.bind(o.event + '.tabs', function() {
- var el = this, $li = $(this).closest('li'), $hide = self.panels.filter(':not(.ui-tabs-hide)'),
- $show = $(self._sanitizeSelector(this.hash));
+ this.anchors.bind( o.event + ".tabs", function() {
+ var el = this,
+ $li = $(el).closest( "li" ),
+ $hide = self.panels.filter( ":not(.ui-tabs-hide)" ),
+ $show = self.element.find( self._sanitizeSelector( el.hash ) );
// If tab is already selected and not collapsible or tab disabled or
// or is already loading or click callback returns false stop here.
// Check if click handler returns false last so that it is not executed
// for a disabled or loading tab!
- if (($li.hasClass('ui-tabs-selected') && !o.collapsible) ||
- $li.hasClass('ui-state-disabled') ||
- $li.hasClass('ui-state-processing') ||
- self._trigger('select', null, self._ui(this, $show[0])) === false) {
+ if ( ( $li.hasClass( "ui-tabs-selected" ) && !o.collapsible) ||
+ $li.hasClass( "ui-state-disabled" ) ||
+ $li.hasClass( "ui-state-processing" ) ||
+ self.panels.filter( ":animated" ).length ||
+ self._trigger( "select", null, self._ui( this, $show[ 0 ] ) ) === false ) {
this.blur();
return false;
}
- o.selected = self.anchors.index(this);
+ o.selected = self.anchors.index( this );
self.abort();
// if tab may be closed
- if (o.collapsible) {
- if ($li.hasClass('ui-tabs-selected')) {
+ if ( o.collapsible ) {
+ if ( $li.hasClass( "ui-tabs-selected" ) ) {
o.selected = -1;
- if (o.cookie) {
- self._cookie(o.selected, o.cookie);
+ if ( o.cookie ) {
+ self._cookie( o.selected, o.cookie );
}
- self.element.queue("tabs", function() {
- hideTab(el, $hide);
- }).dequeue("tabs");
-
+ self.element.queue( "tabs", function() {
+ hideTab( el, $hide );
+ }).dequeue( "tabs" );
+
this.blur();
return false;
- }
- else if (!$hide.length) {
- if (o.cookie) {
- self._cookie(o.selected, o.cookie);
+ } else if ( !$hide.length ) {
+ if ( o.cookie ) {
+ self._cookie( o.selected, o.cookie );
}
-
- self.element.queue("tabs", function() {
- showTab(el, $show);
+
+ self.element.queue( "tabs", function() {
+ showTab( el, $show );
});
- self.load(self.anchors.index(this)); // TODO make passing in node possible, see also http://dev.jqueryui.com/ticket/3171
-
+ // TODO make passing in node possible, see also http://dev.jqueryui.com/ticket/3171
+ self.load( self.anchors.index( this ) );
+
this.blur();
return false;
}
}
- if (o.cookie) {
- self._cookie(o.selected, o.cookie);
+ if ( o.cookie ) {
+ self._cookie( o.selected, o.cookie );
}
// show new tab
- if ($show.length) {
- if ($hide.length) {
- self.element.queue("tabs", function() {
- hideTab(el, $hide);
+ if ( $show.length ) {
+ if ( $hide.length ) {
+ self.element.queue( "tabs", function() {
+ hideTab( el, $hide );
});
}
- self.element.queue("tabs", function() {
- showTab(el, $show);
+ self.element.queue( "tabs", function() {
+ showTab( el, $show );
});
-
- self.load(self.anchors.index(this));
- }
- else {
- throw 'jQuery UI Tabs: Mismatching fragment identifier.';
+
+ self.load( self.anchors.index( this ) );
+ } else {
+ throw "jQuery UI Tabs: Mismatching fragment identifier.";
}
// Prevent IE from keeping other link focussed when using the back button
// and remove dotted border from clicked link. This is controlled via CSS
// in modern browsers; blur() removes focus from address bar in Firefox
// which can become a usability and annoying problem with tabs('rotate').
- if ($.browser.msie) {
+ if ( $.browser.msie ) {
this.blur();
}
-
});
// disable click in any case
- this.anchors.bind('click.tabs', function(){return false;});
+ this.anchors.bind( "click.tabs", function(){
+ return false;
+ });
+ },
+
+ _getIndex: function( index ) {
+ // meta-function to give users option to provide a href string instead of a numerical index.
+ // also sanitizes numerical indexes to valid values.
+ if ( typeof index == "string" ) {
+ index = this.anchors.index( this.anchors.filter( "[href$=" + index + "]" ) );
+ }
+ return index;
},
destroy: function() {
var o = this.options;
this.abort();
-
- this.element.unbind('.tabs')
- .removeClass('ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible')
- .removeData('tabs');
- this.list.removeClass('ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all');
+ this.element
+ .unbind( ".tabs" )
+ .removeClass( "ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible" )
+ .removeData( "tabs" );
+
+ this.list.removeClass( "ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all" );
this.anchors.each(function() {
- var href = $.data(this, 'href.tabs');
- if (href) {
+ var href = $.data( this, "href.tabs" );
+ if ( href ) {
this.href = href;
}
- var $this = $(this).unbind('.tabs');
- $.each(['href', 'load', 'cache'], function(i, prefix) {
- $this.removeData(prefix + '.tabs');
+ var $this = $( this ).unbind( ".tabs" );
+ $.each( [ "href", "load", "cache" ], function( i, prefix ) {
+ $this.removeData( prefix + ".tabs" );
});
});
- this.lis.unbind('.tabs').add(this.panels).each(function() {
- if ($.data(this, 'destroy.tabs')) {
- $(this).remove();
- }
- else {
- $(this).removeClass([
- 'ui-state-default',
- 'ui-corner-top',
- 'ui-tabs-selected',
- 'ui-state-active',
- 'ui-state-hover',
- 'ui-state-focus',
- 'ui-state-disabled',
- 'ui-tabs-panel',
- 'ui-widget-content',
- 'ui-corner-bottom',
- 'ui-tabs-hide'
- ].join(' '));
+ this.lis.unbind( ".tabs" ).add( this.panels ).each(function() {
+ if ( $.data( this, "destroy.tabs" ) ) {
+ $( this ).remove();
+ } else {
+ $( this ).removeClass([
+ "ui-state-default",
+ "ui-corner-top",
+ "ui-tabs-selected",
+ "ui-state-active",
+ "ui-state-hover",
+ "ui-state-focus",
+ "ui-state-disabled",
+ "ui-tabs-panel",
+ "ui-widget-content",
+ "ui-corner-bottom",
+ "ui-tabs-hide"
+ ].join( " " ) );
}
});
- if (o.cookie) {
- this._cookie(null, o.cookie);
+ if ( o.cookie ) {
+ this._cookie( null, o.cookie );
}
return this;
},
- add: function(url, label, index) {
- if (index === undefined) {
- index = this.anchors.length; // append by default
+ add: function( url, label, index ) {
+ if ( index === undefined ) {
+ index = this.anchors.length;
}
- var self = this, o = this.options,
- $li = $(o.tabTemplate.replace(/#\{href\}/g, url).replace(/#\{label\}/g, label)),
- id = !url.indexOf('#') ? url.replace('#', '') : this._tabId($('a', $li)[0]);
+ var self = this,
+ o = this.options,
+ $li = $( o.tabTemplate.replace( /#\{href\}/g, url ).replace( /#\{label\}/g, label ) ),
+ id = !url.indexOf( "#" ) ? url.replace( "#", "" ) : this._tabId( $( "a", $li )[ 0 ] );
- $li.addClass('ui-state-default ui-corner-top').data('destroy.tabs', true);
+ $li.addClass( "ui-state-default ui-corner-top" ).data( "destroy.tabs", true );
// try to find an existing element before creating a new one
- var $panel = $('#' + id);
- if (!$panel.length) {
- $panel = $(o.panelTemplate).attr('id', id).data('destroy.tabs', true);
+ var $panel = self.element.find( "#" + id );
+ if ( !$panel.length ) {
+ $panel = $( o.panelTemplate )
+ .attr( "id", id )
+ .data( "destroy.tabs", true );
}
- $panel.addClass('ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide');
+ $panel.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" );
- if (index >= this.lis.length) {
- $li.appendTo(this.list);
- $panel.appendTo(this.list[0].parentNode);
- }
- else {
- $li.insertBefore(this.lis[index]);
- $panel.insertBefore(this.panels[index]);
+ if ( index >= this.lis.length ) {
+ $li.appendTo( this.list );
+ $panel.appendTo( this.list[ 0 ].parentNode );
+ } else {
+ $li.insertBefore( this.lis[ index ] );
+ $panel.insertBefore( this.panels[ index ] );
}
- o.disabled = $.map(o.disabled,
- function(n, i) { return n >= index ? ++n : n; });
+ o.disabled = $.map( o.disabled, function( n, i ) {
+ return n >= index ? ++n : n;
+ });
this._tabify();
- if (this.anchors.length == 1) { // after tabify
+ if ( this.anchors.length == 1 ) {
o.selected = 0;
- $li.addClass('ui-tabs-selected ui-state-active');
- $panel.removeClass('ui-tabs-hide');
- this.element.queue("tabs", function() {
- self._trigger('show', null, self._ui(self.anchors[0], self.panels[0]));
+ $li.addClass( "ui-tabs-selected ui-state-active" );
+ $panel.removeClass( "ui-tabs-hide" );
+ this.element.queue( "tabs", function() {
+ self._trigger( "show", null, self._ui( self.anchors[ 0 ], self.panels[ 0 ] ) );
});
-
- this.load(0);
+
+ this.load( 0 );
}
- // callback
- this._trigger('add', null, this._ui(this.anchors[index], this.panels[index]));
+ this._trigger( "add", null, this._ui( this.anchors[ index ], this.panels[ index ] ) );
return this;
},
- remove: function(index) {
- var o = this.options, $li = this.lis.eq(index).remove(),
- $panel = this.panels.eq(index).remove();
+ remove: function( index ) {
+ index = this._getIndex( index );
+ var o = this.options,
+ $li = this.lis.eq( index ).remove(),
+ $panel = this.panels.eq( index ).remove();
// If selected tab was removed focus tab to the right or
// in case the last tab was removed the tab to the left.
- if ($li.hasClass('ui-tabs-selected') && this.anchors.length > 1) {
- this.select(index + (index + 1 < this.anchors.length ? 1 : -1));
+ if ( $li.hasClass( "ui-tabs-selected" ) && this.anchors.length > 1) {
+ this.select( index + ( index + 1 < this.anchors.length ? 1 : -1 ) );
}
- o.disabled = $.map($.grep(o.disabled, function(n, i) { return n != index; }),
- function(n, i) { return n >= index ? --n : n; });
+ o.disabled = $.map(
+ $.grep( o.disabled, function(n, i) {
+ return n != index;
+ }),
+ function( n, i ) {
+ return n >= index ? --n : n;
+ });
this._tabify();
- // callback
- this._trigger('remove', null, this._ui($li.find('a')[0], $panel[0]));
+ this._trigger( "remove", null, this._ui( $li.find( "a" )[ 0 ], $panel[ 0 ] ) );
return this;
},
- enable: function(index) {
+ enable: function( index ) {
+ index = this._getIndex( index );
var o = this.options;
- if ($.inArray(index, o.disabled) == -1) {
+ if ( $.inArray( index, o.disabled ) == -1 ) {
return;
}
- this.lis.eq(index).removeClass('ui-state-disabled');
- o.disabled = $.grep(o.disabled, function(n, i) { return n != index; });
+ this.lis.eq( index ).removeClass( "ui-state-disabled" );
+ o.disabled = $.grep( o.disabled, function( n, i ) {
+ return n != index;
+ });
- // callback
- this._trigger('enable', null, this._ui(this.anchors[index], this.panels[index]));
+ this._trigger( "enable", null, this._ui( this.anchors[ index ], this.panels[ index ] ) );
return this;
},
- disable: function(index) {
+ disable: function( index ) {
+ index = this._getIndex( index );
var self = this, o = this.options;
- if (index != o.selected) { // cannot disable already selected tab
- this.lis.eq(index).addClass('ui-state-disabled');
+ // cannot disable already selected tab
+ if ( index != o.selected ) {
+ this.lis.eq( index ).addClass( "ui-state-disabled" );
- o.disabled.push(index);
+ o.disabled.push( index );
o.disabled.sort();
- // callback
- this._trigger('disable', null, this._ui(this.anchors[index], this.panels[index]));
+ this._trigger( "disable", null, this._ui( this.anchors[ index ], this.panels[ index ] ) );
}
return this;
},
- select: function(index) {
- if (typeof index == 'string') {
- index = this.anchors.index(this.anchors.filter('[href$=' + index + ']'));
- }
- else if (index === null) { // usage of null is deprecated, TODO remove in next release
- index = -1;
- }
- if (index == -1 && this.options.collapsible) {
- index = this.options.selected;
+ select: function( index ) {
+ index = this._getIndex( index );
+ if ( index == -1 ) {
+ if ( this.options.collapsible && this.options.selected != -1 ) {
+ index = this.options.selected;
+ } else {
+ return this;
+ }
}
-
- this.anchors.eq(index).trigger(this.options.event + '.tabs');
+ this.anchors.eq( index ).trigger( this.options.event + ".tabs" );
return this;
},
- load: function(index) {
- var self = this, o = this.options, a = this.anchors.eq(index)[0], url = $.data(a, 'load.tabs');
+ load: function( index ) {
+ index = this._getIndex( index );
+ var self = this,
+ o = this.options,
+ a = this.anchors.eq( index )[ 0 ],
+ url = $.data( a, "load.tabs" );
this.abort();
// not remote or from cache
- if (!url || this.element.queue("tabs").length !== 0 && $.data(a, 'cache.tabs')) {
- this.element.dequeue("tabs");
+ if ( !url || this.element.queue( "tabs" ).length !== 0 && $.data( a, "cache.tabs" ) ) {
+ this.element.dequeue( "tabs" );
return;
}
// load remote from here on
- this.lis.eq(index).addClass('ui-state-processing');
+ this.lis.eq( index ).addClass( "ui-state-processing" );
- if (o.spinner) {
- var span = $('span', a);
- span.data('label.tabs', span.html()).html(o.spinner);
+ if ( o.spinner ) {
+ var span = $( "span", a );
+ span.data( "label.tabs", span.html() ).html( o.spinner );
}
- this.xhr = $.ajax($.extend({}, o.ajaxOptions, {
+ this.xhr = $.ajax( $.extend( {}, o.ajaxOptions, {
url: url,
- success: function(r, s) {
- $(self._sanitizeSelector(a.hash)).html(r);
+ success: function( r, s ) {
+ self.element.find( self._sanitizeSelector( a.hash ) ).html( r );
// take care of tab labels
self._cleanup();
- if (o.cache) {
- $.data(a, 'cache.tabs', true); // if loaded once do not load them again
+ if ( o.cache ) {
+ $.data( a, "cache.tabs", true );
}
- // callbacks
- self._trigger('load', null, self._ui(self.anchors[index], self.panels[index]));
+ self._trigger( "load", null, self._ui( self.anchors[ index ], self.panels[ index ] ) );
try {
- o.ajaxOptions.success(r, s);
+ o.ajaxOptions.success( r, s );
}
- catch (e) {}
+ catch ( e ) {}
},
- error: function(xhr, s, e) {
+ error: function( xhr, s, e ) {
// take care of tab labels
self._cleanup();
- // callbacks
- self._trigger('load', null, self._ui(self.anchors[index], self.panels[index]));
+ self._trigger( "load", null, self._ui( self.anchors[ index ], self.panels[ index ] ) );
try {
// Passing index avoid a race condition when this method is
// called after the user has selected another tab.
// Pass the anchor that initiated this request allows
// loadError to manipulate the tab content panel via $(a.hash)
- o.ajaxOptions.error(xhr, s, index, a);
+ o.ajaxOptions.error( xhr, s, index, a );
}
- catch (e) {}
+ catch ( e ) {}
}
- }));
+ } ) );
// last, so that load event is fired before show...
- self.element.dequeue("tabs");
+ self.element.dequeue( "tabs" );
return this;
},
abort: function() {
// stop possibly running animations
- this.element.queue([]);
- this.panels.stop(false, true);
+ this.element.queue( [] );
+ this.panels.stop( false, true );
// "tabs" queue must not contain more than two elements,
// which are the callbacks for the latest clicked tab...
- this.element.queue("tabs", this.element.queue("tabs").splice(-2, 2));
+ this.element.queue( "tabs", this.element.queue( "tabs" ).splice( -2, 2 ) );
// terminate pending requests from other tabs
- if (this.xhr) {
+ if ( this.xhr ) {
this.xhr.abort();
delete this.xhr;
}
@@ -7471,19 +8172,18 @@ $.widget("ui.tabs", {
return this;
},
- url: function(index, url) {
- this.anchors.eq(index).removeData('cache.tabs').data('load.tabs', url);
+ url: function( index, url ) {
+ this.anchors.eq( index ).removeData( "cache.tabs" ).data( "load.tabs", url );
return this;
},
length: function() {
return this.anchors.length;
}
-
});
-$.extend($.ui.tabs, {
- version: '1.8'
+$.extend( $.ui.tabs, {
+ version: "1.8.16"
});
/*
@@ -7493,46 +8193,45 @@ $.extend($.ui.tabs, {
/*
* Rotate
*/
-$.extend($.ui.tabs.prototype, {
+$.extend( $.ui.tabs.prototype, {
rotation: null,
- rotate: function(ms, continuing) {
+ rotate: function( ms, continuing ) {
+ var self = this,
+ o = this.options;
- var self = this, o = this.options;
-
- var rotate = self._rotate || (self._rotate = function(e) {
- clearTimeout(self.rotation);
+ var rotate = self._rotate || ( self._rotate = function( e ) {
+ clearTimeout( self.rotation );
self.rotation = setTimeout(function() {
var t = o.selected;
self.select( ++t < self.anchors.length ? t : 0 );
- }, ms);
+ }, ms );
- if (e) {
+ if ( e ) {
e.stopPropagation();
}
});
-
- var stop = self._unrotate || (self._unrotate = !continuing ?
- function(e) {
+
+ var stop = self._unrotate || ( self._unrotate = !continuing
+ ? function(e) {
if (e.clientX) { // in case of a true click
self.rotate(null);
}
- } :
- function(e) {
+ }
+ : function( e ) {
t = o.selected;
rotate();
});
// start rotation
- if (ms) {
- this.element.bind('tabsshow', rotate);
- this.anchors.bind(o.event + '.tabs', stop);
+ if ( ms ) {
+ this.element.bind( "tabsshow", rotate );
+ this.anchors.bind( o.event + ".tabs", stop );
rotate();
- }
// stop rotation
- else {
- clearTimeout(self.rotation);
- this.element.unbind('tabsshow', rotate);
- this.anchors.unbind(o.event + '.tabs', stop);
+ } else {
+ clearTimeout( self.rotation );
+ this.element.unbind( "tabsshow", rotate );
+ this.anchors.unbind( o.event + ".tabs", stop );
delete this._rotate;
delete this._unrotate;
}
@@ -7541,26 +8240,26 @@ $.extend($.ui.tabs.prototype, {
}
});
-})(jQuery);
+})( jQuery );
/*
- * jQuery UI Datepicker 1.8
+ * jQuery UI Datepicker 1.8.16
*
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
*
* http://docs.jquery.com/UI/Datepicker
*
* Depends:
* jquery.ui.core.js
*/
+(function( $, undefined ) {
-(function($) { // hide the namespace
-
-$.extend($.ui, { datepicker: { version: "1.8" } });
+$.extend($.ui, { datepicker: { version: "1.8.16" } });
var PROP_NAME = 'datepicker';
var dpuuid = new Date().getTime();
+var instActive;
/* Date picker manager.
Use the singleton instance of this class, $.datepicker, to interact with the date picker.
@@ -7605,7 +8304,7 @@ function Datepicker() {
this._defaults = { // Global defaults for all the date picker instances
showOn: 'focus', // 'focus' for popup on focus,
// 'button' for trigger button, or 'both' for either
- showAnim: 'show', // Name of jQuery animation for popup
+ showAnim: 'fadeIn', // Name of jQuery animation for popup
showOptions: {}, // Options for enhanced animations
defaultDate: null, // Used when field is blank: actual date,
// +/-number for offset from today, null for today
@@ -7632,7 +8331,7 @@ function Datepicker() {
// string value starting with '+' for current year + value
minDate: null, // The earliest selectable date, or null for no limit
maxDate: null, // The latest selectable date, or null for no limit
- duration: '_default', // Duration of display/closure
+ duration: 'fast', // Duration of display/closure
beforeShowDay: null, // Function that takes a date and returns an array with
// [0] = true if selectable, false if not, [1] = custom CSS class name(s) or '',
// [2] = cell title (optional), e.g. $.datepicker.noWeekends
@@ -7649,15 +8348,19 @@ function Datepicker() {
altFormat: '', // The date format to use for the alternate field
constrainInput: true, // The input is constrained by the current date format
showButtonPanel: false, // True to show button panel, false to not show it
- autoSize: false // True to size the input for the date format, false to leave as is
+ autoSize: false, // True to size the input for the date format, false to leave as is
+ disabled: false // The initial disabled state
};
$.extend(this._defaults, this.regional['']);
- this.dpDiv = $('<div id="' + this._mainDivId + '" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all ui-helper-hidden-accessible"></div>');
+ this.dpDiv = bindHover($('<div id="' + this._mainDivId + '" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'));
}
$.extend(Datepicker.prototype, {
/* Class name added to elements to indicate already configured with a date picker. */
markerClassName: 'hasDatepicker',
+
+ //Keep track of the maximum number of rows displayed (see #7043)
+ maxRows: 4,
/* Debug logging (if enabled). */
log: function () {
@@ -7697,8 +8400,10 @@ $.extend(Datepicker.prototype, {
}
var nodeName = target.nodeName.toLowerCase();
var inline = (nodeName == 'div' || nodeName == 'span');
- if (!target.id)
- target.id = 'dp' + (++this.uuid);
+ if (!target.id) {
+ this.uuid += 1;
+ target.id = 'dp' + this.uuid;
+ }
var inst = this._newInst($(target), inline);
inst.settings = $.extend({}, settings || {}, inlineSettings || {});
if (nodeName == 'input') {
@@ -7710,13 +8415,13 @@ $.extend(Datepicker.prototype, {
/* Create a new instance object. */
_newInst: function(target, inline) {
- var id = target[0].id.replace(/([^A-Za-z0-9_])/g, '\\\\$1'); // escape jQuery meta chars
+ var id = target[0].id.replace(/([^A-Za-z0-9_-])/g, '\\\\$1'); // escape jQuery meta chars
return {id: id, input: target, // associated target
selectedDay: 0, selectedMonth: 0, selectedYear: 0, // current selection
drawMonth: 0, drawYear: 0, // month being drawn
inline: inline, // is datepicker inline or not
dpDiv: (!inline ? this.dpDiv : // presentation div
- $('<div class="' + this._inlineClass + ' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))};
+ bindHover($('<div class="' + this._inlineClass + ' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>')))};
},
/* Attach the date picker to an input field. */
@@ -7736,6 +8441,10 @@ $.extend(Datepicker.prototype, {
});
this._autoSize(inst);
$.data(target, PROP_NAME, inst);
+ //If disabled option is true, disable the datepicker once it has been attached to the input (see ticket #5665)
+ if( inst.settings.disabled ) {
+ this._disableDatepicker( target );
+ }
},
/* Make attachments based on settings. */
@@ -7815,6 +8524,13 @@ $.extend(Datepicker.prototype, {
this._setDate(inst, this._getDefaultDate(inst), true);
this._updateDatepicker(inst);
this._updateAlternate(inst);
+ //If disabled option is true, disable the datepicker before showing it (see ticket #5665)
+ if( inst.settings.disabled ) {
+ this._disableDatepicker( target );
+ }
+ // Set display:block in place of inst.dpDiv.show() which won't work on disconnected elements
+ // http://bugs.jqueryui.com/ticket/7552 - A Datepicker created on a detached div has zero height
+ inst.dpDiv.css( "display", "block" );
},
/* Pop-up the date picker in a "dialog" box.
@@ -7829,7 +8545,8 @@ $.extend(Datepicker.prototype, {
_dialogDatepicker: function(input, date, onSelect, settings, pos) {
var inst = this._dialogInst; // internal instance
if (!inst) {
- var id = 'dp' + (++this.uuid);
+ this.uuid += 1;
+ var id = 'dp' + this.uuid;
this._dialogInput = $('<input type="text" id="' + id +
'" style="position: absolute; top: -100px; width: 0px; z-index: -10;"/>');
this._dialogInput.keydown(this._doKeyDown);
@@ -7904,6 +8621,8 @@ $.extend(Datepicker.prototype, {
else if (nodeName == 'div' || nodeName == 'span') {
var inline = $target.children('.' + this._inlineClass);
inline.children().removeClass('ui-state-disabled');
+ inline.find("select.ui-datepicker-month, select.ui-datepicker-year").
+ removeAttr("disabled");
}
this._disabledInputs = $.map(this._disabledInputs,
function(value) { return (value == target ? null : value); }); // delete entry
@@ -7927,6 +8646,8 @@ $.extend(Datepicker.prototype, {
else if (nodeName == 'div' || nodeName == 'span') {
var inline = $target.children('.' + this._inlineClass);
inline.children().addClass('ui-state-disabled');
+ inline.find("select.ui-datepicker-month, select.ui-datepicker-year").
+ attr("disabled", "disabled");
}
this._disabledInputs = $.map(this._disabledInputs,
function(value) { return (value == target ? null : value); }); // delete entry
@@ -7985,10 +8706,18 @@ $.extend(Datepicker.prototype, {
this._hideDatepicker();
}
var date = this._getDateDatepicker(target, true);
+ var minDate = this._getMinMaxDate(inst, 'min');
+ var maxDate = this._getMinMaxDate(inst, 'max');
extendRemove(inst.settings, settings);
+ // reformat the old minDate/maxDate values if dateFormat changes and a new minDate/maxDate isn't provided
+ if (minDate !== null && settings['dateFormat'] !== undefined && settings['minDate'] === undefined)
+ inst.settings.minDate = this._formatDate(inst, minDate);
+ if (maxDate !== null && settings['dateFormat'] !== undefined && settings['maxDate'] === undefined)
+ inst.settings.maxDate = this._formatDate(inst, maxDate);
this._attachments($(target), inst);
this._autoSize(inst);
- this._setDateDatepicker(target, date);
+ this._setDate(inst, date);
+ this._updateAlternate(inst);
this._updateDatepicker(inst);
}
},
@@ -8041,10 +8770,17 @@ $.extend(Datepicker.prototype, {
case 9: $.datepicker._hideDatepicker();
handled = false;
break; // hide on tab out
- case 13: var sel = $('td.' + $.datepicker._dayOverClass, inst.dpDiv).
- add($('td.' + $.datepicker._currentClass, inst.dpDiv));
+ case 13: var sel = $('td.' + $.datepicker._dayOverClass + ':not(.' +
+ $.datepicker._currentClass + ')', inst.dpDiv);
if (sel[0])
$.datepicker._selectDay(event.target, inst.selectedMonth, inst.selectedYear, sel[0]);
+ var onSelect = $.datepicker._get(inst, 'onSelect');
+ if (onSelect) {
+ var dateStr = $.datepicker._formatDate(inst);
+
+ // trigger custom callback
+ onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]);
+ }
else
$.datepicker._hideDatepicker();
return false; // don't submit the form
@@ -8106,7 +8842,7 @@ $.extend(Datepicker.prototype, {
if ($.datepicker._get(inst, 'constrainInput')) {
var chars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat'));
var chr = String.fromCharCode(event.charCode == undefined ? event.keyCode : event.charCode);
- return event.ctrlKey || (chr < ' ' || !chars || chars.indexOf(chr) > -1);
+ return event.ctrlKey || event.metaKey || (chr < ' ' || !chars || chars.indexOf(chr) > -1);
}
},
@@ -8132,6 +8868,7 @@ $.extend(Datepicker.prototype, {
},
/* Pop-up the date picker for a given input field.
+ If false returned from beforeShow event handler do not show.
@param input element - the input field attached to the date picker or
event - if triggered by focus */
_showDatepicker: function(input) {
@@ -8142,10 +8879,18 @@ $.extend(Datepicker.prototype, {
return;
var inst = $.datepicker._getInst(input);
if ($.datepicker._curInst && $.datepicker._curInst != inst) {
+ if ( $.datepicker._datepickerShowing ) {
+ $.datepicker._triggerOnClose($.datepicker._curInst);
+ }
$.datepicker._curInst.dpDiv.stop(true, true);
}
var beforeShow = $.datepicker._get(inst, 'beforeShow');
- extendRemove(inst.settings, (beforeShow ? beforeShow.apply(input, [input, inst]) : {}));
+ var beforeShowSettings = beforeShow ? beforeShow.apply(input, [input, inst]) : {};
+ if(beforeShowSettings === false){
+ //false
+ return;
+ }
+ extendRemove(inst.settings, beforeShowSettings);
inst.lastVal = null;
$.datepicker._lastInput = input;
$.datepicker._setDateFromField(inst);
@@ -8166,6 +8911,8 @@ $.extend(Datepicker.prototype, {
}
var offset = {left: $.datepicker._pos[0], top: $.datepicker._pos[1]};
$.datepicker._pos = null;
+ //to avoid flashes on Firefox
+ inst.dpDiv.empty();
// determine sizing offscreen
inst.dpDiv.css({position: 'absolute', display: 'block', top: '-1000px'});
$.datepicker._updateDatepicker(inst);
@@ -8179,13 +8926,15 @@ $.extend(Datepicker.prototype, {
var showAnim = $.datepicker._get(inst, 'showAnim');
var duration = $.datepicker._get(inst, 'duration');
var postProcess = function() {
- $.datepicker._datepickerShowing = true;
- var borders = $.datepicker._getBorders(inst.dpDiv);
- inst.dpDiv.find('iframe.ui-datepicker-cover'). // IE6- only
- css({left: -borders[0], top: -borders[1],
+ var cover = inst.dpDiv.find('iframe.ui-datepicker-cover'); // IE6- only
+ if( !! cover.length ){
+ var borders = $.datepicker._getBorders(inst.dpDiv);
+ cover.css({left: -borders[0], top: -borders[1],
width: inst.dpDiv.outerWidth(), height: inst.dpDiv.outerHeight()});
+ }
};
inst.dpDiv.zIndex($(input).zIndex()+1);
+ $.datepicker._datepickerShowing = true;
if ($.effects && $.effects[showAnim])
inst.dpDiv.show(showAnim, $.datepicker._get(inst, 'showOptions'), duration, postProcess);
else
@@ -8201,44 +8950,41 @@ $.extend(Datepicker.prototype, {
/* Generate the date picker content. */
_updateDatepicker: function(inst) {
var self = this;
+ self.maxRows = 4; //Reset the max number of rows being displayed (see #7043)
var borders = $.datepicker._getBorders(inst.dpDiv);
- inst.dpDiv.empty().append(this._generateHTML(inst))
- .find('iframe.ui-datepicker-cover') // IE6- only
- .css({left: -borders[0], top: -borders[1],
- width: inst.dpDiv.outerWidth(), height: inst.dpDiv.outerHeight()})
- .end()
- .find('button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a')
- .bind('mouseout', function(){
- $(this).removeClass('ui-state-hover');
- if(this.className.indexOf('ui-datepicker-prev') != -1) $(this).removeClass('ui-datepicker-prev-hover');
- if(this.className.indexOf('ui-datepicker-next') != -1) $(this).removeClass('ui-datepicker-next-hover');
- })
- .bind('mouseover', function(){
- if (!self._isDisabledDatepicker( inst.inline ? inst.dpDiv.parent()[0] : inst.input[0])) {
- $(this).parents('.ui-datepicker-calendar').find('a').removeClass('ui-state-hover');
- $(this).addClass('ui-state-hover');
- if(this.className.indexOf('ui-datepicker-prev') != -1) $(this).addClass('ui-datepicker-prev-hover');
- if(this.className.indexOf('ui-datepicker-next') != -1) $(this).addClass('ui-datepicker-next-hover');
- }
- })
- .end()
- .find('.' + this._dayOverClass + ' a')
- .trigger('mouseover')
- .end();
+ instActive = inst; // for delegate hover events
+ inst.dpDiv.empty().append(this._generateHTML(inst));
+ var cover = inst.dpDiv.find('iframe.ui-datepicker-cover'); // IE6- only
+ if( !!cover.length ){ //avoid call to outerXXXX() when not in IE6
+ cover.css({left: -borders[0], top: -borders[1], width: inst.dpDiv.outerWidth(), height: inst.dpDiv.outerHeight()})
+ }
+ inst.dpDiv.find('.' + this._dayOverClass + ' a').mouseover();
var numMonths = this._getNumberOfMonths(inst);
var cols = numMonths[1];
var width = 17;
+ inst.dpDiv.removeClass('ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4').width('');
if (cols > 1)
inst.dpDiv.addClass('ui-datepicker-multi-' + cols).css('width', (width * cols) + 'em');
- else
- inst.dpDiv.removeClass('ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4').width('');
inst.dpDiv[(numMonths[0] != 1 || numMonths[1] != 1 ? 'add' : 'remove') +
'Class']('ui-datepicker-multi');
inst.dpDiv[(this._get(inst, 'isRTL') ? 'add' : 'remove') +
'Class']('ui-datepicker-rtl');
if (inst == $.datepicker._curInst && $.datepicker._datepickerShowing && inst.input &&
- inst.input.is(':visible') && !inst.input.is(':disabled'))
+ // #6694 - don't focus the input if it's already focused
+ // this breaks the change event in IE
+ inst.input.is(':visible') && !inst.input.is(':disabled') && inst.input[0] != document.activeElement)
inst.input.focus();
+ // deffered render of the years select (to avoid flashes on Firefox)
+ if( inst.yearshtml ){
+ var origyearshtml = inst.yearshtml;
+ setTimeout(function(){
+ //assure that inst.yearshtml didn't change.
+ if( origyearshtml === inst.yearshtml && inst.yearshtml ){
+ inst.dpDiv.find('select.ui-datepicker-year:first').replaceWith(inst.yearshtml);
+ }
+ origyearshtml = inst.yearshtml = null;
+ }, 0);
+ }
},
/* Retrieve the size of left and top borders for an element.
@@ -8278,13 +9024,21 @@ $.extend(Datepicker.prototype, {
_findPos: function(obj) {
var inst = this._getInst(obj);
var isRTL = this._get(inst, 'isRTL');
- while (obj && (obj.type == 'hidden' || obj.nodeType != 1)) {
+ while (obj && (obj.type == 'hidden' || obj.nodeType != 1 || $.expr.filters.hidden(obj))) {
obj = obj[isRTL ? 'previousSibling' : 'nextSibling'];
}
var position = $(obj).offset();
return [position.left, position.top];
},
+ /* Trigger custom callback of onClose. */
+ _triggerOnClose: function(inst) {
+ var onClose = this._get(inst, 'onClose');
+ if (onClose)
+ onClose.apply((inst.input ? inst.input[0] : null),
+ [(inst.input ? inst.input.val() : ''), inst]);
+ },
+
/* Hide the date picker from view.
@param input element - the input field attached to the date picker */
_hideDatepicker: function(input) {
@@ -8305,10 +9059,7 @@ $.extend(Datepicker.prototype, {
(showAnim == 'fadeIn' ? 'fadeOut' : 'hide'))]((showAnim ? duration : null), postProcess);
if (!showAnim)
postProcess();
- var onClose = this._get(inst, 'onClose');
- if (onClose)
- onClose.apply((inst.input ? inst.input[0] : null),
- [(inst.input ? inst.input.val() : ''), inst]); // trigger custom callback
+ $.datepicker._triggerOnClose(inst);
this._datepickerShowing = false;
this._lastInput = null;
if (this._inDialog) {
@@ -8376,7 +9127,6 @@ $.extend(Datepicker.prototype, {
_selectMonthYear: function(id, select, period) {
var target = $(id);
var inst = this._getInst(target[0]);
- inst._selectingMonthYear = false;
inst['selected' + (period == 'M' ? 'Month' : 'Year')] =
inst['draw' + (period == 'M' ? 'Month' : 'Year')] =
parseInt(select.options[select.selectedIndex].value,10);
@@ -8384,15 +9134,6 @@ $.extend(Datepicker.prototype, {
this._adjustDate(target);
},
- /* Restore input focus after not changing month/year. */
- _clickMonthYear: function(id) {
- var target = $(id);
- var inst = this._getInst(target[0]);
- if (inst.input && inst._selectingMonthYear && !$.browser.msie)
- inst.input.focus();
- inst._selectingMonthYear = !inst._selectingMonthYear;
- },
-
/* Action for selecting a day. */
_selectDay: function(id, month, year, td) {
var target = $(id);
@@ -8489,6 +9230,8 @@ $.extend(Datepicker.prototype, {
if (value == '')
return null;
var shortYearCutoff = (settings ? settings.shortYearCutoff : null) || this._defaults.shortYearCutoff;
+ shortYearCutoff = (typeof shortYearCutoff != 'string' ? shortYearCutoff :
+ new Date().getFullYear() % 100 + parseInt(shortYearCutoff, 10));
var dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort;
var dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames;
var monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort;
@@ -8507,9 +9250,9 @@ $.extend(Datepicker.prototype, {
};
// Extract a number from the string value
var getNumber = function(match) {
- lookAhead(match);
+ var isDoubled = lookAhead(match);
var size = (match == '@' ? 14 : (match == '!' ? 20 :
- (match == 'y' ? 4 : (match == 'o' ? 3 : 2))));
+ (match == 'y' && isDoubled ? 4 : (match == 'o' ? 3 : 2))));
var digits = new RegExp('^\\d{1,' + size + '}');
var num = value.substring(iValue).match(digits);
if (!num)
@@ -8519,14 +9262,24 @@ $.extend(Datepicker.prototype, {
};
// Extract a name from the string value and convert to an index
var getName = function(match, shortNames, longNames) {
- var names = (lookAhead(match) ? longNames : shortNames);
- for (var i = 0; i < names.length; i++) {
- if (value.substr(iValue, names[i].length) == names[i]) {
- iValue += names[i].length;
- return i + 1;
+ var names = $.map(lookAhead(match) ? longNames : shortNames, function (v, k) {
+ return [ [k, v] ];
+ }).sort(function (a, b) {
+ return -(a[1].length - b[1].length);
+ });
+ var index = -1;
+ $.each(names, function (i, pair) {
+ var name = pair[1];
+ if (value.substr(iValue, name.length).toLowerCase() == name.toLowerCase()) {
+ index = pair[0];
+ iValue += name.length;
+ return false;
}
- }
- throw 'Unknown name at position ' + iValue;
+ });
+ if (index != -1)
+ return index + 1;
+ else
+ throw 'Unknown name at position ' + iValue;
};
// Confirm that a literal character matches the string value
var checkLiteral = function() {
@@ -8583,6 +9336,9 @@ $.extend(Datepicker.prototype, {
checkLiteral();
}
}
+ if (iValue < value.length){
+ throw "Extra/unparsed characters found in date: " + value.substring(iValue);
+ }
if (year == -1)
year = new Date().getFullYear();
else if (year < 100)
@@ -8601,7 +9357,7 @@ $.extend(Datepicker.prototype, {
}
var date = this._daylightSavingAdjust(new Date(year, month - 1, day));
if (date.getFullYear() != year || date.getMonth() + 1 != month || date.getDate() != day)
- throw 'Invalid date'; // E.g. 31/02/*
+ throw 'Invalid date'; // E.g. 31/02/00
return date;
},
@@ -8694,7 +9450,7 @@ $.extend(Datepicker.prototype, {
break;
case 'o':
output += formatNumber('o',
- (date.getTime() - new Date(date.getFullYear(), 0, 0).getTime()) / 86400000, 3);
+ Math.round((new Date(date.getFullYear(), date.getMonth(), date.getDate()).getTime() - new Date(date.getFullYear(), 0, 0).getTime()) / 86400000), 3);
break;
case 'm':
output += formatNumber('m', date.getMonth() + 1, 2);
@@ -8839,16 +9595,16 @@ $.extend(Datepicker.prototype, {
}
return new Date(year, month, day);
};
- date = (date == null ? defaultDate : (typeof date == 'string' ? offsetString(date) :
- (typeof date == 'number' ? (isNaN(date) ? defaultDate : offsetNumeric(date)) : date)));
- date = (date && date.toString() == 'Invalid Date' ? defaultDate : date);
- if (date) {
- date.setHours(0);
- date.setMinutes(0);
- date.setSeconds(0);
- date.setMilliseconds(0);
+ var newDate = (date == null || date === '' ? defaultDate : (typeof date == 'string' ? offsetString(date) :
+ (typeof date == 'number' ? (isNaN(date) ? defaultDate : offsetNumeric(date)) : new Date(date.getTime()))));
+ newDate = (newDate && newDate.toString() == 'Invalid Date' ? defaultDate : newDate);
+ if (newDate) {
+ newDate.setHours(0);
+ newDate.setMinutes(0);
+ newDate.setSeconds(0);
+ newDate.setMilliseconds(0);
}
- return this._daylightSavingAdjust(date);
+ return this._daylightSavingAdjust(newDate);
},
/* Handle switch to/from daylight saving.
@@ -8865,13 +9621,13 @@ $.extend(Datepicker.prototype, {
/* Set the date(s) directly. */
_setDate: function(inst, date, noChange) {
- var clear = !(date);
+ var clear = !date;
var origMonth = inst.selectedMonth;
var origYear = inst.selectedYear;
- date = this._restrictMinMax(inst, this._determineDate(inst, date, new Date()));
- inst.selectedDay = inst.currentDay = date.getDate();
- inst.drawMonth = inst.selectedMonth = inst.currentMonth = date.getMonth();
- inst.drawYear = inst.selectedYear = inst.currentYear = date.getFullYear();
+ var newDate = this._restrictMinMax(inst, this._determineDate(inst, date, new Date()));
+ inst.selectedDay = inst.currentDay = newDate.getDate();
+ inst.drawMonth = inst.selectedMonth = inst.currentMonth = newDate.getMonth();
+ inst.drawYear = inst.selectedYear = inst.currentYear = newDate.getFullYear();
if ((origMonth != inst.selectedMonth || origYear != inst.selectedYear) && !noChange)
this._notifyChange(inst);
this._adjustInstDate(inst);
@@ -8969,6 +9725,7 @@ $.extend(Datepicker.prototype, {
var html = '';
for (var row = 0; row < numMonths[0]; row++) {
var group = '';
+ this.maxRows = 4;
for (var col = 0; col < numMonths[1]; col++) {
var selectedDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, inst.selectedDay));
var cornerClass = ' ui-corner-all';
@@ -9003,7 +9760,9 @@ $.extend(Datepicker.prototype, {
if (drawYear == inst.selectedYear && drawMonth == inst.selectedMonth)
inst.selectedDay = Math.min(inst.selectedDay, daysInMonth);
var leadDays = (this._getFirstDayOfMonth(drawYear, drawMonth) - firstDay + 7) % 7;
- var numRows = (isMultiMonth ? 6 : Math.ceil((leadDays + daysInMonth) / 7)); // calculate the number of rows to generate
+ var curRows = Math.ceil((leadDays + daysInMonth) / 7); // calculate the number of rows to generate
+ var numRows = (isMultiMonth ? this.maxRows > curRows ? this.maxRows : curRows : curRows); //If multiple months, use the higher number of rows (see #7043)
+ this.maxRows = numRows;
var printDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1 - leadDays));
for (var dRow = 0; dRow < numRows; dRow++) { // create date picker rows
calender += '<tr>';
@@ -9073,7 +9832,6 @@ $.extend(Datepicker.prototype, {
var inMaxYear = (maxDate && maxDate.getFullYear() == drawYear);
monthHtml += '<select class="ui-datepicker-month" ' +
'onchange="DP_jQuery_' + dpuuid + '.datepicker._selectMonthYear(\'#' + inst.id + '\', this, \'M\');" ' +
- 'onclick="DP_jQuery_' + dpuuid + '.datepicker._clickMonthYear(\'#' + inst.id + '\');"' +
'>';
for (var month = 0; month < 12; month++) {
if ((!inMinYear || month >= minDate.getMonth()) &&
@@ -9087,32 +9845,37 @@ $.extend(Datepicker.prototype, {
if (!showMonthAfterYear)
html += monthHtml + (secondary || !(changeMonth && changeYear) ? ' ' : '');
// year selection
- if (secondary || !changeYear)
- html += '<span class="ui-datepicker-year">' + drawYear + '</span>';
- else {
- // determine range of years to display
- var years = this._get(inst, 'yearRange').split(':');
- var thisYear = new Date().getFullYear();
- var determineYear = function(value) {
- var year = (value.match(/c[+-].*/) ? drawYear + parseInt(value.substring(1), 10) :
- (value.match(/[+-].*/) ? thisYear + parseInt(value, 10) :
- parseInt(value, 10)));
- return (isNaN(year) ? thisYear : year);
- };
- var year = determineYear(years[0]);
- var endYear = Math.max(year, determineYear(years[1] || ''));
- year = (minDate ? Math.max(year, minDate.getFullYear()) : year);
- endYear = (maxDate ? Math.min(endYear, maxDate.getFullYear()) : endYear);
- html += '<select class="ui-datepicker-year" ' +
- 'onchange="DP_jQuery_' + dpuuid + '.datepicker._selectMonthYear(\'#' + inst.id + '\', this, \'Y\');" ' +
- 'onclick="DP_jQuery_' + dpuuid + '.datepicker._clickMonthYear(\'#' + inst.id + '\');"' +
- '>';
- for (; year <= endYear; year++) {
- html += '<option value="' + year + '"' +
- (year == drawYear ? ' selected="selected"' : '') +
- '>' + year + '</option>';
- }
- html += '</select>';
+ if ( !inst.yearshtml ) {
+ inst.yearshtml = '';
+ if (secondary || !changeYear)
+ html += '<span class="ui-datepicker-year">' + drawYear + '</span>';
+ else {
+ // determine range of years to display
+ var years = this._get(inst, 'yearRange').split(':');
+ var thisYear = new Date().getFullYear();
+ var determineYear = function(value) {
+ var year = (value.match(/c[+-].*/) ? drawYear + parseInt(value.substring(1), 10) :
+ (value.match(/[+-].*/) ? thisYear + parseInt(value, 10) :
+ parseInt(value, 10)));
+ return (isNaN(year) ? thisYear : year);
+ };
+ var year = determineYear(years[0]);
+ var endYear = Math.max(year, determineYear(years[1] || ''));
+ year = (minDate ? Math.max(year, minDate.getFullYear()) : year);
+ endYear = (maxDate ? Math.min(endYear, maxDate.getFullYear()) : endYear);
+ inst.yearshtml += '<select class="ui-datepicker-year" ' +
+ 'onchange="DP_jQuery_' + dpuuid + '.datepicker._selectMonthYear(\'#' + inst.id + '\', this, \'Y\');" ' +
+ '>';
+ for (; year <= endYear; year++) {
+ inst.yearshtml += '<option value="' + year + '"' +
+ (year == drawYear ? ' selected="selected"' : '') +
+ '>' + year + '</option>';
+ }
+ inst.yearshtml += '</select>';
+
+ html += inst.yearshtml;
+ inst.yearshtml = null;
+ }
}
html += this._get(inst, 'yearSuffix');
if (showMonthAfterYear)
@@ -9140,9 +9903,9 @@ $.extend(Datepicker.prototype, {
_restrictMinMax: function(inst, date) {
var minDate = this._getMinMaxDate(inst, 'min');
var maxDate = this._getMinMaxDate(inst, 'max');
- date = (minDate && date < minDate ? minDate : date);
- date = (maxDate && date > maxDate ? maxDate : date);
- return date;
+ var newDate = (minDate && date < minDate ? minDate : date);
+ newDate = (maxDate && newDate > maxDate ? maxDate : newDate);
+ return newDate;
},
/* Notify change of month/year. */
@@ -9166,7 +9929,7 @@ $.extend(Datepicker.prototype, {
/* Find the number of days in a given month. */
_getDaysInMonth: function(year, month) {
- return 32 - new Date(year, month, 32).getDate();
+ return 32 - this._daylightSavingAdjust(new Date(year, month, 32)).getDate();
},
/* Find the day of the week of the first of a month. */
@@ -9216,6 +9979,33 @@ $.extend(Datepicker.prototype, {
}
});
+/*
+ * Bind hover events for datepicker elements.
+ * Done via delegate so the binding only occurs once in the lifetime of the parent div.
+ * Global instActive, set by _updateDatepicker allows the handlers to find their way back to the active picker.
+ */
+function bindHover(dpDiv) {
+ var selector = 'button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a';
+ return dpDiv.bind('mouseout', function(event) {
+ var elem = $( event.target ).closest( selector );
+ if ( !elem.length ) {
+ return;
+ }
+ elem.removeClass( "ui-state-hover ui-datepicker-prev-hover ui-datepicker-next-hover" );
+ })
+ .bind('mouseover', function(event) {
+ var elem = $( event.target ).closest( selector );
+ if ($.datepicker._isDisabledDatepicker( instActive.inline ? dpDiv.parent()[0] : instActive.input[0]) ||
+ !elem.length ) {
+ return;
+ }
+ elem.parents('.ui-datepicker-calendar').find('a').removeClass('ui-state-hover');
+ elem.addClass('ui-state-hover');
+ if (elem.hasClass('ui-datepicker-prev')) elem.addClass('ui-datepicker-prev-hover');
+ if (elem.hasClass('ui-datepicker-next')) elem.addClass('ui-datepicker-next-hover');
+ });
+}
+
/* jQuery extend now ignores nulls! */
function extendRemove(target, props) {
$.extend(target, props);
@@ -9236,7 +10026,12 @@ function isArray(a) {
Object - settings for attaching new datepicker functionality
@return jQuery object */
$.fn.datepicker = function(options){
-
+
+ /* Verify an empty collection wasn't passed - Fixes #6976 */
+ if ( !this.length ) {
+ return this;
+ }
+
/* Initialise the date picker. */
if (!$.datepicker.initialized) {
$(document).mousedown($.datepicker._checkExternalClick).
@@ -9262,7 +10057,7 @@ $.fn.datepicker = function(options){
$.datepicker = new Datepicker(); // singleton instance
$.datepicker.initialized = false;
$.datepicker.uuid = new Date().getTime();
-$.datepicker.version = "1.8";
+$.datepicker.version = "1.8.16";
// Workaround for #4055
// Add another global to avoid noConflict issues with inline event handlers
@@ -9270,11 +10065,11 @@ window['DP_jQuery_' + dpuuid] = $;
})(jQuery);
/*
- * jQuery UI Progressbar 1.8
+ * jQuery UI Progressbar 1.8.16
*
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
*
* http://docs.jquery.com/UI/Progressbar
*
@@ -9282,25 +10077,30 @@ window['DP_jQuery_' + dpuuid] = $;
* jquery.ui.core.js
* jquery.ui.widget.js
*/
-(function( $ ) {
+(function( $, undefined ) {
$.widget( "ui.progressbar", {
options: {
- value: 0
+ value: 0,
+ max: 100
},
+
+ min: 0,
+
_create: function() {
this.element
.addClass( "ui-progressbar ui-widget ui-widget-content ui-corner-all" )
.attr({
role: "progressbar",
- "aria-valuemin": this._valueMin(),
- "aria-valuemax": this._valueMax(),
+ "aria-valuemin": this.min,
+ "aria-valuemax": this.options.max,
"aria-valuenow": this._value()
});
this.valueDiv = $( "<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>" )
.appendTo( this.element );
+ this.oldValue = this._value();
this._refreshValue();
},
@@ -9327,12 +10127,12 @@ $.widget( "ui.progressbar", {
},
_setOption: function( key, value ) {
- switch ( key ) {
- case "value":
- this.options.value = value;
- this._refreshValue();
- this._trigger( "change" );
- break;
+ if ( key === "value" ) {
+ this.options.value = value;
+ this._refreshValue();
+ if ( this._value() === this.options.max ) {
+ this._trigger( "complete" );
+ }
}
$.Widget.prototype._setOption.apply( this, arguments );
@@ -9344,48 +10144,45 @@ $.widget( "ui.progressbar", {
if ( typeof val !== "number" ) {
val = 0;
}
- if ( val < this._valueMin() ) {
- val = this._valueMin();
- }
- if ( val > this._valueMax() ) {
- val = this._valueMax();
- }
-
- return val;
- },
-
- _valueMin: function() {
- return 0;
+ return Math.min( this.options.max, Math.max( this.min, val ) );
},
- _valueMax: function() {
- return 100;
+ _percentage: function() {
+ return 100 * this._value() / this.options.max;
},
_refreshValue: function() {
var value = this.value();
+ var percentage = this._percentage();
+
+ if ( this.oldValue !== value ) {
+ this.oldValue = value;
+ this._trigger( "change" );
+ }
+
this.valueDiv
- [ value === this._valueMax() ? "addClass" : "removeClass"]( "ui-corner-right" )
- .width( value + "%" );
+ .toggle( value > this.min )
+ .toggleClass( "ui-corner-right", value === this.options.max )
+ .width( percentage.toFixed(0) + "%" );
this.element.attr( "aria-valuenow", value );
}
});
$.extend( $.ui.progressbar, {
- version: "1.8"
+ version: "1.8.16"
});
})( jQuery );
/*
- * jQuery UI Effects 1.8
+ * jQuery UI Effects 1.8.16
*
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
*
* http://docs.jquery.com/UI/Effects/
*/
-;jQuery.effects || (function($) {
+;jQuery.effects || (function($, undefined) {
$.effects = {};
@@ -9397,7 +10194,7 @@ $.effects = {};
// override the animation for color styles
$.each(['backgroundColor', 'borderBottomColor', 'borderLeftColor',
- 'borderRightColor', 'borderTopColor', 'color', 'outlineColor'],
+ 'borderRightColor', 'borderTopColor', 'borderColor', 'color', 'outlineColor'],
function(i, attr) {
$.fx.step[attr] = function(fx) {
if (!fx.colorInit) {
@@ -9609,13 +10406,12 @@ $.effects.animateClass = function(value, duration, easing, callback) {
easing = null;
}
- return this.each(function() {
-
+ return this.queue(function() {
var that = $(this),
originalStyleAttr = that.attr('style') || ' ',
originalStyle = filterStyles(getElementStyles.call(this)),
newStyle,
- className = that.attr('className');
+ className = that.attr('class');
$.each(classAnimationActions, function(i, action) {
if (value[action]) {
@@ -9623,20 +10419,26 @@ $.effects.animateClass = function(value, duration, easing, callback) {
}
});
newStyle = filterStyles(getElementStyles.call(this));
- that.attr('className', className);
-
- that.animate(styleDifference(originalStyle, newStyle), duration, easing, function() {
- $.each(classAnimationActions, function(i, action) {
- if (value[action]) { that[action + 'Class'](value[action]); }
- });
- // work around bug in IE by clearing the cssText before setting it
- if (typeof that.attr('style') == 'object') {
- that.attr('style').cssText = '';
- that.attr('style').cssText = originalStyleAttr;
- } else {
- that.attr('style', originalStyleAttr);
+ that.attr('class', className);
+
+ that.animate(styleDifference(originalStyle, newStyle), {
+ queue: false,
+ duration: duration,
+ easing: easing,
+ complete: function() {
+ $.each(classAnimationActions, function(i, action) {
+ if (value[action]) { that[action + 'Class'](value[action]); }
+ });
+ // work around bug in IE by clearing the cssText before setting it
+ if (typeof that.attr('style') == 'object') {
+ that.attr('style').cssText = '';
+ that.attr('style').cssText = originalStyleAttr;
+ } else {
+ that.attr('style', originalStyleAttr);
+ }
+ if (callback) { callback.apply(this, arguments); }
+ $.dequeue( this );
}
- if (callback) { callback.apply(this, arguments); }
});
});
};
@@ -9679,7 +10481,7 @@ $.fn.extend({
/******************************************************************************/
$.extend($.effects, {
- version: "1.8",
+ version: "1.8.16",
// Saves a set of properties in a data storage
save: function(element, set) {
@@ -9740,9 +10542,16 @@ $.extend($.effects, {
border: 'none',
margin: 0,
padding: 0
- });
+ }),
+ active = document.activeElement;
element.wrap(wrapper);
+
+ // Fixes #7595 - Elements lose focus when wrapped.
+ if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
+ $( active ).focus();
+ }
+
wrapper = element.parent(); //Hotfix for jQuery 1.4 since some change in wrap() seems to actually loose the reference to the wrapped element
// transfer positioning properties to the wrapper
@@ -9760,15 +10569,25 @@ $.extend($.effects, {
props[pos] = 'auto';
}
});
- element.css({position: 'relative', top: 0, left: 0 });
+ element.css({position: 'relative', top: 0, left: 0, right: 'auto', bottom: 'auto' });
}
return wrapper.css(props).show();
},
removeWrapper: function(element) {
- if (element.parent().is('.ui-effects-wrapper'))
- return element.parent().replaceWith(element);
+ var parent,
+ active = document.activeElement;
+
+ if (element.parent().is('.ui-effects-wrapper')) {
+ parent = element.parent().replaceWith(element);
+ // Fixes #7595 - Elements lose focus when wrapped.
+ if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
+ $( active ).focus();
+ }
+ return parent;
+ }
+
return element;
},
@@ -9796,44 +10615,72 @@ function _normalizeArguments(effect, options, speed, callback) {
speed = null;
options = {};
}
- if ($.isFunction(speed)) {
- callback = speed;
- speed = null;
- }
- if (typeof options == 'number' || $.fx.speeds[options]) {
+ if (typeof options == 'number' || $.fx.speeds[options]) {
callback = speed;
speed = options;
options = {};
}
+ if ($.isFunction(speed)) {
+ callback = speed;
+ speed = null;
+ }
options = options || {};
speed = speed || options.duration;
speed = $.fx.off ? 0 : typeof speed == 'number'
- ? speed : $.fx.speeds[speed] || $.fx.speeds._default;
+ ? speed : speed in $.fx.speeds ? $.fx.speeds[speed] : $.fx.speeds._default;
callback = callback || options.complete;
return [effect, options, speed, callback];
}
+function standardSpeed( speed ) {
+ // valid standard speeds
+ if ( !speed || typeof speed === "number" || $.fx.speeds[ speed ] ) {
+ return true;
+ }
+
+ // invalid strings - treat as "normal" speed
+ if ( typeof speed === "string" && !$.effects[ speed ] ) {
+ return true;
+ }
+
+ return false;
+}
+
$.fn.extend({
effect: function(effect, options, speed, callback) {
var args = _normalizeArguments.apply(this, arguments),
- // TODO: make effects takes actual parameters instead of a hash
+ // TODO: make effects take actual parameters instead of a hash
args2 = {
options: args[1],
duration: args[2],
callback: args[3]
},
+ mode = args2.options.mode,
effectMethod = $.effects[effect];
- return effectMethod && !$.fx.off ? effectMethod.call(this, args2) : this;
+ if ( $.fx.off || !effectMethod ) {
+ // delegate to the original method (e.g., .show()) if possible
+ if ( mode ) {
+ return this[ mode ]( args2.duration, args2.callback );
+ } else {
+ return this.each(function() {
+ if ( args2.callback ) {
+ args2.callback.call( this );
+ }
+ });
+ }
+ }
+
+ return effectMethod.call(this, args2);
},
_show: $.fn.show,
show: function(speed) {
- if (!speed || typeof speed == 'number' || $.fx.speeds[speed]) {
+ if ( standardSpeed( speed ) ) {
return this._show.apply(this, arguments);
} else {
var args = _normalizeArguments.apply(this, arguments);
@@ -9844,7 +10691,7 @@ $.fn.extend({
_hide: $.fn.hide,
hide: function(speed) {
- if (!speed || typeof speed == 'number' || $.fx.speeds[speed]) {
+ if ( standardSpeed( speed ) ) {
return this._hide.apply(this, arguments);
} else {
var args = _normalizeArguments.apply(this, arguments);
@@ -9853,11 +10700,10 @@ $.fn.extend({
}
},
- // jQuery core overloads toggle and create _toggle
+ // jQuery core overloads toggle and creates _toggle
__toggle: $.fn.toggle,
toggle: function(speed) {
- if (!speed || typeof speed == 'number' || $.fx.speeds[speed] ||
- typeof speed == 'boolean' || $.isFunction(speed)) {
+ if ( standardSpeed( speed ) || typeof speed === "boolean" || $.isFunction( speed ) ) {
return this.__toggle.apply(this, arguments);
} else {
var args = _normalizeArguments.apply(this, arguments);
@@ -10091,25 +10937,25 @@ $.extend($.easing,
})(jQuery);
/*
- * jQuery UI Effects Blind 1.8
+ * jQuery UI Effects Blind 1.8.16
*
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
*
* http://docs.jquery.com/UI/Effects/Blind
*
* Depends:
* jquery.effects.core.js
*/
-(function($) {
+(function( $, undefined ) {
$.effects.blind = function(o) {
return this.queue(function() {
// Create element
- var el = $(this), props = ['position','top','left'];
+ var el = $(this), props = ['position','top','bottom','left','right'];
// Set options
var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode
@@ -10140,25 +10986,25 @@ $.effects.blind = function(o) {
})(jQuery);
/*
- * jQuery UI Effects Bounce 1.8
+ * jQuery UI Effects Bounce 1.8.16
*
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
*
* http://docs.jquery.com/UI/Effects/Bounce
*
* Depends:
* jquery.effects.core.js
*/
-(function($) {
+(function( $, undefined ) {
$.effects.bounce = function(o) {
return this.queue(function() {
// Create element
- var el = $(this), props = ['position','top','left'];
+ var el = $(this), props = ['position','top','bottom','left','right'];
// Set options
var mode = $.effects.setMode(el, o.options.mode || 'effect'); // Set Mode
@@ -10218,25 +11064,25 @@ $.effects.bounce = function(o) {
})(jQuery);
/*
- * jQuery UI Effects Clip 1.8
+ * jQuery UI Effects Clip 1.8.16
*
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
*
* http://docs.jquery.com/UI/Effects/Clip
*
* Depends:
* jquery.effects.core.js
*/
-(function($) {
+(function( $, undefined ) {
$.effects.clip = function(o) {
return this.queue(function() {
// Create element
- var el = $(this), props = ['position','top','left','height','width'];
+ var el = $(this), props = ['position','top','bottom','left','right','height','width'];
// Set options
var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode
@@ -10272,25 +11118,25 @@ $.effects.clip = function(o) {
})(jQuery);
/*
- * jQuery UI Effects Drop 1.8
+ * jQuery UI Effects Drop 1.8.16
*
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
*
* http://docs.jquery.com/UI/Effects/Drop
*
* Depends:
* jquery.effects.core.js
*/
-(function($) {
+(function( $, undefined ) {
$.effects.drop = function(o) {
return this.queue(function() {
// Create element
- var el = $(this), props = ['position','top','left','opacity'];
+ var el = $(this), props = ['position','top','bottom','left','right','opacity'];
// Set options
var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode
@@ -10322,18 +11168,18 @@ $.effects.drop = function(o) {
})(jQuery);
/*
- * jQuery UI Effects Explode 1.8
+ * jQuery UI Effects Explode 1.8.16
*
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
*
* http://docs.jquery.com/UI/Effects/Explode
*
* Depends:
* jquery.effects.core.js
*/
-(function($) {
+(function( $, undefined ) {
$.effects.explode = function(o) {
@@ -10401,25 +11247,57 @@ $.effects.explode = function(o) {
})(jQuery);
/*
- * jQuery UI Effects Fold 1.8
+ * jQuery UI Effects Fade 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Fade
+ *
+ * Depends:
+ * jquery.effects.core.js
+ */
+(function( $, undefined ) {
+
+$.effects.fade = function(o) {
+ return this.queue(function() {
+ var elem = $(this),
+ mode = $.effects.setMode(elem, o.options.mode || 'hide');
+
+ elem.animate({ opacity: mode }, {
+ queue: false,
+ duration: o.duration,
+ easing: o.options.easing,
+ complete: function() {
+ (o.callback && o.callback.apply(this, arguments));
+ elem.dequeue();
+ }
+ });
+ });
+};
+
+})(jQuery);
+/*
+ * jQuery UI Effects Fold 1.8.16
*
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
*
* http://docs.jquery.com/UI/Effects/Fold
*
* Depends:
* jquery.effects.core.js
*/
-(function($) {
+(function( $, undefined ) {
$.effects.fold = function(o) {
return this.queue(function() {
// Create element
- var el = $(this), props = ['position','top','left'];
+ var el = $(this), props = ['position','top','bottom','left','right'];
// Set options
var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode
@@ -10457,18 +11335,18 @@ $.effects.fold = function(o) {
})(jQuery);
/*
- * jQuery UI Effects Highlight 1.8
+ * jQuery UI Effects Highlight 1.8.16
*
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
*
* http://docs.jquery.com/UI/Effects/Highlight
*
* Depends:
* jquery.effects.core.js
*/
-(function($) {
+(function( $, undefined ) {
$.effects.highlight = function(o) {
return this.queue(function() {
@@ -10507,18 +11385,18 @@ $.effects.highlight = function(o) {
})(jQuery);
/*
- * jQuery UI Effects Pulsate 1.8
+ * jQuery UI Effects Pulsate 1.8.16
*
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
*
* http://docs.jquery.com/UI/Effects/Pulsate
*
* Depends:
* jquery.effects.core.js
*/
-(function($) {
+(function( $, undefined ) {
$.effects.pulsate = function(o) {
return this.queue(function() {
@@ -10558,18 +11436,18 @@ $.effects.pulsate = function(o) {
})(jQuery);
/*
- * jQuery UI Effects Scale 1.8
+ * jQuery UI Effects Scale 1.8.16
*
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
*
* http://docs.jquery.com/UI/Effects/Scale
*
* Depends:
* jquery.effects.core.js
*/
-(function($) {
+(function( $, undefined ) {
$.effects.puff = function(o) {
return this.queue(function() {
@@ -10643,8 +11521,8 @@ $.effects.size = function(o) {
return this.queue(function() {
// Create element
- var el = $(this), props = ['position','top','left','width','height','overflow','opacity'];
- var props1 = ['position','top','left','overflow','opacity']; // Always restore
+ var el = $(this), props = ['position','top','bottom','left','right','width','height','overflow','opacity'];
+ var props1 = ['position','top','bottom','left','right','overflow','opacity']; // Always restore
var props2 = ['width','height','overflow']; // Copy for children
var cProps = ['fontSize'];
var vProps = ['borderTopWidth', 'borderBottomWidth', 'paddingTop', 'paddingBottom'];
@@ -10736,25 +11614,25 @@ $.effects.size = function(o) {
})(jQuery);
/*
- * jQuery UI Effects Shake 1.8
+ * jQuery UI Effects Shake 1.8.16
*
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
*
* http://docs.jquery.com/UI/Effects/Shake
*
* Depends:
* jquery.effects.core.js
*/
-(function($) {
+(function( $, undefined ) {
$.effects.shake = function(o) {
return this.queue(function() {
// Create element
- var el = $(this), props = ['position','top','left'];
+ var el = $(this), props = ['position','top','bottom','left','right'];
// Set options
var mode = $.effects.setMode(el, o.options.mode || 'effect'); // Set Mode
@@ -10793,25 +11671,25 @@ $.effects.shake = function(o) {
})(jQuery);
/*
- * jQuery UI Effects Slide 1.8
+ * jQuery UI Effects Slide 1.8.16
*
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
*
* http://docs.jquery.com/UI/Effects/Slide
*
* Depends:
* jquery.effects.core.js
*/
-(function($) {
+(function( $, undefined ) {
$.effects.slide = function(o) {
return this.queue(function() {
// Create element
- var el = $(this), props = ['position','top','left'];
+ var el = $(this), props = ['position','top','bottom','left','right'];
// Set options
var mode = $.effects.setMode(el, o.options.mode || 'show'); // Set Mode
@@ -10823,7 +11701,7 @@ $.effects.slide = function(o) {
var ref = (direction == 'up' || direction == 'down') ? 'top' : 'left';
var motion = (direction == 'up' || direction == 'left') ? 'pos' : 'neg';
var distance = o.options.distance || (ref == 'top' ? el.outerHeight({margin:true}) : el.outerWidth({margin:true}));
- if (mode == 'show') el.css(ref, motion == 'pos' ? -distance : distance); // Shift
+ if (mode == 'show') el.css(ref, motion == 'pos' ? (isNaN(distance) ? "-" + distance : -distance) : distance); // Shift
// Animation
var animation = {};
@@ -10843,18 +11721,18 @@ $.effects.slide = function(o) {
})(jQuery);
/*
- * jQuery UI Effects Transfer 1.8
+ * jQuery UI Effects Transfer 1.8.16
*
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
*
* http://docs.jquery.com/UI/Effects/Transfer
*
* Depends:
* jquery.effects.core.js
*/
-(function($) {
+(function( $, undefined ) {
$.effects.transfer = function(o) {
return this.queue(function() {
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 8c34bdb..1a1dd23 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -555,7 +555,7 @@ $_REQUEST['js_frame'] = PMA_ifSetOr($_REQUEST['js_frame'], '');
*/
$GLOBALS['js_include'] = array();
$GLOBALS['js_include'][] = 'jquery/jquery-1.6.2.js';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
$GLOBALS['js_include'][] = 'update-location.js';
/**
diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php
index 076035b..133afd4 100644
--- a/libraries/header_meta_style.inc.php
+++ b/libraries/header_meta_style.inc.php
@@ -47,5 +47,5 @@ if ($GLOBALS['text_dir'] == 'ltr') {
?></title>
<link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>phpmyadmin.css.php<?php echo PMA_generate_common_url(array('server' => $GLOBA "),10) || 0) ); s initialised as well as being kept in step with any changes that might have happened on the page). @I�� xdF��* 0?�� ��)��* ��)��* �H�� `�)��* I�� �_���* u�)��* P���* �T���* �Y���* ��*��* xdF��* 0?�� >�� k�)��* �! �! �H�� @I�� H.&��* @�� ��)��* ��)��* �H�� `�)��* I�� I�� �H�� 8�J��* �p� @I�� u�)��* ��*��* @�� �>�� k�)��* G H I J K M N O P �H�� @I�� H����* �A�� ��)��* ��)��* �H�� 0_���* u�)��* pF��* ����* P���* �T���* �Y���* ��*��* H����* �A�� �?�� k�)��* 8����* �A�� @�� k�)��* (����* �A�� P@�� k�)��* ����* �A�� �@�� k�)��* �^���* u�)��* �Y���* ;�� �h���* e�)��* �T���* A�� yh���* e�)��* P���* PA�� Zh���* e�)��* ����* pF��* ����* P���* �tF��* �T���* �Y���* ��*��* 8�J��* ݥ��* @I�� p����* C�� �A�� k�)��* 5 6 7 8 : < = > ? @ B D �H�� @I�� �ݢ��* @I�� u�)��* �J��* �A�� ݥ��* e�)��* �J��* �_@f �S Q��l�� ��q��* @I�� �ݢ��* D�� �B�� k�)��* u]�� 4Q��U^Qʉ� �u������*ēv�H�� @I�� H.o��* t���* �J�� ��
��* ��
��* �ƨ��* I�� @J�� �H�� `E�� F��* u�)��* �tF��* �K�� ��
��* �J�� F�� ����������
��* HI�� LS['server'])); ?>&js_frame=<?php echo isset($print_view) ? 'print' : 'right'; ?>&nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" />
<link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>print.css" media="print" />
- <link rel="stylesheet" type="text/css" href="<?php echo $GLOBALS['pmaThemePath']; ?>/jquery/jquery-ui-1.8.custom.css" />
+ <link rel="stylesheet" type="text/css" href="<?php echo $GLOBALS['pmaThemePath']; ?>/jquery/jquery-ui-1.8.16.custom.css" />
<meta name="robots" content="noindex,nofollow" />
diff --git a/main.php b/main.php
index 051b5ef..23e555f 100644
--- a/main.php
+++ b/main.php
@@ -10,7 +10,7 @@
*/
require_once './libraries/common.inc.php';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
$GLOBALS['js_include'][] = 'jquery/jquery.sprintf.js';
// Handles some variables that may have been sent by the calling script
diff --git a/navigation.php b/navigation.php
index 230040b..4edf490 100644
--- a/navigation.php
+++ b/navigation.php
@@ -106,7 +106,7 @@ require_once './libraries/header_http.inc.php';
href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&js_frame=left&nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" />
<?php
echo PMA_includeJS('jquery/jquery-1.6.2.js');
- echo PMA_includeJS('jquery/jquery-ui-1.8.custom.js');
+ echo PMA_includeJS('jquery/jquery-ui-1.8.6.custom.js');
echo PMA_includeJS('jquery/jquery.qtip-1.0.0-rc3.js');
echo PMA_includeJS('navigation.js');
echo PMA_includeJS('functions.js');
diff --git a/server_plugins.php b/server_plugins.php
index ee096f8..2b7650c 100644
--- a/server_plugins.php
+++ b/server_plugins.php
@@ -21,7 +21,7 @@ require_once './libraries/common.inc.php';
/**
* JS includes
*/
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
$GLOBALS['js_include'][] = 'jquery/jquery.cookie.js';
$GLOBALS['js_include'][] = 'jquery/jquery.tablesorter.js';
$GLOBALS['js_include'][] = 'server_plugins.js';
diff --git a/server_privileges.php b/server_privileges.php
index e8b598c..2dbcb3d 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -15,7 +15,7 @@ require_once './libraries/common.inc.php';
*/
$GLOBALS['js_include'][] = 'server_privileges.js';
$GLOBALS['js_include'][] = 'functions.js';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
$_add_user_error = false;
require './libraries/server_common.inc.php';
diff --git a/server_status.php b/server_status.php
index 5f493e5..b314ef7 100644
--- a/server_status.php
+++ b/server_status.php
@@ -413,7 +413,7 @@ if (PMA_DRIZZLE) {
*/
$GLOBALS['js_include'][] = 'server_status.js';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
$GLOBALS['js_include'][] = 'jquery/jquery.tablesorter.js';
$GLOBALS['js_include'][] = 'jquery/jquery.cookie.js'; // For tab persistence
// Charting
diff --git a/setup/index.php b/setup/index.php
index 304e00f..115e9ed 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -38,7 +38,7 @@ require './libraries/header_http.inc.php';
<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.6.2.js"></script>
-<script type="text/javascript" src="../js/jquery/jquery-ui-1.8.custom.js"></script>
+<script type="text/javascript" src="../js/jquery/jquery-ui-1.8.6.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>
<script type="text/javascript" src="scripts.js"></script>
diff --git a/sql.php b/sql.php
index 96fc6b5..4d7e30e 100644
--- a/sql.php
+++ b/sql.php
@@ -14,7 +14,7 @@ require_once './libraries/Table.class.php';
require_once './libraries/check_user_privileges.lib.php';
require_once './libraries/bookmark.lib.php';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
$GLOBALS['js_include'][] = 'jquery/timepicker.js';
$GLOBALS['js_include'][] = 'tbl_change.js';
$GLOBALS['js_include'][] = 'gis_data_editor.js';
diff --git a/tbl_change.php b/tbl_change.php
index 774d711..f2ad519 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -120,7 +120,7 @@ if ($GLOBALS['cfg']['ShowPropertyComments']) {
*/
$GLOBALS['js_include'][] = 'functions.js';
$GLOBALS['js_include'][] = 'tbl_change.js';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
$GLOBALS['js_include'][] = 'jquery/timepicker.js';
$GLOBALS['js_include'][] = 'gis_data_editor.js';
diff --git a/tbl_operations.php b/tbl_operations.php
index e8ea605..14c7873 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -32,7 +32,7 @@ require_once './libraries/StorageEngine.class.php';
// add a javascript file for jQuery functions to handle Ajax actions
// also add jQueryUI
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
/**
* Class for partition management
diff --git a/tbl_replace.php b/tbl_replace.php
index b5c43dc..74edd00 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -568,7 +568,7 @@ if (isset($return_to_sql_query)) {
$GLOBALS['js_include'][] = 'tbl_change.js';
// in case we call sql.php which needs those:
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
$active_page = $goto_include;
diff --git a/tbl_select.php b/tbl_select.php
index ebc3621..0aedc74 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -21,7 +21,7 @@ $GLOBALS['js_include'][] = 'makegrid.js';
$GLOBALS['js_include'][] = 'sql.js';
$GLOBALS['js_include'][] = 'tbl_select.js';
$GLOBALS['js_include'][] = 'tbl_change.js';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
$GLOBALS['js_include'][] = 'jquery/timepicker.js';
$GLOBALS['js_include'][] = 'gis_data_editor.js';
diff --git a/tbl_structure.php b/tbl_structure.php
index b1e5ac9..24df77c 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -12,7 +12,7 @@
require_once './libraries/common.inc.php';
require_once './libraries/mysql_charsets.lib.php';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
$GLOBALS['js_include'][] = 'tbl_structure.js';
$GLOBALS['js_include'][] = 'indexes.js';
/**
diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php
index 3bff270..3242fb2 100644
--- a/tbl_zoom_select.php
+++ b/tbl_zoom_select.php
@@ -26,7 +26,7 @@ $GLOBALS['js_include'][] = 'highcharts/highcharts.js';
/* Files required for chart exporting */
$GLOBALS['js_include'][] = 'highcharts/exporting.js';
$GLOBALS['js_include'][] = 'canvg/canvg.js';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
$GLOBALS['js_include'][] = 'jquery/timepicker.js';
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index fca6cda..fba8c4d 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -2916,3 +2916,7 @@ input.btn {
color:#333;
background-color: #D0DCE0;
}
+
+.ui-dialog fieldset legend a {
+ color: #0000FF;
+}
diff --git a/themes/original/jquery/jquery-ui-1.8.custom.css b/themes/original/jquery/jquery-ui-1.8.16.custom.css
similarity index 71%
rename from themes/original/jquery/jquery-ui-1.8.custom.css
rename to themes/original/jquery/jquery-ui-1.8.16.custom.css
index 0ae653b..0f1a7e7 100644
--- a/themes/original/jquery/jquery-ui-1.8.custom.css
+++ b/themes/original/jquery/jquery-ui-1.8.16.custom.css
@@ -1,13 +1,17 @@
/*
-* jQuery UI CSS Framework
-* Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
-* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
-*/
+ * jQuery UI CSS Framework 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ */
/* Layout helpers
----------------------------------*/
.ui-helper-hidden { display: none; }
-.ui-helper-hidden-accessible { position: absolute; left: -99999999px; }
+.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
.ui-helper-clearfix { display: inline-block; }
@@ -38,43 +42,48 @@
/*
-* jQuery UI CSS Framework
-* Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
-* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
-* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefau…
-*/
+ * jQuery UI CSS Framework 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ *
+ * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefau…
+ */
/* Component containers
----------------------------------*/
-.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
+.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
.ui-widget .ui-widget { font-size: 1em; }
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
-/*.ui-widget-content a { color: #222222; }*/
+.ui-widget-content a { color: #222222; }
.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
.ui-widget-header a { color: #222222; }
/* Interaction states
----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; }
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; }
.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; }
.ui-widget :active { outline: none; }
/* Interaction Cues
----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; }
-.ui-state-highlight a, .ui-widget-content .ui-state-highlight a { color: #363636; }
-.ui-state-error, .ui-widget-content .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
-.ui-state-error a, .ui-widget-content .ui-state-error a { color: #cd0a0a; }
-.ui-state-error-text, .ui-widget-content .ui-state-error-text { color: #cd0a0a; }
-.ui-priority-primary, .ui-widget-content .ui-priority-primary { font-weight: bold; }
-.ui-priority-secondary, .ui-widget-content .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
-.ui-state-disabled, .ui-widget-content .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; }
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
+.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
/* Icons
----------------------------------*/
@@ -271,22 +280,24 @@
----------------------------------*/
/* Corner radius */
-.ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; }
-.ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; }
-.ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
-.ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
-.ui-corner-top { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; }
-.ui-corner-bottom { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
-.ui-corner-right { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
-.ui-corner-left { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
-.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; }
+.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; }
+.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -khtml-border-top-right-radius: 4px; border-top-right-radius: 4px; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
/* Overlays */
.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
-.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/* Resizable
-----------------------------------*/
+.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*
+ * jQuery UI Resizable 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Resizable#theming
+ */
.ui-resizable { position: relative;}
-.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;}
+.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block; }
.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
@@ -295,8 +306,27 @@
.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
-.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/* Accordion
-----------------------------------*/
+.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*
+ * jQuery UI Selectable 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Selectable#theming
+ */
+.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
+/*
+ * jQuery UI Accordion 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Accordion#theming
+ */
+/* IE/Win - Fix animation bug - #4615 */
+.ui-accordion { width: 100%; }
.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
.ui-accordion .ui-accordion-li-fix { display: inline; }
.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
@@ -304,21 +334,36 @@
.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
-.ui-accordion .ui-accordion-content-active { display: block; }/* Autocomplete
-----------------------------------*/
+.ui-accordion .ui-accordion-content-active { display: block; }
+/*
+ * jQuery UI Autocomplete 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Autocomplete#theming
+ */
.ui-autocomplete { position: absolute; cursor: default; }
-.ui-autocomplete-loading { background: white url('images/ui-anim_basic_16x16.gif') right center no-repeat; }
/* workarounds */
* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
-/* Menu
-----------------------------------*/
+/*
+ * jQuery UI Menu 1.8.16
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Menu#theming
+ */
.ui-menu {
list-style:none;
padding: 2px;
margin: 0;
display:block;
+ float: left;
}
.ui-menu .ui-menu {
margin-top: -3px;
@@ -326,6 +371,9 @@
.ui-menu .ui-menu-item {
margin:0;
padding: 0;
+ zoom: 1;
+ float: left;
+ clear: left;
width: 100%;
}
.ui-menu .ui-menu-item a {
@@ -337,11 +385,18 @@
}
.ui-menu .ui-menu-item a.ui-state-hover,
.ui-menu .ui-menu-item a.ui-state-active {
+ font-weight: normal;
margin: -1px;
}
-/* Button
-----------------------------------*/
-
+/*
+ * jQuery UI Button 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Button#theming
+ */
.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
@@ -352,15 +407,17 @@ button.ui-button-icons-only { width: 3.7em; }
.ui-button .ui-button-text { display: block; line-height: 1.4; }
.ui-button-text-only .ui-button-text { padding: .4em 1em; }
.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
-.ui-button-text-icon .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
/* no icon support for input elements, provide padding by default */
input.ui-button { padding: .4em 1em; }
/*button icon element(s) */
-.ui-button-icon-only .ui-icon, .ui-button-text-icon .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
+.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
-.ui-button-text-icon .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
/*button sets*/
@@ -369,27 +426,36 @@ input.ui-button { padding: .4em 1em; }
/* workarounds */
button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
-
-
-
-
-
-/* Dialog
-----------------------------------*/
+/*
+ * jQuery UI Dialog 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Dialog#theming
+ */
.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
-.ui-dialog .ui-dialog-titlebar { padding: .5em 1em .3em; position: relative; }
-.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .2em 0; }
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative; }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; }
.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
-.ui-dialog .ui-dialog-content { border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
-.ui-dialog .ui-dialog-buttonpane button { float: right; margin: .5em .4em .5em 0; cursor: pointer; padding: .2em .6em .3em .6em; line-height: 1.4em; width:auto; overflow:visible; }
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
+.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
.ui-draggable .ui-dialog-titlebar { cursor: move; }
-.ui-dialog fieldset legend a { color: #0000FF; }
-/* Slider
-----------------------------------*/
+/*
+ * jQuery UI Slider 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Slider#theming
+ */
.ui-slider { position: relative; text-align: left; }
.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
@@ -404,8 +470,15 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
-.ui-slider-vertical .ui-slider-range-max { top: 0; }/* Tabs
-----------------------------------*/
+.ui-slider-vertical .ui-slider-range-max { top: 0; }/*
+ * jQuery UI Tabs 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Tabs#theming
+ */
.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
@@ -413,18 +486,18 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
-.ui-tabs .ui-tabs-panel { display: block; border: 0; padding: 1em 1.4em; background: none; }
-/*.ui-tabs .ui-tabs-hide { display: none !important; }*/
-/* Firefox has issues rendering SVG in display:none elements. See also http://jqueryui.com/demos/tabs/#...my_slider.2C_Google_Map.2C_sIFR_etc._not… */
-.ui-tabs .ui-tabs-hide {
- position: absolute;
- left: -10000px;
- /* required so that overflowing content doesn't cause scrolling */
- top: -10000px;
-}
-/* Datepicker
-----------------------------------*/
-.ui-datepicker { width: 17em; padding: .2em .2em 0; }
+.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
+.ui-tabs .ui-tabs-hide { display: none !important; }
+/*
+ * jQuery UI Datepicker 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Datepicker#theming
+ */
+.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
@@ -456,7 +529,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
-.ui-datepicker-row-break { clear:both; width:100%; }
+.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
/* RTL support */
.ui-datepicker-rtl { direction: rtl; }
@@ -482,7 +555,14 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
left: -4px; /*must have*/
width: 200px; /*must have*/
height: 200px; /*must have*/
-}/* Progressbar
-----------------------------------*/
+}/*
+ * jQuery UI Progressbar 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Progressbar#theming
+ */
.ui-progressbar { height:2em; text-align: left; }
-.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
\ No newline at end of file
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index f29794b..8f09feb 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -3339,3 +3339,7 @@ input.btn {
color:#333;
background-color: #D0DCE0;
}
+
+.ui-dialog fieldset legend a {
+ color: #235A81;
+}
diff --git a/themes/pmahomme/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png b/themes/pmahomme/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png
index e425e6e..5b5dab2 100644
Binary files a/themes/pmahomme/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png and b/themes/pmahomme/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png differ
diff --git a/themes/pmahomme/jquery/images/ui-bg_flat_75_ffffff_40x100.png b/themes/pmahomme/jquery/images/ui-bg_flat_75_ffffff_40x100.png
index 72d4757..ac8b229 100644
Binary files a/themes/pmahomme/jquery/images/ui-bg_flat_75_ffffff_40x100.png and b/themes/pmahomme/jquery/images/ui-bg_flat_75_ffffff_40x100.png differ
diff --git a/themes/pmahomme/jquery/images/ui-bg_glass_65_ffffff_1x400.png b/themes/pmahomme/jquery/images/ui-bg_glass_65_ffffff_1x400.png
index 8569c1b..42ccba2 100644
Binary files a/themes/pmahomme/jquery/images/ui-bg_glass_65_ffffff_1x400.png and b/themes/pmahomme/jquery/images/ui-bg_glass_65_ffffff_1x400.png differ
diff --git a/themes/pmahomme/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/themes/pmahomme/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png
index 3cd467e..7c9fa6c 100644
Binary files a/themes/pmahomme/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png and b/themes/pmahomme/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png differ
diff --git a/themes/pmahomme/jquery/images/ui-icons_222222_256x240.png b/themes/pmahomme/jquery/images/ui-icons_222222_256x240.png
index 8bc06cb..b273ff1 100644
Binary files a/themes/pmahomme/jquery/images/ui-icons_222222_256x240.png and b/themes/pmahomme/jquery/images/ui-icons_222222_256x240.png differ
diff --git a/themes/pmahomme/jquery/images/ui-icons_2e83ff_256x240.png b/themes/pmahomme/jquery/images/ui-icons_2e83ff_256x240.png
index 7a3c779..09d1cdc 100644
Binary files a/themes/pmahomme/jquery/images/ui-icons_2e83ff_256x240.png and b/themes/pmahomme/jquery/images/ui-icons_2e83ff_256x240.png differ
diff --git a/themes/pmahomme/jquery/images/ui-icons_454545_256x240.png b/themes/pmahomme/jquery/images/ui-icons_454545_256x240.png
index cfd1eaf..59bd45b 100644
Binary files a/themes/pmahomme/jquery/images/ui-icons_454545_256x240.png and b/themes/pmahomme/jquery/images/ui-icons_454545_256x240.png differ
diff --git a/themes/pmahomme/jquery/images/ui-icons_888888_256x240.png b/themes/pmahomme/jquery/images/ui-icons_888888_256x240.png
index 35f1750..6d02426 100644
Binary files a/themes/pmahomme/jquery/images/ui-icons_888888_256x240.png and b/themes/pmahomme/jquery/images/ui-icons_888888_256x240.png differ
diff --git a/themes/pmahomme/jquery/images/ui-icons_cd0a0a_256x240.png b/themes/pmahomme/jquery/images/ui-icons_cd0a0a_256x240.png
index a239d6c..2ab019b 100644
Binary files a/themes/pmahomme/jquery/images/ui-icons_cd0a0a_256x240.png and b/themes/pmahomme/jquery/images/ui-icons_cd0a0a_256x240.png differ
diff --git a/themes/pmahomme/jquery/jquery-ui-1.8.custom.css b/themes/pmahomme/jquery/jquery-ui-1.8.16.custom.css
similarity index 71%
rename from themes/pmahomme/jquery/jquery-ui-1.8.custom.css
rename to themes/pmahomme/jquery/jquery-ui-1.8.16.custom.css
index fd337dd..0f1a7e7 100644
--- a/themes/pmahomme/jquery/jquery-ui-1.8.custom.css
+++ b/themes/pmahomme/jquery/jquery-ui-1.8.16.custom.css
@@ -1,13 +1,17 @@
/*
-* jQuery UI CSS Framework
-* Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
-* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
-*/
+ * jQuery UI CSS Framework 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ */
/* Layout helpers
----------------------------------*/
.ui-helper-hidden { display: none; }
-.ui-helper-hidden-accessible { position: absolute; left: -99999999px; }
+.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
.ui-helper-clearfix { display: inline-block; }
@@ -38,43 +42,48 @@
/*
-* jQuery UI CSS Framework
-* Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
-* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
-* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefau…
-*/
+ * jQuery UI CSS Framework 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ *
+ * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefau…
+ */
/* Component containers
----------------------------------*/
-.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
+.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
.ui-widget .ui-widget { font-size: 1em; }
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
-/*.ui-widget-content a { color: #222222; }*/
+.ui-widget-content a { color: #222222; }
.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
.ui-widget-header a { color: #222222; }
/* Interaction states
----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; }
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; }
.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; }
.ui-widget :active { outline: none; }
/* Interaction Cues
----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; }
-.ui-state-highlight a, .ui-widget-content .ui-state-highlight a { color: #363636; }
-.ui-state-error, .ui-widget-content .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
-.ui-state-error a, .ui-widget-content .ui-state-error a { color: #cd0a0a; }
-.ui-state-error-text, .ui-widget-content .ui-state-error-text { color: #cd0a0a; }
-.ui-priority-primary, .ui-widget-content .ui-priority-primary { font-weight: bold; }
-.ui-priority-secondary, .ui-widget-content .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
-.ui-state-disabled, .ui-widget-content .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; }
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
+.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
/* Icons
----------------------------------*/
@@ -271,22 +280,24 @@
----------------------------------*/
/* Corner radius */
-.ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; }
-.ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; }
-.ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
-.ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
-.ui-corner-top { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; }
-.ui-corner-bottom { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
-.ui-corner-right { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
-.ui-corner-left { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
-.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; }
+.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; }
+.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -khtml-border-top-right-radius: 4px; border-top-right-radius: 4px; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
/* Overlays */
.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
-.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/* Resizable
-----------------------------------*/
+.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*
+ * jQuery UI Resizable 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Resizable#theming
+ */
.ui-resizable { position: relative;}
-.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;}
+.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block; }
.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
@@ -295,8 +306,27 @@
.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
-.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/* Accordion
-----------------------------------*/
+.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*
+ * jQuery UI Selectable 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Selectable#theming
+ */
+.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
+/*
+ * jQuery UI Accordion 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Accordion#theming
+ */
+/* IE/Win - Fix animation bug - #4615 */
+.ui-accordion { width: 100%; }
.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
.ui-accordion .ui-accordion-li-fix { display: inline; }
.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
@@ -304,21 +334,36 @@
.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
-.ui-accordion .ui-accordion-content-active { display: block; }/* Autocomplete
-----------------------------------*/
+.ui-accordion .ui-accordion-content-active { display: block; }
+/*
+ * jQuery UI Autocomplete 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Autocomplete#theming
+ */
.ui-autocomplete { position: absolute; cursor: default; }
-.ui-autocomplete-loading { background: white url('images/ui-anim_basic_16x16.gif') right center no-repeat; }
/* workarounds */
* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
-/* Menu
-----------------------------------*/
+/*
+ * jQuery UI Menu 1.8.16
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Menu#theming
+ */
.ui-menu {
list-style:none;
padding: 2px;
margin: 0;
display:block;
+ float: left;
}
.ui-menu .ui-menu {
margin-top: -3px;
@@ -326,6 +371,9 @@
.ui-menu .ui-menu-item {
margin:0;
padding: 0;
+ zoom: 1;
+ float: left;
+ clear: left;
width: 100%;
}
.ui-menu .ui-menu-item a {
@@ -337,11 +385,18 @@
}
.ui-menu .ui-menu-item a.ui-state-hover,
.ui-menu .ui-menu-item a.ui-state-active {
+ font-weight: normal;
margin: -1px;
}
-/* Button
-----------------------------------*/
-
+/*
+ * jQuery UI Button 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Button#theming
+ */
.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
@@ -352,15 +407,17 @@ button.ui-button-icons-only { width: 3.7em; }
.ui-button .ui-button-text { display: block; line-height: 1.4; }
.ui-button-text-only .ui-button-text { padding: .4em 1em; }
.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
-.ui-button-text-icon .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
/* no icon support for input elements, provide padding by default */
input.ui-button { padding: .4em 1em; }
/*button icon element(s) */
-.ui-button-icon-only .ui-icon, .ui-button-text-icon .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
+.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
-.ui-button-text-icon .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
/*button sets*/
@@ -369,27 +426,36 @@ input.ui-button { padding: .4em 1em; }
/* workarounds */
button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
-
-
-
-
-
-/* Dialog
-----------------------------------*/
+/*
+ * jQuery UI Dialog 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Dialog#theming
+ */
.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
-.ui-dialog .ui-dialog-titlebar { padding: .5em 1em .3em; position: relative; }
-.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .2em 0; }
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative; }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; }
.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
-.ui-dialog .ui-dialog-content { border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
-.ui-dialog .ui-dialog-buttonpane button { float: right; margin: .5em .4em .5em 0; cursor: pointer; padding: .2em .6em .3em .6em; line-height: 1.4em; width:auto; overflow:visible; }
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
+.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
.ui-draggable .ui-dialog-titlebar { cursor: move; }
-.ui-dialog fieldset legend a { color: #235A81; }
-/* Slider
-----------------------------------*/
+/*
+ * jQuery UI Slider 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Slider#theming
+ */
.ui-slider { position: relative; text-align: left; }
.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
@@ -404,8 +470,15 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
-.ui-slider-vertical .ui-slider-range-max { top: 0; }/* Tabs
-----------------------------------*/
+.ui-slider-vertical .ui-slider-range-max { top: 0; }/*
+ * jQuery UI Tabs 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Tabs#theming
+ */
.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
@@ -413,18 +486,18 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
-.ui-tabs .ui-tabs-panel { display: block; border: 0; padding: 1em 1.4em; background: none; }
-/*.ui-tabs .ui-tabs-hide { display: none !important; }*/
-/* Firefox has issues rendering SVG in display:none elements. See also http://jqueryui.com/demos/tabs/#...my_slider.2C_Google_Map.2C_sIFR_etc._not… */
-.ui-tabs .ui-tabs-hide {
- position: absolute;
- left: -10000px;
- /* required so that overflowing content doesn't cause scrolling */
- top: -10000px;
-}
-/* Datepicker
-----------------------------------*/
-.ui-datepicker { width: 17em; padding: .2em .2em 0; }
+.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
+.ui-tabs .ui-tabs-hide { display: none !important; }
+/*
+ * jQuery UI Datepicker 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Datepicker#theming
+ */
+.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
@@ -456,7 +529,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
-.ui-datepicker-row-break { clear:both; width:100%; }
+.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
/* RTL support */
.ui-datepicker-rtl { direction: rtl; }
@@ -482,7 +555,14 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
left: -4px; /*must have*/
width: 200px; /*must have*/
height: 200px; /*must have*/
-}/* Progressbar
-----------------------------------*/
+}/*
+ * jQuery UI Progressbar 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Progressbar#theming
+ */
.ui-progressbar { height:2em; text-align: left; }
-.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
\ No newline at end of file
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6RC1-20780-g4cef030
by Madhura Jayaratne 10 Oct '11
by Madhura Jayaratne 10 Oct '11
10 Oct '11
The branch, master has been updated
via 4cef030dd4372e22f9ee791189b84bf0e68a6b77 (commit)
via 2d1b7bff0cc4a2f5a5937f2fd3df345561b2a67b (commit)
from b5e63b56a98ce5d46bf5c654c0427ec426688dfc (commit)
- Log -----------------------------------------------------------------
commit 4cef030dd4372e22f9ee791189b84bf0e68a6b77
Merge: b5e63b5 2d1b7bf
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Mon Oct 10 22:58:33 2011 +0530
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
Summary of changes:
tbl_operations.php | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/tbl_operations.php b/tbl_operations.php
index d859a52..e8ea605 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -725,6 +725,7 @@ if (! (isset($db_is_information_schema) && $db_is_information_schema)) {
<?php
}
?>
+<br class="clearfloat">
<?php if (PMA_Partition::havePartitioning()) {
$partition_names = PMA_Partition::getPartitionNames($db, $table);
// show the Partition maintenance section only if we detect a partition
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_6RC1-13-g2d1b7bf
by Madhura Jayaratne 10 Oct '11
by Madhura Jayaratne 10 Oct '11
10 Oct '11
The branch, QA_3_4 has been updated
via 2d1b7bff0cc4a2f5a5937f2fd3df345561b2a67b (commit)
from a6fc7ac92836e6e25cb8efc98c014a0e3a7e55ca (commit)
- Log -----------------------------------------------------------------
commit 2d1b7bff0cc4a2f5a5937f2fd3df345561b2a67b
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Mon Oct 10 22:57:45 2011 +0530
Proper layout for table maintenance page
-----------------------------------------------------------------------
Summary of changes:
tbl_operations.php | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/tbl_operations.php b/tbl_operations.php
index 28530da..fb190fe 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -717,6 +717,7 @@ if (! (isset($db_is_information_schema) && $db_is_information_schema)) {
<?php
}
?>
+<br class="clearfloat">
<?php if (PMA_Partition::havePartitioning()) {
$partition_names = PMA_Partition::getPartitionNames($db, $table);
// show the Partition maintenance section only if we detect a partition
hooks/post-receive
--
phpMyAdmin
1
0