The branch, master has been updated via 662c96494fde621775f01afabc91ac4d293004c3 (commit) from 79df74937cd20a400837b76f264eef4a4f2fe245 (commit)
- Log ----------------------------------------------------------------- commit 662c96494fde621775f01afabc91ac4d293004c3 Author: Michal Čihař mcihar@suse.cz Date: Mon Aug 8 14:33:23 2011 +0200
Fix and simplify theme selection js
-----------------------------------------------------------------------
Summary of changes: js/functions.js | 6 ++---- libraries/Theme.class.php | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/js/functions.js b/js/functions.js index 9eb1244..b16cf80 100644 --- a/js/functions.js +++ b/js/functions.js @@ -3135,10 +3135,8 @@ $(document).ready(function() { /** * Theme changer. */ - $('.take_theme').live('click', function(e) { - alert(e.target.nodeName); - var evt = $(e); - var what = evt.target.id; + $('.take_theme').click(function(e) { + var what = this.name; if (window.opener && window.opener.document.forms['setTheme'].elements['set_theme']) { window.opener.document.forms['setTheme'].elements['set_theme'].value = what; window.opener.document.forms['setTheme'].submit(); diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php index 252d554..f6b08a0 100644 --- a/libraries/Theme.class.php +++ b/libraries/Theme.class.php @@ -324,7 +324,7 @@ class PMA_Theme .' (' . htmlspecialchars($this->getVersion()) . ')</h2>'; echo '<p>'; echo '<a target="_top" class="take_theme" ' - .'id="' . htmlspecialchars($this->getId()) . '" ' + .'name="' . htmlspecialchars($this->getId()) . '" ' . 'href="index.php'.PMA_generate_common_url(array( 'set_theme' => $this->getId() )) . '">';
hooks/post-receive