diff --git a/Gemfile b/Gemfile index ec994d62c..782c3b8f5 100644 --- a/Gemfile +++ b/Gemfile @@ -15,10 +15,6 @@ group :assets do gem 'sass-rails' #, github: 'rails/sass-rails' gem 'coffee-rails' gem 'coffee-script-source' - - # use dedicated version of sprockets, 3.0.0 is broken - gem 'sprockets', '~> 2.0' - gem 'uglifier' gem 'eco' end diff --git a/app/assets/javascripts/app/lib/spine/route.coffee b/app/assets/javascripts/app/lib/spine/route.coffee index 58138e9e9..1c98ffa12 100644 --- a/app/assets/javascripts/app/lib/spine/route.coffee +++ b/app/assets/javascripts/app/lib/spine/route.coffee @@ -9,9 +9,10 @@ escapeRegExp = /[-[\]{}()+?.,\\^$|#\s]/g class Path extends Spine.Module - constructor: (@path, @callback) -> + constructor: (path, callback) -> @names = [] - + @path = path + @callback = callback if typeof path is 'string' namedParam.lastIndex = 0 while (match = namedParam.exec(path)) != null