Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F1069453
in-portal
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Subscribers
None
File Metadata
Details
File Info
Storage
Attached
Created
Sat, Jul 19, 11:58 PM
Size
2 KB
Mime Type
text/x-diff
Expires
Mon, Jul 21, 11:58 PM (16 h, 19 m)
Engine
blob
Format
Raw Data
Handle
692365
Attached To
rINP In-Portal
in-portal
View Options
Index: branches/RC/core/admin_templates/incs/close_popup.tpl
===================================================================
--- branches/RC/core/admin_templates/incs/close_popup.tpl (revision 11332)
+++ branches/RC/core/admin_templates/incs/close_popup.tpl (revision 11333)
@@ -1,48 +1,53 @@
<html>
<head>
<title></title>
<script type="text/javascript">
var $is_debug = <inp2:m_if check="m_ConstOn" name="DBG_REDIRECT">true<inp2:m_else/>false</inp2:m_if>;
var $use_popups = <inp2:m_if check="adm_UsePopups">true<inp2:m_else/>false</inp2:m_if>;
var $redirect_url = '<inp2:m_t t="dummy" opener="u" m_opener="u" escape="escape"/>';
if ($is_debug) {
document.write('<a href="#" onclick="proceed_redirect()">' + $redirect_url.replace('%5C', '\\') + '</a>');
}
else {
proceed_redirect();
}
function isset(variable)
{
if(variable == null) return false;
return (typeof(variable) == 'undefined') ? false : true;
}
function proceed_redirect() {
if (window.opener) {
// using popups & close_popup called (from anywhere)
try {
// parent window is ours
- var $skip_refresh = isset(window.opener.$skip_refresh) && window.opener.$skip_refresh ? true : false;
+ <inp2:m_if check="m_Get" name="skip_refresh">
+ var $skip_refresh = true;
+ <inp2:m_else/>
+ var $skip_refresh = isset(window.opener.$skip_refresh) && window.opener.$skip_refresh ? true : false;
+ </inp2:m_if>
+
if (!$skip_refresh) {
window.opener.location.href = $redirect_url.replace('%5C', '\\');
}
window.close();
window.opener.focus();
}
catch (err) {
// another website is opened in parent window
alert('Error while trying to process redirect in window opener, you should probably close this window. Error message: [' + err.description + ']');
}
}
else if (!$use_popups) {
// not using popups (for editing), but close_popup called (e.g. from selector)
window.location.href = $redirect_url.replace('%5C', '\\');
}
}
</script>
</head>
<body>
</body>
</html>
\ No newline at end of file
Property changes on: branches/RC/core/admin_templates/incs/close_popup.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2.2.1
\ No newline at end of property
+1.2.2.2
\ No newline at end of property
Event Timeline
Log In to Comment