Merge remote-tracking branch 'origin/new/bug_5327'

[koha_fer] / koha-tmpl / intranet-tmpl / prog / en / js / basket.js

diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/basket.js b/koha-tmpl/intranet-tmpl/prog/en/js/basket.js
index 9946cf7..5b96c12 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/js/basket.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/basket.js
@@ -299,15 +299,20 @@ function delRecord (n, s) {
 }
 
 
-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);
+        }
     }
 }
 
@@ -417,7 +422,11 @@ function vShelfAdd() {
 
 function showCart(){
                var position = $("#cartmenulink").offset();
+        var scrolld = $(window).scrollTop();
                var top = position.top + $("#cartmenulink").outerHeight();
+        if( scrolld > top ){
+            top = scrolld + 15;
+        }
                var left = position.left
                $("#cartDetails").css("position","absolute").css("top",top);
                $("#cartDetails").css("position","absolute").css("left",left);