Skip to content

Commit

Permalink
Merge branch 'MAGETWO-53139' of github.com:magento-nord/magento2ce in…
Browse files Browse the repository at this point in the history
…to pr_p1
  • Loading branch information
slopukhov committed Jun 14, 2016
2 parents ecb9f8e + f32e362 commit 68dc4f0
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions app/code/Magento/Catalog/view/base/web/js/price-options.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ define([
$(this.options.priceHolderSelector).trigger('updatePrice', changes);
},


/**
* Helper to fix issue with option nodes:
* - you can't place any html in option ->
Expand Down Expand Up @@ -174,7 +173,10 @@ define([
break;

case 'radio':

if (element.is(':checked')) {
changes[optionHash] = optionConfig[optionValue] && optionConfig[optionValue].prices || {};
}
break;
case 'select-one':
changes[optionHash] = optionConfig[optionValue] && optionConfig[optionValue].prices || {};
break;
Expand Down

0 comments on commit 68dc4f0

Please sign in to comment.