Skip to content

Commit

Permalink
Fixed javascript minification errors
Browse files Browse the repository at this point in the history
  • Loading branch information
edlb committed Oct 16, 2015
1 parent ed9aa6b commit 30cd421
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 8 deletions.
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ end

# More gems
gem 'browserify-rails'
gem 'ngannotate-rails'
gem 'rails_12factor', group: :production
gem 'websocket-rails'

Expand Down
4 changes: 4 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ GEM
mini_portile (0.6.2)
minitest (5.8.1)
multi_json (1.11.2)
ngannotate-rails (1.0.3)
execjs
rails (>= 3.1)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
pg (0.18.3)
Expand Down Expand Up @@ -175,6 +178,7 @@ DEPENDENCIES
byebug
coffee-rails (~> 4.1.0)
jbuilder (~> 2.0)
ngannotate-rails
pg
rails (= 4.2.4)
rails_12factor
Expand Down
1 change: 0 additions & 1 deletion app/assets/javascripts/app/app.module.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
'use strict';

module.exports = require('angular').module('app', [
require('rx-angular'),
require('./services/_index')
])
.controller('AppController', require('./app'))
Expand Down
4 changes: 1 addition & 3 deletions app/assets/javascripts/app/services/_index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
(function() {
'use strict';

module.exports = require('angular').module('app.services', [
require('rx-angular')
])
module.exports = require('angular').module('app.services', [])
.service('message', require('./message.service'))
.service('user', require('./user.service'))
.service('ws', require('./ws.service'))
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/xs/_rc-header.xs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
}
}
.rc-header-icon-menu{
background-image: url('../ic-menu-reverse.svg');
background-image: asset-url('ic-menu-reverse.svg');
}
.rc-header-section{
display: flex;
Expand Down
2 changes: 2 additions & 0 deletions config/environments/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,6 @@

# Do not dump schema after migrations.
config.active_record.dump_schema_after_migration = false

config.middleware.delete Rack::Lock
end
2 changes: 2 additions & 0 deletions config/environments/test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,6 @@

# Raises error for missing translations
# config.action_view.raise_on_missing_translations = true

config.middleware.delete Rack::Lock
end
2 changes: 1 addition & 1 deletion config/initializers/assets.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Be sure to restart your server when you modify this file.

# Version of your assets, change this if you want to expire all your assets.
Rails.application.config.assets.version = '1.0'
Rails.application.config.assets.version = '1.1'

# Add additional assets to the asset load path
# Rails.application.config.assets.paths << Emoji.images_path
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
"browserify": "^11.2.0",
"browserify-incremental": "^3.0.1",
"browserify-ngannotate": "^1.0.1",
"minifyify": "^7.1.0",
"rx-angular": "^1.0.0"
"minifyify": "^7.1.0"
},
"devDependencies": {},
"engines": {
Expand Down

0 comments on commit 30cd421

Please sign in to comment.