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 2016/09/07 20:35:45 UTC
[whimsy] branch master updated: mock up actions
This is an automated email from the ASF dual-hosted git repository.
rubys pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new f522969 mock up actions
f522969 is described below
commit f522969dd2e1254dd65e012dcae725c4c4838d86
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Wed Sep 7 16:32:09 2016 -0400
mock up actions
---
www/secmail/public/spinner.gif | Bin 0 -> 673 bytes
www/secmail/public/tasklist.js | 19 +++++++++++++++++++
www/secmail/server.rb | 5 +++++
www/secmail/views/forms/icla.js.rb | 29 ++++++++++++++++++++---------
www/secmail/views/tasklist.html.rb | 3 +++
5 files changed, 47 insertions(+), 9 deletions(-)
diff --git a/www/secmail/public/spinner.gif b/www/secmail/public/spinner.gif
new file mode 100644
index 0000000..d0bce15
Binary files /dev/null and b/www/secmail/public/spinner.gif differ
diff --git a/www/secmail/public/tasklist.js b/www/secmail/public/tasklist.js
new file mode 100644
index 0000000..c7dd7fd
--- /dev/null
+++ b/www/secmail/public/tasklist.js
@@ -0,0 +1,19 @@
+var tasks = $('h3');
+var spinner = $('<img src="../spinner.gif"/>')
+
+function fake() {
+ if (tasks.length) {
+ tasks.first().parent().append(spinner);
+ tasks = tasks.slice(1);
+ setTimeout(fake, 2000);
+ } else {
+ spinner.remove();
+ window.parent.frames[0].postMessage('hi', '*')
+ }
+}
+
+$('button').click(function(event) {
+ $(this).prop('disabled', true);
+ fake();
+});
+
diff --git a/www/secmail/server.rb b/www/secmail/server.rb
index 6703ec3..160de9e 100644
--- a/www/secmail/server.rb
+++ b/www/secmail/server.rb
@@ -50,6 +50,11 @@ end
# task lists
post '/tasklist/:file' do
+ @params = params.dup
+ @params.delete :file
+ @params.delete 'splat'
+ @params.delete 'captures'
+
@dryrun = JSON.parse(_json(:"actions/#{params[:file]}"))
_html :tasklist
end
diff --git a/www/secmail/views/forms/icla.js.rb b/www/secmail/views/forms/icla.js.rb
index 740a186..7351a90 100644
--- a/www/secmail/views/forms/icla.js.rb
+++ b/www/secmail/views/forms/icla.js.rb
@@ -8,7 +8,7 @@ class ICLA < React
def render
_h4 'ICLA'
- _form action: '../../tasklist/icla', method: 'post', target: 'content' do
+ _form method: 'post', action: '../../tasklist/icla', target: 'content' do
_input type: 'hidden', name: 'message'
_input type: 'hidden', name: 'selected'
@@ -100,6 +100,13 @@ class ICLA < React
@realname = name
@email = @@headers.from
self.componentDidUpdate()
+
+ # watch for status updates
+ window.addEventListener 'message' do |event|
+ console.log(event)
+ @submitted = false
+ @filed = false
+ end
end
# as fields change, enable/disable the associated buttons and adjust
@@ -123,6 +130,8 @@ class ICLA < React
$acreq.disabled = !valid or !@user or !@filed
+ # wire up form
+ jQuery('form')[0].addEventListener('submit', self.file)
jQuery('input[name=message]').val(window.parent.location.pathname)
jQuery('input[name=selected]').val(@@selected)
end
@@ -136,16 +145,18 @@ class ICLA < React
def file(event)
@submitted = true
- @@submit.call(event).then {|response|
- @filed = true
- @submitted = false
- alert response.result
- }.catch {
- @filed = false
- @submitted = false
- }
+# @@submit.call(event).then {|response|
+# @filed = true
+# @submitted = false
+# alert response.result
+# }.catch {
+# @filed = false
+# @submitted = false
+# }
end
+
+
# validate userid is available
def validate_userid(event)
return unless @user and @user != @checked
diff --git a/www/secmail/views/tasklist.html.rb b/www/secmail/views/tasklist.html.rb
index a6ee9cf..a0d9e56 100644
--- a/www/secmail/views/tasklist.html.rb
+++ b/www/secmail/views/tasklist.html.rb
@@ -17,5 +17,8 @@ _html do
_button.btn.btn_primary 'proceed'
+ _script "var params = #{JSON.generate(params)};"
+
+ _script src: '../tasklist.js'
end
end
--
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].