aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/client/views/Main.tsx11
-rw-r--r--src/server/authentication/controllers/WorkspacesMenu.tsx1
2 files changed, 8 insertions, 4 deletions
diff --git a/src/client/views/Main.tsx b/src/client/views/Main.tsx
index 8d6c91c26..5a0fb23bd 100644
--- a/src/client/views/Main.tsx
+++ b/src/client/views/Main.tsx
@@ -70,7 +70,6 @@ export class Main extends React.Component {
@action
requestWorkspace = (activeWorkspaceId: string) => {
- console.log("START LOAD!!!");
Documents.initProtos(activeWorkspaceId, this.prepareWorkspace);
}
@@ -92,11 +91,15 @@ export class Main extends React.Component {
this.mainContainer.Set(KeyStore.ActiveFrame, this.mainfreeform);
}, 0);
}
- console.log("END LOAD!!!");
+ }
+
+ toggleWorkspaces = () => {
+ if (WorkspacesMenu.Instance) {
+ WorkspacesMenu.Instance.toggle()
+ }
}
render() {
- console.log("We're rendering!!!");
let imgRef = React.createRef<HTMLDivElement>();
let webRef = React.createRef<HTMLDivElement>();
let textRef = React.createRef<HTMLDivElement>();
@@ -141,7 +144,7 @@ export class Main extends React.Component {
<div className="main-buttonDiv" style={{ bottom: '125px' }} >
<button onClick={clearDatabase}>Clear Database</button></div>
<div className="main-buttonDiv" style={{ top: '25px' }} ref={workspacesRef}>
- <button>View Workspaces</button></div>
+ <button onClick={this.toggleWorkspaces}>View Workspaces</button></div>
<button className="main-undoButtons" style={{ bottom: '25px' }} onClick={() => UndoManager.Undo()}>Undo</button>
<button className="main-undoButtons" style={{ bottom: '0px' }} onClick={() => UndoManager.Redo()}>Redo</button>
</div>
diff --git a/src/server/authentication/controllers/WorkspacesMenu.tsx b/src/server/authentication/controllers/WorkspacesMenu.tsx
index 94d168a05..fe93aac2c 100644
--- a/src/server/authentication/controllers/WorkspacesMenu.tsx
+++ b/src/server/authentication/controllers/WorkspacesMenu.tsx
@@ -21,6 +21,7 @@ export class WorkspacesMenu extends React.Component<WorkspaceMenuProps> {
constructor(props: WorkspaceMenuProps) {
super(props);
WorkspacesMenu.Instance = this;
+ console.log("ASSIGNED!");
this.loadExistingWorkspace = this.loadExistingWorkspace.bind(this);
this.addNewWorkspace = this.addNewWorkspace.bind(this);
this.selectedWorkspaceId = this.props.active;