You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by ru...@apache.org on 2019/11/21 18:08:17 UTC

[whimsy] 02/02: fix precedence problems

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

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

commit b17a351b2843b7d011c098003a56e18b03fb0eee
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Thu Nov 21 13:07:48 2019 -0500

    fix precedence problems
    
    (this time, only committing files related to this fix)
---
 www/board/agenda/views/layout/footer.js.rb | 2 +-
 www/board/agenda/views/pages/flagged.js.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/board/agenda/views/layout/footer.js.rb b/www/board/agenda/views/layout/footer.js.rb
index b6d9f47..1b0f892 100644
--- a/www/board/agenda/views/layout/footer.js.rb
+++ b/www/board/agenda/views/layout/footer.js.rb
@@ -11,7 +11,7 @@
 class Footer < Vue
   def render
     
-    meeting_day = Minutes.started or
+    meeting_day = Minutes.started ||
       Date.new().toISOString().slice(0,10) >= Agenda.date
 
     _footer.navbar.navbar_fixed_bottom class: @@item.color do
diff --git a/www/board/agenda/views/pages/flagged.js.rb b/www/board/agenda/views/pages/flagged.js.rb
index aa1f403..6a48d0b 100644
--- a/www/board/agenda/views/pages/flagged.js.rb
+++ b/www/board/agenda/views/pages/flagged.js.rb
@@ -7,7 +7,7 @@
 class Flagged < Vue
   def render
     first = true
-    meeting_day = Minutes.started or
+    meeting_day = Minutes.started ||
       Date.new().toISOString().slice(0,10) >= Agenda.date
 
     if meeting_day