- * addEvent(window, 'load', PMA_initPage);
- *
- * @param object or id
- * @param string event type (load, mouseover, focus, ...)
- * @param function to be attached
- */
-function addEvent(obj, type, fn)
-{
- if (obj.attachEvent) {
- obj['e' + type + fn] = fn;
- obj[type + fn] = function() {obj['e' + type + fn](window.event);}
- obj.attachEvent('on' + type, obj[type + fn]);
- } else {
- obj.addEventListener(type, fn, false);
- }
-}
-
-/**
- * detach/remove a function from an object event
- *
- * @param object or id
- * @param event type (load, mouseover, focus, ...)
- * @param function naem of function to be attached
- */
-function removeEvent(obj, type, fn)
-{
- if (obj.detachEvent) {
- obj.detachEvent('on' + type, obj[type + fn]);
- obj[type + fn] = null;
- } else {
- obj.removeEventListener(type, fn, false);
- }
-}
-
-/**
- * get DOM elements by html class
- *
- * @param string class_name - name of class
- * @param node node - search only sub nodes of this node (optional)
- * @param string tag - search only these tags (optional)
- */
-function getElementsByClassName(class_name, node, tag)
-{
- var classElements = new Array();
-
- if (node == null) {
- node = document;
- }
- if (tag == null) {
- tag = '*';
- }
-
- var j = 0, teststr;
- var els = node.getElementsByTagName(tag);
- var elsLen = els.length;
-
- for (i = 0; i < elsLen; i++) {
- if (els[i].className.indexOf(class_name) != -1) {
- teststr = "," + els[i].className.split(" ").join(",") + ",";
- if (teststr.indexOf("," + class_name + ",") != -1) {
- classElements[j] = els[i];
- j++;
- }
- }
- }
- return classElements;
-}
-
/**
* sets current selected db
*
diff --git a/js/functions.js b/js/functions.js
index 9cdb44e751..ae5cdbad8f 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -2152,9 +2152,45 @@ function displayMoreTableOpts() {
}
});
}
+
}
$(document).ready(initTooltips);
+/**
+ * Ensures indexes names are valid according to their type and, for a primary
+ * key, lock index name to 'PRIMARY'
+ * @param string form_id Variable which parses the form name as
+ * the input
+ * @return boolean false if there is no index form, true else
+ */
+function checkIndexName(form_id)
+{
+ if ($("#"+form_id).length == 0) {
+ return false;
+ }
+
+ // Gets the elements pointers
+ var $the_idx_name = $("#input_index_name");
+ var $the_idx_type = $("#select_index_type");
+
+ // Index is a primary key
+ if ($the_idx_type.find("option:selected").attr("value") == 'PRIMARY') {
+ $the_idx_name.attr("value", 'PRIMARY');
+ $the_idx_name.attr("disabled", true);
+ }
+
+ // Other cases
+ else {
+ if ($the_idx_name.attr("value") == 'PRIMARY') {
+ $the_idx_name.attr("value", '');
+ }
+ $the_idx_name.attr("disabled", false);
+ }
+
+ return true;
+} // end of the 'checkIndexName()' function
+
+
/* Displays tooltips */
function initTooltips() {
// Hide the footnotes from the footer (which are displayed for
diff --git a/js/indexes.js b/js/indexes.js
index ef6f877bdd..abbf4d8b49 100644
--- a/js/indexes.js
+++ b/js/indexes.js
@@ -4,45 +4,6 @@
*
*/
-/**
- * Ensures indexes names are valid according to their type and, for a primary
- * key, lock index name to 'PRIMARY'
- *
- * @return boolean false if there is no index form, true else
- */
-function checkIndexName()
-{
- if (typeof(document.forms['index_frm']) == 'undefined') {
- return false;
- }
-
- // Gets the elements pointers
- var the_idx_name = document.forms['index_frm'].elements['index[Key_name]'];
- var the_idx_type = document.forms['index_frm'].elements['index[Index_type]'];
-
- // Index is a primary key
- if (the_idx_type.options[0].value == 'PRIMARY' && the_idx_type.options[0].selected) {
- document.forms['index_frm'].elements['index[Key_name]'].value = 'PRIMARY';
- if (typeof(the_idx_name.disabled) != 'undefined') {
- document.forms['index_frm'].elements['index[Key_name]'].disabled = true;
- }
- }
-
- // Other cases
- else {
- if (the_idx_name.value == 'PRIMARY') {
- document.forms['index_frm'].elements['index[Key_name]'].value = '';
- }
- if (typeof(the_idx_name.disabled) != 'undefined') {
- document.forms['index_frm'].elements['index[Key_name]'].disabled = false;
- }
- }
-
- return true;
-} // end of the 'checkIndexName()' function
-
-onload = checkIndexName;
-
/**
* Hides/shows the inputs and submits appropriately depending
* on whether the index type chosen is 'SPATIAL' or not.
@@ -56,7 +17,7 @@ function checkIndexType()
/**
* @var Object Table header for the size column.
*/
- $size_header = $('thead tr th:nth-child(2)');
+ $size_header = $('#index_columns thead tr th:nth-child(2)');
/**
* @var Object Inputs to specify the columns for the index.
*/
@@ -132,7 +93,12 @@ function checkIndexType()
*/
$(document).ready(function() {
checkIndexType();
- $('#select_index_type').bind('change', checkIndexType);
+ checkIndexName("index_frm");
+ $('#select_index_type').live('change', function(event){
+ event.preventDefault();
+ checkIndexType();
+ checkIndexName("index_frm");
+ });
});
/**#@- */
diff --git a/js/tbl_change.js b/js/tbl_change.js
index 8fc7eca337..5e6ce842e0 100644
--- a/js/tbl_change.js
+++ b/js/tbl_change.js
@@ -70,21 +70,8 @@ function daysInFebruary (year){
//function to convert single digit to double digit
function fractionReplace(num)
{
- num=parseInt(num);
- var res="00";
- switch(num)
- {
- case 1:res= "01";break;
- case 2:res= "02";break;
- case 3:res= "03";break;
- case 4:res= "04";break;
- case 5:res= "05";break;
- case 6:res= "06";break;
- case 7:res= "07";break;
- case 8:res= "08";break;
- case 9:res= "09";break;
- }
- return res;
+ num = parseInt(num);
+ return num >= 1 && num <= 9 ? '0' + num : '00';
}
/* function to check the validity of date
diff --git a/js/tbl_structure.js b/js/tbl_structure.js
index d4ef1cdf97..49e3fe08f5 100644
--- a/js/tbl_structure.js
+++ b/js/tbl_structure.js
@@ -179,6 +179,7 @@ $(document).ready(function() {
height: 230,
width: 900,
open: PMA_verifyTypeOfAllColumns,
+ modal: true,
buttons : button_options_error
})// end dialog options
} else {
@@ -189,6 +190,7 @@ $(document).ready(function() {
height: 600,
width: 900,
open: PMA_verifyTypeOfAllColumns,
+ modal: true,
buttons : button_options
})
//Remove the top menu container from the dialog
@@ -269,10 +271,10 @@ $(document).ready(function() {
*/
var button_options = {};
// in the following function we need to use $(this)
- button_options[PMA_messages['strCancel']] = function() {$(this).parent().dialog('close').remove();}
+ button_options[PMA_messages['strCancel']] = function() {$(this).dialog('close').remove();}
var button_options_error = {};
- button_options_error[PMA_messages['strOK']] = function() {$(this).parent().dialog('close').remove();}
+ button_options_error[PMA_messages['strOK']] = function() {$(this).dialog('close').remove();}
var $msgbox = PMA_ajaxShowMessage();
$.get( "tbl_indexes.php" , url , function(data) {
@@ -285,6 +287,7 @@ $(document).ready(function() {
height: 230,
width: 900,
open: PMA_verifyTypeOfAllColumns,
+ modal: true,
buttons : button_options_error
})// end dialog options
} else {
@@ -295,16 +298,18 @@ $(document).ready(function() {
height: 600,
width: 900,
open: PMA_verifyTypeOfAllColumns,
+ modal: true,
buttons : button_options
})
//Remove the top menu container from the dialog
.find("#topmenucontainer").hide()
; // end dialog options
+ checkIndexName("index_frm");
}
PMA_ajaxRemoveMessage($msgbox);
}) // end $.get()
});
-
+
/**
*Ajax action for submiting the index form
**/
@@ -337,8 +342,14 @@ $(document).ready(function() {
}
} else {
- var temp_div = $("