Created a new js file for the tbl_structure.php page and moved jQuery scripts for it into that file

js/db_structure.js

@@ -101,88 +101,6 @@ $(document).ready(function() {
         }); // end $.PMA_confirm()
     }); //end of Drop Table Ajax action
 
-    //Drop Column
-    /**
-     * Attach Event Handler for 'Drop Column'
-     *
-     * @uses    $.PMA_confirm()
-     * @uses    PMA_ajaxShowMessage()
-     */
-    $(".drop_column_anchor").live('click', function(event) {
-        event.preventDefault();
-
-        /**
-         * @var curr_table_name String containing the name of the current table
-         */
-        var curr_table_name = window.parent.table;
-        /**
-         * @var curr_row    Object reference to the currently selected row (i.e. field in the table)
-         */
-        var curr_row = $(this).parents('tr');
-        /**
-         * @var curr_column_name    String containing name of the field referred to by {@link curr_row}
-         */
-        var curr_column_name = $(curr_row).children('th').children('label').text();
-        /**
-         * @var question    String containing the question to be asked for confirmation
-         */
-        var question = PMA_messages['strDoYouReally'] + ' :\n ALTER TABLE `' + curr_table_name + '` DROP `' + curr_column_name + '`';
-
-        $(this).PMA_confirm(question, $(this).attr('href'), function(url) {
-
-            PMA_ajaxShowMessage(PMA_messages['strDroppingColumn']);
-
-            $.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function(data) {
-                if(data.success == true) {
-                    PMA_ajaxShowMessage(data.message);
-                    $(curr_row).hide("medium").remove();
-                }
-                else {
-                    PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error);
-                }
-            }) // end $.get()
-        }); // end $.PMA_confirm()
-    }) ; //end of Drop Column Anchor action
-
-    //Add Primary Key
-    /**
-     * Ajax Event handler for 'Add Primary Key'
-     * 
-     * @uses    $.PMA_confirm()
-     * @uses    PMA_ajaxShowMessage()
-     */
-    $(".add_primary_key_anchor").live('click', function(event) {
-        event.preventDefault();
-
-        /**
-         * @var curr_table_name String containing the name of the current table
-         */
-        var curr_table_name = window.parent.table;
-        /**
-         * @var curr_column_name    String containing name of the field referred to by {@link curr_row}
-         */
-        var curr_column_name = $(this).parents('tr').children('th').children('label').text();
-        /**
-         * @var question    String containing the question to be asked for confirmation
-         */
-        var question = PMA_messages['strDoYouReally'] + ' :\n ALTER TABLE `' + curr_table_name + '` ADD PRIMARY KEY(`' + curr_column_name + '`)';
-
-        $(this).PMA_confirm(question, $(this).attr('href'), function(url) {
-
-            PMA_ajaxShowMessage(PMA_messages['strAddingPrimaryKey']);
-
-            $.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function(data) {
-                if(data.success == true) {
-                    PMA_ajaxShowMessage(data.message);
-                    $(this).remove();
-                }
-                else {
-                    PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error);
-                }
-            }) // end $.get()
-        }) // end $.PMA_confirm()
-    })//end Add Primary Key
-
     /**
      * Ajax Event handler for 'Drop Event'
      * 
@@ -255,7 +173,6 @@ $(document).ready(function() {
         }) // end $.PMA_confirm()
     }) //end Drop Procedure
     
-    
     $('.drop_tracking_anchor').live('click', function(event) {
         event.preventDefault();
 
@@ -284,38 +201,6 @@ $(document).ready(function() {
         }) // end $.PMA_confirm()
     }) //end Drop Tracking
 
-    /**
-     * Ajax Event handler for 'Drop Primary Key/Index'
-     * 
-     * @uses    $.PMA_confirm()
-     * @uses    PMA_ajaxShowMessage()
-     */
-    $('.drop_primary_key_index_anchor').live('click', function(event) {
-        event.preventDefault();
-
-        /**
-         * @var curr_row    Object containing reference to the current field's row
-         */
-        var curr_row = $(this).parents('tr');
-        
-        var question = $(curr_row).children('.drop_primary_key_index_msg').val();
-
-        $(this).PMA_confirm(question, $(this).attr('href'), function(url) {
-
-            PMA_ajaxShowMessage(PMA_messages['strDroppingPrimaryKeyIndex']);
-
-            $.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function(data) {
-                if(data.success == true) {
-                    PMA_ajaxShowMessage(data.message);
-                    $(curr_row).hide("medium").remove();
-                }
-                else {
-                    PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error);
-                }
-            }) // end $.get()
-        }) // end $.PMA_confirm()
-    }) //end Drop Primary Key/Index
-
     //Calculate Real End for InnoDB
     /**
      * Ajax Event handler for calculatig the real end for a InnoDB table

js/tbl_structure.js

@@ -0,0 +1,134 @@
+/**
+ * @fileoverview    functions used on the table structure page
+ * @name            Table Structure
+ *
+ * @requires    jQuery
+ * @requires    jQueryUI
+ * @required    js/functions.js
+ */
+
+/**
+ * AJAX scripts for tbl_structure.php
+ *
+ * Actions ajaxified here:
+ * Drop Column
+ * Add Primary Key
+ * Drop Primary Key/Index
+ *
+ */
+$(document).ready(function() {
+    //Drop Column
+    /**
+     * Attach Event Handler for 'Drop Column'
+     *
+     * @uses    $.PMA_confirm()
+     * @uses    PMA_ajaxShowMessage()
+     */
+    $(".drop_column_anchor").live('click', function(event) {
+        event.preventDefault();
+
+        /**
+         * @var curr_table_name String containing the name of the current table
+         */
+        var curr_table_name = window.parent.table;
+        /**
+         * @var curr_row    Object reference to the currently selected row (i.e. field in the table)
+         */
+        var curr_row = $(this).parents('tr');
+        /**
+         * @var curr_column_name    String containing name of the field referred to by {@link curr_row}
+         */
+        var curr_column_name = $(curr_row).children('th').children('label').text();
+        /**
+         * @var question    String containing the question to be asked for confirmation
+         */
+        var question = PMA_messages['strDoYouReally'] + ' :\n ALTER TABLE `' + curr_table_name + '` DROP `' + curr_column_name + '`';
+
+        $(this).PMA_confirm(question, $(this).attr('href'), function(url) {
+
+            PMA_ajaxShowMessage(PMA_messages['strDroppingColumn']);
+
+            $.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function(data) {
+                if(data.success == true) {
+                    PMA_ajaxShowMessage(data.message);
+                    $(curr_row).hide("medium").remove();
+                }
+                else {
+                    PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error);
+                }
+            }) // end $.get()
+        }); // end $.PMA_confirm()
+    }) ; //end of Drop Column Anchor action
+
+    //Add Primary Key
+    /**
+     * Ajax Event handler for 'Add Primary Key'
+     *
+     * @uses    $.PMA_confirm()
+     * @uses    PMA_ajaxShowMessage()
+     */
+    $(".add_primary_key_anchor").live('click', function(event) {
+        event.preventDefault();
+
+        /**
+         * @var curr_table_name String containing the name of the current table
+         */
+        var curr_table_name = window.parent.table;
+        /**
+         * @var curr_column_name    String containing name of the field referred to by {@link curr_row}
+         */
+        var curr_column_name = $(this).parents('tr').children('th').children('label').text();
+        /**
+         * @var question    String containing the question to be asked for confirmation
+         */
+        var question = PMA_messages['strDoYouReally'] + ' :\n ALTER TABLE `' + curr_table_name + '` ADD PRIMARY KEY(`' + curr_column_name + '`)';
+
+        $(this).PMA_confirm(question, $(this).attr('href'), function(url) {
+
+            PMA_ajaxShowMessage(PMA_messages['strAddingPrimaryKey']);
+
+            $.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function(data) {
+                if(data.success == true) {
+                    PMA_ajaxShowMessage(data.message);
+                    $(this).remove();
+                }
+                else {
+                    PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error);
+                }
+            }) // end $.get()
+        }) // end $.PMA_confirm()
+    })//end Add Primary Key
+
+    /**
+     * Ajax Event handler for 'Drop Primary Key/Index'
+     *
+     * @uses    $.PMA_confirm()
+     * @uses    PMA_ajaxShowMessage()
+     */
+    $('.drop_primary_key_index_anchor').live('click', function(event) {
+        event.preventDefault();
+
+        /**
+         * @var curr_row    Object containing reference to the current field's row
+         */
+        var curr_row = $(this).parents('tr');
+
+        var question = $(curr_row).children('.drop_primary_key_index_msg').val();
+
+        $(this).PMA_confirm(question, $(this).attr('href'), function(url) {
+
+            PMA_ajaxShowMessage(PMA_messages['strDroppingPrimaryKeyIndex']);
+
+            $.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function(data) {
+                if(data.success == true) {
+                    PMA_ajaxShowMessage(data.message);
+                    $(curr_row).hide("medium").remove();
+                }
+                else {
+                    PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error);
+                }
+            }) // end $.get()
+        }) // end $.PMA_confirm()
+    }) //end Drop Primary Key/Index
+    
+}) // end $(document).ready()

tbl_structure.php

@@ -13,6 +13,7 @@ require_once './libraries/common.inc.php';
 require_once './libraries/mysql_charsets.lib.php';
 
 $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+$GLOBALS['js_include'][] = 'tbl_structure.js';
 
 /**
  * handle multiple field commands if required