summaryrefslogtreecommitdiff
path: root/roundcubemail
diff options
context:
space:
mode:
authorroundcube <roundcube@208e9e7b-5314-0410-a742-e7e81cd9613c>2006-04-13 18:07:06 +0000
committerroundcube <roundcube@208e9e7b-5314-0410-a742-e7e81cd9613c>2006-04-13 18:07:06 +0000
commit4095194cbb4973cd69f8dc4011d28cc5733c8eeb (patch)
treee129c588ee13e2dda20ede411601b596fb7527ae /roundcubemail
parentde89e7ae6ae96538b2d9b8b4a6df5991cedddfe2 (diff)
Fixed parent.location problem for compose-links
git-svn-id: https://svn.roundcube.net/trunk@192 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail')
-rw-r--r--roundcubemail/program/js/app.js7
1 files changed, 5 insertions, 2 deletions
diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js
index d2bf41e58..60daf8c32 100644
--- a/roundcubemail/program/js/app.js
+++ b/roundcubemail/program/js/app.js
@@ -835,14 +835,17 @@ function rcube_webmail()
}
else if (props)
url += '&_to='+props;
-
+
// don't know if this is necessary...
url = url.replace(/&_framed=1/, "");
this.set_busy(true);
// need parent in case we are coming from the contact frame
- parent.window.location.href = url;
+ if (this.env.framed)
+ parent.location.href = url;
+ else
+ location.href = url;
break;
case 'send':