").append(form_data);
+ if ($("#sqlqueryresults").length != 0) {
+ $temp_div.find("#fieldsForm").insertAfter("#sqlqueryresults");
+ } else {
+ $temp_div.find("#fieldsForm").insertAfter(".error");
+ }
+ /*Call the function to display the more options in table*/
+ displayMoreTableOpts();
+ });
+ } else {
+ var $temp_div = $("
").append(data);
+ var $error = $temp_div.find(".error code").addClass("error");
+ PMA_ajaxShowMessage($error);
+ }
+ }) // end $.post()
+ } else {
+ // non-Ajax submit
+ $form.append('');
+ $form.submit();
+ }
+ }
+ }) // end change table button "do_save_data"
+
+}, 'top.frame_content'); //end $(document).ready for 'Change Table'
+
/**
* Attach Ajax event handlers for Drop Database. Moved here from db_structure.js
* as it was also required on db_create.php
@@ -2355,6 +2425,136 @@ function PMA_init_slider() {
});
}
+/**
+ * var toggleButton This is a function that creates a toggle
+ * sliding button given a jQuery reference
+ * to the correct DOM element
+ */
+var toggleButton = function ($obj) {
+ // In rtl mode the toggle switch is flipped horizontally
+ // so we need to take that into account
+ if ($('.text_direction', $obj).text() == 'ltr') {
+ var right = 'right';
+ } else {
+ var right = 'left';
+ }
+ /**
+ * var h Height of the button, used to scale the
+ * background image and position the layers
+ */
+ var h = $obj.height();
+ $('img', $obj).height(h);
+ $('table', $obj).css('bottom', h-1);
+ /**
+ * var on Width of the "ON" part of the toggle switch
+ * var off Width of the "OFF" part of the toggle switch
+ */
+ var on = $('.toggleOn', $obj).width();
+ var off = $('.toggleOff', $obj).width();
+ // Make the "ON" and "OFF" parts of the switch the same size
+ $('.toggleOn > div', $obj).width(Math.max(on, off));
+ $('.toggleOff > div', $obj).width(Math.max(on, off));
+ /**
+ * var w Width of the central part of the switch
+ */
+ var w = parseInt(($('img', $obj).height() / 16) * 22, 10);
+ // Resize the central part of the switch on the top
+ // layer to match the background
+ $('table td:nth-child(2) > div', $obj).width(w);
+ /**
+ * var imgw Width of the background image
+ * var tblw Width of the foreground layer
+ * var offset By how many pixels to move the background
+ * image, so that it matches the top layer
+ */
+ var imgw = $('img', $obj).width();
+ var tblw = $('table', $obj).width();
+ var offset = parseInt(((imgw - tblw) / 2), 10);
+ // Move the background to match the layout of the top layer
+ $obj.find('img').css(right, offset);
+ /**
+ * var offw Outer width of the "ON" part of the toggle switch
+ * var btnw Outer width of the central part of the switch
+ */
+ var offw = $('.toggleOff', $obj).outerWidth();
+ var btnw = $('table td:nth-child(2)', $obj).outerWidth();
+ // Resize the main div so that exactly one side of
+ // the switch plus the central part fit into it.
+ $obj.width(offw + btnw + 2);
+ /**
+ * var move How many pixels to move the
+ * switch by when toggling
+ */
+ var move = $('.toggleOff', $obj).outerWidth();
+ // If the switch is initialized to the
+ // OFF state we need to move it now.
+ if ($('.container', $obj).hasClass('off')) {
+ if (right == 'right') {
+ $('table, img', $obj).animate({'left': '-=' + move + 'px'}, 0);
+ } else {
+ $('table, img', $obj).animate({'left': '+=' + move + 'px'}, 0);
+ }
+ }
+ // Attach an 'onclick' event to the switch
+ $('.container', $obj).click(function () {
+ if ($(this).hasClass('isActive')) {
+ return false;
+ } else {
+ $(this).addClass('isActive');
+ }
+ var $msg = PMA_ajaxShowMessage(PMA_messages['strLoading']);
+ var $container = $(this);
+ var callback = $('.callback', this).text();
+ // Perform the actual toggle
+ if ($(this).hasClass('on')) {
+ if (right == 'right') {
+ var operator = '-=';
+ } else {
+ var operator = '+=';
+ }
+ var url = $(this).find('.toggleOff > span').text();
+ var removeClass = 'on';
+ var addClass = 'off';
+ } else {
+ if (right == 'right') {
+ var operator = '+=';
+ } else {
+ var operator = '-=';
+ }
+ var url = $(this).find('.toggleOn > span').text();
+ var removeClass = 'off';
+ var addClass = 'on';
+ }
+ $.post(url, {'ajax_request': true}, function(data) {
+ if(data.success == true) {
+ PMA_ajaxRemoveMessage($msg);
+ $container
+ .removeClass(removeClass)
+ .addClass(addClass)
+ .animate({'left': operator + move + 'px'}, function () {
+ $container.removeClass('isActive');
+ });
+ eval(callback);
+ } else {
+ PMA_ajaxShowMessage(data.error);
+ $container.removeClass('isActive');
+ }
+ });
+ });
+};
+
+/**
+ * Initialise all toggle buttons
+ */
+$(window).load(function () {
+ $('.toggleAjax').each(function () {
+ $(this)
+ .show()
+ .find('.toggleButton')
+ toggleButton($(this));
+ });
+});
+
/**
* Vertical pointer
*/
@@ -2458,44 +2658,6 @@ $(document).ready(function() {
}) // end of $(document).ready()
-/**
- * Attach Ajax event handlers for Export of Routines, Triggers and Events.
- *
- * @uses PMA_ajaxShowMessage()
- * @uses PMA_ajaxRemoveMessage()
- *
- * @see $cfg['AjaxEnable']
- */
-$(document).ready(function() {
- $('.export_routine_anchor, .export_trigger_anchor, .export_event_anchor').live('click', function(event) {
- event.preventDefault();
- var $msg = PMA_ajaxShowMessage(PMA_messages['strLoading']);
- $.get($(this).attr('href'), {'ajax_request': true}, function(data) {
- if(data.success == true) {
- PMA_ajaxRemoveMessage($msg);
- /**
- * @var button_options Object containing options for jQueryUI dialog buttons
- */
- var button_options = {};
- button_options[PMA_messages['strClose']] = function() {$(this).dialog("close").remove();}
- /**
- * Display the dialog to the user
- */
- var $ajaxDialog = $('
'+data.message+'
').dialog({
- width: 500,
- buttons: button_options,
- title: data.title
- });
- // Attach syntax highlited editor to export dialog
- var elm = $ajaxDialog.find('textarea');
- CodeMirror.fromTextArea(elm[0], {lineNumbers: true, matchBrackets: true, indentUnit: 4, mode: "text/x-mysql"});
- } else {
- PMA_ajaxShowMessage(data.error);
- }
- }) // end $.get()
- }); // end $.live()
-}); // end of $(document).ready() for Export of Routines, Triggers and Events.
-
/**
* Creates a message inside an object with a sliding effect
*
@@ -2573,69 +2735,6 @@ function PMA_slidingMessage(msg, $obj) {
return true;
} // end PMA_slidingMessage()
-/**
- * Attach Ajax event handlers for Drop functionality of Routines, Triggers and Events.
- *
- * @uses $.PMA_confirm()
- * @uses PMA_ajaxShowMessage()
- * @see $cfg['AjaxEnable']
- */
-$(document).ready(function() {
- $('.drop_routine_anchor, .drop_trigger_anchor, .drop_event_anchor').live('click', function(event) {
- event.preventDefault();
- /**
- * @var $curr_row Object containing reference to the current row
- */
- var $curr_row = $(this).parents('tr');
- /**
- * @var question String containing the question to be asked for confirmation
- */
- var question = $('').text($curr_row.children('td').children('.drop_sql').html());
- $(this).PMA_confirm(question, $(this).attr('href'), function(url) {
- /**
- * @var $msg jQuery object containing the reference to
- * the AJAX message shown to the user.
- */
- var $msg = PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
- $.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function(data) {
- if(data.success == true) {
- /**
- * @var $table Object containing reference to the main list of elements.
- */
- var $table = $curr_row.parent();
- if ($table.find('tr').length == 2) {
- $table.hide("slow", function () {
- $(this).find('tr.even, tr.odd').remove();
- $('#nothing2display').show("slow");
- });
- } else {
- $curr_row.hide("slow", function () {
- $(this).remove();
- // Now we have removed the row from the list, but maybe
- // some row classes are wrong now. So we will itirate
- // throught all rows and assign correct classes to them.
- /**
- * @var ct Count of processed rows.
- */
- var ct = 0;
- $table.find('tr').has('td').each(function() {
- rowclass = (ct % 2 == 0) ? 'even' : 'odd';
- $(this).removeClass().addClass(rowclass);
- ct++;
- });
- });
- }
- // Show the query that we just executed
- PMA_ajaxRemoveMessage($msg);
- PMA_slidingMessage(data.sql_query);
- } else {
- PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error);
- }
- }) // end $.get()
- }) // end $.PMA_confirm()
- }); // end $.live()
-}); //end $(document).ready() for Drop functionality of Routines, Triggers and Events.
-
/**
* Attach Ajax event handlers for Drop Table.
*
diff --git a/js/messages.php b/js/messages.php
index b8ac2bac3a..4bf5d7c142 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -122,7 +122,6 @@ $js_messages['strDeleting'] = __('Deleting');
/* For db_routines.js */
$js_messages['MissingReturn'] = __('The definition of a stored function must contain a RETURN statement!');
-$js_messages['strValueTooLong'] = __('Value too long in the form!');
/* For import.js */
$js_messages['strImportCSV'] = __('Note: If the file contains multiple tables, they will be combined into one');
diff --git a/js/rte/common.js b/js/rte/common.js
new file mode 100644
index 0000000000..4e3893e5c0
--- /dev/null
+++ b/js/rte/common.js
@@ -0,0 +1,380 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+
+/**
+ * @var RTE a JavaScript namespace containing the functionality
+ * for Routines, Triggers and Events.
+ *
+ * This namespace is extended by the functionality required
+ * to handle a specific item (a routine, trigger or event)
+ * in the relevant javascript files in this folder.
+ */
+var RTE = {
+ /**
+ * @var $ajaxDialog jQuery object containing the reference to the
+ * dialog that contains the editor.
+ */
+ $ajaxDialog: null,
+ /**
+ * @var syntaxHiglighter Reference to the codemirror editor.
+ */
+ syntaxHiglighter: null,
+ /**
+ * @var buttonOptions Object containing options for
+ * the jQueryUI dialog buttons
+ */
+ buttonOptions: {},
+ /**
+ * Validate editor form fields.
+ */
+ validate: function () {
+ /**
+ * @var $elm a jQuery object containing the reference
+ * to an element that is being validated.
+ */
+ var $elm = null;
+ // Common validation. At the very least the name
+ // and the definition must be provided for an item
+ $elm = $('.rte_table').last().find('input[name=item_name]');
+ if ($elm.val() === '') {
+ $elm.focus();
+ alert(PMA_messages['strFormEmpty']);
+ return false;
+ }
+ $elm = $('.rte_table').find('textarea[name=item_definition]');
+ if ($elm.val() === '') {
+ this.syntaxHiglighter.focus();
+ alert(PMA_messages['strFormEmpty']);
+ return false;
+ }
+ // The validation has so far passed, so now
+ // we can validate item-specific fields.
+ return RTE.validateCustom();
+ }, // end validate()
+ /**
+ * Validate custom editor form fields.
+ * This function can be overridden by
+ * other files in this folder.
+ */
+ validateCustom: function () {
+ return true;
+ }, // end validateCustom()
+ /**
+ * Execute some code after the ajax
+ * dialog for the ditor is shown.
+ * This function can be overridden by
+ * other files in this folder.
+ */
+ postDialogShow: function () {
+ // Nothing by default
+ } // end postDialogShow()
+}; // end RTE namespace
+
+/**
+ * Attach Ajax event handlers for the Routines, Triggers and Events editor.
+ *
+ * @see $cfg['AjaxEnable']
+ */
+$(document).ready(function () {
+ /**
+ * Attach Ajax event handlers for the Add/Edit functionality.
+ */
+ $('.ajax_add_anchor, .ajax_edit_anchor').live('click', function (event) {
+ event.preventDefault();
+ /**
+ * @var $edit_row jQuery object containing the reference to
+ * the row of the the item being edited
+ * from the list of items .
+ */
+ var $edit_row = null;
+ if ($(this).hasClass('ajax_edit_anchor')) {
+ // Remeber the row of the item being edited for later,
+ // so that if the edit is successful, we can replace the
+ // row with info about the modified item.
+ $edit_row = $(this).parents('tr');
+ }
+ /**
+ * @var $msg jQuery object containing the reference to
+ * the AJAX message shown to the user.
+ */
+ var $msg = PMA_ajaxShowMessage();
+ $.get($(this).attr('href'), {'ajax_request': true}, function (data) {
+ if (data.success === true) {
+ // We have successfully fetched the editor form
+ PMA_ajaxRemoveMessage($msg);
+ // Now define the function that is called when
+ // the user presses the "Go" button
+ RTE.buttonOptions[PMA_messages['strGo']] = function () {
+ // Move the data from the codemirror editor back to the
+ // textarea, where it can be used in the form submission.
+ RTE.syntaxHiglighter.save();
+ // Validate editor and submit request, if passed.
+ if (RTE.validate()) {
+ /**
+ * @var data Form data to be sent in the AJAX request.
+ */
+ var data = $('.rte_form').last().serialize();
+ $msg = PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
+ $.post($('.rte_form').last().attr('action'), data, function (data) {
+ if (data.success === true) {
+ // Item created successfully
+ PMA_ajaxRemoveMessage($msg);
+ PMA_slidingMessage(data.message);
+ RTE.$ajaxDialog.dialog('close');
+ // If we are in 'edit' mode, we must remove the reference to the old row.
+ if (mode === 'edit') {
+ $edit_row.remove();
+ }
+ // Sometimes, like when moving a trigger from a table to
+ // another one, the new row should not be inserted into the
+ // list. In this case "data.insert" will be set to false.
+ if (data.insert) {
+ // Insert the new row at the correct location in the list of items
+ /**
+ * @var text Contains the name of an item from the list
+ * that is used in comparisons to find the correct
+ * location where to insert a new row.
+ */
+ var text = '';
+ /**
+ * @var inserted Whether a new item has been inserted
+ * in the list or not.
+ */
+ var inserted = false;
+ $('table.data').find('tr').each(function () {
+ text = $(this)
+ .children('td')
+ .eq(0)
+ .find('strong')
+ .text()
+ .toUpperCase();
+ text = $.trim(text);
+ if (text !== '' && text > data.name) {
+ $(this).before(data.new_row);
+ inserted = true;
+ return false;
+ }
+ });
+ if (! inserted) {
+ // If we didn't manage to insert the row yet,
+ // it must belong at the end of the list,
+ // so we insert it there.
+ $('table.data').append(data.new_row);
+ }
+ // Fade-in the new row
+ $('.ajaxInsert').show('slow').removeClass('ajaxInsert');
+ } else if ($('table.data').find('tr').has('td').length === 0) {
+ // If we are not supposed to insert the new row, we will now
+ // check if the table is empty and needs to be hidden. This
+ // will be the case if we were editing the only item in the
+ // list, which we removed and will not be inserting something
+ // else in its place.
+ $('table.data').hide("slow", function () {
+ $('#nothing2display').show("slow");
+ });
+ }
+ // Now we have inserted the row at the correct position, but surely
+ // at least some row classes are wrong now. So we will itirate
+ // throught all rows and assign correct classes to them.
+ /**
+ * @var ct Count of processed rows.
+ */
+ var ct = 0;
+ /**
+ * @var rowclass Class to be attached to the row
+ * that is being processed
+ */
+ var rowclass = '';
+ $('table.data').find('tr').has('td').each(function () {
+ rowclass = (ct % 2 === 0) ? 'even' : 'odd';
+ $(this).removeClass().addClass(rowclass);
+ ct++;
+ });
+ // If this is the first item being added, remove
+ // the "No items" message and show the list.
+ if ($('table.data').find('tr').has('td').length > 0
+ && $('#nothing2display').is(':visible')) {
+ $('#nothing2display').hide("slow", function () {
+ $('table.data').show("slow");
+ });
+ }
+ } else {
+ PMA_ajaxShowMessage(data.error);
+ }
+ }); // end $.post()
+ } // end "if (RTE.validate())"
+ }; // end of function that handles the submission of the Editor
+ RTE.buttonOptions[PMA_messages['strClose']] = function () {
+ $(this).dialog("close");
+ };
+ /**
+ * Display the dialog to the user
+ */
+ RTE.$ajaxDialog = $('' + data.message + '
').dialog({
+ width: 700,
+ height: 555,
+ buttons: RTE.buttonOptions,
+ title: data.title,
+ modal: true,
+ close: function () {
+ $(this).remove();
+ }
+ });
+ RTE.$ajaxDialog.find('input[name=item_name]').focus();
+ RTE.$ajaxDialog.find('.datefield, .datetimefield').each(function () {
+ PMA_addDatepicker($(this).css('width', '95%'));
+ });
+ /**
+ * @var mode Used to remeber whether the editor is in
+ * "Edit" or "Add" mode.
+ */
+ var mode = 'add';
+ if ($('input[name=editor_process_edit]').length > 0) {
+ mode = 'edit';
+ }
+ // Attach syntax highlited editor to the definition
+ /**
+ * @var $elm jQuery object containing the reference to
+ * the Definition textarea.
+ */
+ var $elm = $('textarea[name=item_definition]').last();
+ /**
+ * @var opts Options to pass to the codemirror editor.
+ */
+ var opts = {lineNumbers: true, matchBrackets: true, indentUnit: 4, mode: "text/x-mysql"};
+ RTE.syntaxHiglighter = CodeMirror.fromTextArea($elm[0], opts);
+ // Hack to prevent the syntax highlighter from expanding beyond dialog boundries
+ $('.CodeMirror-scroll').find('div').first().css('width', '1px');
+ // Execute item-specific code
+ RTE.postDialogShow(data);
+ } else {
+ PMA_ajaxShowMessage(data.error);
+ }
+ }); // end $.get()
+ }); // end $.live()
+
+ /**
+ * Attach Ajax event handlers for input fields in the editor
+ * and the routine execution dialog used to submit the Ajax
+ * request when the ENTER key is pressed.
+ */
+ $('.rte_table').find('input[name^=item], input[name^=params]').live('keydown', function (e) {
+ if (e.which === 13) { // 13 is the ENTER key
+ e.preventDefault();
+ if (typeof RTE.buttonOptions[PMA_messages['strGo']] === 'function') {
+ RTE.buttonOptions[PMA_messages['strGo']].call();
+ }
+ }
+ }); // end $.live()
+
+ /**
+ * Attach Ajax event handlers for Export of Routines, Triggers and Events.
+ */
+ $('.ajax_export_anchor').live('click', function (event) {
+ event.preventDefault();
+ var $msg = PMA_ajaxShowMessage();
+ // Fire the ajax request straight away
+ $.get($(this).attr('href'), {'ajax_request': true}, function (data) {
+ if (data.success === true) {
+ PMA_ajaxRemoveMessage($msg);
+ /**
+ * @var button_options Object containing options for jQueryUI dialog buttons
+ */
+ var button_options = {};
+ button_options[PMA_messages['strClose']] = function () {
+ $(this).dialog("close").remove();
+ };
+ /**
+ * Display the dialog to the user
+ */
+ var $ajaxDialog = $('' + data.message + '
').dialog({
+ width: 500,
+ buttons: button_options,
+ title: data.title
+ });
+ // Attach syntax highlited editor to export dialog
+ /**
+ * @var $elm jQuery object containing the reference
+ * to the Export textarea.
+ */
+ var $elm = $ajaxDialog.find('textarea');
+ /**
+ * @var opts Options to pass to the codemirror editor.
+ */
+ var opts = {lineNumbers: true, matchBrackets: true, indentUnit: 4, mode: "text/x-mysql"};
+ CodeMirror.fromTextArea($elm[0], opts);
+ } else {
+ PMA_ajaxShowMessage(data.error);
+ }
+ }); // end $.get()
+ }); // end $.live()
+
+ /**
+ * Attach Ajax event handlers for Drop functionality of Routines, Triggers and Events.
+ */
+ $('.ajax_drop_anchor').live('click', function (event) {
+ event.preventDefault();
+ /**
+ * @var $curr_row Object containing reference to the current row
+ */
+ var $curr_row = $(this).parents('tr');
+ /**
+ * @var question String containing the question to be asked for confirmation
+ */
+ var question = $('').text($curr_row.children('td').children('.drop_sql').html());
+ // We ask for confirmation first here, before submitting the ajax request
+ $(this).PMA_confirm(question, $(this).attr('href'), function (url) {
+ /**
+ * @var $msg jQuery object containing the reference to
+ * the AJAX message shown to the user.
+ */
+ var $msg = PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
+ $.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function (data) {
+ if (data.success === true) {
+ /**
+ * @var $table Object containing reference to the main list of elements.
+ */
+ var $table = $curr_row.parent();
+ // Check how many rows will be left after we remove
+ // the one that the user has requested us to remove
+ if ($table.find('tr').length === 2) {
+ // If there are two rows left, it means that they are
+ // the header of the table and the rows that we are
+ // about to remove, so after the removal there will be
+ // nothing to show in the table, so we hide it.
+ $table.hide("slow", function () {
+ $(this).find('tr.even, tr.odd').remove();
+ $('#nothing2display').show("slow");
+ });
+ } else {
+ $curr_row.hide("slow", function () {
+ $(this).remove();
+ // Now we have removed the row from the list, but maybe
+ // some row classes are wrong now. So we will itirate
+ // throught all rows and assign correct classes to them.
+ /**
+ * @var ct Count of processed rows.
+ */
+ var ct = 0;
+ /**
+ * @var rowclass Class to be attached to the row
+ * that is being processed
+ */
+ var rowclass = '';
+ $table.find('tr').has('td').each(function () {
+ rowclass = (ct % 2 === 0) ? 'even' : 'odd';
+ $(this).removeClass().addClass(rowclass);
+ ct++;
+ });
+ });
+ }
+ // Get rid of the "Loading" message
+ PMA_ajaxRemoveMessage($msg);
+ // Show the query that we just executed
+ PMA_slidingMessage(data.sql_query);
+ } else {
+ PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error);
+ }
+ }); // end $.get()
+ }); // end $.PMA_confirm()
+ }); // end $.live()
+}); // end of $(document).ready()
diff --git a/js/rte/events.js b/js/rte/events.js
new file mode 100644
index 0000000000..257a17dd9f
--- /dev/null
+++ b/js/rte/events.js
@@ -0,0 +1,43 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+
+/**
+ * Overriding the validateCustom() function defined in common.js
+ */
+RTE.validateCustom = function () {
+ /**
+ * @var $elm a jQuery object containing the reference
+ * to an element that is being validated.
+ */
+ var $elm = null;
+ if ($('select[name=item_type]').find(':selected').val() === 'RECURRING') {
+ // The interval field must not be empty for recurring events
+ $elm = $('input[name=item_interval_value]');
+ if ($elm.val() === '') {
+ $elm.focus();
+ alert(PMA_messages['strFormEmpty']);
+ return false;
+ }
+ } else {
+ // The execute_at field must not be empty for "once off" events
+ $elm = $('input[name=item_execute_at]');
+ if ($elm.val() === '') {
+ $elm.focus();
+ alert(PMA_messages['strFormEmpty']);
+ return false;
+ }
+ }
+ return true;
+}; // end RTE.validateCustom()
+
+/**
+ * Attach Ajax event handlers for the "Change event type"
+ * functionality in the events editor, so that the correct
+ * rows are shown in the editor when changing the event type
+ *
+ * @see $cfg['AjaxEnable']
+ */
+$(document).ready(function () {
+ $('select[name=item_type]').live('change', function () {
+ $('.recurring_event_row, .onetime_event_row').toggle();
+ }); // end $.live()
+}); // end of $(document).ready()
diff --git a/js/rte/routines.js b/js/rte/routines.js
new file mode 100644
index 0000000000..50c4f00051
--- /dev/null
+++ b/js/rte/routines.js
@@ -0,0 +1,395 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+
+/**
+ * @var param_template This variable contains the template for one row
+ * of the parameters table that is attached to the
+ * dialog when a new parameter is added.
+ */
+RTE.param_template = '';
+
+/**
+ * Overriding the postDialogShow() function defined in common.js
+ *
+ * @param data JSON-encoded data from the ajax request
+ */
+RTE.postDialogShow = function (data) {
+ // Cache the template for a parameter table row
+ RTE.param_template = data.param_template;
+ // Make adjustments in the dialog to make it AJAX compatible
+ $('.routine_param_remove').show();
+ $('input[name=routine_removeparameter]').remove();
+ $('input[name=routine_addparameter]').css('width', '100%');
+ // Enable/disable the 'options' dropdowns for parameters as necessary
+ $('.routine_params_table').last().find('th[colspan=2]').attr('colspan', '1');
+ $('.routine_params_table').last().find('tr').has('td').each(function () {
+ RTE.setOptionsForParameter(
+ $(this).find('select[name^=item_param_type]'),
+ $(this).find('input[name^=item_param_length]'),
+ $(this).find('select[name^=item_param_opts_text]'),
+ $(this).find('select[name^=item_param_opts_num]')
+ );
+ });
+ // Enable/disable the 'options' dropdowns for
+ // function return value as necessary
+ RTE.setOptionsForParameter(
+ $('.rte_table').last().find('select[name=item_returntype]'),
+ $('.rte_table').last().find('input[name=item_returnlength]'),
+ $('.rte_table').last().find('select[name=item_returnopts_text]'),
+ $('.rte_table').last().find('select[name=item_returnopts_num]')
+ );
+}; // end RTE.postDialogShow()
+
+/**
+ * Overriding the validateCustom() function defined in common.js
+ */
+RTE.validateCustom = function () {
+ /**
+ * @var isSuccess Stores the outcome of the validation
+ */
+ var isSuccess = true;
+ /**
+ * @var inputname The value of the "name" attribute for
+ * the field that is being processed
+ */
+ var inputname = '';
+ $('.routine_params_table').last().find('tr').each(function () {
+ // Every parameter of a routine must have
+ // a non-empty direction, name and type
+ if (isSuccess) {
+ $(this).find(':input').each(function () {
+ inputname = $(this).attr('name');
+ if (inputname.substr(0, 17) === 'item_param_dir' ||
+ inputname.substr(0, 18) === 'item_param_name' ||
+ inputname.substr(0, 18) === 'item_param_type') {
+ if ($(this).val() === '') {
+ $(this).focus();
+ isSuccess = false;
+ return false;
+ }
+ }
+ });
+ } else {
+ return false;
+ }
+ });
+ if (! isSuccess) {
+ alert(PMA_messages['strFormEmpty']);
+ return false;
+ }
+ $('.routine_params_table').last().find('tr').each(function () {
+ // SET, ENUM, VARCHAR and VARBINARY fields must have length/values
+ var $inputtyp = $(this).find('select[name^=item_param_type]');
+ var $inputlen = $(this).find('input[name^=item_param_length]');
+ if ($inputtyp.length && $inputlen.length) {
+ if (($inputtyp.val() === 'ENUM' || $inputtyp.val() === 'SET' || $inputtyp.val().substr(0, 3) === 'VAR')
+ && $inputlen.val() === '') {
+ $inputlen.focus();
+ isSuccess = false;
+ return false;
+ }
+ }
+ });
+ if (! isSuccess) {
+ alert(PMA_messages['strFormEmpty']);
+ return false;
+ }
+ if ($('select[name=item_type]').find(':selected').val() === 'FUNCTION') {
+ // The length/values of return variable for functions must
+ // be set, if the type is SET, ENUM, VARCHAR or VARBINARY.
+ var $returntyp = $('select[name=item_returntype]');
+ var $returnlen = $('input[name=item_returnlength]');
+ if (($returntyp.val() === 'ENUM' || $returntyp.val() === 'SET' || $returntyp.val().substr(0, 3) === 'VAR')
+ && $returnlen.val() === '') {
+ $returnlen.focus();
+ alert(PMA_messages['strFormEmpty']);
+ return false;
+ }
+ }
+ if ($('select[name=item_type]').find(':selected').val() === 'FUNCTION') {
+ // A function must contain a RETURN statement in its definition
+ if ($('.rte_table').find('textarea[name=item_definition]').val().toUpperCase().indexOf('RETURN') < 0) {
+ RTE.syntaxHiglighter.focus();
+ alert(PMA_messages['MissingReturn']);
+ return false;
+ }
+ }
+ return true;
+}; // end RTE.validateCustom()
+
+/**
+ * Enable/disable the "options" dropdown and "length" input for
+ * parameters and the return variable in the routine editor
+ * as necessary.
+ *
+ * @param $type a jQuery object containing the reference
+ * to the "Type" dropdown box
+ * @param $len a jQuery object containing the reference
+ * to the "Length" input box
+ * @param $text a jQuery object containing the reference
+ * to the dropdown box with options for
+ * parameters of text type
+ * @param $num a jQuery object containing the reference
+ * to the dropdown box with options for
+ * parameters of numeric type
+ */
+RTE.setOptionsForParameter = function ($type, $len, $text, $num) {
+ /**
+ * @var $no_opts a jQuery object containing the reference
+ * to an element to be displayed when no
+ * options are available
+ */
+ var $no_opts = $text.parent().parent().find('.no_opts');
+ /**
+ * @var $no_len a jQuery object containing the reference
+ * to an element to be displayed when no
+ * "length/values" field is available
+ */
+ var $no_len = $len.parent().parent().find('.no_len');
+
+ // Process for parameter options
+ switch ($type.val()) {
+ case 'TINYINT':
+ case 'SMALLINT':
+ case 'MEDIUMINT':
+ case 'INT':
+ case 'BIGINT':
+ case 'DECIMAL':
+ case 'FLOAT':
+ case 'DOUBLE':
+ case 'REAL':
+ $text.parent().hide();
+ $num.parent().show();
+ $no_opts.hide();
+ break;
+ case 'TINYTEXT':
+ case 'TEXT':
+ case 'MEDIUMTEXT':
+ case 'LONGTEXT':
+ case 'CHAR':
+ case 'VARCHAR':
+ case 'SET':
+ case 'ENUM':
+ $text.parent().show();
+ $num.parent().hide();
+ $no_opts.hide();
+ break;
+ default:
+ $text.parent().hide();
+ $num.parent().hide();
+ $no_opts.show();
+ break;
+ }
+ // Process for parameter length
+ switch ($type.val()) {
+ case 'DATE':
+ case 'DATETIME':
+ case 'TIME':
+ case 'TINYBLOB':
+ case 'TINYTEXT':
+ case 'BLOB':
+ case 'TEXT':
+ case 'MEDIUMBLOB':
+ case 'MEDIUMTEXT':
+ case 'LONGBLOB':
+ case 'LONGTEXT':
+ $len.parent().hide();
+ $no_len.show();
+ break;
+ default:
+ $len.parent().show();
+ $no_len.hide();
+ break;
+ }
+}; // end RTE.setOptionsForParameter()
+
+/**
+ * Attach Ajax event handlers for the Routines functionalities.
+ *
+ * @see $cfg['AjaxEnable']
+ */
+$(document).ready(function () {
+ /**
+ * Attach Ajax event handlers for the "Add parameter to routine" functionality.
+ */
+ $('input[name=routine_addparameter]').live('click', function (event) {
+ event.preventDefault();
+ /**
+ * @var $routine_params_table jQuery object containing the reference
+ * to the routine parameters table.
+ */
+ var $routine_params_table = $('.routine_params_table').last();
+ /**
+ * @var $new_param_row A string containing the HTML code for the
+ * new row for the routine paramaters table.
+ */
+ var new_param_row = RTE.param_template.replace(/%s/g, $routine_params_table.find('tr').length - 1);
+ // Append the new row to the parameters table
+ $routine_params_table.append(new_param_row);
+ // Make sure that the row is correctly shown according to the type of routine
+ if ($('.rte_table').find('select[name=item_type]').val() === 'FUNCTION') {
+ $('.routine_return_row').show();
+ $('.routine_direction_cell').hide();
+ }
+ /**
+ * @var $newrow jQuery object containing the reference to the newly
+ * inserted row in the routine parameters table.
+ */
+ var $newrow = $('.routine_params_table').last().find('tr').has('td').last();
+ // Enable/disable the 'options' dropdowns for parameters as necessary
+ RTE.setOptionsForParameter(
+ $newrow.find('select[name^=item_param_type]'),
+ $newrow.find('input[name^=item_param_length]'),
+ $newrow.find('select[name^=item_param_opts_text]'),
+ $newrow.find('select[name^=item_param_opts_num]')
+ );
+ }); // end $.live()
+
+ /**
+ * Attach Ajax event handlers for the "Remove parameter from routine" functionality.
+ */
+ $('.routine_param_remove_anchor').live('click', function (event) {
+ event.preventDefault();
+ $(this).parent().parent().remove();
+ // After removing a parameter, the indices of the name attributes in
+ // the input fields lose the correct order and need to be reordered.
+ /**
+ * @var index Counter used for reindexing the input
+ * fields in the routine parameters table.
+ */
+ var index = 0;
+ $('.routine_params_table').last().find('tr').has('td').each(function () {
+ $(this).find(':input').each(function () {
+ /**
+ * @var inputname The value of the name attribute of
+ * the input field being reindexed.
+ */
+ var inputname = $(this).attr('name');
+ if (inputname.substr(0, 17) === 'item_param_dir') {
+ $(this).attr('name', inputname.substr(0, 17) + '[' + index + ']');
+ } else if (inputname.substr(0, 18) === 'item_param_name') {
+ $(this).attr('name', inputname.substr(0, 18) + '[' + index + ']');
+ } else if (inputname.substr(0, 18) === 'item_param_type') {
+ $(this).attr('name', inputname.substr(0, 18) + '[' + index + ']');
+ } else if (inputname.substr(0, 20) === 'item_param_length') {
+ $(this).attr('name', inputname.substr(0, 20) + '[' + index + ']');
+ } else if (inputname.substr(0, 23) === 'item_param_opts_text') {
+ $(this).attr('name', inputname.substr(0, 23) + '[' + index + ']');
+ } else if (inputname.substr(0, 22) === 'item_param_opts_num') {
+ $(this).attr('name', inputname.substr(0, 22) + '[' + index + ']');
+ }
+ });
+ index++;
+ });
+ }); // end $.live()
+
+ /**
+ * Attach Ajax event handlers for the "Change routine type"
+ * functionality in the routines editor, so that the correct
+ * fields are shown in the editor when changing the routine type
+ */
+ $('select[name=item_type]').live('change', function () {
+ $('.routine_return_row, .routine_direction_cell').toggle();
+ }); // end $.live()
+
+ /**
+ * Attach Ajax event handlers for the "Change parameter type"
+ * functionality in the routines editor, so that the correct
+ * option/length fields, if any, are shown when changing
+ * a parameter type
+ */
+ $('select[name^=item_param_type]').live('change', function () {
+ /**
+ * @var $row jQuery object containing the reference to
+ * a row in the routine parameters table
+ */
+ var $row = $(this).parents('tr').first();
+ RTE.setOptionsForParameter(
+ $row.find('select[name^=item_param_type]'),
+ $row.find('input[name^=item_param_length]'),
+ $row.find('select[name^=item_param_opts_text]'),
+ $row.find('select[name^=item_param_opts_num]')
+ );
+ }); // end $.live()
+
+ /**
+ * Attach Ajax event handlers for the "Change the type of return
+ * variable of function" functionality, so that the correct fields,
+ * if any, are shown when changing the function return type type
+ */
+ $('select[name=item_returntype]').live('change', function () {
+ RTE.setOptionsForParameter(
+ $('.rte_table').find('select[name=item_returntype]'),
+ $('.rte_table').find('input[name=item_returnlength]'),
+ $('.rte_table').find('select[name=item_returnopts_text]'),
+ $('.rte_table').find('select[name=item_returnopts_num]')
+ );
+ }); // end $.live()
+
+ /**
+ * Attach Ajax event handlers for the Execute routine functionality.
+ */
+ $('.ajax_exec_anchor').live('click', function (event) {
+ event.preventDefault();
+ /**
+ * @var $msg jQuery object containing the reference to
+ * the AJAX message shown to the user
+ */
+ var $msg = PMA_ajaxShowMessage();
+ $.get($(this).attr('href'), {'ajax_request': true}, function (data) {
+ if (data.success === true) {
+ PMA_ajaxRemoveMessage($msg);
+ // If 'data.dialog' is true we show a dialog with a form
+ // to get the input parameters for routine, otherwise
+ // we just show the results of the query
+ if (data.dialog) {
+ // Define the function that is called when
+ // the user presses the "Go" button
+ RTE.buttonOptions[PMA_messages['strGo']] = function () {
+ /**
+ * @var data Form data to be sent in the AJAX request.
+ */
+ var data = $('.rte_form').last().serialize();
+ $msg = PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
+ $.post('db_routines.php', data, function (data) {
+ if (data.success === true) {
+ // Routine executed successfully
+ PMA_ajaxRemoveMessage($msg);
+ PMA_slidingMessage(data.message);
+ $ajaxDialog.dialog('close');
+ } else {
+ PMA_ajaxShowMessage(data.error);
+ }
+ });
+ };
+ RTE.buttonOptions[PMA_messages['strClose']] = function () {
+ $(this).dialog("close");
+ };
+ /**
+ * Display the dialog to the user
+ */
+ $ajaxDialog = $('' + data.message + '
').dialog({
+ width: 650,
+ buttons: RTE.buttonOptions,
+ title: data.title,
+ modal: true,
+ close: function () {
+ $(this).remove();
+ }
+ });
+ $ajaxDialog.find('input[name^=params]').first().focus();
+ /**
+ * Attach the datepickers to the relevant form fields
+ */
+ $ajaxDialog.find('.datefield, .datetimefield').each(function () {
+ PMA_addDatepicker($(this).css('width', '95%'));
+ });
+ } else {
+ // Routine executed successfully
+ PMA_slidingMessage(data.message);
+ }
+ } else {
+ PMA_ajaxShowMessage(data.error);
+ }
+ }); // end $.get()
+ }); // end $.live()
+}); // end of $(document).ready() for the Routine Functionalities
diff --git a/js/rte/triggers.js b/js/rte/triggers.js
new file mode 100644
index 0000000000..826cd55cfb
--- /dev/null
+++ b/js/rte/triggers.js
@@ -0,0 +1,8 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+
+/**
+ * So far it looks like triggers don't need
+ * any special treatment as far as JavaScript
+ * goes, but leaving this file here in case
+ * the need for custom code will arise.
+ */
diff --git a/js/tbl_structure.js b/js/tbl_structure.js
index c58bd5443a..a9b9adae77 100644
--- a/js/tbl_structure.js
+++ b/js/tbl_structure.js
@@ -18,7 +18,7 @@
*
*/
$(document).ready(function() {
-
+
/**
* Attach Event Handler for 'Drop Column'
*
@@ -181,53 +181,6 @@ $(document).ready(function() {
changeColumns(action,url);
});
- /**
- *Ajax action for submitting the column change form
- **/
- $("#append_fields_form input[name=do_save_data].ajax").live('click', function(event) {
- event.preventDefault();
- /**
- * @var the_form object referring to the export form
- */
- var $form = $("#append_fields_form");
-
- PMA_prepareForAjaxRequest($form);
- //User wants to submit the form
- $.post($form.attr('action'), $form.serialize()+"&do_save_data=Save", function(data) {
- if ($("#sqlqueryresults").length != 0) {
- $("#sqlqueryresults").remove();
- } else if ($(".error").length != 0) {
- $(".error").remove();
- }
- if (data.success == true) {
- PMA_ajaxShowMessage(data.message);
- $("").insertAfter("#topmenucontainer");
- $("#sqlqueryresults").html(data.sql_query);
- $("#result_query .notice").remove();
- $("#result_query").prepend((data.message));
- if ($("#change_column_dialog").length > 0) {
- $("#change_column_dialog").dialog("close").remove();
- }
- /*Reload the field form*/
- $.post($("#fieldsForm").attr('action'), $("#fieldsForm").serialize()+"&ajax_request=true", function(form_data) {
- $("#fieldsForm").remove();
- var $temp_div = $("").append(form_data);
- if ($("#sqlqueryresults").length != 0) {
- $temp_div.find("#fieldsForm").insertAfter("#sqlqueryresults");
- } else {
- $temp_div.find("#fieldsForm").insertAfter(".error");
- }
- /*Call the function to display the more options in table*/
- displayMoreTableOpts();
- });
- } else {
- var $temp_div = $("
").append(data);
- var $error = $temp_div.find(".error code").addClass("error");
- PMA_ajaxShowMessage($error);
- }
- }) // end $.post()
- }) // end insert table button "do_save_data"
-
/**
*Ajax event handler for index edit
**/
@@ -239,7 +192,11 @@ $(document).ready(function() {
}
url = url + "&ajax_request=true";
- var div = $('');
+ /*Remove the hidden dialogs if there are*/
+ if ($('#edit_index_dialog').length != 0) {
+ $('#edit_index_dialog').remove();
+ }
+ var $div = $('');
/**
* @var button_options Object that stores the options passed to jQueryUI
@@ -256,7 +213,7 @@ $(document).ready(function() {
$.get( "tbl_indexes.php" , url , function(data) {
//in the case of an error, show the error message returned.
if (data.success != undefined && data.success == false) {
- div
+ $div
.append(data.error)
.dialog({
title: PMA_messages['strEdit'],
@@ -267,7 +224,7 @@ $(document).ready(function() {
buttons : button_options_error
})// end dialog options
} else {
- div
+ $div
.append(data)
.dialog({
title: PMA_messages['strEdit'],
@@ -280,6 +237,7 @@ $(document).ready(function() {
//Remove the top menu container from the dialog
.find("#topmenucontainer").hide()
; // end dialog options
+ checkIndexType();
checkIndexName("index_frm");
}
PMA_ajaxRemoveMessage($msgbox);
@@ -311,22 +269,22 @@ $(document).ready(function() {
/*Reload the field form*/
$("#table_index").remove();
- var temp_div = $("
").append(data.index_table);
- $(temp_div).find("#table_index").insertAfter("#index_header");
+ var $temp_div = $("
").append(data.index_table);
+ $temp_div.find("#table_index").insertAfter("#index_header");
if ($("#edit_index_dialog").length > 0) {
$("#edit_index_dialog").dialog("close").remove();
}
} else {
if(data.error != undefined) {
- var temp_div = $("
").append(data.error);
- if($(temp_div).find(".error code").length != 0) {
- var error = $(temp_div).find(".error code").addClass("error");
+ var $temp_div = $("
").append(data.error);
+ if ($temp_div.find(".error code").length != 0) {
+ var $error = $temp_div.find(".error code").addClass("error");
} else {
- var error = temp_div;
+ var $error = $temp_div;
}
}
- PMA_ajaxShowMessage(error);
+ PMA_ajaxShowMessage($error);
}
}) // end $.post()
@@ -346,8 +304,8 @@ $(document).ready(function() {
//User wants to submit the form
$.post($form.attr('action'), $form.serialize()+"&add_fields=Go", function(data) {
$("#index_columns").remove();
- var temp_div = $("
").append(data);
- $(temp_div).find("#index_columns").appendTo("#index_edit_fields");
+ var $temp_div = $("
").append(data);
+ $temp_div.find("#index_columns").appendTo("#index_edit_fields");
}) // end $.post()
}) // end insert table button "Go"
@@ -394,7 +352,7 @@ function changeColumns(action,url) {
if ($('#change_column_dialog').length != 0) {
$('#change_column_dialog').remove();
}
- var div = $('');
+ var $div = $('');
/**
* @var button_options Object that stores the options passed to jQueryUI
@@ -411,7 +369,7 @@ function changeColumns(action,url) {
$.get( action , url , function(data) {
//in the case of an error, show the error message returned.
if (data.success != undefined && data.success == false) {
- div
+ $div
.append(data.error)
.dialog({
title: PMA_messages['strChangeTbl'],
@@ -422,7 +380,7 @@ function changeColumns(action,url) {
buttons : button_options_error
})// end dialog options
} else {
- div
+ $div
.append(data)
.dialog({
title: PMA_messages['strChangeTbl'],
diff --git a/libraries/Index.class.php b/libraries/Index.class.php
index 35ea369253..822ba2d845 100644
--- a/libraries/Index.class.php
+++ b/libraries/Index.class.php
@@ -194,9 +194,10 @@ class PMA_Index
// $columns[names][]
// $columns[sub_parts][]
foreach ($columns['names'] as $key => $name) {
+ $sub_part = isset($columns['sub_parts'][$key]) ? $columns['sub_parts'][$key] : '';
$_columns[] = array(
'Column_name' => $name,
- 'Sub_part' => $columns['sub_parts'][$key],
+ 'Sub_part' => $sub_part,
);
}
} else {
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 8ea4081f2d..06f6417f99 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -363,6 +363,7 @@ $goto_whitelist = array(
'db_create.php',
'db_datadict.php',
'db_sql.php',
+ 'db_events.php',
'db_export.php',
'db_importdocsql.php',
'db_qbe.php',
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index e006fa01e3..522e471e4f 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2406,6 +2406,87 @@ function PMA_generate_slider_effect($id, $message)
\n";
+ if ($GLOBALS['cfg']['AjaxEnable']) {
+ $retval .= "\n";
+ $retval .= "