whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@apache.org
Subject [whimsy] branch master updated: Revert "begin prep for es2015"
Date Sun, 14 Jan 2018 03:06:39 GMT
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


The following commit(s) were added to refs/heads/master by this push:
     new f7ed2e8  Revert "begin prep for es2015"
f7ed2e8 is described below

commit f7ed2e8a60871424b24720597fcb38da30c3af4f
Author: Sam Ruby <rubys@intertwingly.net>
AuthorDate: Sat Jan 13 22:06:31 2018 -0500

    Revert "begin prep for es2015"
    
    This reverts commit de3b1097856dd863238827ecec41cb8c9bdbd6e0.
---
 www/board/agenda/views/models/agenda.js.rb | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/www/board/agenda/views/models/agenda.js.rb b/www/board/agenda/views/models/agenda.js.rb
index 19df944..4b2e2d0 100644
--- a/www/board/agenda/views/models/agenda.js.rb
+++ b/www/board/agenda/views/models/agenda.js.rb
@@ -28,8 +28,8 @@ class Agenda
 
     # remove president attachments from the normal flow
     @@index.each do |pres|
-      match = (pres.title == 'President' and pres.text and pres.text.
-        match(/Additionally, please see Attachments (\d) through (\d)/))
+      match = (pres.title == 'President') and pres.text and pres.text.
+        match(/Additionally, please see Attachments (\d) through (\d)/)
       next unless match
 
       first = last = nil
@@ -139,21 +139,13 @@ class Agenda
     for name in entry
       self["_#{name}"] = entry[name]
     end
-
-    @color = nil
   end
 
-  # provide read-write access to a number of properties 
-  attr :index, :color
-
   # provide read-only access to a number of properties 
-  attr_reader :attach, :title, :owner, :shepherd, :timestamp, :digest
+  attr_reader :attach, :title, :owner, :shepherd, :index, :timestamp, :digest
   attr_reader :approved, :roster, :prior_reports, :stats, :people, :notes
   attr_reader :chair_email, :mail_list, :warnings, :flagged_by
 
-  # provide write access to a number of properties 
-  attr_writer :color
-
   def fulltitle
     @fulltitle || @title
   end
@@ -273,11 +265,7 @@ class Agenda
 
   # the default banner color to use for the agenda as a whole
   def self.color
-    @@color || 'blank'
-  end
-
-  def self.color=(color)
-    @@color = color
+    'blank'
   end
 
   # fetch the start date
@@ -499,9 +487,7 @@ class Agenda
 
   # banner color for this agenda item
   def color
-    if @color
-      @color
-    elsif not @title
+    if not @title
       'blank'
     elsif @warnings
       'missing'

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <commits@whimsical.apache.org>'].

Mime
View raw message