The branch, master has been updated
via 5ecbd6941df6adb6aa43af9371c5000ddf77bb3c (commit)
from add9bc3a38faa0abc30ac1d51d8fa1bdf40883cf (commit)
- Log -----------------------------------------------------------------
commit 5ecbd6941df6adb6aa43af9371c5000ddf77bb3c
Author: Michal Čihař <mcihar(a)novell.com>
Date: Thu Apr 1 11:24:38 2010 +0200
Better name for javascript file.
-----------------------------------------------------------------------
Summary of changes:
index.php | 2 +-
js/{helper.js => update-location.js} | 3 ++-
libraries/auth/cookie.auth.lib.php | 2 +-
libraries/common.inc.php | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
rename js/{helper.js => update-location.js} (93%)
diff --git a/index.php b/index.php
index ca284ff..fb8c977 100644
--- a/index.php
+++ b/index.php
@@ -161,7 +161,7 @@ header('Content-Type: text/html; charset=' .
$GLOBALS['charset']);
</script>
<script src="./js/mootools.js"
type="text/javascript"></script>
<script src="./js/jquery/jquery-1.4.2-min.js"
type="text/javascript"></script>
-<script src="./js/helper.js"
type="text/javascript"></script>
+<script src="./js/update-location.js"
type="text/javascript"></script>
<script src="./js/common.js"
type="text/javascript"></script>
</head>
<frameset cols="<?php
diff --git a/js/helper.js b/js/update-location.js
similarity index 93%
rename from js/helper.js
rename to js/update-location.js
index 0a3fbf1..8ebdb62 100644
--- a/js/helper.js
+++ b/js/update-location.js
@@ -1,6 +1,7 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
- * Various helper scripts, using jQuery.
+ * Scripts to update location to allow bookmarking of frameset
+ * and restoring the bookmark once the page is loaded.
*
* @version $Id$
*/
diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index 0ea4a81..ab5bae7 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -185,7 +185,7 @@ function PMA_auth()
require './libraries/header_meta_style.inc.php';
?>
<script src="./js/mootools.js"
type="text/javascript"></script>
-<script src="./js/helper.js"
type="text/javascript"></script>
+<script src="./js/update-location.js"
type="text/javascript"></script>
<script type="text/javascript">
//<![CDATA[
// show login form in top frame
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index a81d197..8a45e75 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -547,7 +547,7 @@ $_REQUEST['js_frame'] =
PMA_ifSetOr($_REQUEST['js_frame'], '');
$GLOBALS['js_include'] = array();
$GLOBALS['js_include'][] = 'mootools.js';
$GLOBALS['js_include'][] = 'jquery/jquery-1.4.2-min.js';
-$GLOBALS['js_include'][] = 'helper.js';
+$GLOBALS['js_include'][] = 'update-location.js';
/**
* holds locale messages required by JavaScript function
hooks/post-receive
--
phpMyAdmin
Show replies by date