The branch, master has been updated
via 681df0a9f9380ae2b5f8f065f6b5b3e986a23351 (commit)
via 85f62705e4dbbbf34b1e1c3bbc790b66a0e78966 (commit)
via 69c14828baf1a6c256e91d55d899d33d7b05bb71 (commit)
from 249a1d5c8cd7796cb240f99389b731df0f02cc43 (commit)
- Log -----------------------------------------------------------------
commit 681df0a9f9380ae2b5f8f065f6b5b3e986a23351
Merge: 85f6270 249a1d5
Author: Thilanka Kaushalya <[email protected]>
Date: Sat Aug 20 15:58:37 2011 +0530
Merge branch 'master' of
git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
commit 85f62705e4dbbbf34b1e1c3bbc790b66a0e78966
Author: Thilanka Kaushalya <[email protected]>
Date: Sat Aug 20 15:55:02 2011 +0530
Rewrote the functions in querywindow.js using jquery
commit 69c14828baf1a6c256e91d55d899d33d7b05bb71
Merge: 90c010f 9147f30
Author: Thilanka Kaushalya <[email protected]>
Date: Sat Aug 13 07:01:34 2011 +0530
Merge branch 'master' of
git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
-----------------------------------------------------------------------
Summary of changes:
js/querywindow.js | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/js/querywindow.js b/js/querywindow.js
index ba9fe6e..55c895a 100644
--- a/js/querywindow.js
+++ b/js/querywindow.js
@@ -7,36 +7,35 @@ function PMA_queryAutoCommit()
function PMA_querywindowCommit(tab)
{
- document.getElementById('hiddenqueryform').querydisplay_tab.value = tab;
- document.getElementById('hiddenqueryform').submit();
+ $('#hiddenqueryform').find("input[name='querydisplay_tab']").attr("value"
,tab);
+ $('#hiddenqueryform').submit();
return false;
}
function PMA_querywindowSetFocus()
{
- document.getElementById('sqlquery').focus();
+ $('#sqlquery').focus();
}
function PMA_querywindowResize()
{
// for Gecko
- if (typeof(self.sizeToContent) == 'function') {
- self.sizeToContent();
+ if (typeof($(this)[0].sizeToContent) == 'function') {
+ $(this)[0].sizeToContent();
//self.scrollbars.visible = false;
// give some more space ... to prevent 'fli(pp/ck)ing'
- self.resizeBy(10, 50);
+ $(this)[0].resizeBy(10, 50);
return;
}
// for IE, Opera
- if (document.getElementById &&
typeof(document.getElementById('querywindowcontainer')) != 'undefined') {
-
+ if ($('#querywindowcontainer') != 'undefined') {
// get content size
- var newWidth =
document.getElementById('querywindowcontainer').offsetWidth;
- var newHeight =
document.getElementById('querywindowcontainer').offsetHeight;
+ var newWidth = $("#querywindowcontainer")[0].offsetWidth;
+ var newHeight = $("#querywindowcontainer")[0].offsetHeight;
// set size to contentsize
// plus some offset for scrollbars, borders, statusbar, menus ...
- self.resizeTo(newWidth + 45, newHeight + 75);
+ $(this)[0].resizeTo(newWidth + 45, newHeight + 75);
}
}
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
Get a FREE DOWNLOAD! and learn more about uberSVN rich system,
user administration capabilities and model configuration. Take
the hassle out of deploying and managing Subversion and the
tools developers use with it. http://p.sf.net/sfu/wandisco-d2d-2
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
