gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2013-06-24 15:06:40 +02:00
commit 84867b45f5
7 changed files with 12 additions and 24374 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9472
js/jquery/jquery-1.8.3.js vendored
View File

File diff suppressed because it is too large Load Diff

2
js/jquery/jquery-1.8.3.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

14879
js/jquery/jquery-ui-1.9.2.custom.js vendored
View File

File diff suppressed because it is too large Load Diff

6
js/jquery/jquery-ui-1.9.2.custom.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

4
libraries/Header.class.php
View File

@ -146,10 +146,10 @@ class PMA_Header
*/
private function _addDefaultScripts()
{
$this->_scripts->addFile('jquery/jquery-1.8.3.js');
$this->_scripts->addFile('jquery/jquery-1.8.3.min.js');
$this->_scripts->addFile('ajax.js');
$this->_scripts->addFile('keyhandler.js');
$this->_scripts->addFile('jquery/jquery-ui-1.9.2.custom.js');
$this->_scripts->addFile('jquery/jquery-ui-1.9.2.custom.min.js');
$this->_scripts->addFile('jquery/jquery.sprintf.js');
$this->_scripts->addFile('jquery/jquery.cookie.js');
$this->_scripts->addFile('jquery/jquery.mousewheel.js');

19
scripts/compress-js
View File

@ -1,19 +0,0 @@
#!/bin/sh
set -e
if [ "x$1" = "x-v" -o "x$1" = "x--verbose" ] ; then
VERBOSE="--verbose"
else
VERBOSE=""
fi
for file in `find js -name '*.js' -not -name '*min.js'` ; do
mkdir -p sources/`dirname $file`
if [ ! -z "$VERBOSE" ] ; then
echo "Compressing $file ..."
fi
yui-compressor --charset utf-8 $VERBOSE --type js $file > $file.tmp
cp -a $file sources/$file
mv $file.tmp $file
done

4
setup/index.php
View File

@ -37,8 +37,8 @@ PMA_noCacheHeader();
<link href="../favicon.ico" rel="icon" type="image/x-icon" />
<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.8.3.js"></script>
<script type="text/javascript" src="../js/jquery/jquery-ui-1.9.2.custom.js"></script>
<script type="text/javascript" src="../js/jquery/jquery-1.8.3.min.js"></script>
<script type="text/javascript" src="../js/jquery/jquery-ui-1.9.2.custom.min.js"></script>
<script type="text/javascript" src="../js/jquery/jquery.json-2.4.js"></script>
<script type="text/javascript" src="ajax.js"></script>
<script type="text/javascript" src="../js/config.js"></script>