Skip to content

Commit

Permalink
Update for Spree v2.2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
futhr committed Apr 12, 2014
1 parent 1b1f3a0 commit 48fd830
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem 'spree', github: 'spree/spree', branch: '2-1-stable'
gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-1-stable'
gem 'spree', github: 'spree/spree', branch: '2-2-stable'
gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-2-stable'

gemspec
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Spree Frequently Asked Question

[![Build Status](https://travis-ci.org/futhr/spree-faq.png?branch=2-1-stable)](https://travis-ci.org/futhr/spree-faq)
[![Coverage Status](https://coveralls.io/repos/futhr/spree-faq/badge.png?branch=2-1-stable)](https://coveralls.io/r/futhr/spree-faq)
[![Build Status](https://travis-ci.org/futhr/spree-faq.png?branch=2-2-stable)](https://travis-ci.org/futhr/spree-faq)
[![Coverage Status](https://coveralls.io/repos/futhr/spree-faq/badge.png?branch=2-2-stable)](https://coveralls.io/r/futhr/spree-faq)
[![Code Climate](https://codeclimate.com/github/futhr/spree-faq.png)](https://codeclimate.com/github/futhr/spree-faq)
[![Gem Version](https://badge.fury.io/rb/spree-faq.png)](http://badge.fury.io/rb/spree-faq)

Expand All @@ -12,7 +12,7 @@ An Spree Commerce extension for managing FAQs.
Add to your `Gemfile`:

```ruby
gem 'spree_faq', '~> 2.1.0'
gem 'spree_faq', '~> 2.2.0'
```

Then run from the command line:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#= require admin/spree_backend
#= require spree/backend

(($) ->
$('form').on 'click', '.add_fields', ->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#= require store/spree_frontend
#= require spree/frontend

(($) ->
$('.answer').hide()
Expand Down
3 changes: 0 additions & 3 deletions app/assets/stylesheets/admin/spree_faq.css

This file was deleted.

3 changes: 3 additions & 0 deletions app/assets/stylesheets/spree/backend/spree_faq.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/*
*= require spree/backend
*/
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
*= require store/spree_frontend
*= require spree/frontend
*/

#questions .question {
Expand Down
8 changes: 4 additions & 4 deletions lib/generators/spree_faq/install/install_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ class InstallGenerator < Rails::Generators::Base
class_option :auto_run_migrations, type: :boolean, default: false

def add_javascripts
append_file 'app/assets/javascripts/store/all.js', "//= require store/spree_faq\n"
append_file 'app/assets/javascripts/admin/all.js', "//= require admin/spree_faq\n"
append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require spree/frontend/spree_faq\n"
append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/spree_faq\n"
end

def add_stylesheets
inject_into_file 'app/assets/stylesheets/store/all.css', " *= require store/spree_faq\n", before: /\*\//, verbose: true
inject_into_file 'app/assets/stylesheets/admin/all.css', " *= require admin/spree_faq\n", before: /\*\//, verbose: true
inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/spree_faq\n", before: /\*\//, verbose: true
inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/spree_faq\n", before: /\*\//, verbose: true
end

def add_migrations
Expand Down
2 changes: 1 addition & 1 deletion spree_faq.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Gem::Specification.new do |s|

s.has_rdoc = false

s.add_runtime_dependency 'spree_core', '~> 2.1.0'
s.add_runtime_dependency 'spree_core', '~> 2.2.0'

s.add_development_dependency 'rspec-rails', '~> 2.14'
s.add_development_dependency 'capybara', '~> 2.2.1'
Expand Down

0 comments on commit 48fd830

Please sign in to comment.