Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Collapse long strings in HTML #4053

Merged
merged 1 commit into from
Nov 7, 2024
Merged

Collapse long strings in HTML #4053

merged 1 commit into from
Nov 7, 2024

Conversation

casey
Copy link
Collaborator

@casey casey commented Nov 7, 2024

This PR uses JavaScript to collapse hashes, outpoints, satpoints, addresses, and inscription IDs.

Any node which has exactly one child node which is a text mode that matches a regex matching the above is eligible to be collapsed. A data-original attribute is added with the original text, and on resize, the size of the element is measured, and if smaller than the size of the text content, the text content is abridged in the middle with .

Since the text content is now changed, we need to fix clipboard copying, so that users can copy the original unabridged text. This is accomplished by intersecting clipboard copy events, and, if they target a collapsible node, replacing the copied text with the original text. One failing of this approach is that if you copy multiple nodes, the target of the copy command will not be a collapsible node, but it may contain collapsible nodes, so the copied text will may contain abridged text. We could fix that by traversing the nodes which are copied and replacing any copied text with original text, but I think this PR is still an improvement, and we should merge it and fix that issue in a future PR.

Another thing which we should fix, I think also in a future PR, is not using heuristics to find collapsible nodes, and instead relying on the presence of a CSS class to determine if a node is collapsible. Since all collapsible items already have the CSS monospace class, we can simply replace monospace on collapsible classes with collapsible. (Or maybe collapse, since it's shorter and I can never spell "collapsible" on the first try.)

One thing which I'm not sure we can fully fix, but we should try, is visible resizing of the page after elements are collapsed. Text is collapsed after the page first renders, so element movement after collapsing is visible.

Edit: Okay, I actually fixed visible resizing. I changed our JS from running as a defer script to running after the DOMContentLoaded event. This runs our JS after the DOM is loaded, but earlier than defer scripts, which wait for images, other scripts, stylesheets, etc. Apparently DOMContentLoaded runs before first render, so our JS can modify the HTML without the original HTML being visible.

before and after

before
after

@casey
Copy link
Collaborator Author

casey commented Nov 7, 2024

Also deployed to charlie to preview.

Copy link
Collaborator

@raphjaph raphjaph left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@casey casey merged commit b5c7f88 into ordinals:master Nov 7, 2024
10 checks passed
@casey casey deleted the collapse branch November 7, 2024 03:35
danadi7 pushed a commit to sadoprotocol/ord that referenced this pull request Nov 20, 2024
* Change test-bitcoincore-rpc to mockcore in README.md (ordinals#3842)

* Commit twice to work around redb off-by-one bug (ordinals#3856)

* Release 0.19.1 (ordinals#3864)

- Bump version: 0.19.0 → 0.19.1
- Update changelog
- Update changelog contributor credits
- Update dependencies

* Update Portuguese Translation pt.po (ordinals#3837)

* Updated Chinese translation  (ordinals#3881)

* Fix rune links for runes with no symbol (ordinals#3849)

* Suppress printing sat_ranges by default (ordinals#3867)

* Re-enter beta (ordinals#3884)

* Update pointer specification (ordinals#3861)

* Clarify that unused runes tags should not be used (ordinals#3885)

* Migrate object.rs to snafu error handling (ordinals#3858)

* Make index settings harder to misuse (ordinals#3893)

* Don't unnecessarily insert into utxo cache when indexing addresses (ordinals#3894)

* Remove trailing space from runes specification (ordinals#3896)

* Serve responses with cross origin isolation headers (ordinals#3898)

* List all Bitcoin Core wallets (ordinals#3902)

* Make first first and last sat in range clickable (ordinals#3903)

* Migrate Outgoing to SnafuError (ordinals#3854)

* Update Bitcoin Core deploy to 27.1 (ordinals#3912)

* Add sat_balance to address API (ordinals#3905)

Co-authored-by: raph <[email protected]>

* Add Dutch translation to Ordinals Handbook (ordinals#3907)

* Migrate chain.rs to snafu error (ordinals#3904)

* Bump version to 0.20.0-dev (ordinals#3916)

* Revert "Serve responses with cross origin isolation headers" (ordinals#3920)

* Remove inscription content type counts from /status page (ordinals#3922)

* Unified OUTPOINT_TO_UTXO_ENTRY table (ordinals#3915)

- Upgrade `redb` to 2.1.1
- Remove `--index-spent-sats`
- Remove redundant pointer handling in `index_inscriptions()`
- Fix incorrect `is_output_spent()` results when not using `--index-sats`
- Unify UTXO index data in `OUTPOINT_TO_UTXO_ENTRY` table
- Read addresses from index when exporting

* Add address field to `/r/inscription/:id` (ordinals#3891)

* Add inscriptions and runes details to address API endpoint (ordinals#3924)

* Release 0.20.0 (ordinals#3928)

- Bump ord version: 0.19.1 → 0.20.0
- Bump ordinals version: 0.0.9 → 0.0.10
- Update changelog
- Update changelog contributor credits
- Update dependencies

* Bump version to 0.20.0-dev (ordinals#3929)

* Add test to remind us to fix the UtxoEntry redb type name (ordinals#3934)

* Put AddressInfo into api module (ordinals#3933)

* Fix clippy lint (ordinals#3937)

* Add inscription index to /status (ordinals#3938)

* Remove unnecessary symbols in docs/src/guides/testing.md (ordinals#3945)

* Add inscription examples to handbook (ordinals#3769)

* Allow scrolling in iframe (ordinals#3947)

* Skip serializing None in batch::File (ordinals#3943)

* Fix /output page (ordinals#3948)

* Add `/satpoint/<SATPOINT>` endpoint (ordinals#3949)

* Don't log RPC connections to bitcoind (ordinals#3952)

* Start indexing at correct block height (ordinals#3956)

* Fix output API struct (ordinals#3957)

* Remove dependency on `ord-bitcoincore-rpc` crate (ordinals#3959)

* Keep sat ranges in low-level format (ordinals#3963)

* Implement burn for wallet command (ordinals#3437)

* Add multi parent support to wallet (ordinals#3228)

* Get parents using `as_slice` instead of converting to `Vec` (ordinals#3972)

* Rename parents_values -> parent_values (ordinals#3973)

* Fix non-existant output lookup (ordinals#3968)

* Release 0.20.1 (ordinals#3975)

* Refactor burn command (ordinals#3976)

* Remove regtest.ordinals.net just recipes (ordinals#3978)

* Add `ord verify` (ordinals#3906)

* Release 0.21.0 (ordinals#3997)

- Bump version: 0.20.1 → 0.21.0
- Update changelog
- Update changelog contributor credits
- Update dependencies

* Remove /runes/balances API endpoint (ordinals#3980)

* Update rust-bitcoin in ord (ordinals#3962)

* Revert redb to 2.1.3 (ordinals#4003)

* Release 0.21.1 (ordinals#4006)

* Update Bitcoin Core install script (ordinals#4007)

* Remove pre-alpha warning from ord help (ordinals#4011)

* Change mint progress to `mints / terms.cap` (ordinals#4012)

* Only show rune mint progress during mint (ordinals#4013)

* Show if JSON API is enabled on /status (ordinals#4014)

* Update JSON-API & Recursive documentation (ordinals#3984)

* Document POST method for /inscriptions (ordinals#4017)

* Add authors to Handbook (ordinals#4018)

* Add more info to `wallet outputs` (ordinals#4019)

* Add `wallet addresses` (ordinals#4005)

* Add BIP322 `wallet sign` (ordinals#3988)

* Add `/r/undelegated-content/<INSCRIPTION_ID>` (ordinals#3932)

* Show total child count (ordinals#4009)

* Create change output when inputs containing non-outgoing runes are selected (ordinals#4028)

* Release 0.21.2 (ordinals#4029)

- Bump version: 0.21.1 → 0.21.2
- Update changelog
- Update changelog contributor credits

* Allow fallback for satpoints and addresses (ordinals#4033)

* Un-pin redb dependency and update to 2.2.0 (ordinals#4032)

* Add `ord wallet split` command for splitting utxos (ordinals#4030)

* Hide image preview and thumbnail scrollbars (ordinals#4042)

* Rescan wallet on restore (ordinals#4041)

* Do not chunk runestone data pushes (ordinals#4036)

* Add simple taproot HD wallet to mockcore (ordinals#4038)

* Collapse long strings in HTML (ordinals#4053)

* BIP322 sign file (ordinals#4026)

* Identify collapsible nodes with class=collapse (ordinals#4055)

* Add assert_html function (ordinals#4058)

* Allow including metadata when burning inscriptions (ordinals#4045)

* Get output information by address (ordinals#4056)

* Document split command (ordinals#4062)

* Add palindrome charm (ordinals#4064)

* Allow restoring wallet with custom timestamp (ordinals#4065)

* Release 0.21.3 (ordinals#4059)

- Bump version: 0.21.2 → 0.21.3
- Update changelog
- Update changelog contributor credits
- Update dependencies
- Pin `bitcoin` to 0.32.3
- Downgrade `bip322` to 0.0.8

* Add Cargo.lock

---------

Co-authored-by: Anchor <[email protected]>
Co-authored-by: Casey Rodarmor <[email protected]>
Co-authored-by: 0xArtur <[email protected]>
Co-authored-by: Dr.JingLee <[email protected]>
Co-authored-by: nine <[email protected]>
Co-authored-by: Bohdan Cryptolions <[email protected]>
Co-authored-by: raph <[email protected]>
Co-authored-by: Patrick Collins <[email protected]>
Co-authored-by: Tibebtc <[email protected]>
Co-authored-by: partialord <[email protected]>
Co-authored-by: Eloc <[email protected]>
Co-authored-by: twosatsmaxi <[email protected]>
Co-authored-by: tiaoxizhan <[email protected]>
Co-authored-by: onchainguy <[email protected]>
Co-authored-by: lifofifo <[email protected]>
Co-authored-by: Arik <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants