aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/client/documents/Documents.ts1
-rw-r--r--src/client/util/CurrentUserUtils.ts144
-rw-r--r--src/client/util/SettingsManager.tsx9
-rw-r--r--src/client/views/nodes/FontIconBox.tsx8
4 files changed, 117 insertions, 45 deletions
diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts
index 7719b3eef..3b5f10050 100644
--- a/src/client/documents/Documents.ts
+++ b/src/client/documents/Documents.ts
@@ -201,6 +201,7 @@ export interface DocumentOptions {
linearViewIsExpanded?: boolean; // is linear view expanded
border?: string; //for searchbox
hovercolor?: string;
+ developerFeature?: boolean;
}
class EmptyBox {
diff --git a/src/client/util/CurrentUserUtils.ts b/src/client/util/CurrentUserUtils.ts
index 1f140e145..822979e32 100644
--- a/src/client/util/CurrentUserUtils.ts
+++ b/src/client/util/CurrentUserUtils.ts
@@ -387,7 +387,8 @@ export class CurrentUserUtils {
static creatorBtnDescriptors(doc: Doc): {
title: string, toolTip: string, icon: string, drag?: string, ignoreClick?: boolean,
- click?: string, ischecked?: string, activeInkPen?: Doc, backgroundColor?: string, dragFactory?: Doc
+ click?: string, ischecked?: string, activeInkPen?: Doc, backgroundColor?: string, dragFactory?: Doc, hidden?: any,
+ developerFeature?: boolean
}[] {
if (doc.emptyPresentation === undefined) {
doc.emptyPresentation = Docs.Create.PresDocument(new List<Doc>(),
@@ -426,30 +427,90 @@ export class CurrentUserUtils {
if (doc.activeMobileMenu === undefined) {
this.setupActiveMobileMenu(doc);
}
- return [
- { toolTip: "Drag a collection", title: "Col", icon: "folder", click: 'openOnRight(getCopy(this.dragFactory, true))', drag: 'getCopy(this.dragFactory, true)', dragFactory: doc.emptyCollection as Doc },
- { toolTip: "Drag a web page", title: "Web", icon: "globe-asia", click: 'openOnRight(getCopy(this.dragFactory, true))', drag: 'getCopy(this.dragFactory, true)', dragFactory: doc.emptyWebpage as Doc },
- { toolTip: "Drag a cat image", title: "Image", icon: "cat", click: 'openOnRight(getCopy(this.dragFactory, true))', drag: 'getCopy(this.dragFactory, true)', dragFactory: doc.emptyImage as Doc },
- { toolTip: "Drag a comparison box", title: "Compare", icon: "columns", click: 'openOnRight(getCopy(this.dragFactory, true))', drag: 'getCopy(this.dragFactory, true)', dragFactory: doc.emptyComparison as Doc },
- { toolTip: "Drag a screengrabber", title: "Grab", icon: "photo-video", click: 'openOnRight(getCopy(this.dragFactory, true))', drag: 'getCopy(this.dragFactory, true)', dragFactory: doc.emptyScreenshot as Doc },
- // { title: "Drag a webcam", title: "Cam", icon: "video", ignoreClick: true, drag: 'Docs.Create.WebCamDocument("", { _width: 400, _height: 400, title: "a test cam" })' },
- { toolTip: "Drag a audio recorder", title: "Audio", icon: "microphone", click: 'openOnRight(getCopy(this.dragFactory, true))', drag: 'getCopy(this.dragFactory, true)', dragFactory: doc.emptyAudio as Doc },
- { toolTip: "Drag a button", title: "Button", icon: "bolt", click: 'openOnRight(getCopy(this.dragFactory, true))', drag: 'getCopy(this.dragFactory, true)', dragFactory: doc.emptyButton as Doc },
-
- { toolTip: "Drag a presentation view", title: "Prezi", icon: "tv", click: 'openOnRight(Doc.UserDoc().activePresentation = getCopy(this.dragFactory, true))', drag: `Doc.UserDoc().activePresentation = getCopy(this.dragFactory, true)`, dragFactory: doc.emptyPresentation as Doc },
- { toolTip: "Drag a search box", title: "Query", icon: "search", click: 'openOnRight(getCopy(this.dragFactory, true))', drag: 'getCopy(this.dragFactory, true)', dragFactory: doc.emptySearch as Doc },
- { toolTip: "Drag a scripting box", title: "Script", icon: "terminal", click: 'openOnRight(getCopy(this.dragFactory, true))', drag: 'getCopy(this.dragFactory, true)', dragFactory: doc.emptyScript as Doc },
- // { title: "Drag an import folder", title: "Load", icon: "cloud-upload-alt", ignoreClick: true, drag: 'Docs.Create.DirectoryImportDocument({ title: "Directory Import", _width: 400, _height: 400 })' },
- { toolTip: "Drag a mobile view", title: "Phone", icon: "mobile", click: 'openOnRight(Doc.UserDoc().activeMobileMenu)', drag: 'this.dragFactory', dragFactory: doc.activeMobileMenu as Doc },
- // { title: "Drag an instance of the device collection", title: "Buxton", icon: "globe-asia", ignoreClick: true, drag: 'Docs.Create.Buxton()' },
- // { title: "use pen", icon: "pen-nib", click: 'activatePen(this.activeInkPen = sameDocs(this.activeInkPen, this) ? undefined : this)', backgroundColor: "blue", ischecked: `sameDocs(this.activeInkPen, this)`, activeInkPen: doc },
- // { title: "use highlighter", icon: "highlighter", click: 'activateBrush(this.activeInkPen = sameDocs(this.activeInkPen, this) ? undefined : this,20,this.backgroundColor)', backgroundColor: "yellow", ischecked: `sameDocs(this.activeInkPen, this)`, activeInkPen: doc },
- // { title: "use stamp", icon: "stamp", click: 'activateStamp(this.activeInkPen = sameDocs(this.activeInkPen, this) ? undefined : this)', backgroundColor: "orange", ischecked: `sameDocs(this.activeInkPen, this)`, activeInkPen: doc },
- // { title: "use eraser", icon: "eraser", click: 'activateEraser(this.activeInkPen = sameDocs(this.activeInkPen, this) ? undefined : this);', ischecked: `sameDocs(this.activeInkPen, this)`, backgroundColor: "pink", activeInkPen: doc },
- // { title: "use drag", icon: "mouse-pointer", click: 'deactivateInk();this.activeInkPen = this;', ischecked: `sameDocs(this.activeInkPen, this)`, backgroundColor: "white", activeInkPen: doc },
- { toolTip: "Drag a document previewer", title: "Prev", icon: "expand", click: 'openOnRight(getCopy(this.dragFactory, true))', drag: 'getCopy(this.dragFactory, true)', dragFactory: doc.emptyDocHolder as Doc },
- { toolTip: "Toggle a Calculator REPL", title: "repl", icon: "calculator", click: 'addOverlayWindow("ScriptingRepl", { x: 300, y: 100, width: 200, height: 200, title: "Scripting REPL" })' },
- ];
+
+ // { title: "Drag an instance of the device collection", title: "Buxton", icon: "globe-asia", ignoreClick: true, drag: 'Docs.Create.Buxton()' },
+ // { title: "use pen", icon: "pen-nib", click: 'activatePen(this.activeInkPen = sameDocs(this.activeInkPen, this) ? undefined : this)', backgroundColor: "blue", ischecked: `sameDocs(this.activeInkPen, this)`, activeInkPen: doc },
+ // { title: "use highlighter", icon: "highlighter", click: 'activateBrush(this.activeInkPen = sameDocs(this.activeInkPen, this) ? undefined : this,20,this.backgroundColor)', backgroundColor: "yellow", ischecked: `sameDocs(this.activeInkPen, this)`, activeInkPen: doc },
+ // { title: "use stamp", icon: "stamp", click: 'activateStamp(this.activeInkPen = sameDocs(this.activeInkPen, this) ? undefined : this)', backgroundColor: "orange", ischecked: `sameDocs(this.activeInkPen, this)`, activeInkPen: doc },
+ // { title: "use eraser", icon: "eraser", click: 'activateEraser(this.activeInkPen = sameDocs(this.activeInkPen, this) ? undefined : this);', ischecked: `sameDocs(this.activeInkPen, this)`, backgroundColor: "pink", activeInkPen: doc },
+ // { title: "use drag", icon: "mouse-pointer", click: 'deactivateInk();this.activeInkPen = this;', ischecked: `sameDocs(this.activeInkPen, this)`, backgroundColor: "white", activeInkPen: doc },
+ // { title: "Drag an import folder", title: "Load", icon: "cloud-upload-alt", ignoreClick: true, drag: 'Docs.Create.DirectoryImportDocument({ title: "Directory Import", _width: 400, _height: 400 })' },
+ // { title: "Drag a webcam", title: "Cam", icon: "video", ignoreClick: true, drag: 'Docs.Create.WebCamDocument("", { _width: 400, _height: 400, title: "a test cam" })' },
+
+ const collection = {
+ toolTip: "Drag a collection", title: "Col",
+ icon: "folder", click: 'openOnRight(getCopy(this.dragFactory, true))',
+ drag: 'getCopy(this.dragFactory, true)', dragFactory: doc.emptyCollection as Doc
+ };
+ const web = {
+ toolTip: "Drag a web page", title: "Web",
+ icon: "globe-asia", click: 'openOnRight(getCopy(this.dragFactory, true))',
+ drag: 'getCopy(this.dragFactory, true)', dragFactory: doc.emptyWebpage as Doc
+ };
+ const cat = {
+ toolTip: "Drag a cat image", title: "Image",
+ icon: "cat", click: 'openOnRight(getCopy(this.dragFactory, true))',
+ drag: 'getCopy(this.dragFactory, true)', dragFactory: doc.emptyImage as Doc
+ };
+ const compare = {
+ toolTip: "Drag a comparison box", title: "Compare",
+ icon: "columns", click: 'openOnRight(getCopy(this.dragFactory, true))',
+ drag: 'getCopy(this.dragFactory, true)', dragFactory: doc.emptyComparison as Doc
+ }
+ const screen = {
+ toolTip: "Drag a screengrabber", title: "Grab",
+ icon: "photo-video", click: 'openOnRight(getCopy(this.dragFactory, true))',
+ drag: 'getCopy(this.dragFactory, true)', dragFactory: doc.emptyScreenshot as Doc,
+ developerFeature: true,
+ };
+ const audio = {
+ toolTip: "Drag a audio recorder", title: "Audio",
+ icon: "microphone", click: 'openOnRight(getCopy(this.dragFactory, true))',
+ drag: 'getCopy(this.dragFactory, true)', dragFactory: doc.emptyAudio as Doc
+ };
+ const button = {
+ toolTip: "Drag a button", title: "Button",
+ icon: "bolt", click: 'openOnRight(getCopy(this.dragFactory, true))',
+ drag: 'getCopy(this.dragFactory, true)', dragFactory: doc.emptyButton as Doc
+ };
+ const pres = {
+ toolTip: "Drag a presentation view", title: "Pres", icon: "tv",
+ click: 'openOnRight(Doc.UserDoc().activePresentation = getCopy(this.dragFactory, true))',
+ drag: `Doc.UserDoc().activePresentation = getCopy(this.dragFactory, true)`,
+ dragFactory: doc.emptyPresentation as Doc
+ };
+ const search = {
+ toolTip: "Drag a search box", title: "Query", icon: "search",
+ click: 'openOnRight(getCopy(this.dragFactory, true))', drag: 'getCopy(this.dragFactory, true)',
+ dragFactory: doc.emptySearch as Doc, developerFeature: true,
+ };
+ const script = {
+ toolTip: "Drag a scripting box", title: "Script",
+ icon: "terminal", click: 'openOnRight(getCopy(this.dragFactory, true))',
+ drag: 'getCopy(this.dragFactory, true)', dragFactory: doc.emptyScript as Doc,
+ developerFeature: true,
+ };
+ const mobile = {
+ toolTip: "Drag a mobile view", title: "Phone",
+ icon: "mobile", click: 'openOnRight(Doc.UserDoc().activeMobileMenu)',
+ drag: 'this.dragFactory', dragFactory: doc.activeMobileMenu as Doc,
+ developerFeature: true,
+ };
+ const preview = {
+ toolTip: "Drag a document previewer", title: "Prev",
+ icon: "expand", click: 'openOnRight(getCopy(this.dragFactory, true))',
+ drag: 'getCopy(this.dragFactory, true)', dragFactory: doc.emptyDocHolder as Doc,
+ developerFeature: true,
+ };
+ const repl = {
+ toolTip: "Toggle a Calculator REPL", title: "repl",
+ icon: "calculator",
+ click: 'addOverlayWindow("ScriptingRepl", { x: 300, y: 100, width: 200, height: 200, title: "Scripting REPL" })',
+ developerFeature: true,
+ };
+
+ // novice : [collection, web, compare, audio, button, pres]
+ return [collection, web, compare, screen, audio, button, pres, search, script, preview, repl];
}
@@ -465,21 +526,24 @@ export class CurrentUserUtils {
}
}
const buttons = CurrentUserUtils.creatorBtnDescriptors(doc).filter(d => !alreadyCreatedButtons?.includes(d.title));
- const creatorBtns = buttons.map(({ title, toolTip, icon, ignoreClick, drag, click, ischecked, activeInkPen, backgroundColor, dragFactory }) => Docs.Create.FontIconDocument({
- _nativeWidth: 50, _nativeHeight: 50, _width: 50, _height: 50,
- icon,
- title,
- toolTip,
- ignoreClick,
- dropAction: "copy",
- onDragStart: drag ? ScriptField.MakeFunction(drag) : undefined,
- onClick: click ? ScriptField.MakeScript(click) : undefined,
- ischecked: ischecked ? ComputedField.MakeFunction(ischecked) : undefined,
- activeInkPen,
- backgroundColor,
- removeDropProperties: new List<string>(["dropAction"]),
- dragFactory,
- }));
+ const creatorBtns = buttons.map(({ title, toolTip, icon, ignoreClick, drag,
+ click, ischecked, activeInkPen, backgroundColor, dragFactory,
+ developerFeature }) => Docs.Create.FontIconDocument({
+ _nativeWidth: 50, _nativeHeight: 50, _width: 50, _height: 50,
+ icon,
+ title,
+ toolTip,
+ ignoreClick,
+ dropAction: "copy",
+ onDragStart: drag ? ScriptField.MakeFunction(drag) : undefined,
+ onClick: click ? ScriptField.MakeScript(click) : undefined,
+ ischecked: ischecked ? ComputedField.MakeFunction(ischecked) : undefined,
+ activeInkPen,
+ backgroundColor,
+ removeDropProperties: new List<string>(["dropAction"]),
+ dragFactory,
+ developerFeature,
+ }));
if (dragCreatorSet === undefined) {
doc.myItemCreators = new PrefetchProxy(Docs.Create.MasonryDocument(creatorBtns, {
diff --git a/src/client/util/SettingsManager.tsx b/src/client/util/SettingsManager.tsx
index 8124b7676..1a419b7c6 100644
--- a/src/client/util/SettingsManager.tsx
+++ b/src/client/util/SettingsManager.tsx
@@ -203,9 +203,12 @@ export default class SettingsManager extends React.Component<{}> {
@computed get accountsContent() {
return <div className="accounts-content">
- <button onClick={this.googleAuthorize} value="data">{`Link to Google`}</button>
- <button onClick={this.hypothesisAuthorize} value="data">{`Link to Hypothes.is`}</button>
- <button onClick={() => GroupManager.Instance.open()}>Manage groups</button>
+ <button onClick={this.googleAuthorize}
+ style={{ paddingLeft: 20, paddingRight: 20, marginRight: 35 }}
+ value="data">{`Link to Google`}</button>
+ {/* <button onClick={this.hypothesisAuthorize} value="data">{`Link to Hypothes.is`}</button> */}
+ <button onClick={() => GroupManager.Instance.open()}
+ style={{ paddingLeft: 20, paddingRight: 20 }}>Manage groups</button>
</div>;
}
diff --git a/src/client/views/nodes/FontIconBox.tsx b/src/client/views/nodes/FontIconBox.tsx
index c0eb78d98..71832b0dc 100644
--- a/src/client/views/nodes/FontIconBox.tsx
+++ b/src/client/views/nodes/FontIconBox.tsx
@@ -64,14 +64,18 @@ export class FontIconBox extends DocComponent<FieldViewProps, FontIconDocument>(
const backgroundColor = StrCast(this.layoutDoc._backgroundColor, StrCast(this.rootDoc.backgroundColor, this.props.backgroundColor?.(this.rootDoc)));
const shape = StrCast(this.layoutDoc.iconShape, "round");
const button = <button className={`menuButton-${shape}`} ref={this._ref} onContextMenu={this.specificContextMenu}
- style={{ boxShadow: this.layoutDoc.ischecked ? `4px 4px 12px black` : undefined, backgroundColor: this.layoutDoc.iconShape === "square" ? backgroundColor : "" }}>
+ style={{
+ boxShadow: this.layoutDoc.ischecked ? `4px 4px 12px black` : undefined,
+ backgroundColor: this.layoutDoc.iconShape === "square" ? backgroundColor : "",
+ display: (this.layoutDoc.developerFeature && Doc.UserDoc().noviceMode) ? "none" : ""
+ }}>
<div className="menuButton-wrap">
{<FontAwesomeIcon className={`menuButton-icon-${shape}`} icon={StrCast(this.dataDoc.icon, "user") as any} color={color}
size={this.layoutDoc.iconShape === "square" ? "sm" : "lg"} />}
{!label ? (null) : <div className="fontIconBox-label" style={{ color, backgroundColor }}> {label} </div>}
</div>
</button>;
- return !this.layoutDoc.toolTip ? button :
+ return !this.layoutDoc.toolTip || (this.layoutDoc.developerFeature && Doc.UserDoc().noviceMode) ? button :
<Tooltip title={<div className="dash-tooltip">{StrCast(this.layoutDoc.toolTip)}</div>}>
{button}
</Tooltip>;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-10-09 10:11:13 +0000