fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-10 20:44:28 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1206 from kijin/develop

Browse source 
화면 전환 없이 손쉽게 폼을 제출할 수 있도록 지원
This commit is contained in:
Kijin Sung 2019-10-10 15:30:04 +09:00 • committed by GitHub
commit 302f541234
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 81 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
classes/context/Context.class.php
View file

@ -166,6 +166,7 @@ class Context
private static $_reserved_keys = array( private static $_reserved_keys = array(
'_rx_ajax_compat' => true, '_rx_ajax_compat' => true,
'_rx_csrf_token' => true, '_rx_csrf_token' => true,
'_rx_target_iframe' => true,
); );
/** /**

18
classes/module/ModuleHandler.class.php
View file

@ -940,6 +940,24 @@ class ModuleHandler extends Handler
$methodList = array('XMLRPC' => 1, 'JSON' => 1, 'JS_CALLBACK' => 1); $methodList = array('XMLRPC' => 1, 'JSON' => 1, 'JS_CALLBACK' => 1);
if(!isset($methodList[Context::getRequestMethod()])) if(!isset($methodList[Context::getRequestMethod()]))
{ {
// Handle iframe form submissions.
if(isset($_POST['_rx_target_iframe']) && starts_with('_rx_temp_', $_POST['_rx_target_iframe']))
{
if($_SESSION['XE_VALIDATOR_RETURN_URL'])
{
ob_end_clean();
echo sprintf('<html><head></head><body><script> window.parent.redirect(%s); </script></body></html>', json_encode($_SESSION['XE_VALIDATOR_RETURN_URL']));
return;
}
if($this->error)
{
ob_end_clean();
echo sprintf('<html><head></head><body><script> window.parent.alert(%s); window.parent.remove_iframe(%s); </script></body></html>', json_encode($this->error), json_encode($_POST['_rx_target_iframe']));
return;
}
}
// Handle redirects.
if($_SESSION['XE_VALIDATOR_RETURN_URL']) if($_SESSION['XE_VALIDATOR_RETURN_URL'])
{ {
if ($_SESSION['is_new_session']) if ($_SESSION['is_new_session'])

74
common/js/xml_handler.js
View file

@ -190,16 +190,19 @@
window.exec_json = $.exec_json = function(action, params, callback_success, callback_error) { window.exec_json = $.exec_json = function(action, params, callback_success, callback_error) {
// Convert params to object and fill in the module and act. // Convert params to object and fill in the module and act.
params = params ? ($.isArray(params) ? arr2obj(params) : params) : {}; var request_info;
action = action.split("."); if (action === 'raw') {
//if (action.length != 2) return; request_info = 'RAW FORM SUBMISSION';
params.module = action[0]; } else {
params.act = action[1]; params = params ? ($.isArray(params) ? arr2obj(params) : params) : {};
params._rx_ajax_compat = 'JSON'; action = action.split(".");
params._rx_csrf_token = getCSRFToken(); //if (action.length != 2) return;
params.module = action[0];
// Fill in the XE vid. params.act = action[1];
if (typeof(xeVid) != "undefined") params.vid = xeVid; params._rx_ajax_compat = 'JSON';
params._rx_csrf_token = getCSRFToken();
request_info = params.module + "." + params.act;
}
// Delay the waiting message for 1 second to prevent rapid blinking. // Delay the waiting message for 1 second to prevent rapid blinking.
waiting_obj.css("opacity", 0.0); waiting_obj.css("opacity", 0.0);
@ -218,7 +221,7 @@
// Add debug information. // Add debug information.
if (data._rx_debug) { if (data._rx_debug) {
data._rx_debug.page_title = "AJAX : " + params.module + "." + params.act; data._rx_debug.page_title = "AJAX : " + request_info;
if (window.rhymix_debug_add_data) { if (window.rhymix_debug_add_data) {
window.rhymix_debug_add_data(data._rx_debug); window.rhymix_debug_add_data(data._rx_debug);
} else { } else {
@ -238,7 +241,7 @@
if (data.message) { if (data.message) {
alert(data.message.replace(/\\n/g, "\n")); alert(data.message.replace(/\\n/g, "\n"));
} else { } else {
alert("AJAX communication error while requesting " + data.module + "." + data.act); alert("AJAX communication error while requesting " + request_info);
} }
if ($.isFunction(callback_error)) { if ($.isFunction(callback_error)) {
callback_error(data); callback_error(data);
@ -283,6 +286,7 @@
dataType: "json", dataType: "json",
url: request_uri, url: request_uri,
data: params, data: params,
processData: (action !== 'raw'),
success : successHandler, success : successHandler,
error : errorHandler error : errorHandler
}); });
@ -356,6 +360,52 @@
} }
}; };
/**
* Function for AJAX submission of arbitrary forms.
*/
$(document).on('submit', 'form.rx_ajax', function(event) {
// Abort if the form already has a 'target' attribute.
var form = $(this);
if (form.attr('target')) {
return;
}
// Prevent page refresh.
event.preventDefault();
// Get success and error callback functions.
var callback_success = form.data('callback-success');
if (callback_success && window[callback_success] && $.isFunction(window[callback_success])) {
callback_success = window[callback_success];
} else {
callback_success = null;
}
var callback_error = form.data('callback-error');
if (callback_error && window[callback_error] && $.isFunction(window[callback_error])) {
callback_error = window[callback_error];
} else {
callback_error = null;
}
// If the form has file uploads, use a hidden iframe to submit. Otherwise use exec_json.
var has_files = form.find('input[type=file][name!=Filedata]').size();
if (has_files) {
var iframe_id = '_rx_temp_' + (new Date()).getTime();
$('<iframe id="' + iframe_id + '" name="' + iframe_id + '" style="display:none"></iframe>').appendTo($(document.body));
form.attr('method', 'POST').attr('enctype', 'multipart/form-data');
form.attr('target', iframe_id).find('input[name=_rx_target_iframe]').remove();
form.append('<input type="hidden" name="_rx_target_iframe" value="' + iframe_id + '" />');
window.remove_iframe = function(iframe_id) {
if (iframe_id.match(/^_rx_temp_[0-9]+$/)) {
$('iframe#' + iframe_id).remove();
}
};
setTimeout(function() {
form.removeAttr('target').find('input[name=_rx_target_iframe]').remove();
}, 1000);
form.submit();
} else {
window.exec_json('raw', form.serialize(), callback_success, callback_error);
}
});
/** /**
* Empty placeholder for beforeUnload handler. * Empty placeholder for beforeUnload handler.
*/ */