share-to-fediverse-jekyll-theme 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f70a7cb2292f13a87fb137d0a64f7def5524287846207ff44f437cf44f814028
-  data.tar.gz: 0e1b31d2799da74dad71ac45b3a470f112b25abc8781479c91f9c2382e4a1a0e
+  metadata.gz: 4d8cb5d855f0cdea583192060b84f4f2c7fa5e6b51bc08feee2b5eeda92aed7d
+  data.tar.gz: 853688ddfc62c42859aa5f8f1383e6d69ecbde96975cdf78dc3abc87f9d15592
 SHA512:
-  metadata.gz: 7ab7dcb734e0f7f92a445064a4dea419d76862cb146fc7f375da47b2e136087f7821afc07979f98bec0fa3570e37a0d1d55b6003e662949041d7a00c4912521b
-  data.tar.gz: b03be2b7c6f1eb0895f0070cdbc2020ae30e18981cb142e5eebf4c291cf0f212d20fbb49a4a2b1414d780064db0fe02212a4639dd233726fc2d43cd3200d3e96
+  metadata.gz: 8386178a4cde7d29adaa781a17c59736ce003eeec7e708c045b6b7bb0b5e86725a4afe47e043a110f3083e9a6a44bcd3929bf9695d1f61e5f841ea549662ddf1
+  data.tar.gz: dbd1065edb4f5281cca6d3260691cff1217ffb5419887ffe4db6f677827c5451c895a81c6d7ee0520cad304462a0a7c3cf819842834a8a76368aa5900f429bc4

data/_config.yml

@@ -42,3 +42,4 @@ locales:
 lang: es
 locale: es
 instance: 'https://todon.nl/'
+auto_submit_seconds: 3

data/_data/forms/fediverse.yml

@@ -11,6 +11,17 @@ instance:
   help:
     es: 'Tu servidor de Mastodon, incluyendo https://'
     en: 'Your Mastodon server, including https://'
+remember:
+  type: 'boolean'
+  autocomplete: 'on'
+  label:
+    es: 'Recordar la instancia'
+    en: 'Remember instance'
+  help:
+    es: 'Continuar automáticamente'
+    en: 'Auto-forward from now on'
+separator:
+  type: 'separator'
 submit:
   type: 'submit'
   label:

data/_includes/boolean.html

@@ -4,7 +4,7 @@
 {%- assign help = include.field[1].help[site.locale] -%}
 {%- assign autocomplete = include.field[1].autocomplete -%}
 
-<div class="form-check text-left">
+<div class="custom-control custom-switch">
   <input
     {% if help %}
       aria-describedby="help-{{ id }}"
@@ -18,9 +18,9 @@
     {% if autocomplete %}
       autocomplete="{{ autocomplete }}"
     {% endif %}
-    class="form-check-input" />
+    class="custom-control-input" />
 
-  <label class="form-check-label" for="{{ id }}">{{ label }}</label>
+  <label class="custom-control-label" for="{{ id }}">{{ label }}</label>
 
   {%- if help -%}
     <small id="help-{{ id }}" class="form-text">

data/assets/css/styles.scss

@@ -4,6 +4,7 @@
 
 $mastodon: #191b22;
 $mastodon-grey: #9baec8;
+$primary: $mastodon-grey;
 $success: $mastodon-grey;
 
 $colors: (

data/assets/js/script.js

@@ -1,7 +1,9 @@
 ---
 ---
 
-// https://stackoverflow.com/a/7090123
+// Convert query arguments to object
+// @see {https://stackoverflow.com/a/7090123}
+// @return [Object]
 const searchToObject = () => {
   var pairs = window.location.search.substring(1).split("&"),
     obj = {},
@@ -18,21 +20,64 @@ const searchToObject = () => {
   return obj;
 }
 
+// Compatible with Turbolinks
+const loadEvent = () => window.Turbolinks ? 'turbolinks:load' : 'DOMContentLoaded';
 
-document.addEventListener('{%- if site.turbolinks.enabled -%}turbolinks:load{%- else -%}DOMContentLoaded{%- endif -%}', () => {
+document.addEventListener(loadEvent(), () => {
   const urlShared = searchToObject();
 
+  // Add the query args to the locale selector
   document.querySelectorAll('a[lang]').forEach(a => a.href += window.location.search);
 
+  // Recover data from URL only if it's set
   ['t','d','u'].forEach(field => {
     if (urlShared[field] === undefined) return;
 
     document.querySelector(`#${field}`).innerText = urlShared[field];
   });
 
+  // Send this field
   document.querySelector('#text').value = Object.values(urlShared).join("\n\n");
 
-  document.querySelector('form').addEventListener('submit', e => {
-    e.target.action = document.querySelector('#instance').value + '/share';
+  // Helpers for data storage
+  const isCheckbox = input => input.type == 'checkbox';
+  const itemId = (form, input) => form.id + ':' + input.id;
+
+  const form = document.querySelector('form')
+  const formInputs = Array.from(form.elements);
+
+  form.addEventListener('submit', e => {
+    // Change the form action to the actual instance
+    form.action = document.querySelector('#instance').value + '/share';
+
+    const rememberInstance = document.querySelector('#remember').checked;
+
+    // If user disabled it, forget data.
+    if (!rememberInstance) localStorage.clear();
+
+    // Store the data.  Form autocomplete should be helpful
+    // here but for some reason it doesn't.
+    formInputs.forEach(input => {
+      if (input.type == 'submit') return;
+
+      if (!rememberInstance) return;
+
+      localStorage.setItem(itemId(form, input), isCheckbox(input) ? input.checked : input.value);
+    });
+  });
+
+  // Recover information
+  formInputs.forEach(input => {
+    if (input.type == 'submit') return;
+
+    const value = localStorage.getItem(itemId(form, input));
+
+    if (value) input[isCheckbox(input) ? 'checked' : 'value'] = value;
   });
+
+  // Redirect after a timeout, so users have time to disable.
+  setTimeout(() => {
+    if (!document.querySelector('#remember').checked) return;
+    document.querySelector('form').submit();
+  }, {{ site.auto_submit_seconds | default: 3 }} * 1000);
 });

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: share-to-fediverse-jekyll-theme
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - f
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-17 00:00:00.000000000 Z
+date: 2020-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll