For some reason the latest version of Firefox doesn't like
the javascript which empties the cart on logout. As Ian points
out, there is code which tries to redirect to "about:blank"
and close the window (since the main context of the function
is the Cart's popup window.
This patch adds a parameter to the delBasket function so
that we can pass a "popup" context to the function and
choose whether or not we want to ask JS to close the window.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
[% loggedinusername %]
</span>
[% IF ( intranetbookbag ) %]
- (<a href="/cgi-bin/koha/mainpage.pl?logout.x=1" onclick="clearHoldFor(); delBasket(true);">Log Out</a>) |
+ (<a href="/cgi-bin/koha/mainpage.pl?logout.x=1" onclick="clearHoldFor(); delBasket('main', true);">Log Out</a>) |
[% ELSE %]
(<a href="/cgi-bin/koha/mainpage.pl?logout.x=1" onclick="clearHoldFor();">Log Out</a>) |
[% END %]
}
-function delBasket(rep) {
+function delBasket(context,rep) {
if (rep == undefined){
rep = confirm(MSG_CONFIRM_DEL_BASKET);
}
if (rep) {
- delCookie(nameCookie);
- document.location = "about:blank";
- updateBasket(0,top.opener);
- window.close();
+ if(context == "popup"){
+ delCookie(nameCookie);
+ document.location = "about:blank";
+ updateBasket(0,top.opener);
+ window.close();
+ } else {
+ delCookie(nameCookie);
+ updateBasket(0,top.opener);
+ }
}
}
</li>
<li>
<span id="delete" class="yui-button yui-link-button"><span class="first-child">
- <a class="empty" href="basket.pl" onclick="delBasket(); return false;">Empty and Close</a>
+ <a class="empty" href="basket.pl" onclick="delBasket('popup'); return false;">Empty and Close</a>
</span></span>
</li>
<li>