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.

Sign up for GitHub

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

Jump to bottom

Bookmark autoclick management #2006

Merged
merged 1 commit into from
Sep 9, 2023
Merged

Bookmark autoclick management #2006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions controllers/scriptStorage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,6 +664,8 @@ exports.sendScript = function (aReq, aRes, aNext) {
aRes.set('Last-modified', lastModified);
aRes.set('Etag', eTag);

aRes.set('Content-Length', Buffer.byteLength(source, 'utf8'));

aRes.write(source);
aRes.end();

Expand Down Expand Up @@ -827,6 +829,8 @@ exports.sendScript = function (aReq, aRes, aNext) {
aRes.set('Last-Modified', lastModified);
aRes.set('Etag', eTag);

aRes.set('Content-Length', Buffer.byteLength(source, 'utf8'));

aRes.write(source);
aRes.end();

Expand Down
2 changes: 1 addition & 1 deletion routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ module.exports = function (aApp) {
aApp.route('/api/user/session/destroyOne').post(apiCapLimiter, authentication.validateUser, user.destroyOne);

// Adding script/library routes
aApp.route('/user/add/scripts').head(statusTMR).get(list1Limiter, list2Limiter, listAnyQRateLimiter, listSameQRateLimiter, authentication.validateUser, user.newScriptPage);
aApp.route('/user/add/scripts').head(statusTMR).get(authentication.validateUser, user.newScriptPage);
aApp.route('/user/add/scripts/new').head(statusTMR).get(authentication.validateUser, script.new(user.editScript)).post(authentication.validateUser, script.new(user.submitSource));
aApp.route('/user/add/scripts/upload').post(authentication.validateUser, user.uploadScript);
aApp.route('/user/add/lib').head(statusTMR).get(authentication.validateUser, user.newLibraryPage);
Expand Down
4 changes: 2 additions & 2 deletions views/includes/scriptAuthorToolsPanel.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h4>UserScript and UserLibrary Block</h4>
<span class="input-group-btn">
<a class="btn btn-default"
title="How do I use this?"
href="/user/add/{{#script.isLib}}lib{{/script.isLib}}{{^script.isLib}}scripts{{/script.isLib}}#user-block-copyright">
href="/user/add/{{#script.isLib}}lib{{/script.isLib}}{{^script.isLib}}scripts{{/script.isLib}}#userscript-block-copyright">
<i class="fa fa-{{#lockdown.updateURLCheck}}exclamation-triangle{{/lockdown.updateURLCheck}}{{^lockdown.updateURLCheck}}question-circle{{/lockdown.updateURLCheck}}"></i>
</a>
</span>
Expand All @@ -96,7 +96,7 @@ <h4>UserScript and UserLibrary Block</h4>
<span class="input-group-btn">
<a class="btn btn-danger"
title="How do I use this?"
href="/user/add/{{#script.isLib}}lib{{/script.isLib}}{{^script.isLib}}scripts{{/script.isLib}}#user-block-license">
href="/user/add/{{#script.isLib}}lib{{/script.isLib}}{{^script.isLib}}scripts{{/script.isLib}}#userscript-block-license">
<i class="fa fa-exclamation-triangle"></i>
</a>
</span>
Expand Down
34 changes: 34 additions & 0 deletions views/includes/scripts/autoClickBookmark.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<script type="text/javascript">
(function () {
'use strict';

function onDOMContentLoaded(aEv) {
var block = null;
var key = null;
var collapse = null;
var clickNode = null;
var testNode = null;

var matches = window.location.hash.match(/^\#(userscript|openuserjs)-block-(.*)$/);
if (matches) {

[, block, key] = matches;

if (block && key) {
collapse = 'collapse-' + block + '-' + key;

clickNode = document.querySelector('a[href="#' + collapse + '"]');
testNode = document.querySelector('div[id="' + collapse + '"]');

if (clickNode && testNode && !testNode.classList.contains('in')) {
clickNode.click();
}
}
}
}

document.addEventListener('DOMContentLoaded', onDOMContentLoaded);
window.addEventListener('hashchange', onDOMContentLoaded);

})();
</script>
71 changes: 36 additions & 35 deletions views/pages/newScriptPage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<head>
<title>{{title}}</title>
{{> includes/head.html }}
{{> includes/scripts/autoClickBookmark.html }}
<style>
.script-metadata-definitions .list-group-item-heading code,
.panel code {
Expand Down Expand Up @@ -92,11 +93,11 @@ <h3><a id="userscript-block"></a>UserScript Block<a href="#userscript-block" cla
<div class="panel panel-default">
<div class="panel-heading">
<h5 class="panel-title">
<a id="user-block-exclude" rel="bookmark"></a>
<a data-toggle="collapse" data-parent="#accordion-userscript-exclude" href="#collapse-exclude"><code>@exclude *</code></a>
<a id="userscript-block-exclude" rel="bookmark"></a>
<a data-toggle="collapse" data-parent="#accordion-userscript-exclude" href="#collapse-userscript-exclude"><code>@exclude *</code></a>
</h5>
</div>
<div id="collapse-exclude" class="panel-collapse collapse in">
<div id="collapse-userscript-exclude" class="panel-collapse collapse in">
<div class="panel-body">
<p><strong>This is required.</strong></p>
</div>
Expand All @@ -109,11 +110,11 @@ <h3><a id="userscript{{#newJSLibrary}}-and-userlibrary{{/newJSLibrary}}-block"><
<div class="panel panel-default">
<div class="panel-heading">
<h5 class="panel-title">
<a id="user-block-name" rel="bookmark"></a>
<a data-toggle="collapse" data-parent="#accordion-user{{#newUserJS}}script{{/newUserJS}}-block" href="#collapse-name"><code>@name My Script</code></a>
<a id="userscript-block-name" rel="bookmark"></a>
<a data-toggle="collapse" data-parent="#accordion-user{{#newUserJS}}script{{/newUserJS}}-block" href="#collapse-userscript-name"><code>@name My Script</code></a>
</h5>
</div>
<div id="collapse-name" class="panel-collapse collapse in">
<div id="collapse-userscript-name" class="panel-collapse collapse in">
<div class="panel-body">
<p><strong>Default non-localized is required.</strong></p>
<p>Last value is used.</p>
Expand All @@ -123,11 +124,11 @@ <h5 class="panel-title">
<div class="panel panel-default">
<div class="panel-heading">
<h5 class="panel-title">
<a id="user-block-description" rel="bookmark"></a>
<a data-toggle="collapse" data-parent="#accordion-user{{#newUserJS}}script{{/newUserJS}}-block" href="#collapse-description"><code>@description This script even does the laundry!</code></a>
<a id="userscript-block-description" rel="bookmark"></a>
<a data-toggle="collapse" data-parent="#accordion-user{{#newUserJS}}script{{/newUserJS}}-block" href="#collapse-userscript-description"><code>@description This script even does the laundry!</code></a>
</h5>
</div>
<div id="collapse-description" class="panel-collapse collapse">
<div id="collapse-userscript-description" class="panel-collapse collapse">
<div class="panel-body">
<p>Specially formatted on the script page.</p>
<p>Last value shown.</p>
Expand All @@ -137,11 +138,11 @@ <h5 class="panel-title">
<div class="panel panel-default">
<div class="panel-heading">
<h5 class="panel-title">
<a id="user-block-copyright" rel="bookmark"></a>
<a data-toggle="collapse" data-parent="#accordion-user{{#newUserJS}}script{{/newUserJS}}-block" href="#collapse-copyright"><code>@copyright Year, Author (Author Website)</code></a>
<a id="userscript-block-copyright" rel="bookmark"></a>
<a data-toggle="collapse" data-parent="#accordion-user{{#newUserJS}}script{{/newUserJS}}-block" href="#collapse-userscript-copyright"><code>@copyright Year, Author (Author Website)</code></a>
</h5>
</div>
<div id="collapse-copyright" class="panel-collapse collapse">
<div id="collapse-userscript-copyright" class="panel-collapse collapse">
<div class="panel-body">
<p>Specially formatted on the script page.</p>
<p>All values shown in reverse order. Last key is primary.</p>
Expand All @@ -151,11 +152,11 @@ <h5 class="panel-title">
<div class="panel panel-default">
<div class="panel-heading">
<h5 class="panel-title">
<a id="user-block-license" rel="bookmark"></a>
<a data-toggle="collapse" data-parent="#accordion-user{{#newUserJS}}script{{/newUserJS}}-block" href="#collapse-license"><code>@license License Type; License Homepage</code></a>
<a id="userscript-block-license" rel="bookmark"></a>
<a data-toggle="collapse" data-parent="#accordion-user{{#newUserJS}}script{{/newUserJS}}-block" href="#collapse-userscript-license"><code>@license License Type; License Homepage</code></a>
</h5>
</div>
<div id="collapse-license" class="panel-collapse collapse">
<div id="collapse-userscript-license" class="panel-collapse collapse">
<div class="panel-body">
<p>Specially formatted on the script page. All values shown in reverse order. If absent <a href="https://spdx.org/licenses/MIT.html"><code>MIT</code></a> <a href="https://opensource.org/licenses/MIT">License <em>(Expat)</em></a> is implied. See <a href="/about/Terms-of-Service#licensing">licensing terms</a> for specifics.</p>
<p><strong><code>License Type</code> component is required</strong> using at least one <a href="https://opensource.org/licenses/category">OSI approved</a> case&dash;sensitive <a href="https://spdx.org/licenses/">SPDX short identifier</a> and must be the only primary, last, <code>@license</code> key. Single short ids are accepted only per license key. i.e. No conjunction composites like <code>AND</code> or <code>OR</code>, or <code>WITH</code>exceptions. Any additional license is considered conjunctive with an implied <code>AND</code> using another <code>@license</code> key.</p>
Expand Down Expand Up @@ -183,11 +184,11 @@ <h5 class="panel-title">
<div class="panel panel-default">
<div class="panel-heading">
<h5 class="panel-title">
<a id="user-block-icon" rel="bookmark"></a>
<a data-toggle="collapse" data-parent="#accordion-userscript-block" href="#collapse-icon"><code>@icon url</code></a>
<a id="userscript-block-icon" rel="bookmark"></a>
<a data-toggle="collapse" data-parent="#accordion-userscript-block" href="#collapse-userscript-icon"><code>@icon url</code></a>
</h5>
</div>
<div id="collapse-icon" class="panel-collapse collapse">
<div id="collapse-userscript-icon" class="panel-collapse collapse">
<div class="panel-body">
<p>A url of http, https, or an image <a href="https://www.wikipedia.org/wiki/Data_URI_scheme">data uri</a>.</p>
<p>Resolution should be near 48px by 48px.</p>
Expand All @@ -199,11 +200,11 @@ <h5 class="panel-title">
<div class="panel panel-default">
<div class="panel-heading">
<h5 class="panel-title">
<a id="user-block-homepageurl" rel="bookmark"></a>
<a data-toggle="collapse" data-parent="#accordion-userscript-block" href="#collapse-homepageurl"><code>@homepageURL url</code></a>
<a id="userscript-block-homepageurl" rel="bookmark"></a>
<a data-toggle="collapse" data-parent="#accordion-userscript-block" href="#collapse-userscript-homepageurl"><code>@homepageURL url</code></a>
</h5>
</div>
<div id="collapse-homepageurl" class="panel-collapse collapse">
<div id="collapse-userscript-homepageurl" class="panel-collapse collapse">
<div class="panel-body">
<p>A url of http or https. Specially formatted on the script page.</p>
<p>All values shown in reverse order.</p>
Expand All @@ -214,11 +215,11 @@ <h5 class="panel-title">
<div class="panel panel-default">
<div class="panel-heading">
<h5 class="panel-title">
<a id="user-block-supporturl" rel="bookmark"></a>
<a data-toggle="collapse" data-parent="#accordion-userscript-block" href="#collapse-supporturl"><code>@supportURL url</code></a>
<a id="userscript-block-supporturl" rel="bookmark"></a>
<a data-toggle="collapse" data-parent="#accordion-userscript-block" href="#collapse-userscript-supporturl"><code>@supportURL url</code></a>
</h5>
</div>
<div id="collapse-supporturl" class="panel-collapse collapse">
<div id="collapse-userscript-supporturl" class="panel-collapse collapse">
<div class="panel-body">
<p>A url of http, https or mailto protocol. Specially formatted on the script page.</p>
<p>Last value shown.</p>
Expand All @@ -228,11 +229,11 @@ <h5 class="panel-title">
<div class="panel panel-default">
<div class="panel-heading">
<h5 class="panel-title">
<a id="user-block-contributionurl" rel="bookmark"></a>
<a data-toggle="collapse" data-parent="#accordion-userscript-block" href="#collapse-contributionurl"><code>@contributionURL url</code></a>
<a id="userscript-block-contributionurl" rel="bookmark"></a>
<a data-toggle="collapse" data-parent="#accordion-userscript-block" href="#collapse-userscript-contributionurl"><code>@contributionURL url</code></a>
</h5>
</div>
<div id="collapse-contributionurl" class="panel-collapse collapse">
<div id="collapse-userscript-contributionurl" class="panel-collapse collapse">
<div class="panel-body">
<p>A url of https protocol only. Used for monetary requests for contributions. <code>@contributionAmount</code> is currently unsupported. Specially formatted on the script issues list and script issue page.</p>
<p>Last value shown.</p>
Expand All @@ -243,11 +244,11 @@ <h5 class="panel-title">
<div class="panel panel-default">
<div class="panel-heading">
<h5 class="panel-title">
<a id="user-block-version" rel="bookmark"></a>
<a data-toggle="collapse" data-parent="#accordion-user{{#newUserJS}}script{{/newUserJS}}-block" href="#collapse-version"><code>@version 1.0.0</code></a>
<a id="userscript-block-version" rel="bookmark"></a>
<a data-toggle="collapse" data-parent="#accordion-user{{#newUserJS}}script{{/newUserJS}}-block" href="#collapse-userscript-version"><code>@version 1.0.0</code></a>
</h5>
</div>
<div id="collapse-version" class="panel-collapse collapse">
<div id="collapse-userscript-version" class="panel-collapse collapse">
<div class="panel-body">
<p>Enables the ability to use automatic script updates in most .user.js engines.</p>
<p>Usually major dot minor dot build <em>(or Patch)</em>. May utilize the <a href="https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/manifest.json/version/format">Manifest Version Format</a> previously known as the Toolkit version format.</p>
Expand All @@ -259,11 +260,11 @@ <h5 class="panel-title">
<div class="panel panel-default">
<div class="panel-heading">
<h5 class="panel-title">
<a id="user-block-updateurl" rel="bookmark"></a>
<a data-toggle="collapse" data-parent="#accordion-userscript-block" href="#collapse-updateurl"><code>@updateURL https://openuserjs.org/meta/{{#authedUser}}{{authedUser.name}}{{/authedUser}}{{^authedUser}}username{{/authedUser}}/My_Script.meta.js</code></a>
<a id="userscript-block-updateurl" rel="bookmark"></a>
<a data-toggle="collapse" data-parent="#accordion-userscript-block" href="#collapse-userscript-updateurl"><code>@updateURL https://openuserjs.org/meta/{{#authedUser}}{{authedUser.name}}{{/authedUser}}{{^authedUser}}username{{/authedUser}}/My_Script.meta.js</code></a>
</h5>
</div>
<div id="collapse-updateurl" class="panel-collapse collapse">
<div id="collapse-userscript-updateurl" class="panel-collapse collapse">
<div class="panel-body">
<p><strong>Required in lockdown mode.</strong> See <a href="/about/Frequently-Asked-Questions#q-does-openuserjs-org-have-meta-">this FAQ item</a> for more.</p>
<p>Last value is used.</p>
Expand Down Expand Up @@ -293,10 +294,10 @@ <h5 class="panel-title">
<div class="panel-heading">
<h5 class="panel-title">
<a id="openuserjs-block-collaborator" rel="bookmark"></a>
<a data-toggle="collapse" data-parent="#accordion-openuserjs-block" href="#collapse-openuserjs-collaboration"><code>@collaborator username</code></a>
<a data-toggle="collapse" data-parent="#accordion-openuserjs-block" href="#collapse-openuserjs-collaborator"><code>@collaborator username</code></a>
</h5>
</div>
<div id="collapse-openuserjs-collaboration" class="panel-collapse collapse">
<div id="collapse-openuserjs-collaborator" class="panel-collapse collapse">
<div class="panel-body">
<p>The OpenUserJS Author username to collaborate with.</p>
<p><strong>Required to activate</strong> <a href="#collaboration">Collaboration</a>. <strong>Please ensure the usernames exist for your scripts security.</strong></p>
Expand Down