From 7f8c59edaa9c790f36fe99552e818cfe8d8f9c8f Mon Sep 17 00:00:00 2001 From: David Cook Date: Mon, 4 Aug 2014 13:49:56 +1000 Subject: [PATCH] Bug 12708 - Unexpected behaviour in IE 9 and lower when using openWindow MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This patch removes the whitespace from arguments to the "name" parameter in "window.open". It also adds a trap for the "openWindow" helper function, which will use a "null" instead of a "name" if window.open isn't able to handle a name with whitespace (i.e. if it's IE <= 9). _TEST PLAN_ 1) Switch to an emulated or authentic Internet Explorer version E 9 or lower 2) Click "Help" 3) Note that it opens the page in the current window rather than as a popup 4) Apply the patch 5) Shift refresh your page 6) Click "Help" 7) Note that it now opens (correctly) as a pop-up (If you want to be more thorough, you can test in other browsers as well to make sure that it still works.) Tested with IE 10 developer tools: IE7, IE 8, IE 9 Window pops up as expected. No regression found with IE 10 / FF31.0 Signed-off-by: Marc Véron Signed-off-by: Katrin Fischer Tested for regressions in Firefox and Chromium. I checked the help and the duplicate authorities windows still work correctly. Passes tests and QA script. Signed-off-by: Tomas Cohen Arazi --- koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js | 9 +++++++-- .../prog/en/modules/authorities/authorities.tt | 2 +- .../prog/en/modules/cataloguing/addbiblio.tt | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js index c553a6da07..fa75b441fc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js @@ -81,7 +81,7 @@ function logOut(){ } function openHelp(){ - openWindow("/cgi-bin/koha/help.pl","Koha help",600,600); + openWindow("/cgi-bin/koha/help.pl","KohaHelp",600,600); } jQuery.fn.preventDoubleFormSubmit = function() { @@ -98,7 +98,12 @@ function openWindow(link,name,width,height) { name = (typeof name == "undefined")?'popup':name; width = (typeof width == "undefined")?'600':width; height = (typeof height == "undefined")?'400':height; - var newin=window.open(link,name,'width='+width+',height='+height+',resizable=yes,toolbar=false,scrollbars=yes,top'); + //IE <= 9 can't handle a "name" with whitespace + try { + var newin=window.open(link,name,'width='+width+',height='+height+',resizable=yes,toolbar=false,scrollbars=yes,top'); + } catch(e) { + var newin=window.open(link,null,'width='+width+',height='+height+',resizable=yes,toolbar=false,scrollbars=yes,top'); + } } // Use this function to remove the focus from any element for diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt index a3329cd6fb..ea47100b3c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt @@ -154,7 +154,7 @@ function confirmnotdup(redirect){ [% IF ( duplicateauthid ) %]

Duplicate record suspected

-

Is this a duplicate of [% duplicateauthvalue %]?

+

Is this a duplicate of [% duplicateauthvalue %]?

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt index 5dc1a5ff3a..790a57b119 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt @@ -403,7 +403,7 @@ function Changefwk(FwkList) { [% IF ( duplicatebiblionumber ) %]

Duplicate record suspected

-

Is this a duplicate of [% duplicatetitle %]?

+

Is this a duplicate of [% duplicatetitle %]?

[% IF ( CAN_user_editcatalogue_edit_items ) %] -- 2.39.5