From 44cfef0927614f3bc48ab3376791aecd31fc90d9 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 4 Aug 2014 11:05:58 +0200 Subject: Modify is_framed() so it returns boolean value --- program/js/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'program/js/app.js') diff --git a/program/js/app.js b/program/js/app.js index 490234b4a..ca65176d9 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -1451,7 +1451,7 @@ function rcube_webmail() this.is_framed = function() { - return (this.env.framed && parent.rcmail && parent.rcmail != this && parent.rcmail.command); + return this.env.framed && parent.rcmail && parent.rcmail != this && typeof parent.rcmail.command == 'function'; }; this.save_pref = function(prop) -- cgit v1.2.3 From 9e9dcc34bc32d5f0f382751245fdfa77d4a93a6a Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 4 Aug 2014 11:07:27 +0200 Subject: Fix frame check and strange "parent is undefined" issue --- program/js/app.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'program/js/app.js') diff --git a/program/js/app.js b/program/js/app.js index ca65176d9..8ac5ca2e9 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -5989,8 +5989,10 @@ function rcube_webmail() this.replace_folder_row = function(oldid, id, name, display_name, is_protected, class_name) { if (!this.gui_objects.subscriptionlist) { - if (this.is_framed) - return parent.rcmail.replace_folder_row(oldid, id, name, display_name, is_protected, class_name); + if (this.is_framed()) { + // @FIXME: for some reason this 'parent' variable need to be prefixed with 'window.' + return window.parent.rcmail.replace_folder_row(oldid, id, name, display_name, is_protected, class_name); + } return false; } -- cgit v1.2.3