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: tweak spacing, strip redundand words
Date Sun, 04 Jun 2017 01:32:51 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  bd039d7   tweak spacing, strip redundand words
bd039d7 is described below

commit bd039d762d21a00aba78f9c8c5415a31f9e2fe03
Author: Sam Ruby <rubys@intertwingly.net>
AuthorDate: Sat Jun 3 21:32:31 2017 -0400

    tweak spacing, strip redundand words
---
 www/roster/views/ppmc/establish.text.rb |  2 +-
 www/roster/views/ppmc/graduate.js.rb    | 22 +++++++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/www/roster/views/ppmc/establish.text.rb b/www/roster/views/ppmc/establish.text.rb
index f85b65b..83f8d05 100644
--- a/www/roster/views/ppmc/establish.text.rb
+++ b/www/roster/views/ppmc/establish.text.rb
@@ -12,7 +12,7 @@ WHEREAS, the Board of Directors deems it to be in the best interests of
the
 Foundation and consistent with the Foundation's purpose to establish a Project
 Management Committee charged with the creation and maintenance of open-source
 software, for distribution at no charge to the public, related to
-#{@description}
+#{@description}.
 
 NOW, THEREFORE, BE IT RESOLVED, that a Project Management Committee (PMC), to
 be known as the "Apache #{podling.display_name} Project", be and hereby is
diff --git a/www/roster/views/ppmc/graduate.js.rb b/www/roster/views/ppmc/graduate.js.rb
index a3cceaf..35efce2 100644
--- a/www/roster/views/ppmc/graduate.js.rb
+++ b/www/roster/views/ppmc/graduate.js.rb
@@ -49,24 +49,36 @@ class PPMCGraduate < React
     end
   end
 
+  def resize(textarea)
+    textarea.css('height', 0)
+    textarea.css('height', Math.max(50, textarea[0].scrollHeight)+'px')
+  end
+
   def componentDidMount()
     textarea = jQuery('#graduate textarea')
 
     jQuery('#graduate').on('show.bs.modal') do |event|
       @project = @@ppmc.display_name
-      @description = @@ppmc.description
+      @description = @@ppmc.description.gsub(/\s+/, ' ').strip().
+        sub(/^(Apache )?#{@@ppmc.display_name}\s(is )?/, '').sub(/\.$/, '')
 
-      textarea.css('height', 0)
-      textarea.css('height',Math.max(50, textarea[0].scrollHeight)+'px')
+      self.resize(textarea)
 
       @owners = @@ppmc.owners.
         map {|id| {id: id, name: @@ppmc.roster[id].name}}.
         sort_by {|person| person.name}
     end
 
+    jQuery('#graduate').on('shown.bs.modal') do |event|
+      self.resize(textarea)
+    end
+
     textarea.on('keyup') do |event|
-      textarea.css('height', 0)
-      textarea.css('height', Math.max(50, textarea[0].scrollHeight)+'px')
+      self.resize(textarea)
     end
   end
+
+  def componentDidUpdate()
+    self.resize(jQuery('#graduate textarea'))
+  end
 end

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

Mime
View raw message