Index: branches/5.1.x/core/admin_templates/js/ajax.js =================================================================== diff -u -N -r12657 -r14144 --- branches/5.1.x/core/admin_templates/js/ajax.js (.../ajax.js) (revision 12657) +++ branches/5.1.x/core/admin_templates/js/ajax.js (.../ajax.js) (revision 14144) @@ -77,7 +77,7 @@ } Request.processRedirect = function($request) { - var $match_redirect = new RegExp('^#redirect#(.*)').exec($request.responseText); + var $match_redirect = new RegExp('^#redirect#(.*?)($|\\s.*)').exec($request.responseText); if ($match_redirect != null) { // redirect to external template requested window.location.href = $match_redirect[1]; @@ -264,7 +264,7 @@ AjaxProgressBar.prototype.successCallback = function($request, $params, $object) { var $responce = $request.responseText; - var $match_redirect = new RegExp('^#redirect#(.*)').exec($responce); + var $match_redirect = new RegExp('^#redirect#(.*?)($|\\s.*)').exec($responce); if ($match_redirect != null) { $object.showProgress(100); // redirect to external template requested @@ -340,13 +340,6 @@ AjaxPopupManager.prototype.successCallback = function($request, $params, $object) { var $responce = $request.responseText; - /*var $match_redirect = new RegExp('^#redirect#(.*)').exec($responce); - if ($match_redirect != null) { - alert('AJAX REDIRECT!!!') - // redirect to external template requested - window.location.href = $match_redirect[1]; - return false; - }*/ switch ($params[0]) { case 'GetSize': Index: branches/5.1.x/core/admin_templates/js/jquery/thickbox/thickbox.js =================================================================== diff -u -N -r13895 -r14144 --- branches/5.1.x/core/admin_templates/js/jquery/thickbox/thickbox.js (.../thickbox.js) (revision 13895) +++ branches/5.1.x/core/admin_templates/js/jquery/thickbox/thickbox.js (.../thickbox.js) (revision 14144) @@ -429,7 +429,7 @@ } TB.parseRedirect = function ($data) { - var $match_redirect = new RegExp('^#redirect#(.*)').exec($data); + var $match_redirect = new RegExp('^#redirect#(.*?)($|\\s.*)').exec($data); if ($match_redirect != null) { // redirect to external template requested return $match_redirect[1]; Index: branches/5.1.x/core/admin_templates/js/frame_resizer.js =================================================================== diff -u -N -r12127 -r14144 --- branches/5.1.x/core/admin_templates/js/frame_resizer.js (.../frame_resizer.js) (revision 12127) +++ branches/5.1.x/core/admin_templates/js/frame_resizer.js (.../frame_resizer.js) (revision 14144) @@ -36,14 +36,7 @@ } FrameResizer.prototype.successCallback = function($request, $params, $object) { - /*var $responce = $request.responseText; - var $match_redirect = new RegExp('^#redirect#(.*)').exec($responce); - if ($match_redirect != null) { - $object.showProgress(100); - // redirect to external template requested - window.location.href = $match_redirect[1]; - return false; - }*/ + } FrameResizer.prototype.errorCallback = function($request, $params, $object) {