gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source 
Signed-off-by: Marc Delisle <marc@infomarc.info>
This commit is contained in:
Marc Delisle 2014-05-15 08:17:00 -04:00
commit 665423047a
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/ajax.js
View File

@ -166,6 +166,8 @@ var AJAX = {
} else if ($(this).attr('target')) {
return true;
} else if ($(this).hasClass('ajax') || $(this).hasClass('disableAjax')) {
//reset the alteredTarget array, as specified AJAX operation has finished
AJAX.alteredTargets.length = 0;
return true;
} else if (href && href.match(/^#/)) {
return true;
@ -192,6 +194,11 @@ var AJAX = {
break;
}
};
//triggers a confirm dialog if:
//the user has performes some operations on loaded page
//the user clicks on some link, (won't trigger for buttons)
//the the click event is not triggered by script
if (event.type === 'click' &&
event.isTrigger !== true &&
isInputAltered &&