aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--deploy/index.html20
-rw-r--r--deploy/loader.css141
-rw-r--r--src/client/views/MainView.tsx7
-rw-r--r--src/client/views/collections/CollectionStackingView.tsx6
-rw-r--r--src/client/views/nodes/PresBox.scss10
-rw-r--r--src/client/views/nodes/PresBox.tsx1
6 files changed, 177 insertions, 8 deletions
diff --git a/deploy/index.html b/deploy/index.html
index 282acc0ce..7b68af2ef 100644
--- a/deploy/index.html
+++ b/deploy/index.html
@@ -4,12 +4,32 @@
<title>Dash Web</title>
<link href="https://fonts.googleapis.com/css?family=Fjalla+One|Hind+Siliguri:300" rel="stylesheet">
<link href='https://fonts.googleapis.com/css?family=Roboto:300,400,500' rel='stylesheet'>
+ <link rel="stylesheet" href="loader.css">
+ <link rel="stylesheet" href="loader.css?rnd=23">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"
integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
<script src="https://cdnjs.cloudflare.com/ajax/libs/typescript/3.3.1/typescript.min.js"></script>
</head>
<body style="display:flex" id="dash-body">
+ <div class="dash-loader" id="loader" style="z-index:10; width:100%; height:100%">
+ <div class="dash-loader-container">
+ <svg viewBox="0 0 1000 350" preserveAspectRatio="xMidYMid meet" xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink">
+ <path class="dash-h-path" fill-rule="evenodd" stroke="rgb(0, 0, 0)" stroke-width="35px"
+ stroke-linecap="butt" stroke-linejoin="miter" fill="none"
+ d="M715.500,18.500 C715.471,31.660 714.944,295.500 714.500,295.500 C714.402,295.500 715.244,280.815 715.500,256.500 C715.946,214.157 715.230,180.785 738.500,156.500 C747.852,146.740 760.202,139.340 773.500,135.500 C787.860,131.353 803.153,131.374 817.500,135.500 C831.597,139.554 844.116,147.176 853.500,157.500 C860.178,164.847 868.127,178.418 872.500,197.500 C876.205,213.669 875.764,225.372 875.500,240.500 C875.182,258.739 876.422,275.258 876.500,293.500 C876.527,299.855 876.527,306.155 876.500,312.500 " />
+ <path class="dash-s-path" fill-rule="evenodd" stroke="rgb(0, 0, 0)" stroke-width="35px"
+ stroke-linecap="butt" stroke-linejoin="miter" fill="none" d="M478.500,218.500 L659.500,218.500 " />
+ <path class="dash-a-path" fill-rule="evenodd" stroke="rgb(0, 0, 0)" stroke-width="35px"
+ stroke-linecap="butt" stroke-linejoin="miter" fill="none"
+ d="M415.500,114.500 C415.289,138.638 414.639,172.181 414.500,186.500 C414.443,192.334 413.099,209.263 410.500,222.500 C406.705,241.826 400.738,255.391 393.500,264.500 C384.452,275.887 372.241,284.599 358.500,289.500 C341.059,295.721 322.262,295.132 305.500,289.500 C288.269,283.710 269.907,271.467 259.500,251.500 C251.662,236.462 249.244,218.558 252.500,200.500 C255.577,183.436 263.540,167.965 275.500,156.500 C284.223,148.138 296.476,140.618 313.500,136.500 C328.570,132.855 340.519,133.485 349.500,135.500 C361.011,138.082 372.777,143.861 383.500,153.500 C391.643,160.820 398.714,170.309 404.500,183.500 C417.205,212.466 414.550,240.003 412.500,270.500 C411.558,284.506 410.905,298.271 410.500,312.500 " />
+ <path class="dash-d-path" fill-rule="evenodd" stroke="rgb(0, 0, 0)" stroke-width="35px"
+ stroke-linecap="butt" stroke-linejoin="miter" fill="none"
+ d="M196.500,18.500 C195.888,79.462 194.655,160.273 197.500,195.500 C198.117,203.144 199.664,225.773 189.500,246.500 C183.949,257.819 175.192,268.535 163.500,277.500 C147.404,289.842 133.006,294.212 121.500,295.500 C106.618,297.166 92.057,294.673 79.500,288.500 C68.971,283.324 58.384,274.780 49.500,261.500 C39.958,247.237 35.188,230.375 35.500,213.500 C35.760,199.463 39.572,185.692 46.500,173.500 C55.433,157.780 65.945,148.829 75.500,143.500 C85.352,138.005 98.187,134.141 114.500,134.500 C128.982,134.819 143.177,139.076 155.500,146.500 C186.160,164.973 196.208,196.242 197.500,216.500 C197.663,219.061 197.578,222.985 197.500,226.500 C197.092,244.967 195.719,262.030 195.500,280.500 C195.460,283.898 195.500,293.783 195.500,300.500 C195.500,304.834 195.500,309.189 195.500,313.500 " />
+ </svg>
+ </div>
+ </div>
<!-- <script src="https://hypothes.is/embed.js" async></script> -->
<div id="root" style="position:absolute;width:100%;height:100%;overflow: hidden;"></div>
<script src="/bundle.js"></script>
diff --git a/deploy/loader.css b/deploy/loader.css
new file mode 100644
index 000000000..065862013
--- /dev/null
+++ b/deploy/loader.css
@@ -0,0 +1,141 @@
+.dash-loader {
+ display: flex;
+ align-content: center;
+ justify-content: center;
+ background-color: lightcyan;
+ z-index: 10;
+ width: 100%;
+ height: 100%;
+}
+
+.dash-loader-container {
+ width: 100;
+ align-self: center;
+}
+
+.dash-d-path {
+ stroke-dasharray: 1000;
+ stroke-dashoffset: 1000;
+ animation: dash-d-path 10s linear infinite;
+}
+
+@keyframes dash-d-path {
+ 0% {
+ stroke-dashoffset: 1000;
+ /* stroke-width: 0px; */
+ }
+
+ 10% {
+ stroke-dashoffset: 0;
+ /* stroke-width: 20px; */
+ }
+
+ 90% {
+ stroke-dashoffset: 0;
+ /* stroke-width: 20px; */
+ }
+
+ 100% {
+ stroke-dashoffset: 1000;
+ /* stroke-width: 0px; */
+ }
+}
+
+.dash-a-path {
+ stroke-dasharray: 1000;
+ stroke-dashoffset: 1000;
+ animation: dash-a-path 10s linear infinite;
+}
+
+@keyframes dash-a-path {
+ 0% {
+ stroke-dashoffset: 1000;
+ /* stroke-width: 0px; */
+ }
+
+ 7% {
+ stroke-dashoffset: 1000;
+ /* stroke-width: 0px; */
+ }
+
+ 17% {
+ stroke-dashoffset: 0;
+ /* stroke-width: 20px; */
+ }
+
+ 90% {
+ stroke-dashoffset: 0;
+ /* stroke-width: 20px; */
+ }
+
+ 100% {
+ stroke-dashoffset: 1000;
+ /* stroke-width: 0px; */
+ }
+}
+
+.dash-s-path {
+ stroke-dasharray: 1000;
+ stroke-dashoffset: 1000;
+ animation: dash-s-path 10s linear infinite;
+}
+
+@keyframes dash-s-path {
+ 0% {
+ stroke-dashoffset: 1000;
+ /* stroke-width: 0px; */
+ }
+
+ 14% {
+ stroke-dashoffset: 1000;
+ /* stroke-width: 0px; */
+ }
+
+ 20% {
+ stroke-dashoffset: 0;
+ /* stroke-width: 20px; */
+ }
+
+ 90% {
+ stroke-dashoffset: 0;
+ /* stroke-width: 20px; */
+ }
+
+ 100% {
+ stroke-dashoffset: 1000;
+ /* stroke-width: 0px; */
+ }
+}
+
+.dash-h-path {
+ stroke-dasharray: 1000;
+ stroke-dashoffset: 1000;
+ animation: dash-h-path 10s linear infinite;
+}
+
+@keyframes dash-h-path {
+ 0% {
+ stroke-dashoffset: 1000;
+ /* stroke-width: 0px; */
+ }
+
+ 18% {
+ stroke-dashoffset: 1000;
+ /* stroke-width: 0px; */
+ }
+
+ 28% {
+ stroke-dashoffset: 0;
+ /* stroke-width: 20px; */
+ }
+
+ 90% {
+ stroke-dashoffset: 0;
+ /* stroke-width: 20px; */
+ }
+
+ 100% {
+ stroke-dashoffset: 1000;
+ /* stroke-width: 0px; */
+ }
+} \ No newline at end of file
diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx
index 452ce61ff..2100f1458 100644
--- a/src/client/views/MainView.tsx
+++ b/src/client/views/MainView.tsx
@@ -85,6 +85,13 @@ export class MainView extends React.Component {
componentDidMount() {
document.getElementById("root")?.addEventListener("scroll", e => ((ele) => ele.scrollLeft = ele.scrollTop = 0)(document.getElementById("root")!));
+ const ele = document.getElementById("loader");
+ if (ele) {
+ setTimeout(() => {
+ // remove from DOM
+ ele.outerHTML = '';
+ }, 0);
+ }
new InkStrokeProperties();
this._sidebarContent.proto = undefined;
DocServer.setPlaygroundFields(["x", "y", "dataTransition", "_delayAutoHeight", "_autoHeight", "_showSidebar", "_sidebarWidthPercent", "_width", "_height", "_viewTransition", "_panX", "_panY", "_viewScale", "_scrollY", "_scrollTop", "hidden", "_curPage", "_viewType", "_chromeStatus"]); // can play with these fields on someone else's
diff --git a/src/client/views/collections/CollectionStackingView.tsx b/src/client/views/collections/CollectionStackingView.tsx
index 97eacaeab..d86a6816d 100644
--- a/src/client/views/collections/CollectionStackingView.tsx
+++ b/src/client/views/collections/CollectionStackingView.tsx
@@ -290,11 +290,11 @@ export class CollectionStackingView extends CollectionSubView<StackingDocument,
dropAfter = where[axis] > (pos[axis] + pos1[axis]) / 2 ? 1 : 0;
}
});
- const oldDocs = this.childDocs.length;
+ // const oldDocs = this.childDocs.length;
if (super.onInternalDrop(e, de)) {
- const newDocs = this.childDocs.slice().filter((d: Doc, ind: number) => ind >= oldDocs);
+ // const newDocs = this.childDocs.slice().filter((d: Doc, ind: number) => ind >= oldDocs);
- //de.complete.docDragData.droppedDocuments;
+ const newDocs = de.complete.docDragData.droppedDocuments;
const docs = this.childDocList;
DragManager.docsBeingDragged = [];
if (docs && newDocs.length) {
diff --git a/src/client/views/nodes/PresBox.scss b/src/client/views/nodes/PresBox.scss
index de2aee8fa..56b3b0593 100644
--- a/src/client/views/nodes/PresBox.scss
+++ b/src/client/views/nodes/PresBox.scss
@@ -420,20 +420,20 @@ $light-background: #ececec;
background-color: #ececec;
border: 1px solid #9f9f9f;
grid-template-rows: max-content;
-
+
.frameList-header {
display: grid;
width: 100%;
height: 20px;
background-color: #9f9f9f;
-
+
.frameList-headerButtons {
display: flex;
grid-column: 7;
width: 60px;
justify-self: right;
justify-content: flex-end;
-
+
.headerButton {
cursor: pointer;
position: relative;
@@ -452,7 +452,7 @@ $light-background: #ececec;
transition: 0.2s;
margin-right: 3px;
}
-
+
.headerButton:hover {
background-color: rgba(0, 0, 0, 1);
transform: scale(1.15);
@@ -1061,7 +1061,7 @@ $light-background: #ececec;
background-color: #5a5a5a;
}
-
+
}
// .miniPres {
diff --git a/src/client/views/nodes/PresBox.tsx b/src/client/views/nodes/PresBox.tsx
index 683cb938a..e1f93c991 100644
--- a/src/client/views/nodes/PresBox.tsx
+++ b/src/client/views/nodes/PresBox.tsx
@@ -610,6 +610,7 @@ export class PresBox extends ViewBoxBaseComponent<FieldViewProps, PresBoxSchema>
addDocumentFilter = (doc: Doc | Doc[]) => {
const docs = doc instanceof Doc ? [doc] : doc;
docs.forEach((doc, i) => {
+ if (doc.presentationTargetDoc) return true;
if (doc.type === DocumentType.LABEL) {
const audio = Cast(doc.annotationOn, Doc, null);
if (audio) {
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-10-07 21:10:22 +0000