From 5e6d90bf080877c595198453a83d3babcf734e21 Mon Sep 17 00:00:00 2001 From: Russell Morland Date: Thu, 17 Jan 2019 16:18:16 +0100 Subject: [PATCH 01/33] add robert-haeussler to contributers --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 20ad636..70415ca 100644 --- a/README.md +++ b/README.md @@ -12,10 +12,12 @@ In progress there are The online site is at [splash-snap.github.io](splash-snap.github.io) -The /server/ directory is for code related to the server. It is writen in java. - + + + + +
+

+
+

+

+ + diff --git a/vote/index.html~ b/vote/index.html~ new file mode 100644 index 0000000..afd170c --- /dev/null +++ b/vote/index.html~ @@ -0,0 +1,10 @@ + + + + Splash vs. Snap! + + + + + + From 53ecdaf5fe838f54d27ef2cca0eca193ae33775d Mon Sep 17 00:00:00 2001 From: Russell Date: Sat, 19 Jan 2019 09:01:21 +0100 Subject: [PATCH 11/33] remove *~ files --- vote/choose.js~ | 31 ------------------------------- vote/index.html~ | 10 ---------- 2 files changed, 41 deletions(-) delete mode 100644 vote/choose.js~ delete mode 100644 vote/index.html~ diff --git a/vote/choose.js~ b/vote/choose.js~ deleted file mode 100644 index b562560..0000000 --- a/vote/choose.js~ +++ /dev/null @@ -1,31 +0,0 @@ -function setCookie(cname, cvalue, exdays) { - var d = new Date(); - d.setTime(d.getTime() + (exdays*24*60*60*1000)); - var expires = "expires="+ d.toUTCString(); - document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/"; -} -function getCookie(cname) { - var name = cname + "="; - var decodedCookie = decodeURIComponent(document.cookie); - var ca = decodedCookie.split(';'); - for(var i = 0; i - - - Splash vs. Snap! - - - - - - From 08fe6c0b565477e5427bae033b2c1dbac2e6c128 Mon Sep 17 00:00:00 2001 From: Russell Date: Sat, 19 Jan 2019 09:06:32 +0100 Subject: [PATCH 12/33] fix index.html for strict browsers --- vote/index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vote/index.html b/vote/index.html index 85db3c2..6c8f43b 100644 --- a/vote/index.html +++ b/vote/index.html @@ -4,8 +4,8 @@ Splash vs. Snap! - + From 048dfdcb083e3690e8d4be50070e2a94e0cc887d Mon Sep 17 00:00:00 2001 From: Russell Morland Date: Mon, 11 Feb 2019 18:37:49 +0100 Subject: [PATCH 25/33] show firebase limitations --- index.html | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index a9612cb..bb9b65f 100644 --- a/index.html +++ b/index.html @@ -59,7 +59,15 @@

What is Splash?

Cloud Variable Limitations

- As in scratch, I will not allow arbitrary types in cloud variables. I don't want my server to need to be able to store and sprites that only make any sense in one specific client. I will support booleans, and convert all other types to strings, to avoid compatibility problems between big numbers like 1+2i and users without bignums enabled. Lists, dicts and sprites will not be supported because they are not atomic, and rings because I don't have a format for them on the server. There will be no character limit, meaning that you may encode your data. + As in scratch, I will not allow arbitrary types in cloud variables. I don't want my server to need to be able to store and sprites that only make any sense in one specific client. + I will convert numbers to strings, and support +
    +
  • Booleans
    • +
  • strings
    • +
  • lists
    • +
  • dictionaries
    • +
+ There will also be a limit of 1MB, and 20 000 dictionary pairs, per variable due to the use of firebase for the variables.
From 0ec1d774892f66cf5545c93f98e340c4fd7e8e1e Mon Sep 17 00:00:00 2001 From: Russell Morland Date: Mon, 11 Feb 2019 18:42:24 +0100 Subject: [PATCH 26/33] fix grammer "support and sprites" make firebase link full --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index bb9b65f..bab8285 100644 --- a/index.html +++ b/index.html @@ -59,7 +59,7 @@

What is Splash?

Cloud Variable Limitations

- As in scratch, I will not allow arbitrary types in cloud variables. I don't want my server to need to be able to store and sprites that only make any sense in one specific client. + As in scratch, I will not allow arbitrary types in cloud variables. I don't want my server to need to be able to store sprites that only make any sense in one specific client. I will convert numbers to strings, and support
  • Booleans
    • @@ -67,7 +67,7 @@

    Cloud Variable Limitations

  • lists
  • dictionaries
- There will also be a limit of 1MB, and 20 000 dictionary pairs, per variable due to the use of firebase for the variables. + There will also be a limit of 1MB, and 20 000 dictionary pairs, per variable due to the use of firebase for the variables.
From 60e08b918a71aa90cbaef207e54aebb9121671b4 Mon Sep 17 00:00:00 2001 From: Russell Morland Date: Tue, 12 Feb 2019 19:13:51 +0100 Subject: [PATCH 27/33] make about/index.html use /style.css and etc. --- about/index.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/about/index.html b/about/index.html index 111c09c..974a9a8 100644 --- a/about/index.html +++ b/about/index.html @@ -2,15 +2,15 @@ Splash - About - - + + @@ -20,12 +20,12 @@

Splash

- splash image + splash image

What is Splash?

Splash is a mod for Snap! - Currently I have added
+ Currently I have

  • First class dictionarries
  • Native JSON support
    • From 240f3167b85fc3e609aa5f8038908d4ac60d55cf Mon Sep 17 00:00:00 2001 From: Russell Date: Wed, 20 Feb 2019 16:21:54 +0100 Subject: [PATCH 31/33] end github URL with / --- docs/index.html | 2 +- index.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/index.html b/docs/index.html index fa25b12..cdb18c9 100644 --- a/docs/index.html +++ b/docs/index.html @@ -11,7 +11,7 @@
  • Home
  • Create
  • Docs
    • -
  • Github
    • +
  • Github
  • About
  • Case Sensing
    • diff --git a/index.html b/index.html index 33392f5..a88595d 100644 --- a/index.html +++ b/index.html @@ -11,7 +11,7 @@
  • Home
  • Create
  • Docs
    • -
  • Github
    • +
  • Github
  • About
  • Cloud Variable Limitations
@@ -47,7 +47,7 @@

What is Splash?


From 0783b4b994ad2ffbfbbc54d018294a12dd773bbf Mon Sep 17 00:00:00 2001 From: Russell Morland Date: Fri, 1 Mar 2019 13:13:44 +0100 Subject: [PATCH 32/33] Update index.html --- about/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about/index.html b/about/index.html index fb7627d..401eda2 100644 --- a/about/index.html +++ b/about/index.html @@ -18,7 +18,7 @@

About

-

Splash is a mod for Snap! by @space-elphant (Snap!, rfmorland@gmail.com) with support for first class dictionaries

+

Splash is a mod for Snap! by @space-elphant (Snap!, email) with support for first class dictionaries

Cloud variables will use firebase to store the cloud vars and sinc the messages.

From 5f8c3df7f8d45f73ac3bc532263289bfd95b55c6 Mon Sep 17 00:00:00 2001 From: Cameron Morland Date: Sun, 2 Jun 2019 12:39:17 -0400 Subject: [PATCH 33/33] remove vote --- vote/choose.js | 61 ------------------------------------------------- vote/index.html | 38 ------------------------------ votes.js | 2 -- 3 files changed, 101 deletions(-) delete mode 100644 vote/choose.js delete mode 100644 vote/index.html delete mode 100644 votes.js diff --git a/vote/choose.js b/vote/choose.js deleted file mode 100644 index eb2197f..0000000 --- a/vote/choose.js +++ /dev/null @@ -1,61 +0,0 @@ -function setCookie(cname, cvalue, exdays) {/* - var d = new Date(); - d.setTime(d.getTime() + (exdays*24*60*60*1000)); - var expires = "expires="+ d.toUTCString(); - document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/"; -*/} -function getCookie(cname) { - var name = cname + "="; - var decodedCookie = decodeURIComponent(document.cookie); - var ca = decodedCookie.split(';'); - for(var i = 0; i !', 365 * 20); - success.innerHTML = 'You chose ' + (isSplash ? 'Splash' : - 'Snap!') + '.'; - showPrecent(isSplash); - } else { - success.innerHTML = 'You have already voted.'; - showPrecent(); - } -} -function showPrecent(isSplash) { - var precent = document.getElementById('precent'); - if (isSplash === undefined) { - precent.innerHTML = ('' + splash / (splash + snap) * 100 + - '% chose Splash.') - } else if (isSplash) { - splash += 1; - precent.innerHTML = ('' + splash / (splash + snap) * 100 + - '% agree with you on Splash.') - } else { - snap += 1; - precent.innerHTML = ('' + snap / (snap + splash) * 100 + - '% agree with you on Snap!') - } -} -function setup() { - if (getCookie('choice') === '') { - document.getElementById('main').style = ''; - } else { - success.innerHTML = 'You have already voted.'; - showPrecent(); - } - document.getElementById('noJs').style = 'display: none;'; -} -function save(isSplash) {// transmit a vote to server -} diff --git a/vote/index.html b/vote/index.html deleted file mode 100644 index cefdbce..0000000 --- a/vote/index.html +++ /dev/null @@ -1,38 +0,0 @@ - - - - Splash vs. Snap! - - - - - - - -
-

You need javascript to vote about splash

- -
-

-
-

-
- - diff --git a/votes.js b/votes.js deleted file mode 100644 index 3d6ec4c..0000000 --- a/votes.js +++ /dev/null @@ -1,2 +0,0 @@ -var snap = 0; -var splash = 0;