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 f0bbf7b..5b96c12 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/js/basket.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/basket.js
@@ -210,9 +210,7 @@ function showCartUpdate(msg){
 
 function showListsUpdate(msg){
        // set body of popup window
-       $("#listsDetails").html(msg);
-       showLists();
-       setTimeout("hideLists()",2000); 
+       alert(msg);
 }
 
 function selRecord(num, status) {
@@ -301,15 +299,20 @@ function delRecord (n, s) {
 }
 
 
-function delBasket() {
-
-    var rep = false;
-    rep = confirm(MSG_CONFIRM_DEL_BASKET);
+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);
+        }
     }
 }
 
@@ -374,10 +377,10 @@ function showLess() {
 
 function updateBasket(updated_value,target) {
        if(target){
-       target.$('#basketcount').html("<span>"+updated_value+"</span>");
+       target.$('#basketcount').html(" <span>("+updated_value+")</span>");
        target.$('#cartDetails').html(_("Your cart contains ")+updated_value+_(" items"));
        } else {
-       $('#basketcount').html("<span>"+updated_value+"</span>");
+       $('#basketcount').html(" <span>("+updated_value+")</span>");
        $('#cartDetails').html(_("Your cart contains ")+updated_value+_(" items"));
        }
        var basketcount = updated_value;
@@ -419,51 +422,23 @@ function vShelfAdd() {
 
 function showCart(){
                var position = $("#cartmenulink").offset();
+        var scrolld = $(window).scrollTop();
                var top = position.top + $("#cartmenulink").outerHeight();
-               var menuWidth = 200;
-               var buttonWidth = $("#cartmenulink").innerWidth();
-               var buttonOffset = menuWidth - buttonWidth;
-               var left = position.left -  buttonOffset;
+        if( scrolld > top ){
+            top = scrolld + 15;
+        }
+               var left = position.left
                $("#cartDetails").css("position","absolute").css("top",top);
                $("#cartDetails").css("position","absolute").css("left",left);
-               $("#cartDetails").fadeIn("fast",function(){
-                       $("#cartDetails").dropShadow({left: 3, top: 3, blur: 0,  color: "#000", opacity: 0.1});
-        });
-}
-
-function showLists(){
-               var position = $("#listsmenulink").offset();
-              var top = position.top + $("#listsmenulink").outerHeight();
-               var menuWidth = 200;
-               var buttonWidth = $("#listsmenulink").innerWidth();
-               var buttonOffset = menuWidth - buttonWidth;
-               var left = position.left -  buttonOffset;
-               $("#listsDetails").css("position","absolute").css("top",top);
-               $("#listsDetails").css("position","absolute").css("left",left);
-               $("#listsDetails").fadeIn("fast",function(){
-                       $("#listsDetails").dropShadow({left: 3, top: 3, blur: 0,  color: "#000", opacity: 0.1});
-        });
+               $("#cartDetails").fadeIn("fast");
 }
 
 function hideCart(){
-    $("#cartDetails").removeShadow();
     $("#cartDetails").fadeOut("fast");
 }
 
-function hideLists(){
-    $("#listsDetails").removeShadow();
-    $("#listsDetails").fadeOut("fast");
-}
-
-
 $(document).ready(function(){
        $("#cartmenulink").click(function(){ openBasket(); return false; });
-       $("#cartDetails,#cartmenulink").click(function(){ hideCart(); });
-       $("#cartmenulink").hover(function(){
-               showCart();
-       },function(){
-               hideCart();
-       });
        if(basketcount){ updateBasket(basketcount); }
 });