Skip to content

Commit

Permalink
Merge commit 'a020eac11a26977295cf2439ddd2e5b4af2c88fe'
Browse files Browse the repository at this point in the history 
Conflicts:
	js/config.js
	js/db_search.js
	js/functions.js
	js/makegrid.js
	js/server_privileges.js
	js/tbl_structure.js
  • Loading branch information
@atul516
atul516 committed Oct 1, 2014
2 parents ff4be7e + a020eac commit 6c83a2f
Show file tree
Hide file tree
Showing 18 changed files with 70 additions and 70 deletions.
2 changes: 1 addition & 1 deletion js/config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -734,7 +734,7 @@ function savePrefsToLocalStorage(form)
submit_get_json: true
},
success: function (data) {
if (data.success === true) {
if (typeof data !== 'undefined' && data.success === true) {
window.localStorage.config = data.prefs;
window.localStorage.config_mtime = data.mtime;
window.localStorage.config_mtime_local = (new Date()).toUTCString();
Expand Down
6 changes: 3 additions & 3 deletions js/db_operations.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ AJAX.registerOnload('db_operations.js', function () {
$form.PMA_confirm(question, $form.attr('action'), function (url) {
PMA_ajaxShowMessage(PMA_messages.strRenamingDatabases, false);
$.get(url, $("#rename_db_form").serialize() + '&is_js_confirmed=1', function (data) {
if (data.success === true) {
if (typeof data !== 'undefined' && data.success === true) {
PMA_ajaxShowMessage(data.message);
PMA_commonParams.set('db', data.newname);

Expand Down Expand Up @@ -86,7 +86,7 @@ AJAX.registerOnload('db_operations.js', function () {
$.get($form.attr('action'), $form.serialize(), function (data) {
// use messages that stay on screen
$('div.success, div.error').fadeOut();
if (data.success === true) {
if (typeof data !== 'undefined' && data.success === true) {
if ($("#checkbox_switch").is(":checked")) {
PMA_commonParams.set('db', data.newname);
PMA_commonActions.refreshMain(false, function () {
Expand All @@ -112,7 +112,7 @@ AJAX.registerOnload('db_operations.js', function () {
PMA_prepareForAjaxRequest($form);
PMA_ajaxShowMessage(PMA_messages.strChangingCharset);
$.get($form.attr('action'), $form.serialize() + "&submitcollation=1", function (data) {
if (data.success === true) {
if (typeof data !== 'undefined' && data.success === true) {
PMA_ajaxShowMessage(data.message);
} else {
PMA_ajaxShowMessage(data.error, false);
Expand Down
6 changes: 3 additions & 3 deletions js/db_search.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ function loadResult(result_path, table_name, link)
$('#table-link').attr({"href" : 'sql.php?' + link }).text(table_name);
var url = result_path + "#sqlqueryresults";
$.get(url, {'ajax_request': true, 'is_js_confirmed': true}, function (data) {
if (data.success) {
if (typeof data !== 'undefined' && data.success) {
$('#browse-results').html(data.message);
$('html, body')
.animate({
Expand Down Expand Up @@ -85,7 +85,7 @@ function deleteResult(result_path, msg)
var url = result_path + "#result_query, #sqlqueryform";
$.get(url, {'ajax_request': true, 'is_js_confirmed': true},
function (data) {
if (data.success) {
if (typeof data !== 'undefined' && data.success) {
$('#sqlqueryform').html(data.sql_query);
/** Refresh the search results after the deletion */
document.getElementById('buttonGo').click();
Expand Down Expand Up @@ -203,7 +203,7 @@ AJAX.registerOnload('db_search.js', function () {

var url = $form.serialize() + "&submit_search=" + $("#buttonGo").val();
$.post($form.attr('action'), url, function (data) {
if (data.success === true) {
if (typeof data !== 'undefined' && data.success === true) {
// found results
$("#searchresults").html(data.message);

Expand Down
6 changes: 3 additions & 3 deletions js/db_structure.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ AJAX.registerOnload('db_structure.js', function () {
PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);

$.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function (data) {
if (data.success === true) {
if (typeof data !== 'undefined' && data.success === true) {
PMA_ajaxShowMessage(data.message);
// Adjust table statistics
var $tr = $this_anchor.closest('tr');
Expand Down Expand Up @@ -355,7 +355,7 @@ AJAX.registerOnload('db_structure.js', function () {
var $msg = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);

$.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function (data) {
if (data.success === true) {
if (typeof data !== 'undefined' && data.success === true) {
PMA_ajaxShowMessage(data.message);
toggleRowColors($curr_row.next());
$curr_row.hide("medium").remove();
Expand Down Expand Up @@ -391,7 +391,7 @@ AJAX.registerOnload('db_structure.js', function () {
PMA_ajaxShowMessage(PMA_messages.strDeletingTrackingData);

$.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function (data) {
if (data.success === true) {
if (typeof data !== 'undefined' && data.success === true) {
var $tracked_table = $curr_tracking_row.parents('table');
var table_name = $curr_tracking_row.find('td:nth-child(2)').text();

Expand Down
42 changes: 21 additions & 21 deletions js/functions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ function PMA_display_git_revision()
"ajax_request": true
},
function (data) {
if (data.success === true) {
if (typeof data !== 'undefined' && data.success === true) {
$(data.message).insertAfter('#li_pma_version');
}
}
Expand Down Expand Up @@ -2402,7 +2402,7 @@ AJAX.registerOnload('functions.js', function () {
PMA_prepareForAjaxRequest($form);
//User wants to submit the form
$.post($form.attr('action'), $form.serialize() + "&do_save_data=1", function (data) {
if (data.success === true) {
if (typeof data !== 'undefined' && data.success === true) {
$('#properties_message')
.removeClass('error')
.html('');
Expand Down Expand Up @@ -2483,7 +2483,7 @@ AJAX.registerOnload('functions.js', function () {

//User wants to add more fields to the table
$.post($form.attr('action'), $form.serialize() + "&submit_num_fields=1", function (data) {
if (data.success) {
if (typeof data !== 'undefined' && data.success) {
$("#page_content").html(data.message);
PMA_highlightSQL($('#page_content'));
PMA_verifyColumnsProperties();
Expand Down Expand Up @@ -2545,7 +2545,7 @@ AJAX.registerOnload('functions.js', function () {
var $form = $(this);
PMA_prepareForAjaxRequest($form);
$.post($form.attr('action'), $form.serialize() + "&submit_copy=Go", function (data) {
if (data.success === true) {
if (typeof data !== 'undefined' && data.success === true) {
if ($form.find("input[name='switch_to_new']").prop('checked')) {
PMA_commonParams.set(
'db',
Expand Down Expand Up @@ -2579,7 +2579,7 @@ AJAX.registerOnload('functions.js', function () {
var tbl = $form.find('input[name=new_name]').val();
PMA_prepareForAjaxRequest($form);
$.post($form.attr('action'), $form.serialize() + "&submit_move=1", function (data) {
if (data.success === true) {
if (typeof data !== 'undefined' && data.success === true) {
PMA_commonParams.set('db', db);
PMA_commonParams.set('table', tbl);
PMA_commonActions.refreshMain(false, function () {
Expand All @@ -2606,7 +2606,7 @@ AJAX.registerOnload('functions.js', function () {
PMA_prepareForAjaxRequest($form);
var tbl = $tblNameField.val();
$.post($form.attr('action'), $form.serialize(), function (data) {
if (data.success === true) {
if (typeof data !== 'undefined' && data.success === true) {
PMA_commonParams.set('table', tbl);
PMA_commonActions.refreshMain(false, function () {
$('#page_content').html(data.message);
Expand Down Expand Up @@ -2638,14 +2638,14 @@ AJAX.registerOnload('functions.js', function () {
$('html, body').animate({ scrollTop: 0 });
}
var $temp_div;
if (data.success === true && data.sql_query !== undefined) {
if (typeof data !== 'undefined' && data.success === true && data.sql_query !== undefined) {
PMA_ajaxShowMessage(data.message);
$("<div id='sqlqueryresults' class='ajax'></div>").prependTo("#page_content");
$("#sqlqueryresults").html(data.sql_query);
PMA_highlightSQL($('#page_content'));
scrollToTop();
} else if (data.success === true) {
$temp_div = $("<div id='temp_div'></div>");
} else if (typeof data !== 'undefined' && data.success === true) {
var $temp_div = $("<div id='temp_div'></div>");
$temp_div.html(data.message);
var $success = $temp_div.find("#result_query .success");
PMA_ajaxShowMessage($success);
Expand Down Expand Up @@ -2689,7 +2689,7 @@ AJAX.registerOnload('functions.js', function () {
$(this).PMA_confirm(question, $(this).attr('href'), function (url) {
PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
$.get(url, {'is_js_confirmed': '1', 'ajax_request': true}, function (data) {
if (data.success) {
if (typeof data !== 'undefined' && data.success) {
//Database deleted successfully, refresh both the frames
PMA_reloadNavigation();
PMA_commonParams.set('db', '');
Expand Down Expand Up @@ -2794,7 +2794,7 @@ AJAX.registerOnload('functions.js', function () {
$the_form.append('<input type="hidden" name="ajax_request" value="true" />');

$.post($the_form.attr('action'), $the_form.serialize() + '&change_pw=' + this_value, function (data) {
if (data.success === true) {
if (typeof data !== 'undefined' && data.success === true) {
$("#page_content").prepend(data.message);
PMA_highlightSQL($('#page_content'));
$("#change_password_dialog").hide().remove();
Expand All @@ -2811,7 +2811,7 @@ AJAX.registerOnload('functions.js', function () {
$(this).dialog('close');
};
$.get($(this).attr('href'), {'ajax_request': true}, function (data) {
if (data.success) {
if (typeof data !== 'undefined' && data.success) {
$('<div id="change_password_dialog"></div>')
.dialog({
title: PMA_messages.strChangePassword,
Expand Down Expand Up @@ -3342,7 +3342,7 @@ function indexEditorDialog(url, title, callback_success, callback_failure)
if ($("#sqlqueryresults").length !== 0) {
$("#sqlqueryresults").remove();
}
if (data.success === true) {
if (typeof data !== 'undefined' && data.success === true) {
PMA_ajaxShowMessage(data.message);
if ($('#result_query').length) {
$('#result_query').remove();
Expand Down Expand Up @@ -3392,7 +3392,7 @@ function indexEditorDialog(url, title, callback_success, callback_failure)
};
var $msgbox = PMA_ajaxShowMessage();
$.get("tbl_indexes.php", url, function (data) {
if (data.success === false) {
if (typeof data !== 'undefined' && data.success === false) {
//in the case of an error, show the error message returned.
PMA_ajaxShowMessage(data.error, false);
} else {
Expand Down Expand Up @@ -3614,7 +3614,7 @@ var toggleButton = function ($obj) {
addClass = 'on';
}
$.post(url, {'ajax_request': true}, function (data) {
if (data.success === true) {
if (typeof data !== 'undefined' && data.success === true) {
PMA_ajaxRemoveMessage($msg);
$container
.removeClass(removeClass)
Expand Down Expand Up @@ -3762,7 +3762,7 @@ AJAX.registerOnload('functions.js', function () {
$.get(
$('#update_recent_tables').attr('href'),
function (data) {
if (data.success === true) {
if (typeof data !== 'undefined' && data.success === true) {
$('#pma_recent_list').html(data.list);
}
}
Expand Down Expand Up @@ -3962,7 +3962,7 @@ AJAX.registerOnload('functions.js', function () {

var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
$.get(url, {'is_js_confirmed': '1', 'ajax_request': true}, function (data) {
if (data.success === true) {
if (typeof data !== 'undefined' && data.success === true) {
PMA_ajaxRemoveMessage($msgbox);
// Table deleted successfully, refresh both the frames
PMA_reloadNavigation();
Expand Down Expand Up @@ -3995,7 +3995,7 @@ AJAX.registerOnload('functions.js', function () {

var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
$.get(url, {'is_js_confirmed': '1', 'ajax_request': true}, function (data) {
if (data.success === true) {
if (typeof data !== 'undefined' && data.success === true) {
PMA_ajaxRemoveMessage($msgbox);
// Table deleted successfully, refresh both the frames
PMA_reloadNavigation();
Expand Down Expand Up @@ -4032,7 +4032,7 @@ AJAX.registerOnload('functions.js', function () {
if ($("#result_query").length !== 0) {
$("#result_query").remove();
}
if (data.success === true) {
if (typeof data !== 'undefined' && data.success === true) {
PMA_ajaxShowMessage(data.message);
$("<div id='sqlqueryresults'></div>").prependTo("#page_content");
$("#sqlqueryresults").html(data.sql_query);
Expand Down Expand Up @@ -4275,7 +4275,7 @@ function PMA_createViewDialog($this)
var $msg = PMA_ajaxShowMessage();
var syntaxHighlighter = null;
$.get($this.attr('href') + '&ajax_request=1&ajax_dialog=1', function (data) {
if (data.success === true) {
if (typeof data !== 'undefined' && data.success === true) {
PMA_ajaxRemoveMessage($msg);
var buttonOptions = {};
buttonOptions[PMA_messages.strGo] = function () {
Expand All @@ -4285,7 +4285,7 @@ function PMA_createViewDialog($this)
$msg = PMA_ajaxShowMessage();
$.get('view_create.php', $('#createViewDialog').find('form').serialize(), function (data) {
PMA_ajaxRemoveMessage($msg);
if (data.success === true) {
if (typeof data !== 'undefined' && data.success === true) {
$('#createViewDialog').dialog("close");
$('#result_query').html(data.message);
PMA_reloadNavigation();
Expand Down
8 changes: 4 additions & 4 deletions js/gis_data_editor.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ function loadGISEditor(value, field, type, input_name, token) {
'token' : token,
'ajax_request': true
}, function (data) {
if (data.success === true) {
if (typeof data !== 'undefined' && data.success === true) {
$gis_editor.html(data.gis_editor);
initGISEditorVisualization();
prepareJSVersion();
Expand Down Expand Up @@ -197,7 +197,7 @@ function insertDataAndClose() {
var input_name = $form.find("input[name='input_name']").val();

$.post('gis_data_editor.php', $form.serialize() + "&generate=true&ajax_request=true", function (data) {
if (data.success === true) {
if (typeof data !== 'undefined' && data.success === true) {
$("input[name='" + input_name + "']").val(data.result);
} else {
PMA_ajaxShowMessage(data.error, false);
Expand Down Expand Up @@ -248,7 +248,7 @@ AJAX.registerOnload('gis_data_editor.js', function () {
$('#gis_editor').find("input[type='text']").live('change', function () {
var $form = $('form#gis_data_editor_form');
$.post('gis_data_editor.php', $form.serialize() + "&generate=true&ajax_request=true", function (data) {
if (data.success === true) {
if (typeof data !== 'undefined' && data.success === true) {
$('#gis_data_textarea').val(data.result);
$('#placeholder').empty().removeClass('hasSVG').html(data.visualization);
$('#openlayersmap').empty();
Expand All @@ -269,7 +269,7 @@ AJAX.registerOnload('gis_data_editor.js', function () {
var $form = $('form#gis_data_editor_form');

$.post('gis_data_editor.php', $form.serialize() + "&get_gis_editor=true&ajax_request=true", function (data) {
if (data.success === true) {
if (typeof data !== 'undefined' && data.success === true) {
$gis_editor.html(data.gis_editor);
initGISEditorVisualization();
prepareJSVersion();
Expand Down
2 changes: 1 addition & 1 deletion js/indexes.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ AJAX.registerOnload('indexes.js', function () {
$anchor.PMA_confirm(question, $anchor.attr('href'), function (url) {
var $msg = PMA_ajaxShowMessage(PMA_messages.strDroppingPrimaryKeyIndex, false);
$.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function (data) {
if (data.success === true) {
if (typeof data !== 'undefined' && data.success === true) {
PMA_ajaxRemoveMessage($msg);
var $table_ref = $rows_to_hide.closest('table');
if ($rows_to_hide.length == $table_ref.find('tbody > tr').length) {
Expand Down
4 changes: 2 additions & 2 deletions js/makegrid.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -970,7 +970,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
}, function (data) {
g.lastXHR = null;
$editArea.removeClass('edit_area_loading');
if (data.success === true) {
if (typeof data !== 'undefined' && data.success === true) {
$td.data('original_data', data.value);
$(g.cEdit).find('.edit_box').val(data.value);
$editArea.append('<textarea></textarea>');
Expand Down Expand Up @@ -1258,7 +1258,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
$('div.save_edited').removeClass('saving_edited_data')
.find('input').removeProp('disabled'); // enable the save button back
}
if (data.success === true) {
if (typeof data !== 'undefined' && data.success === true) {
PMA_ajaxShowMessage(data.message);

// update where_clause related data in each edited row
Expand Down
Loading

0 comments on commit 6c83a2f

Please sign in to comment.