The branch, master has been updated
via 754a42bcb57f4ed81d81ab6a5612f3a588c23612 (commit)
from dd2dc3a5a7665a09bd128571ea1ac9a4389d68db (commit)
- Log -----------------------------------------------------------------
commit 754a42bcb57f4ed81d81ab6a5612f3a588c23612
Author: Michal Čihař <[email protected]>
Date: Fri Aug 5 09:40:11 2011 +0200
Revert "Collapsible navigation frame: Fix for expand link disappeared after
page load"
This reverts commit b0290ca1bf58700c71654120daaee62d9d76a069.
Conflicts:
js/common.js
js/functions.js
-----------------------------------------------------------------------
Summary of changes:
js/common.js | 4 ++--
js/functions.js | 6 ------
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/js/common.js b/js/common.js
index b595108..97fa7d9 100644
--- a/js/common.js
+++ b/js/common.js
@@ -115,12 +115,12 @@ function refreshMain(url) {
* @uses lang
* @uses collation_connection
* @uses encodeURIComponent()
- * @param boolean force force reloading
+ * @param boolean force force reloading
*/
function refreshNavigation(force) {
// The goTo() function won't refresh in case the target
// url is the same as the url given as parameter, but sometimes
- // we want to refresh anyway.
+ // we want to refresh anyway.
if (typeof force != undefined && force && window.parent &&
window.parent.frame_navigation) {
window.parent.frame_navigation.location.reload();
} else {
diff --git a/js/functions.js b/js/functions.js
index b6b7692..48003f1 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -29,12 +29,6 @@ var codemirror_editor = false;
*/
var chart_activeTimeouts = new Object();
-if(window.parent) {
- $(document).ready(function() {
- if(window.parent.currentWidth() == 0)
- $('div#frameExpand').show();
- });
-}
/**
* Add a hidden field to the form to indicate that this will be an
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
The must-attend event for mobile developers. Connect with experts.
Get tools for creating Super Apps. See the latest technologies.
Sessions, hands-on labs, demos & much more. Register early & save!
http://p.sf.net/sfu/rim-blackberry-1
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
