[REV] website_sale: reverted changes in shop (JS)

bzr revid: tde@openerp.com-20140122171606-md7exi4319w3vqqx

diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js
index c6a032c..a10b300 100644 (file)
--- a/addons/website_sale/static/src/js/website_sale.js
+++ b/addons/website_sale/static/src/js/website_sale.js
@@ -65,19 +65,13 @@ $(document).ready(function () {
         ev.preventDefault();
         var $label = $(ev.currentTarget);
         var $price = $label.parent("form").find(".oe_price .oe_currency_value");
-        var $variant_price = $label.find(".oe_variant_price .oe_currency_value");
-        if (!$variant_price.data("price")) {
-            $variant_price.data("price", parseFloat($variant_price.text()));
+        if (!$price.data("price")) {
+            $price.data("price", parseFloat($price.text()));
         }
-        $price.html($variant_price.data("price"));
+        $price.html($price.data("price")+parseFloat($label.find(".badge span").text() || 0));
     });
-    //Trigger mouseup event of the checked radio button.
-    $('form.js_add_cart_json label input.variant_radio').each(function() {
-        if (this.checked) {
-            $(this).parent().trigger('mouseup'); 
-            }
-    });
-    
+
+
     $(".js_slider").each(function() {
         var $slide = $(this);
         var $slider = $('<div>'+