Skip to content

Commit

Permalink
v 2.0.1 include alternative mappings
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexVangelov committed Dec 30, 2014
1 parent 56861d3 commit 854a068
Show file tree
Hide file tree
Showing 5 changed files with 1,711 additions and 58 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
@@ -1,3 +1,6 @@
## 2.0.1
- Include alternative mappings

## 2.0.0

- Sencha Touch 2.4.1 GPL
Expand Down
76 changes: 24 additions & 52 deletions Gemfile.lock
@@ -1,63 +1,35 @@
PATH
remote: .
specs:
sencha-touch-rails (1.0.2)
railties (>= 3.2.1, < 5.0)
sencha-touch-rails (2.0.0)
compass (>= 1.0.1)
compass-blueprint (>= 1.0.0)

GEM
remote: https://rubygems.org/
specs:
actionpack (4.2.0)
actionview (= 4.2.0)
activesupport (= 4.2.0)
rack (~> 1.6.0)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
actionview (4.2.0)
activesupport (= 4.2.0)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
activesupport (4.2.0)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
builder (3.2.2)
erubis (2.7.0)
i18n (0.7.0)
json (1.8.1)
loofah (2.0.1)
nokogiri (>= 1.5.9)
mini_portile (0.6.1)
minitest (5.5.0)
nokogiri (1.6.5)
mini_portile (~> 0.6.0)
rack (1.6.0)
rack-test (0.6.2)
rack (>= 1.0)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.5)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.1)
loofah (~> 2.0)
railties (4.2.0)
actionpack (= 4.2.0)
activesupport (= 4.2.0)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
chunky_png (1.3.3)
compass (1.0.1)
chunky_png (~> 1.2)
compass-core (~> 1.0.1)
compass-import-once (~> 1.0.5)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
sass (>= 3.3.13, < 3.5)
compass-blueprint (1.0.0)
compass
compass-core (1.0.1)
multi_json (~> 1.0)
sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
ffi (1.9.6)
multi_json (1.10.1)
rb-fsevent (0.9.4)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
rubyzip (1.1.6)
thor (0.19.1)
thread_safe (0.3.4)
tzinfo (1.2.2)
thread_safe (~> 0.1)
sass (3.4.9)

PLATFORMS
ruby
Expand Down
4 changes: 1 addition & 3 deletions lib/sencha-touch/rails/engine.rb
Expand Up @@ -2,9 +2,7 @@
module SenchaTouch
module Rails
class Engine < ::Rails::Engine
initializer "add compass assets" do |app|
#Rails.application.config.assets.precompile += %w{ bookmarklet.css }
#Rails.application.config.assets.precompile += %w{ bookmarklet.js }
initializer "add assets" do |app|
app.config.assets.paths << "#{Gem.loaded_specs['compass-core'].full_gem_path}/stylesheets"
app.config.assets.paths << "#{Gem.loaded_specs['compass-blueprint'].full_gem_path}/framework/blueprint/stylesheets"
app.config.assets.paths << root.join("vendor", "compass-recipes", "stylesheets")
Expand Down
4 changes: 2 additions & 2 deletions lib/sencha-touch/rails/version.rb
@@ -1,6 +1,6 @@
module SenchaTouch
module Rails
VERSION = "2.0.0"
SENCHA_TOUC_VERSION = "2.4.1"
VERSION = "2.0.1"
SENCHA_TOUCH_VERSION = "2.4.1 GPL"
end
end

0 comments on commit 854a068

Please sign in to comment.