From 18bb4da76c6a7d3197728ddfab19a8f6925fca56 Mon Sep 17 00:00:00 2001
From: Wick <hagg.viktor@gmail.com>
Date: Fri, 25 Jan 2019 11:28:39 +0100
Subject: [PATCH 1/5] Merge branch 'master' into fix-glossary-anchors
--
2.49.1
From eb618cc874a8ba6684d91875ec20a406f5a9117a Mon Sep 17 00:00:00 2001
From: Wick <hagg.viktor@gmail.com>
Date: Fri, 25 Jan 2019 11:59:23 +0100
Subject: [PATCH 2/5] refactor(app.js, glossary): make smoothscroll work with
links in md
---
app/dist/scripts/app.js | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/app/dist/scripts/app.js b/app/dist/scripts/app.js
index 22117c0..6a50fa4 100755
--- a/app/dist/scripts/app.js
+++ b/app/dist/scripts/app.js
@@ -36,13 +36,8 @@ document.querySelectorAll("a[href^='#']").forEach(anchor => {
if (document.getElementById(element)) {
elementOffset = document.getElementById(element).offsetTop - 74;
window.scroll({ top: elementOffset, behavior: "smooth" });
+ history.replaceState({}, "", `#${element}`); // Add hash to URL bar
}
-
- // Add hash to URL bar when sidebar links are clicked
- if (
- event.target.parentElement.className === "api__toc__item" ||
- event.target.parentElement.parentElement.className === "component--glossary-toc"
- ) history.replaceState({}, "", `#${element}`);
});
});
--
2.49.1
From 5ebacee4229933e1a80f4883e12369a2d966916a Mon Sep 17 00:00:00 2001
From: Wick <hagg.viktor@gmail.com>
Date: Fri, 25 Jan 2019 12:01:17 +0100
Subject: [PATCH 3/5] refactor(glossary.md): fix broken links and
smooth-scroll
---
documents/glossary.md | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/documents/glossary.md b/documents/glossary.md
index 97972c7..90e2057 100644
--- a/documents/glossary.md
+++ b/documents/glossary.md
@@ -12,7 +12,7 @@ We encourage the submission of changes and additions to this glossary.
A Binary Large Object (BLOB) is a collection of binary data stored as a single entity in a database management system. When files are uploaded to the LBRY peer to peer network, they are broken down into 2MB encrypted blobs which are then shared to other peers.
-A [[manifest]] blob is also created to index the multiple content blobs that were created from the file. A [[stream]] is the collection of all these blobs particlar to one published file. See [Encoding](https://spec.lbry.io/#encoding) in the specification.
+A [manifest](#manifest) blob is also created to index the multiple content blobs that were created from the file. A [stream](#stream) is the collection of all these blobs particlar to one published file. See [Encoding](https://spec.lbry.io/#encoding) in the specification.
### Block
@@ -144,11 +144,11 @@ The currency code for 1 LBRY Credit (defined as 100 000 000 *deweys*).
### lbrycrd
-lbrycrd is the authoritative implementation of the LBRY [[blockchain]] protocol. See [the source code](https://github.com/lbryio/lbrycrd), [the API](/api/blockchain), or [the whitepaper](/whitepaper).
+lbrycrd is the authoritative implementation of the LBRY [blockchain](#blockchain) protocol. See [the source code](https://github.com/lbryio/lbrycrd), [the API](/api/blockchain), or [the whitepaper](/whitepaper).
### lbry-sdk
-An [[SDK]] for the LBRY protocol that can also be used independently. Distributed as a daemon or bundled directly, it contains a set of convenience methods for developing applications, and bundles an [[SPV]] wallet as well as implementation of the data network.
+An [SDK](#sdk) for the LBRY protocol that can also be used independently. Distributed as a daemon or bundled directly, it contains a set of convenience methods for developing applications, and bundles an [SPV](#spv) wallet as well as implementation of the data network.
See [the source code](https://github.com/lbryio/lbry) or [the API documentation](/api/sdk).
@@ -194,7 +194,7 @@ Main LBRY network and its blockchain. The term is mostly used in comparison to *
### Manifest
-A blob that contains information about all the other blobs in its stream (the content blobs), in JSON format. Sometimes referred to as the [[Stream Descriptor (SD) Blob]], this blob lists each of the other blobs in the stream, in order, along with the filename for the content, and the cryptographic key needed to decode the content blobs [[the stream key]]. See [Content Blobs](https://spec.lbry.io/#content-blobs) in the specification.
+A blob that contains information about all the other blobs in its stream (the content blobs), in JSON format. Sometimes referred to as the [[Stream Descriptor (SD) Blob]], this blob lists each of the other blobs in the stream, in order, along with the filename for the content, and the cryptographic key needed to decode the content blobs [the stream key](#stream-key). See [Content Blobs](https://spec.lbry.io/#content-blobs) in the specification.
### Main Chain
@@ -298,7 +298,7 @@ A compact Turing-incomplete programming language used in transaction *inputs* an
### SDK
-An abbreviation for Software Development Kit. [[lbry-sdk]] is an SDK for developing applications that use the LBRY protocol.
+An abbreviation for Software Development Kit. [lbry-sdk](#lbry-sdk) is an SDK for developing applications that use the LBRY protocol.
### Secret key
@@ -326,7 +326,7 @@ A transaction *output* can be spent only once: when another valid transaction ma
### SPV
-SPV is an abbreviation for [[Simplified Payment Verification]].
+SPV is an abbreviation for [Simplified Payment Verification](#simplified-payment-verification).
### Stream
@@ -334,19 +334,19 @@ Streaming media is multimedia that is constantly received by and presented to an
### Stream Descriptor (SD) Blob
-Same as [[manifest]] The initial blob of a stream, it contains encryption information and points to other blobs required for the stream.
+Same as [manifest](#manifest) The initial blob of a stream, it contains encryption information and points to other blobs required for the stream.
### Stream Hash
-A unique hash for a [[Stream]]. It is the sha384 hash of the file.
+A unique hash for a [Stream](#stream). It is the sha384 hash of the file.
### Stream Key
-Found in the [[manifest]], this is the cryptographic key needed to decrypt the content blobs of a stream.
+Found in the [manifest](#manifest), this is the cryptographic key needed to decrypt the content blobs of a stream.
### Support (Claim Support)
-Same as [[Claim Support]]. A support is a wallet send transaction that includes claim information, which results in adding to a claim's effective amount. A tip is a special type of support that is sent from one wallet to another, so that the receiver can send it to their own wallet.
+Same as [Claim Support](#claim-support). A support is a wallet send transaction that includes claim information, which results in adding to a claim's effective amount. A tip is a special type of support that is sent from one wallet to another, so that the receiver can send it to their own wallet.
### Takeover Period
@@ -362,7 +362,7 @@ A set of parameters used for testing a LBRY network. Testnet is like *mainnet*,
### Torba
-An [[SPV]] wallet for the LBRY [[blockchain]]. See the [source code](https://github.com/lbryio/torba).
+An [SPV](#spv) wallet for the LBRY [blockchain](#blockchain). See the [source code](https://github.com/lbryio/torba).
### Transaction
--
2.49.1
From 4406726b1638f450874b1bd9a002231e2c0e3745 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?netop=3A//=20=E3=82=A6=E3=82=A7=E3=83=83=E3=83=96?=
<netopwibby@thenetwork.email>
Date: Fri, 25 Jan 2019 10:11:41 -0600
Subject: [PATCH 4/5] Reduced spacing
---
app/dist/scripts/app.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/dist/scripts/app.js b/app/dist/scripts/app.js
index 6a50fa4..be2b50f 100755
--- a/app/dist/scripts/app.js
+++ b/app/dist/scripts/app.js
@@ -36,7 +36,7 @@ document.querySelectorAll("a[href^='#']").forEach(anchor => {
if (document.getElementById(element)) {
elementOffset = document.getElementById(element).offsetTop - 74;
window.scroll({ top: elementOffset, behavior: "smooth" });
- history.replaceState({}, "", `#${element}`); // Add hash to URL bar
+ history.replaceState({}, "", `#${element}`); // Add hash to URL bar
}
});
});
--
2.49.1
From 1d44d258b541fad32af69f9621aaa453aefc63f6 Mon Sep 17 00:00:00 2001
From: Wick <hagg.viktor@gmail.com>
Date: Fri, 25 Jan 2019 18:57:58 +0100
Subject: [PATCH 5/5] refactor(smoothscroll, anchoring): use pushState instead
of replaceState when updating browser history
---
app/dist/scripts/app.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/dist/scripts/app.js b/app/dist/scripts/app.js
index be2b50f..3528f98 100755
--- a/app/dist/scripts/app.js
+++ b/app/dist/scripts/app.js
@@ -36,7 +36,7 @@ document.querySelectorAll("a[href^='#']").forEach(anchor => {
if (document.getElementById(element)) {
elementOffset = document.getElementById(element).offsetTop - 74;
window.scroll({ top: elementOffset, behavior: "smooth" });
- history.replaceState({}, "", `#${element}`); // Add hash to URL bar
+ history.pushState({}, "", `#${element}`); // Add hash to URL bar
}
});
});
--
2.49.1