Skip to content

Commit

Permalink
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Browse files Browse the repository at this point in the history
  • Loading branch information
@madhuracj
madhuracj committed Jul 21, 2015
2 parents e5d5ce6 + d93fd41 commit fc9bc4a
Show file tree
Hide file tree
Showing 33 changed files with 677 additions and 573 deletions.
20 changes: 11 additions & 9 deletions js/ajax.js
View file
Expand Up @@ -390,12 +390,13 @@ var AJAX = {
.not('#pma_console_container')
.not('#prefs_autoload')
.remove();
var $page_content = $('#page_content');
// Replace #page_content with new content
if (data.message && data.message.length > 0) {
$('#page_content').replaceWith(
$page_content.replaceWith(
"<div id='page_content'>" + data.message + "</div>"
);
PMA_highlightSQL($('#page_content'));
PMA_highlightSQL($page_content);
checkNumberOfFields();
}

Expand All @@ -411,7 +412,7 @@ var AJAX = {
var replacement = $selflink_replace[source];
data._selflink = data._selflink.replace(source, replacement);
}
$('#selflink > a').attr('href', data._selflink);
$('#selflink').find('> a').attr('href', data._selflink);
}
if (data._scripts) {
AJAX.scriptHandler.load(data._scripts);
Expand All @@ -431,8 +432,8 @@ var AJAX = {
PMA_commonParams.setAll(data._params);
}
if (data._displayMessage) {
$('#page_content').prepend(data._displayMessage);
PMA_highlightSQL($('#page_content'));
$page_content.prepend(data._displayMessage);
PMA_highlightSQL($page_content);
}

$('#pma_errors').remove();
Expand Down Expand Up @@ -650,11 +651,12 @@ AJAX.registerOnload('functions.js', function () {
}
});

var $page_content = $('#page_content');
/**
* Workaround for passing submit button name,value on ajax form submit
* by appending hidden element with submit button name and value.
*/
$("#page_content").on('click', 'form input[type=submit]', function() {
$page_content.on('click', 'form input[type=submit]', function() {
var buttonName = $(this).attr('name');
if (typeof buttonName === 'undefined') {
return;
Expand All @@ -670,7 +672,7 @@ AJAX.registerOnload('functions.js', function () {
* Attach event listener to events when user modify visible
* Input,Textarea and select fields to make changes in forms
*/
$('#page_content').on(
$page_content.on(
'keyup change',
'form.lock-page textarea, ' +
'form.lock-page input[type="text"], ' +
Expand All @@ -679,7 +681,7 @@ AJAX.registerOnload('functions.js', function () {
{value:1},
AJAX.lockPageHandler
);
$('#page_content').on(
$page_content.on(
'change',
'form.lock-page input[type="checkbox"], ' +
'form.lock-page input[type="radio"]',
Expand Down Expand Up @@ -707,7 +709,7 @@ $(function () {
if (history && history.pushState) {
//set initial state reload
var initState = ('state' in window.history && window.history.state !== null);
var initURL = $('#selflink > a').attr('href') || location.href;
var initURL = $('#selflink').find('> a').attr('href') || location.href;
var state = {
url : initURL,
menu : menuContent
Expand Down
17 changes: 10 additions & 7 deletions js/common.js
View file
Expand Up @@ -140,7 +140,7 @@ var PMA_commonActions = {
*/
refreshMain: function (url, callback) {
if (! url) {
url = $('#selflink a').attr('href');
url = $('#selflink').find('a').attr('href');
url = url.substring(0, url.indexOf('?'));
}
url += PMA_commonParams.getUrlQuery();
Expand Down Expand Up @@ -350,9 +350,10 @@ PMA_DROP_IMPORT = {
_dragleave: function (event) {
event.stopPropagation();
event.preventDefault();
$(".pma_drop_handler").clearQueue().stop();
$(".pma_drop_handler").fadeOut();
$(".pma_drop_handler").html(PMA_messages.dropImportDropFiles);
var $pma_drop_handler = $(".pma_drop_handler")
$pma_drop_handler.clearQueue().stop();
$pma_drop_handler.fadeOut();
$pma_drop_handler.html(PMA_messages.dropImportDropFiles);
},
/**
* Called when upload has finished
Expand Down Expand Up @@ -423,15 +424,17 @@ PMA_DROP_IMPORT = {
var ext = (PMA_DROP_IMPORT._getExtension(files[i].name));
var hash = AJAX.hash(++PMA_DROP_IMPORT.uploadCount);

$(".pma_sql_import_status div").append('<li data-hash="' +hash +'">' +
var $pma_sql_import_status_div = $(".pma_sql_import_status div")
$pma_sql_import_status_div.append('<li data-hash="' +hash +'">' +
((ext !== '') ? '' : '<img src="./themes/dot.gif" title="invalid format" class="icon ic_s_notice"> ') +
escapeHtml(files[i].name) + '<span class="filesize" data-filename="' +
escapeHtml(files[i].name) +'">' +(files[i].size/1024).toFixed(2) +
' kb</span></li>');

//scroll the UI to bottom
$(".pma_sql_import_status div").scrollTop(
$(".pma_sql_import_status div").scrollTop() + 50); //50 hardcoded for now
$pma_sql_import_status_div.scrollTop(
$pma_sql_import_status_div.scrollTop() + 50
); //50 hardcoded for now

if (ext !== '') {
// Increment liveUploadCount by one
Expand Down
9 changes: 5 additions & 4 deletions js/config.js
View file
Expand Up @@ -17,8 +17,9 @@ AJAX.registerTeardown('config.js', function () {
});

AJAX.registerOnload('config.js', function () {
$('#topmenu2.user_prefs_tabs').find('li.active a').attr('rel', 'samepage');
$('#topmenu2.user_prefs_tabs').find('li:not(.active) a').attr('rel', 'newpage');
var $topmenu_upt = $('#topmenu2.user_prefs_tabs');
$topmenu_upt.find('li.active a').attr('rel', 'samepage');
$topmenu_upt.find('li:not(.active) a').attr('rel', 'newpage');
});

// default values for fields
Expand Down Expand Up @@ -496,7 +497,7 @@ function setupValidation() {
}
// register validators and mark custom values
var $elements = $('.optbox input[id], .optbox select[id], .optbox textarea[id]');
$('.optbox input[id], .optbox select[id], .optbox textarea[id]').each(function () {
$elements.each(function () {
markField(this);
var $el = $(this);
$el.bind('change', function () {
Expand Down Expand Up @@ -802,7 +803,7 @@ function updatePrefsDate()
'@DATE@',
PMA_formatDateTime(d)
);
$('#opts_import_local_storage div.localStorage-exists').html(msg);
$('#opts_import_local_storage').find('div.localStorage-exists').html(msg);
}

/**
Expand Down
10 changes: 4 additions & 6 deletions js/navigation.js
View file
Expand Up @@ -904,15 +904,13 @@ function PMA_reloadNavigation(callback, paths) {
}

function PMA_selectCurrentDb() {
if ($('#navi_db_select').length) {
var $navi_db_select = ('#navi_db_select');
if ($navi_db_select.length) {
if (PMA_commonParams.get('db')) { // db selected
$('#navi_db_select').show();
}
$('#navi_db_select').val(PMA_commonParams.get('db'));
if ($('#navi_db_select').val() !== PMA_commonParams.get('db')) {
return false;
}
return true;
$navi_db_select.val(PMA_commonParams.get('db'));
return $navi_db_select.val() === PMA_commonParams.get('db');
}
}

Expand Down
2 changes: 1 addition & 1 deletion js/page_settings.js
View file
Expand Up @@ -19,7 +19,7 @@ function showSettings(selector) {
};

// Keeping a clone to restore in case the user cancels the operation
var $clone = $(selector + ' .page_settings').clone(true);;
var $clone = $(selector + ' .page_settings').clone(true);
$(selector)
.dialog({
title: PMA_messages.strPageSettings,
Expand Down
4 changes: 2 additions & 2 deletions js/pmd/history.js
View file
Expand Up @@ -359,9 +359,9 @@ var orderby = function(norder) {
};
this.get_order = function() {
return order;
}
};
this.set_order(norder);
}
};

/**
* Having object closure, makes an object with all information of where
Expand Down
30 changes: 17 additions & 13 deletions js/pmd/move.js
View file
Expand Up @@ -182,7 +182,7 @@ function MouseMove(e)
if (ON_grid) {
new_x = parseInt(new_x / grid_size) * grid_size;
new_y = parseInt(new_y / grid_size) * grid_size;
};
}

$cur_click.css('left', new_x + 'px');
$cur_click.css('top', new_y + 'px');
Expand All @@ -195,14 +195,15 @@ function MouseMove(e)
if (menu_moved) {
delta_x = -delta_x;
}
var new_width = $('#layer_menu').width() + delta_x;
var $layer_menu = $('#layer_menu');
var new_width = $layer_menu.width() + delta_x;
if (new_width < 150) {
new_width = 150;
}
else {
dx = e.pageX;
}
$('#layer_menu').width(new_width);
$layer_menu.width(new_width);
}

if (ON_relation || ON_display_field) {
Expand Down Expand Up @@ -265,12 +266,13 @@ function setDefaultValuesFromSavedState()
}
Grid();

if ($('#relLineInvert').attr('class') === 'M_butt') {
var $relLineInvert = $('#relLineInvert');
if ($relLineInvert.attr('class') === 'M_butt') {
show_relation_lines = false;
$('#relLineInvert').attr('class', 'M_butt');
$relLineInvert.attr('class', 'M_butt');
} else {
show_relation_lines = true;
$('#relLineInvert').attr('class', 'M_butt_Selected_down');
$relLineInvert.attr('class', 'M_butt_Selected_down');
}
Relation_lines_invert();

Expand All @@ -281,14 +283,16 @@ function setDefaultValuesFromSavedState()
always_show_text = false;
}

if ($('#key_SB_all').attr('class') === 'M_butt_Selected_down') {
$('#key_SB_all').click();
$('#key_SB_all').toggleClass('M_butt_Selected_down');
$('#key_SB_all').toggleClass('M_butt');
var $key_SB_all = $('#key_SB_all');
if ($key_SB_all.attr('class') === 'M_butt_Selected_down') {
$key_SB_all.click();
$key_SB_all.toggleClass('M_butt_Selected_down');
$key_SB_all.toggleClass('M_butt');
}

if ($('#key_Left_Right').attr('class') === 'M_butt_Selected_down') {
$('#key_Left_Right').click();
var $key_Left_Right = $('#key_Left_Right');
if ($key_Left_Right.attr('class') === 'M_butt_Selected_down') {
$key_Left_Right.click();
}

}
Expand Down Expand Up @@ -1531,7 +1535,7 @@ function No_have_constr(id_this)

if (id_this.alt == 'v') {
id_this.alt = '>';
id_this.src = id_this.dataset.right;;
id_this.src = id_this.dataset.right;
} else {
id_this.alt = 'v';
id_this.src = id_this.dataset.down;
Expand Down
2 changes: 1 addition & 1 deletion js/rte.js
View file
Expand Up @@ -174,7 +174,7 @@ RTE.COMMON = {
} else {
PMA_ajaxShowMessage(data.error, false);
}
}; // end showExport()
} // end showExport()
}, // end exportDialog()
editorDialog: function (is_new, $this) {
var that = this;
Expand Down
2 changes: 1 addition & 1 deletion js/sql.js
View file
Expand Up @@ -91,7 +91,7 @@ AJAX.registerTeardown('sql.js', function () {
$(document).off('stickycolumns', ".sqlqueryresults");
$("#togglequerybox").unbind('click');
$(document).off('click', "#button_submit_query");
$(document).off('change', '#id_bookmark')
$(document).off('change', '#id_bookmark');
$("input[name=bookmark_variable]").unbind("keypress");
$(document).off('submit', "#sqlqueryform.ajax");
$(document).off('click', "input[name=navig].ajax");
Expand Down
44 changes: 15 additions & 29 deletions js/tbl_change.js
View file
Expand Up @@ -339,38 +339,28 @@ AJAX.registerOnload('tbl_change.js', function () {
// validate the comment form when it is submitted
$("#insertForm").validate();
jQuery.validator.addMethod("validationFunctionForHex", function(value, element) {
if (value.match(/^[a-f0-9]*$/i) === null) {
return false;
} else {
return true;
}
return value.match(/^[a-f0-9]*$/i) !== null;
});

jQuery.validator.addMethod("validationFunctionForFuns", function(value, element, options) {
if (value.substring(0, 3) === "AES" && options.data('type') !== 'HEX') {
return false;
} else if (value.substring(0, 3) === "MD5"
&& typeof options.data('maxlength') !== 'undefined'
&& options.data('maxlength') < 32) {
return false;
} else {
return true;
}

return !(value.substring(0, 3) === "MD5"
&& typeof options.data('maxlength') !== 'undefined'
&& options.data('maxlength') < 32);
});

jQuery.validator.addMethod("validationFunctionForDateTime", function(value, element, options) {
var dt_value = value;
var theType = options;
if (theType == "date") {
if (! isDate(dt_value)) {
return false;
}
return true;
return isDate(dt_value);

} else if (theType == "time") {
if (! isTime(dt_value)) {
return false;
}
return true;
return isTime(dt_value);

} else if (theType == "datetime" || theType == "timestamp") {
var tmstmp = false;
dt_value = dt_value.trim();
Expand All @@ -385,16 +375,12 @@ AJAX.registerOnload('tbl_change.js', function () {
}
var dv = dt_value.indexOf(" ");
if (dv == -1) { // Only the date component, which is valid
if (! isDate(dt_value, tmstmp)) {
return false;
}
return true;
return isDate(dt_value, tmstmp);

} else {
if (! (isDate(dt_value.substring(0, dv), tmstmp)
&& isTime(dt_value.substring(dv + 1)))) {
return false;
}
return true;
return isDate(dt_value.substring(0, dv), tmstmp)
&& isTime(dt_value.substring(dv + 1));

}
}
});
Expand All @@ -403,7 +389,7 @@ AJAX.registerOnload('tbl_change.js', function () {
* after initiation of functions
*/
extendingValidatorMessages();
};
}

$.datepicker.initialized = false;

Expand Down

0 comments on commit fc9bc4a

Please sign in to comment.