Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin
This commit is contained in:
commit
1221a76991
@ -83,6 +83,7 @@ phpMyAdmin - ChangeLog
|
||||
4.4.13.0 (not yet released)
|
||||
- issue #1808 "Improve table structure" generates invalid SQL
|
||||
- bug Once checked "Show only active" checkbox is always checked
|
||||
- issue #1813 Delete rows using "Check All" is broken
|
||||
|
||||
4.4.12.0 (2015-07-20)
|
||||
- bug Saved chart image does not have a proper name or an extension
|
||||
|
||||
@ -861,8 +861,9 @@ AJAX.registerOnload('functions.js', function () {
|
||||
*/
|
||||
|
||||
$(document).on('click', 'input:checkbox.checkall', function (e) {
|
||||
var $tr = $(this).closest('tr');
|
||||
var $table = $(this).closest('table');
|
||||
$this = $(this);
|
||||
var $tr = $this.closest('tr');
|
||||
var $table = $this.closest('table');
|
||||
|
||||
// make the table unselectable (to prevent default highlighting when shift+click)
|
||||
//$tr.parents('table').noSelect();
|
||||
@ -871,21 +872,15 @@ AJAX.registerOnload('functions.js', function () {
|
||||
// usual click
|
||||
|
||||
// XXX: FF fires two click events for <label> (label and checkbox), so we need to handle this differently
|
||||
var $checkbox = $tr.find(':checkbox');
|
||||
if ($checkbox.length) {
|
||||
// checkbox in a row, add or remove class depending on checkbox state
|
||||
var checked = $checkbox.prop('checked');
|
||||
if (!$(e.target).is(':checkbox, label')) {
|
||||
checked = !checked;
|
||||
$checkbox.prop('checked', checked).trigger('change');
|
||||
}
|
||||
$tr.toggleClass('marked', checked);
|
||||
last_click_checked = checked;
|
||||
var $checkbox = $tr.find(':checkbox.checkall');
|
||||
var checked = $this.prop('checked');
|
||||
$checkbox.prop('checked', checked).trigger('change');
|
||||
if (checked) {
|
||||
$tr.addClass('marked');
|
||||
} else {
|
||||
// normal data table, just toggle class
|
||||
$tr.toggleClass('marked');
|
||||
last_click_checked = false;
|
||||
$tr.removeClass('marked');
|
||||
}
|
||||
last_click_checked = checked;
|
||||
|
||||
// remember the last clicked row
|
||||
last_clicked_row = last_click_checked ? $table.find('tr.odd:not(.noclick), tr.even:not(.noclick)').index($tr) : -1;
|
||||
|
||||
13
po/tr.po
13
po/tr.po
@ -4,10 +4,10 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2015-07-23 03:54-0700\n"
|
||||
"PO-Revision-Date: 2015-07-20 13:26+0200\n"
|
||||
"PO-Revision-Date: 2015-07-23 16:30+0200\n"
|
||||
"Last-Translator: Burak Yavuz <hitowerdigit@hotmail.com>\n"
|
||||
"Language-Team: Turkish <https://hosted.weblate.org/projects/phpmyadmin/"
|
||||
"master/tr/>\n"
|
||||
"Language-Team: Turkish "
|
||||
"<https://hosted.weblate.org/projects/phpmyadmin/master/tr/>\n"
|
||||
"Language: tr\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
@ -3909,7 +3909,7 @@ msgstr ""
|
||||
#: libraries/Linter.class.php:147
|
||||
#, php-format
|
||||
msgid "%1$s (near <code>%2$s</code>)"
|
||||
msgstr ""
|
||||
msgstr "%1$s (yaklaşık <code>%2$s</code>)"
|
||||
|
||||
#: libraries/Menu.class.php:199 libraries/ServerStatusData.class.php:430
|
||||
#: libraries/config/messages.inc.php:823
|
||||
@ -13788,15 +13788,14 @@ msgid "This is a read-only variable and can not be edited"
|
||||
msgstr "Bu, salt okunur bir değişkendir ve düzenlenemez"
|
||||
|
||||
#: libraries/sql-parser/src/Components/AlterOperation.php:191
|
||||
#, fuzzy
|
||||
#| msgid "Iconic table operations"
|
||||
msgid "Unrecognized alter operation."
|
||||
msgstr "Sembolik tablo işlemleri"
|
||||
msgstr "Kategorilenmemiş değiştirme işlemi."
|
||||
|
||||
#: libraries/sql-parser/src/Components/Array2d.php:90
|
||||
#, php-format
|
||||
msgid "%1$d values were expected, but found %2$d."
|
||||
msgstr ""
|
||||
msgstr "%1$d değer beklendi, ancak %2$d bulundu."
|
||||
|
||||
#: libraries/sql-parser/src/Components/Array2d.php:113
|
||||
msgid "An opening bracket followed by a set of values was expected."
|
||||
|
||||
Loading…
Reference in New Issue
Block a user