[whimsy] branch master updated: Simplify code

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new c0dac2d  Simplify code
c0dac2d is described below

commit c0dac2df01c1ce94deb819d9057e69fc449d53be
Author: Sebb <s...@apache.org>
AuthorDate: Fri Mar 25 09:22:23 2022 +0000

    Simplify code
---
 www/board/agenda/views/router.js.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/www/board/agenda/views/router.js.rb 
b/www/board/agenda/views/router.js.rb
index 72123d5..c9fbeaa 100644
--- a/www/board/agenda/views/router.js.rb
+++ b/www/board/agenda/views/router.js.rb
@@ -105,7 +105,7 @@ class Router
       item = nil
       Agenda.index.each do |i|
         if i.attach =~ /^8[.A-Z]/
-          item = i unless item
+          item ||= i
         end
       end
 
@@ -128,7 +128,7 @@ class Router
     # provide defaults for required properties
     item.color ||= 'blank'
 
-    if not item.title
+    unless item.title
       item.title = item.view.options.name.
         gsub(/(^|-)\w/) {|c| return c.upcase()}.
         gsub('-', ' ').strip()
@@ -144,11 +144,11 @@ class Router
 
         # form overrides
         form = button.form
-        if form and form.button
+        if form&.button
           form.button.each_pair do |name, override|
             if name == 'text'
               props.text = form.button.text
-            elsif name == 'class' or name == 'classname'
+            elsif %w{class classname}.include? name
               props.attrs.class += " #{override.gsub('_', '-')}"
             else
               props.attrs[name.gsub('_', '-')] = override
@@ -165,7 +165,7 @@ class Router
         button.each_pair do |name, override|
           if name == 'text'
             props.text = button.text
-          elsif name == 'class' or name == 'classname'
+          elsif %w{class classname}.include? name
             props.attrs.class += " #{override.gsub('_', '-')}"
           elsif name != 'form'
             props.attrs[name.gsub('_', '-')] = override