Merge remote-tracking branch 'origin/master'

js/db_operations.js

@@ -18,7 +18,7 @@
  * Change charset
  */
 
-$(document).ready(function() {
+$(function() {
 
     /**
      * Ajax event handlers for 'Rename Database'

js/db_search.js

@@ -26,7 +26,7 @@
  */
 function loadResult(result_path, table_name, link, ajaxEnable)
 {
-    $(document).ready(function() {
+    $(function() {
         if(ajaxEnable) {
             /**   Hides the results shown by the delete criteria */
             var $msg = PMA_ajaxShowMessage();
@@ -64,7 +64,7 @@ function loadResult(result_path, table_name, link, ajaxEnable)
  */
 function deleteResult(result_path, msg, ajaxEnable)
 {
-    $(document).ready(function() {
+    $(function() {
         /**  Hides the results shown by the browse criteria */
         $("#table-info").hide();
         $('#browse-results').hide();
@@ -94,7 +94,7 @@ function deleteResult(result_path, msg, ajaxEnable)
     });
 }
 
-$(document).ready(function() {
+$(function() {
     /** Hide the table link in the initial search result */
     var icon = PMA_getImage('s_tbl.png', '', {'id': 'table-image'}).toString();
     $("#table-info").prepend(icon).hide();
@@ -225,4 +225,4 @@ $(document).ready(function() {
             PMA_ajaxRemoveMessage($msgbox);
         })
     })
-}, 'top.frame_content'); // end $(document).ready()
+}, 'top.frame_content'); // end $()

js/db_structure.js

@@ -117,7 +117,7 @@ function PMA_adjustTotals() {
     $summary.find('.tbl_overhead').text(overheadSum + " " + byteUnits[overhead_magnitude]);
 }
 
-$(document).ready(function() {
+$(function() {
     /**
      * Ajax Event handler for 'Insert Table'
      *
@@ -488,4 +488,4 @@ $(document).ready(function() {
         return false;
     }) //end Calculate Real End for InnoDB
 
-}, 'top.frame_content'); // end $(document).ready()
+}, 'top.frame_content'); // end $()

js/export.js

@@ -8,7 +8,7 @@
  * Toggles the hiding and showing of each plugin's options
  * according to the currently selected plugin from the dropdown list
  */
-$(document).ready(function() {
+$(function() {
     $("#plugins").change(function() {
         $("#format_specific_opts div.format_specific_options").hide();
         var selected_plugin_name = $("#plugins option:selected").val();
@@ -19,7 +19,7 @@ $(document).ready(function() {
 /**
  * Toggles the enabling and disabling of the SQL plugin's comment options that apply only when exporting structure
  */
-$(document).ready(function() {
+$(function() {
     $("input[type='radio'][name='sql_structure_or_data']").change(function() {
         var comments_are_present = $("#checkbox_sql_include_comments").prop("checked");
         var show = $("input[type='radio'][name='sql_structure_or_data']:checked").val();
@@ -65,7 +65,7 @@ function toggle_structure_data_opts(pluginName)
     }
 }
 
-$(document).ready(function() {
+$(function() {
     $("input[type='radio'][name='latex_structure_or_data']").change(function() {
         toggle_structure_data_opts("latex");
     });
@@ -99,7 +99,7 @@ function toggle_save_to_file()
     }
 }
 
-$(document).ready(function() {
+$(function() {
     toggle_save_to_file();
     $("input[type='radio'][name='output_format']").change(toggle_save_to_file);
 });
@@ -128,7 +128,7 @@ function toggle_sql_include_comments()
 /**
  * For SQL plugin, if "CREATE TABLE options" is checked/unchecked, check/uncheck each of its sub-options
  */
-$(document).ready(function() {
+$(function() {
     var $create = $("#checkbox_sql_create_table_statements");
     var $create_options = $("#ul_create_table_statements input");
     $create.change(function() {
@@ -144,7 +144,7 @@ $(document).ready(function() {
 /**
  * Disables the view output as text option if the output must be saved as a file
  */
-$(document).ready(function() {
+$(function() {
     $("#plugins").change(function() {
         var active_plugin = $("#plugins option:selected").val();
         var force_file = $("#force_file_" + active_plugin).val();
@@ -178,7 +178,7 @@ function toggle_quick_or_custom()
     }
 }
 
-$(document).ready(function() {
+$(function() {
     $("input[type='radio'][name='quick_or_custom']").change(toggle_quick_or_custom);
 });
 
@@ -186,7 +186,7 @@ $(document).ready(function() {
  * Sets up the interface for Javascript-enabled browsers since the default is for
  *  Javascript-disabled browsers
  */
-$(document).ready(function() {
+$(function() {
     if ($("input[type='hidden'][name='export_method']").val() != "custom-no-form") {
         $("#quick_or_custom").show();
     }
@@ -208,7 +208,7 @@ $(document).ready(function() {
 /**
  * Disables the "Dump some row(s)" sub-options when it is not selected
  */
-$(document).ready(function() {
+$(function() {
     $("input[type='radio'][name='allrows']").change(function() {
         if ($("input[type='radio'][name='allrows']").prop("checked")) {
             $("label[for='limit_to']").fadeTo('fast', 0.4);

js/functions.js

@@ -533,7 +533,7 @@ function checkTableEditForm(theForm, fieldsCnt)
     return true;
 } // enf of the 'checkTableEditForm()' function
 
-$(document).ready(function() {
+$(function() {
     /**
      * Row marking in horizontal mode (use "live" so that it works also for
      * next pages reached via AJAX); a tr may have the class noclick to remove
@@ -654,7 +654,7 @@ var last_shift_clicked_row = -1;
  * Row highlighting in horizontal mode (use "live"
  * so that it works also for pages reached via AJAX)
  */
-/*$(document).ready(function() {
+/*$(function() {
     $('tr.odd, tr.even').live('hover',function(event) {
         var $tr = $(this);
         $tr.toggleClass('hover',event.type=='mouseover');
@@ -1070,7 +1070,7 @@ function pdfPaperSize(format, axis)
 /**
  * Jquery Coding for inline editing SQL_QUERY
  */
-$(document).ready(function() {
+$(function() {
     $("a.inline_edit_sql").live('click', function() {
         if ($('#sql_query_edit').length) {
             // An inline query editor is already open,
@@ -1330,7 +1330,7 @@ function PMA_ajaxRemoveMessage($this_msgbox)
     }
 }
 
-$(document).ready(function() {
+$(function() {
     /**
      * Allows the user to dismiss a notification
      * created with PMA_ajaxShowMessage()
@@ -1935,7 +1935,7 @@ jQuery.fn.PMA_sort_table = function(text_selector) {
  *
  * Attach Ajax Event handlers for Create Table
  */
-$(document).ready(function() {
+$(function() {
 
      /**
      * Attach event handler to the submit action of the create table minimal form
@@ -2100,7 +2100,7 @@ $(document).ready(function() {
  * jQuery coding for 'Table operations'.  Used on tbl_operations.php
  * Attach Ajax Event handlers for Table operations
  */
-$(document).ready(function() {
+$(function() {
     /**
      *Ajax action for submitting the "Alter table order by"
     **/
@@ -2222,7 +2222,7 @@ $(document).ready(function() {
  *
  * @see $cfg['AjaxEnable']
  */
-$(document).ready(function() {
+$(function() {
     $("#drop_db_anchor").live('click', function(event) {
         event.preventDefault();
 
@@ -2244,7 +2244,7 @@ $(document).ready(function() {
             }); // end $.get()
         }); // end $.PMA_confirm()
     }); //end of Drop Database Ajax action
-}); // end of $(document).ready() for Drop Database
+}); // end of $() for Drop Database
 
 /**
  * Attach Ajax event handlers for 'Create Database'.  Used wherever libraries/
@@ -2252,7 +2252,7 @@ $(document).ready(function() {
  *
  * @see $cfg['AjaxEnable']
  */
-$(document).ready(function() {
+$(function() {
 
     $('#create_database_form.ajax').live('submit', function(event) {
         event.preventDefault();
@@ -2288,12 +2288,12 @@ $(document).ready(function() {
             }
         }); // end $.post()
     }); // end $().live()
-});  // end $(document).ready() for Create Database
+});  // end $() for Create Database
 
 /**
  * Attach Ajax event handlers for 'Change Password' on main.php
  */
-$(document).ready(function() {
+$(function() {
 
     /**
      * Attach Ajax event handler on the change password anchor
@@ -2379,13 +2379,13 @@ $(document).ready(function() {
      *
      * @see $cfg['AjaxEnable']
      */
-}); // end $(document).ready() for Change Password
+}); // end $() for Change Password
 
 /**
  * Toggle the hiding/showing of the "Open in ENUM/SET editor" message when
  * the page loads and when the selected data type changes
  */
-$(document).ready(function() {
+$(function() {
     // is called here for normal page loads and also when opening
     // the Create table dialog
     PMA_verifyColumnsProperties();
@@ -2450,7 +2450,7 @@ var $enum_editor_dialog = null;
 /**
  * Opens the ENUM/SET editor and controls its functions
  */
-$(document).ready(function() {
+$(function() {
     $("a.open_enum_editor").live('click', function() {
         // Get the name of the column that is being edited
         var colname = $(this).closest('tr').find('input:first').val();
@@ -2623,7 +2623,7 @@ $(document).ready(function() {
     });
 });
 
-$(document).ready(function() {
+$(function() {
     PMA_convertFootnotesToTooltips();
 });
 
@@ -3020,7 +3020,7 @@ $(window).load(function () {
 /**
  * Vertical pointer
  */
-$(document).ready(function() {
+$(function() {
     $('.vpointer').live('hover',
         //handlerInOut
         function(e) {
@@ -3030,9 +3030,9 @@ $(document).ready(function() {
             $('.vpointer').filter('.row_' + row_num).toggleClass('hover');
         }
         );
-}); // end of $(document).ready() for vertical pointer
+}); // end of $() for vertical pointer
 
-$(document).ready(function() {
+$(function() {
     /**
      * Vertical marker
      */
@@ -3130,7 +3130,7 @@ $(document).ready(function() {
             window.parent.frame_navigation.PMA_reloadRecentTable();
         }
     });
-}); // end of $(document).ready()
+}); // end of $()
 
 /**
  * Creates a message inside an object with a sliding effect
@@ -3215,7 +3215,7 @@ function PMA_slidingMessage(msg, $obj)
  *
  * @see $cfg['AjaxEnable']
  */
-$(document).ready(function() {
+$(function() {
     $("#drop_tbl_anchor").live('click', function(event) {
         event.preventDefault();
 
@@ -3237,14 +3237,14 @@ $(document).ready(function() {
             }); // end $.get()
         }); // end $.PMA_confirm()
     }); //end of Drop Table Ajax action
-}); // end of $(document).ready() for Drop Table
+}); // end of $() for Drop Table
 
 /**
  * Attach Ajax event handlers for Truncate Table.
  *
  * @see $cfg['AjaxEnable']
  */
-$(document).ready(function() {
+$(function() {
     $("#truncate_tbl_anchor.ajax").live('click', function(event) {
         event.preventDefault();
 
@@ -3279,12 +3279,12 @@ $(document).ready(function() {
             }); // end $.get()
         }); // end $.PMA_confirm()
     }); //end of Truncate Table Ajax action
-}); // end of $(document).ready() for Truncate Table
+}); // end of $() for Truncate Table
 
 /**
  * Attach CodeMirror2 editor to SQL edit area.
  */
-$(document).ready(function() {
+$(function() {
     var elm = $('#sqlquery');
     if (elm.length > 0 && typeof CodeMirror != 'undefined') {
         codemirror_editor = CodeMirror.fromTextArea(elm[0], {
@@ -3407,7 +3407,7 @@ loadJavascript=function(file) {
     }
 };
 
-$(document).ready(function() {
+$(function() {
     /**
      * Theme selector.
      */
@@ -3478,14 +3478,14 @@ function printPage()
     }
 }
 
-$(document).ready(function() {
+$(function() {
     $('input#print').click(printPage);
 });
 
 /**
  * Makes the breadcrumbs and the menu bar float at the top of the viewport
  */
-$(document).ready(function () {
+$(function () {
     if ($("#floating_menubar").length && $('#PMA_disable_floating_menubar').length == 0) {
         $("#floating_menubar")
             .css({

js/gis_data_editor.js

@@ -200,7 +200,7 @@ function insertDataAndClose() {
     closeGISEditor();
 }
 
-$(document).ready(function() {
+$(function() {
 
     // Remove the class that is added due to the URL being too long.
     $('span.open_gis_editor a').removeClass('formLinkSubmit');

js/import.js

@@ -43,7 +43,7 @@ function matchFile(fname)
         }
     }
 }
-$(document).ready(function() {
+$(function() {
     // Initially display the options for the selected plugin
     changePluginOpts();
 

js/indexes.js

@@ -91,7 +91,7 @@ function checkIndexType()
  * @name        document.ready
  * @memberOf    jQuery
  */
-$(document).ready(function() {
+$(function() {
     checkIndexType();
     checkIndexName("index_frm");
     $('#select_index_type').live('change', function(event){

js/jquery/jquery-1.6.2.js

@@ -449,7 +449,7 @@ jQuery.extend({
 
 		readyList = jQuery._Deferred();
 
-		// Catch cases where $(document).ready() is called after the
+		// Catch cases where $() is called after the
 		// browser event has already occurred.
 		if ( document.readyState === "complete" ) {
 			// Handle it asynchronously to allow scripts the opportunity to delay ready

js/jquery/jquery.qtip-1.0.0-rc3.js

@@ -1867,7 +1867,7 @@
    };
 
    // Assign cache and event initialisation on document load
-   $(document).ready(function()
+   $(function()
    {
       // Setup library cache with window scroll and dimensions of document
       $.fn.qtip.cache = {

js/navigation.js

@@ -199,7 +199,7 @@ function PMA_reloadRecentTable()
 }
 
 /* Performed on load */
-$(document).ready(function(){
+$(function(){
     /* Display filter */
     $('#NavFilter').css('display', 'inline');
     var txt = $('#fast_filter').val();

js/pmd/move.js

@@ -14,7 +14,7 @@
 
 // Below is the function to bind onbeforeunload events with the content_frame as well as the top window.
 
- $(document).ready(function(){
+ $(function(){
     $(window).bind('beforeunload', function(){        // onbeforeunload for the frame window.
         if (_change == 1 && _staying == 0)
             return PMA_messages['strLeavingDesigner'];

js/replication.js

@@ -25,7 +25,7 @@ function update_config()
     }
 }
 
-$(document).ready(function() {
+$(function() {
     $('#rep').text(conf_prefix);
     $('#db_type').change(update_config);
     $('#db_select').change(update_config);

js/rte/common.js

@@ -79,7 +79,7 @@ var RTE = {
  *
  * @see $cfg['AjaxEnable']
  */
-$(document).ready(function () {
+$(function () {
     /**
      * Attach Ajax event handlers for the Add/Edit functionality.
      */
@@ -384,4 +384,4 @@ $(document).ready(function () {
             }); // end $.get()
         }); // end $.PMA_confirm()
     }); // end $.live()
-}); // end of $(document).ready()
+}); // end of $()

js/rte/events.js

@@ -36,8 +36,8 @@ RTE.validateCustom = function () {
  *
  * @see $cfg['AjaxEnable']
  */
-$(document).ready(function () {
+$(function () {
     $('select[name=item_type]').live('change', function () {
         $('tr.recurring_event_row, tr.onetime_event_row').toggle();
     }); // end $.live()
-}); // end of $(document).ready()
+}); // end of $()

js/rte/routines.js

@@ -213,7 +213,7 @@ RTE.setOptionsForParameter = function ($type, $len, $text, $num) {
  *
  * @see $cfg['AjaxEnable']
  */
-$(document).ready(function () {
+$(function () {
     /**
      * Attach Ajax event handlers for the "Add parameter to routine" functionality.
      */
@@ -399,4 +399,4 @@ $(document).ready(function () {
             }
         }); // end $.get()
     }); // end $.live()
-}); // end of $(document).ready() for the Routine Functionalities
+}); // end of $() for the Routine Functionalities

js/server_databases.js

@@ -15,7 +15,7 @@
  * Drop Databases
  *
  */
-$(document).ready(function() {
+$(function() {
     /**
      * Attach Event Handler for 'Drop Databases'
      *
@@ -66,4 +66,4 @@ $(document).ready(function() {
                 }); // end $.post()
         }); // end $.PMA_confirm()
     }) ; //end of Drop Database action
-}); // end $(document).ready()
+}); // end $()

js/server_privileges.js

@@ -138,7 +138,7 @@ function appendNewUser(new_user_string, new_user_initial, new_user_initial_strin
  * @name        document.ready
  */
 
-$(document).ready(function() {
+$(function() {
     /**
      * AJAX event handler for 'Add a New User'
      *
@@ -614,6 +614,6 @@ $(document).ready(function() {
     });
 
     displayPasswordGenerateButton();
-}, 'top.frame_content'); //end $(document).ready()
+}, 'top.frame_content'); //end $()
 
 /**#@- */

js/server_synchronize.js

@@ -318,7 +318,7 @@ function hideOrDisplayServerFields($server_selector, selected_option)
     }
 }
 
-$(document).ready(function() {
+$(function() {
     $('select.server_selector').change(function(evt) {
         var selected_option = $(evt.target).val();
         hideOrDisplayServerFields($(evt.target), selected_option);

js/sql.js

@@ -76,7 +76,7 @@ function getFieldName($this_field)
  * @name        document.ready
  * @memberOf    jQuery
  */
-$(document).ready(function() {
+$(function() {
     /* Hides the bookmarkoptions checkboxes when the bookmark label is empty */
     $('input#bkm_label').keyup(function() {
         $('input#id_bkm_all_users, input#id_bkm_replace')
@@ -522,7 +522,7 @@ $(document).ready(function() {
         }); // end $.post()
     });
 
-}, 'top.frame_content'); // end $(document).ready()
+}, 'top.frame_content'); // end $()
 
 
 /**
@@ -546,7 +546,7 @@ function PMA_changeClassForColumn($this_th, newclass, isAddClass)
     }
 }
 
-$(document).ready(function() {
+$(function() {
 
     $('a.browse_foreign').live('click', function(e) {
         e.preventDefault();

js/tbl_change.js

@@ -226,7 +226,7 @@ function verificationsAfterFieldChange(urlField, multi_edit, theType)
  * Submit Data to be inserted into the table.
  * Restart insertion with 'N' rows.
  */
-$(document).ready(function() {
+$(function() {
 
     $('span.open_gis_editor').live('click', function(event) {
         event.preventDefault();
@@ -554,4 +554,4 @@ $(document).ready(function() {
             }
         }
     })
-}, 'top.frame_content'); //end $(document).ready()
+}, 'top.frame_content'); //end $()

js/tbl_chart.js

@@ -5,7 +5,7 @@ var chart_series_index = -1;
 var chart_data;
 var temp_chart_title;
 
-$(document).ready(function() {
+$(function() {
     var currentChart = null;
     chart_series = 'columns';
     chart_xaxis_idx = $('select[name="chartXAxis"]').val();

js/tbl_gis_visualization.js

@@ -170,7 +170,7 @@ function initGISVisualization() {
  * Panning on clicking the arrow buttons.
  * Displaying tooltips for GIS objects.
  */
-$(document).ready(function() {
+$(function() {
 
     // If we are in GIS visualization, initialize it
     if ($('table.gis_table').length > 0) {

js/tbl_relation.js

@@ -15,7 +15,7 @@ function show_hide_clauses($thisDropdown)
     }
 }
 
-$(document).ready(function() {
+$(function() {
     // initial display
     $('select.referenced_column_dropdown').each(function(index, one_dropdown) {
         show_hide_clauses($(one_dropdown));

js/tbl_select.js

@@ -12,7 +12,7 @@
  * Actions ajaxified here:
  * Table Search
  */
-$(document).ready(function() {
+$(function() {
     /**
      * Prepare a div containing a link, otherwise it's incorrectly displayed 
      * after a couple of clicks
@@ -174,4 +174,4 @@ $(document).ready(function() {
         }
     });
 
-}, 'top.frame_content'); // end $(document).ready()
+}, 'top.frame_content'); // end $()

js/tbl_structure.js

@@ -17,7 +17,7 @@
  * Drop Primary Key/Index
  *
  */
-$(document).ready(function() {
+$(function() {
     /**
      * Attach Event Handler for 'Drop Column'
      *
@@ -424,7 +424,7 @@ $(document).ready(function() {
             PMA_ajaxRemoveMessage($msgbox);
         }); // end $.get()
     });
-}); // end $(document).ready()
+}); // end $()
 
 /**
  * Loads the append_fields_form to the Change dialog allowing users
@@ -499,7 +499,7 @@ function changeColumns(action,url)
  * jQuery coding for 'Change Table' and 'Add Column'.  Used on tbl_structure.php *
  * Attach Ajax Event handlers for Change Table
  */
-$(document).ready(function() {
+$(function() {
     /**
      *Ajax action for submitting the "Column Change" and "Add Column" form
     **/

js/tbl_zoom_plot.js

@@ -166,7 +166,7 @@ function includePan(currentChart) {
     });
 }
 
-$(document).ready(function() {
+$(function() {
     var cursorMode = ($("input[name='mode']:checked").val() == 'edit') ? 'crosshair' : 'pointer';
     var currentChart = null;
     var currentData = null;

js/update-location.js

@@ -53,7 +53,7 @@ function fix_favicon() {
  * Handler for changing url according to the hash part, which is updated
  * on each page to allow bookmarks.
  */
-$(document).ready(function(){
+$(function(){
     /* Don't do anything if we're not root Window */
     if (window.parent != window && window.parent.setURLHash) {
         return;

libraries/display_import.lib.php

@@ -31,7 +31,7 @@ if (empty($import_list)) {
     <img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" width="16" height="16" alt="ajax clock" style="display: none;" />
     <script type="text/javascript">
         //<![CDATA[
-        $(document).ready( function() {
+        $( function() {
             // add event when user click on "Go" button
             $('#buttonGo').bind('click', function() {
                 $('#upload_form_form').css("display", "none"); // hide form

libraries/footer.inc.php

@@ -73,7 +73,7 @@ if (!$GLOBALS['is_ajax_request']) {
 <?php
 if (empty($GLOBALS['error_message'])) {
     ?>
-$(document).ready(function() {
+$(function() {
 // updates current settings
 if (window.parent.setAll) {
     window.parent.setAll('<?php

pmd_general.php

@@ -49,7 +49,7 @@ echo '
     echo "\n";
     if (isset($_REQUEST['query'])) {
     echo '
-     $(document).ready(function() {
+     $(function() {
         $(".trigger").click(function() {
         $(".panel").toggle("fast");
         $(this).toggleClass("active");

sql.php

@@ -951,7 +951,7 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) {
 <script type="text/javascript">
 pma_token = '<?php echo $_SESSION[' PMA_token ']; ?>';
 url_query = '<?php echo isset($url_query)?$url_query:PMA_generate_common_url($db);?>';
-$(document).ready(makeProfilingChart);
+$(makeProfilingChart);
 </script>
 <?php
         echo '<fieldset><legend>' . __('Profiling') . '</legend>' . "\n";