FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'remove-emoji' into 'master' 

Remove twemoji

See merge request nilsding/retrospring!73
This commit is contained in:
Andreas Nedbal 2020-04-19 15:06:00 +00:00
parent 5eb61eb418 d680185b0b
commit 7a0a009352
3 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -43,8 +43,6 @@ gem 'tiny-color-rails'
gem 'jquery-minicolors-rails' gem 'jquery-minicolors-rails'
gem 'colorize' gem 'colorize'
gem 'twemoji-rails'
gem 'ruby-progressbar' gem 'ruby-progressbar'
gem 'rails_admin' gem 'rails_admin'

3
Gemfile.lock
View File

@ -623,8 +623,6 @@ GEM
simple_oauth simple_oauth
turbolinks (2.5.4) turbolinks (2.5.4)
coffee-rails coffee-rails
twemoji-rails (1.2.1.3)
railties (>= 3.0.0)
twitter (7.0.0) twitter (7.0.0)
addressable (~> 2.3) addressable (~> 2.3)
buftok (~> 0.2.0) buftok (~> 0.2.0)
@ -742,7 +740,6 @@ DEPENDENCIES
tiny-color-rails tiny-color-rails
tumblr_client tumblr_client
turbolinks (~> 2.5.3) turbolinks (~> 2.5.3)
twemoji-rails
twitter twitter
uglifier (>= 1.3.0) uglifier (>= 1.3.0)
unicorn unicorn

12
app/assets/javascripts/application.js.erb.coffee
View File

@ -4,7 +4,6 @@
#= require jquery.arctic_scroll #= require jquery.arctic_scroll
#= require turbolinks #= require turbolinks
#= require bootstrap #= require bootstrap
#= require twemoji
#= require nprogress #= require nprogress
#= require nprogress-turbolinks #= require nprogress-turbolinks
#= require growl #= require growl
@ -75,17 +74,6 @@ _ready = ->
lineColor: bodyColor lineColor: bodyColor
density: 23000 density: 23000
if twemoji?
twemoji.parse document.body,
size: 16
callback: (icon, options) ->
switch icon
# copyright, registered, trademark
when 'a9' or 'ae' or '2122'
false
else
''.concat(options.base, options.size, '/', icon, options.ext)
$('.arctic_scroll').arctic_scroll speed: 500 $('.arctic_scroll').arctic_scroll speed: 500