The branch, master has been updated via d296a5222bff9913eedfb7a66efb7ac2809fe204 (commit) via d2991f71bd0d9dfebe5068e981d9e18c3f85699e (commit) via 83ce2fee572c734360fda99230b946d3fca14116 (commit) from 7148a7a38046ba91595ff1d9e4f49569fd84c2a9 (commit)

- Log ----------------------------------------------------------------- commit d296a5222bff9913eedfb7a66efb7ac2809fe204 Author: Michal Čihař michal@cihar.com Date: Wed Feb 2 22:55:10 2011 +0100

Avoid new lines between elements as this can lead to spaces

commit d2991f71bd0d9dfebe5068e981d9e18c3f85699e Author: Michal Čihař michal@cihar.com Date: Wed Feb 2 22:54:40 2011 +0100

Tabs to spaces.

commit 83ce2fee572c734360fda99230b946d3fca14116 Author: Michal Čihař michal@cihar.com Date: Wed Feb 2 22:54:11 2011 +0100

Should use only inner width here

-----------------------------------------------------------------------

Summary of changes: js/functions.js | 28 ++++++++++++++-------------- libraries/common.lib.php | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/js/functions.js b/js/functions.js index 6b291fe..9446485 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1846,13 +1846,13 @@ $(document).ready(function() { //User wants to add more fields to the table $.post($form.attr('action'), $form.serialize() + "&submit_num_fields=" + $(this).val(), function(data) { // if 'create_table_dialog' exists - if ($("#create_table_dialog").length > 0) { - $("#create_table_dialog").html(data); + if ($("#create_table_dialog").length > 0) { + $("#create_table_dialog").html(data); + } + // if 'create_table_div' exists + if ($("#create_table_div").length > 0) { + $("#create_table_div").html(data); } - // if 'create_table_div' exists - if ($("#create_table_div").length > 0) { - $("#create_table_div").html(data); - } }) //end $.post()

}) // end create table form (add fields) @@ -2167,7 +2167,7 @@ $(document).ready(function() { // Remove the actions from the table cells (they are available by default for JavaScript-disabled browsers) // if the table is not a view or information_schema (otherwise there is only one action to hide and there's no point) if($("input[type='hidden'][name='table_type']").val() == "table") { - var $table = $("table[id='tablestructure']"); + var $table = $("table[id='tablestructure']"); $table.find("td[class='browse']").remove(); $table.find("td[class='primary']").remove(); $table.find("td[class='unique']").remove(); @@ -2192,8 +2192,8 @@ $(document).ready(function() { // A hack for IE6 to prevent the after_field select element from being displayed on top of the dropdown by // positioning an iframe directly on top of it var $after_field = $("select[name='after_field']"); - $("iframe[class='IE_hack']") - .width($after_field.width()) + $("iframe[class='IE_hack']") + .width($after_field.width()) .height($after_field.height()) .offset({ top: $after_field.offset().top, @@ -2202,10 +2202,10 @@ $(document).ready(function() {

// When "more" is hovered over, show the hidden actions $table.find("td[class='more_opts']") - .mouseenter(function() { + .mouseenter(function() { if($.browser.msie && $.browser.version == "6.0") { $("iframe[class='IE_hack']") - .show() + .show() .width($after_field.width()+4) .height($after_field.height()+4) .offset({ @@ -2220,8 +2220,8 @@ $(document).ready(function() { var left_offset_IE = $(this).offset().left + $(this).innerWidth() - $(this).children(".structure_actions_dropdown").innerWidth(); var top_offset_IE = $(this).offset().top + $(this).innerHeight(); $(this).children(".structure_actions_dropdown").offset({ - top: top_offset_IE, - left: left_offset_IE }); + top: top_offset_IE, + left: left_offset_IE }); } }) .mouseleave(function() { @@ -2265,7 +2265,7 @@ $(document).ready(function() { function menuResize() { var cnt = $('#topmenu'); - var wmax = cnt.width() - 5; // 5 px margin for jumping menu in Chrome + var wmax = cnt.innerWidth() - 5; // 5 px margin for jumping menu in Chrome var submenu = cnt.find('.submenu'); var submenu_w = submenu.outerWidth(true); var submenu_ul = submenu.find('ul'); diff --git a/libraries/common.lib.php b/libraries/common.lib.php index ac79a12..ca39131 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1723,7 +1723,7 @@ function PMA_generate_html_tabs($tabs, $url_params) .'<ul id="' . htmlentities($tag_id) . '">' . "\n";

foreach ($tabs as $tab) { - $tab_navigation .= PMA_generate_html_tab($tab, $url_params) . "\n"; + $tab_navigation .= PMA_generate_html_tab($tab, $url_params); }

$tab_navigation .=

hooks/post-receive