aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package-lock.json56
-rw-r--r--package.json4
-rw-r--r--src/client/views/nodes/WebBox.tsx2
-rw-r--r--src/mobile/MobileInkOverlay.tsx5
-rw-r--r--src/mobile/MobileInterface.tsx2
-rw-r--r--src/server/authentication/models/current_user_utils.ts4
6 files changed, 28 insertions, 45 deletions
diff --git a/package-lock.json b/package-lock.json
index 833710fe7..5492f7dbf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5682,8 +5682,7 @@
},
"ansi-regex": {
"version": "2.1.1",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"aproba": {
"version": "1.2.0",
@@ -5701,13 +5700,11 @@
},
"balanced-match": {
"version": "1.0.0",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
- "optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -5720,18 +5717,15 @@
},
"code-point-at": {
"version": "1.1.0",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"concat-map": {
"version": "0.0.1",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"console-control-strings": {
"version": "1.1.0",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"core-util-is": {
"version": "1.0.2",
@@ -5834,8 +5828,7 @@
},
"inherits": {
"version": "2.0.4",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"ini": {
"version": "1.3.5",
@@ -5845,7 +5838,6 @@
"is-fullwidth-code-point": {
"version": "1.0.0",
"bundled": true,
- "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -5858,20 +5850,17 @@
"minimatch": {
"version": "3.0.4",
"bundled": true,
- "optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
},
"minimist": {
"version": "0.0.8",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"minipass": {
"version": "2.9.0",
"bundled": true,
- "optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -5888,7 +5877,6 @@
"mkdirp": {
"version": "0.5.1",
"bundled": true,
- "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -5969,8 +5957,7 @@
},
"number-is-nan": {
"version": "1.0.1",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"object-assign": {
"version": "4.1.1",
@@ -5980,7 +5967,6 @@
"once": {
"version": "1.4.0",
"bundled": true,
- "optional": true,
"requires": {
"wrappy": "1"
}
@@ -6056,8 +6042,7 @@
},
"safe-buffer": {
"version": "5.1.2",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -6087,7 +6072,6 @@
"string-width": {
"version": "1.0.2",
"bundled": true,
- "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -6105,7 +6089,6 @@
"strip-ansi": {
"version": "3.0.1",
"bundled": true,
- "optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -6144,13 +6127,11 @@
},
"wrappy": {
"version": "1.0.2",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"yallist": {
"version": "3.1.1",
- "bundled": true,
- "optional": true
+ "bundled": true
}
}
},
@@ -14665,19 +14646,22 @@
"dev": true
},
"resilient-server-session": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/resilient-server-session/-/resilient-server-session-1.1.2.tgz",
- "integrity": "sha512-eLoXxTc5bFOYH2JejSCYc2O8emoo80p2zOuwVVWVoK6/2NJBzLP8Yl7kU8m7tJDrOoqDSZGghsVD5ob9BbUgAQ==",
+ "version": "1.1.9",
+ "resolved": "https://registry.npmjs.org/resilient-server-session/-/resilient-server-session-1.1.9.tgz",
+ "integrity": "sha512-XSVujTyJOQMACllXUvWOSHY4GK4JI6aECjCrQR0UBvd2+hdjM1euffspn2b+7M0fepo+bJ71YrAOA9M34ChBZw==",
"requires": {
"@types/chai": "^4.2.7",
+ "@types/express": "^4.17.2",
"@types/mocha": "^5.2.7",
"@types/node": "^10.12.30",
"@types/request-promise": "^4.1.42",
"@types/uuid": "^3.4.6",
"chai": "^4.2.0",
"colors": "^1.4.0",
+ "express": "^4.17.1",
"jsonschema": "^1.2.5",
"mocha": "^7.0.0",
+ "request": "^2.88.0",
"request-promise": "^4.2.5",
"typescript": "^3.7.4",
"uuid": "^3.3.3"
@@ -14842,9 +14826,9 @@
}
},
"mocha": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.0.0.tgz",
- "integrity": "sha512-CirsOPbO3jU86YKjjMzFLcXIb5YiGLUrjrXFHoJ3e2z9vWiaZVCZQ2+gtRGMPWF+nFhN6AWwLM/juzAQ6KRkbA==",
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.0.1.tgz",
+ "integrity": "sha512-9eWmWTdHLXh72rGrdZjNbG3aa1/3NRPpul1z0D979QpEnFdCG0Q5tv834N+94QEN2cysfV72YocQ3fn87s70fg==",
"requires": {
"ansi-colors": "3.2.3",
"browser-stdout": "1.3.1",
diff --git a/package.json b/package.json
index 67b9b1630..6a2b5fac4 100644
--- a/package.json
+++ b/package.json
@@ -233,7 +233,7 @@
"readline": "^1.3.0",
"request": "^2.88.0",
"request-promise": "^4.2.5",
- "resilient-server-session": "^1.1.2",
+ "resilient-server-session": "^1.1.9",
"rimraf": "^3.0.0",
"serializr": "^1.5.4",
"sharp": "^0.23.4",
@@ -253,4 +253,4 @@
"xoauth2": "^1.2.0",
"youtube": "^0.1.0"
}
-} \ No newline at end of file
+}
diff --git a/src/client/views/nodes/WebBox.tsx b/src/client/views/nodes/WebBox.tsx
index 082a9a965..d486253b8 100644
--- a/src/client/views/nodes/WebBox.tsx
+++ b/src/client/views/nodes/WebBox.tsx
@@ -222,7 +222,7 @@ export class WebBox extends DocAnnotatableComponent<FieldViewProps, WebDocument>
if (pressedElement.nodeName === "IMG") {
const src = pressedElement.getAttribute("src"); // TODO: may not always work
if (src) {
- const doc = Docs.Create.ImageDocument(src, { width: 300 });
+ const doc = Docs.Create.ImageDocument(src, { _width: 300 });
ImageUtils.ExtractExif(doc);
// add clone to div so that dragging ghost is placed properly
diff --git a/src/mobile/MobileInkOverlay.tsx b/src/mobile/MobileInkOverlay.tsx
index db6cf21b4..4dde3a075 100644
--- a/src/mobile/MobileInkOverlay.tsx
+++ b/src/mobile/MobileInkOverlay.tsx
@@ -78,7 +78,7 @@ export default class MobileInkOverlay extends React.Component {
};
const target = document.elementFromPoint(this._x + 10, this._y + 10);
- target ?.dispatchEvent(
+ target?.dispatchEvent(
new CustomEvent<GestureUtils.GestureEvent>("dashOnGesture",
{
bubbles: true,
@@ -112,7 +112,8 @@ export default class MobileInkOverlay extends React.Component {
complete: complete,
altKey: false,
metaKey: false,
- ctrlKey: false
+ ctrlKey: false,
+ shiftKey: false
}
}
)
diff --git a/src/mobile/MobileInterface.tsx b/src/mobile/MobileInterface.tsx
index d0954a84b..07ee611ee 100644
--- a/src/mobile/MobileInterface.tsx
+++ b/src/mobile/MobileInterface.tsx
@@ -206,7 +206,6 @@ export default class MobileInterface extends React.Component {
ContentScaling={returnOne}
whenActiveChanged={returnFalse}
ScreenToLocalTransform={Transform.Identity}
- ruleProvider={undefined}
renderDepth={0}
ContainingCollectionView={undefined}
ContainingCollectionDoc={undefined}>
@@ -254,7 +253,6 @@ export default class MobileInterface extends React.Component {
addDocTab={returnFalse}
pinToPres={emptyFunction}
removeDocument={undefined}
- ruleProvider={undefined}
onClick={undefined}
ScreenToLocalTransform={Transform.Identity}
ContentScaling={returnOne}
diff --git a/src/server/authentication/models/current_user_utils.ts b/src/server/authentication/models/current_user_utils.ts
index 4a765e8d3..aa9f3649e 100644
--- a/src/server/authentication/models/current_user_utils.ts
+++ b/src/server/authentication/models/current_user_utils.ts
@@ -156,14 +156,14 @@ export class CurrentUserUtils {
static setupMobileUploadDoc(userDoc: Doc) {
const webDoc = Docs.Create.WebDocument("https://www.britannica.com/animal/cat", {
- title: "Upload Images From the Web", chromeStatus: "enabled", lockedPosition: true
+ title: "Upload Images From the Web", _chromeStatus: "enabled", lockedPosition: true
});
const uploadDoc = Docs.Create.StackingDocument([], {
title: "Mobile Upload Collection", backgroundColor: "white", lockedPosition: true
});
console.log(window.innerWidth, screen.width, window.devicePixelRatio);
return Docs.Create.StackingDocument([webDoc, uploadDoc], {
- columnWidth: screen.width - 10, lockedPosition: true, chromeStatus: "disabled", title: "Upload", autoHeight: true, yMargin: 80, backgroundColor: "lightgray"
+ columnWidth: screen.width - 10, lockedPosition: true, _chromeStatus: "disabled", title: "Upload", _autoHeight: true, _yMargin: 80, backgroundColor: "lightgray"
});
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-10-17 12:21:32 +0000