Bug 10310: Followup Prevent submitting form with enter does not work with IE

[koha.git] / 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..cddddf7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/js/basket.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/basket.js
@@ -79,7 +79,7 @@ function openBasket() {
     if ( strCookie ) {
         var iW = 820;
         var iH = 450;
-        var optWin = "dependant=yes,status=yes,scrollbars=yes,resizable=yes,toolbar=no,location=yes,height="+iH+",width="+iW;
+        var optWin = "status=yes,scrollbars=yes,resizable=yes,toolbar=no,location=yes,height="+iH+",width="+iW;
         var loc = CGIBIN + "basket/basket.pl?" + strCookie;
         var basket = open(loc, "basket", optWin);
         if (window.focus) {basket.focus()}
@@ -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);
+        }
     }
 }
 
@@ -330,7 +335,7 @@ function sendBasket() {
 
     var loc = CGIBIN + "basket/sendbasket.pl?" + strCookie;
 
-    var optWin="dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100";
+    var optWin="scrollbars=no,resizable=no,height=300,width=450,top=50,left=100";
     var win_form = open(loc,"win_form",optWin);
 }
 
@@ -340,7 +345,7 @@ function downloadBasket() {
 
     var loc = CGIBIN + "basket/downloadcart.pl?" + strCookie;
 
-    open(loc,"win_form",'dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100');
+    open(loc,"win_form",'scrollbars=no,resizable=no,height=300,width=450,top=50,left=100');
 }
 
 function printBasket() {
@@ -373,10 +378,10 @@ function showLess() {
 function updateBasket(updated_value,target) {
        if(target){
        target.$('#basketcount').html(" <span>("+updated_value+")</span>");
-       target.$('#cartDetails').html(_("Your cart contains ")+updated_value+_(" items"));
+    target.$('#cartDetails').html(MSG_IN_YOUR_CART+updated_value);
        } else {
        $('#basketcount').html(" <span>("+updated_value+")</span>");
-       $('#cartDetails').html(_("Your cart contains ")+updated_value+_(" items"));
+    $('#cartDetails').html(MSG_IN_YOUR_CART+updated_value);
        }
        var basketcount = updated_value;
 }
@@ -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);