diff options
| author | Luc Donnet | 2018-02-09 15:04:58 +0100 |
|---|---|---|
| committer | Luc Donnet | 2018-02-09 15:04:58 +0100 |
| commit | 7b62e86c4d5cc878fd9178d2296c3f5498bcd1cb (patch) | |
| tree | e97abcf575f059463fda54f15dba045f08467402 /lib | |
| parent | 8147a3bd838aaaa959c3f488c1bc9016a5401645 (diff) | |
| parent | a68053c85fdb55e43fdf1ae7d9aba95e31a148bb (diff) | |
| download | chouette-core-7b62e86c4d5cc878fd9178d2296c3f5498bcd1cb.tar.bz2 | |
Merge branch 'master' into 4126-add-i18n-js
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/af83/decorator/link.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/af83/decorator/link.rb b/lib/af83/decorator/link.rb index de7106740..ee09f80dc 100644 --- a/lib/af83/decorator/link.rb +++ b/lib/af83/decorator/link.rb @@ -130,7 +130,9 @@ class AF83::Decorator::Link out[:method] = link_method out[:class] = extra_class out.delete(:link_class) + out.delete(:link_method) out[:class] += " disabled" if disabled + out[:class].strip! out[:disabled] = !!disabled out end |