[whimsy] branch master updated: Docco

[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 480a65d  Docco
480a65d is described below

commit 480a65df8a960a45302a3e18011ef05cd9884ee7
Author: Sebb <s...@apache.org>
AuthorDate: Sat Jul 7 17:09:27 2018 +0100

    Docco
---
 www/project/icla/views/app.html.rb | 15 +++++++++++----
 www/project/icla/views/main.js.rb  |  2 ++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/www/project/icla/views/app.html.rb 
b/www/project/icla/views/app.html.rb
index c9887ce..1a7ac7a 100755
--- a/www/project/icla/views/app.html.rb
+++ b/www/project/icla/views/app.html.rb
@@ -373,10 +373,17 @@ _html lang: 'en', _width: '80' do
     _script src: "app.js?#{@appmtime}"
 
     _.render '#main' do
-      _Main data: {allData: @allData,
-        token: @token, progress: @progress, user: @user, member: @member,
-        debug: @debug},
-        view: @view
+      # This sets up @@data and @@view; they are used by main.js.rb
+      # The variables are set up by ../main.rb for each URL
+      _Main data: {
+                    allData: @allData,
+                    token: @token,
+                    progress: @progress,
+                    user: @user,
+                    member: @member,
+                    debug: @debug
+                  },
+            view: @view
     end
   end
 end
diff --git a/www/project/icla/views/main.js.rb 
b/www/project/icla/views/main.js.rb
index 87f970b..d3c96fc 100644
--- a/www/project/icla/views/main.js.rb
+++ b/www/project/icla/views/main.js.rb
@@ -17,10 +17,12 @@ class Main < Vue
 
   # save data on first load
   def created()
+    # @@data is set up by app.html.rb
     Server.data = @@data
   end
 
   def mounted()
+    # @@view is set up by app.html.rb
     # set view based on properties
     if @@view == 'interview'
       @view = Interview