Created
March 1, 2013 17:37
-
-
Save jetsgit/5066332 to your computer and use it in GitHub Desktop.
diff git://github.com/lilleyt/spree_flexi_variants.git master and git://github.com/bluehandtalking/spree_flexi_variants.git spree1-3-stable
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -X diff-exclude -Naur spree_flexi_variants_Lilley/app/assets/javascripts/admin/orders/edit.js spree_flexi_variants/app/assets/javascripts/admin/orders/edit.js | |
--- spree_flexi_variants_Lilley/app/assets/javascripts/admin/orders/edit.js 2013-03-01 08:19:40.000000000 -0800 | |
+++ spree_flexi_variants/app/assets/javascripts/admin/orders/edit.js 2013-03-01 08:27:48.000000000 -0800 | |
@@ -13,7 +13,7 @@ | |
return false; | |
}); | |
- $("#add_product_name").product_autocomplete(); | |
+ $(".variant_autocomplete").variantAutocomplete(); | |
}); | |
diff -X diff-exclude -Naur spree_flexi_variants_Lilley/app/helpers/spree/admin/base_helper_decorator.rb spree_flexi_variants/app/helpers/spree/admin/base_helper_decorator.rb | |
--- spree_flexi_variants_Lilley/app/helpers/spree/admin/base_helper_decorator.rb 2013-03-01 08:19:40.000000000 -0800 | |
+++ spree_flexi_variants/app/helpers/spree/admin/base_helper_decorator.rb 1969-12-31 16:00:00.000000000 -0800 | |
@@ -1,10 +0,0 @@ | |
-module Spree | |
- module Admin | |
- BaseHelper.module_eval do | |
- def link_to_remove_fields(name, f) | |
- # fixes https://github.com/jsqu99/spree_flexi_variants/issues/52 by reverting back to 'old spree' version | |
- f.hidden_field(:_destroy) + link_to_with_icon(:delete, name, '#', :class => 'remove_fields') | |
- end | |
- end | |
- end | |
-end | |
diff -X diff-exclude -Naur spree_flexi_variants_Lilley/app/views/spree/admin/ad_hoc_option_types/_option_value_fields.html.erb spree_flexi_variants/app/views/spree/admin/ad_hoc_option_types/_option_value_fields.html.erb | |
--- spree_flexi_variants_Lilley/app/views/spree/admin/ad_hoc_option_types/_option_value_fields.html.erb 2013-03-01 08:19:40.000000000 -0800 | |
+++ spree_flexi_variants/app/views/spree/admin/ad_hoc_option_types/_option_value_fields.html.erb 2013-02-28 09:16:47.000000000 -0800 | |
@@ -3,5 +3,5 @@ | |
<td class='presentation'><span> <%= f.object.option_value.presentation %> </span></td> | |
<td class='price_modifier'><%= f.text_field :price_modifier %></td> | |
<td><%= f.check_box :selected %></td> | |
- <td class="actions"><%= link_to_remove_fields t("remove"), f %></td> | |
+ | |
</tr> | |
diff -X diff-exclude -Naur spree_flexi_variants_Lilley/app/views/spree/products/customizations/calculator_type/_amount_times_constant.html.erb spree_flexi_variants/app/views/spree/products/customizations/calculator_type/_amount_times_constant.html.erb | |
--- spree_flexi_variants_Lilley/app/views/spree/products/customizations/calculator_type/_amount_times_constant.html.erb 2013-03-01 08:19:40.000000000 -0800 | |
+++ spree_flexi_variants/app/views/spree/products/customizations/calculator_type/_amount_times_constant.html.erb 2012-07-27 10:32:40.000000000 -0700 | |
@@ -9,7 +9,7 @@ | |
<%= content_for :head do %> | |
<%= javascript_tag do %> | |
- $(document).on('keyup', '#<%= cust_dom_id %>', function(e) { | |
+ $('#<%= cust_dom_id %>').live('keyup', function(e) { | |
var tf = $(this); | |
diff -X diff-exclude -Naur spree_flexi_variants_Lilley/app/views/spree/products/customizations/calculator_type/_customization_image.html.erb spree_flexi_variants/app/views/spree/products/customizations/calculator_type/_customization_image.html.erb | |
--- spree_flexi_variants_Lilley/app/views/spree/products/customizations/calculator_type/_customization_image.html.erb 2013-03-01 08:19:40.000000000 -0800 | |
+++ spree_flexi_variants/app/views/spree/products/customizations/calculator_type/_customization_image.html.erb 2012-07-27 10:32:40.000000000 -0700 | |
@@ -9,7 +9,7 @@ | |
<%= content_for :head do %> | |
<%= javascript_tag do %> | |
- $(document).on('change', '#<%= cust_dom_id %>', function(e) { | |
+ $('#<%= cust_dom_id %>').live('change', function(e) { | |
// update the hidden price field for this file input | |
$(this).siblings(".customization_price").val(calculate_customization_image_price(this)); | |
diff -X diff-exclude -Naur spree_flexi_variants_Lilley/app/views/spree/products/customizations/calculator_type/_engraving.html.erb spree_flexi_variants/app/views/spree/products/customizations/calculator_type/_engraving.html.erb | |
--- spree_flexi_variants_Lilley/app/views/spree/products/customizations/calculator_type/_engraving.html.erb 2013-03-01 08:19:40.000000000 -0800 | |
+++ spree_flexi_variants/app/views/spree/products/customizations/calculator_type/_engraving.html.erb 2012-07-27 10:32:40.000000000 -0700 | |
@@ -9,7 +9,7 @@ | |
<%= content_for :head do %> | |
<%= javascript_tag do %> | |
- $(document).on('keyup', $('#<%= cust_dom_id %>', function(e) { | |
+ $('#<%= cust_dom_id %>').live('keyup', function(e) { | |
var tf = $(this); | |
diff -X diff-exclude -Naur spree_flexi_variants_Lilley/app/views/spree/products/customizations/calculator_type/_product_area.html.erb spree_flexi_variants/app/views/spree/products/customizations/calculator_type/_product_area.html.erb | |
--- spree_flexi_variants_Lilley/app/views/spree/products/customizations/calculator_type/_product_area.html.erb 2013-03-01 08:19:40.000000000 -0800 | |
+++ spree_flexi_variants/app/views/spree/products/customizations/calculator_type/_product_area.html.erb 2012-07-27 10:32:40.000000000 -0700 | |
@@ -10,8 +10,8 @@ | |
<%= content_for :head do %> | |
<%= javascript_tag do %> | |
+ $('#<%= width_dom_id %> , #<%= height_dom_id %>').live('keyup', function(e) { | |
- function product_area_keyup() { | |
var tf = $(this); | |
delay(function(){ | |
@@ -21,9 +21,6 @@ | |
updatePrice(); | |
}, 1000 ); // delay | |
}); // keyup | |
- | |
- $(document).on('keyup', '#<%= width_dom_id %>', product_area_keyup); | |
- $(document).on('keyup', '#<%= height_dom_id %>', product_area_keyup); | |
<% end %> | |
<% end %> | |
diff -X diff-exclude -Naur spree_flexi_variants_Lilley/spree_flexi_variants.gemspec spree_flexi_variants/spree_flexi_variants.gemspec | |
--- spree_flexi_variants_Lilley/spree_flexi_variants.gemspec 2013-03-01 08:19:40.000000000 -0800 | |
+++ spree_flexi_variants/spree_flexi_variants.gemspec 2013-02-28 09:16:47.000000000 -0800 | |
@@ -1,7 +1,7 @@ | |
Gem::Specification.new do |s| | |
s.platform = Gem::Platform::RUBY | |
s.name = 'spree_flexi_variants' | |
- s.version = '1.0.0' | |
+ s.version = '1.0.1' | |
s.summary = 'Add gem summary here' | |
#s.description = 'Add (optional) gem description here' | |
s.required_ruby_version = '>= 1.8.7' |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment