diff options
Diffstat (limited to 'src/mobile')
| -rw-r--r-- | src/mobile/MobileInterface.tsx | 19 | ||||
| -rw-r--r-- | src/mobile/MobileMain.tsx | 32 |
2 files changed, 27 insertions, 24 deletions
diff --git a/src/mobile/MobileInterface.tsx b/src/mobile/MobileInterface.tsx index e1360553a..f19496d25 100644 --- a/src/mobile/MobileInterface.tsx +++ b/src/mobile/MobileInterface.tsx @@ -104,14 +104,13 @@ import { action, computed, observable, runInAction } from 'mobx'; import { observer } from 'mobx-react'; import * as React from 'react'; import { Docs, DocumentOptions, DocUtils } from '../client/documents/Documents'; -import { DocumentType } from '../client/documents/DocumentTypes'; +import { CollectionViewType, DocumentType } from '../client/documents/DocumentTypes'; import { CurrentUserUtils } from '../client/util/CurrentUserUtils'; import { ScriptingGlobals } from '../client/util/ScriptingGlobals'; import { SettingsManager, ColorScheme } from '../client/util/SettingsManager'; import { Transform } from '../client/util/Transform'; import { UndoManager } from '../client/util/UndoManager'; import { TabDocView } from '../client/views/collections/TabDocView'; -import { CollectionViewType } from '../client/views/collections/CollectionView'; import { GestureOverlay } from '../client/views/GestureOverlay'; import { AudioBox } from '../client/views/nodes/AudioBox'; import { DocumentView } from '../client/views/nodes/DocumentView'; @@ -249,7 +248,7 @@ export class MobileInterface extends React.Component { @observable private _parents: Array<Doc> = []; // array of parent docs (for pathbar) @computed private get mainContainer() { - return Doc.UserDoc() ? FieldValue(Cast(Doc.UserDoc().activeMobile, Doc)) : CurrentUserUtils.GuestMobile; + return Doc.UserDoc() ? FieldValue(Cast(Doc.UserDoc().activeMobile, Doc)) : Doc.GuestMobile; } constructor(props: Readonly<{}>) { @@ -262,7 +261,7 @@ export class MobileInterface extends React.Component { componentDidMount = () => { // if the home menu is in list view -> adjust the menu toggle appropriately this._menuListView = this._homeDoc._viewType === 'stacking' ? true : false; - CurrentUserUtils.ActiveTool = InkTool.None; // ink should intially be set to none + Doc.ActiveTool = InkTool.None; // ink should intially be set to none Doc.UserDoc().activeMobile = this._homeDoc; // active mobile set to home AudioBox.Enabled = true; @@ -511,7 +510,7 @@ export class MobileInterface extends React.Component { ); } // stores dashboards documents as 'dashboards' variable - let dashboards = CurrentUserUtils.MyDashboards; + let dashboards = Doc.MyDashboards; if (this.dashboards) { dashboards = this.dashboards; } @@ -580,14 +579,14 @@ export class MobileInterface extends React.Component { */ @action createNewDashboard = (id?: string) => { - const scens = CurrentUserUtils.MyDashboards; + const scens = Doc.MyDashboards; const dashboardCount = DocListCast(scens.data).length + 1; const freeformOptions: DocumentOptions = { x: 0, y: 400, title: 'Collection ' + dashboardCount, }; - const freeformDoc = CurrentUserUtils.GuestTarget || Docs.Create.FreeformDocument([], freeformOptions); + const freeformDoc = Doc.GuestTarget || Docs.Create.FreeformDocument([], freeformOptions); const dashboardDoc = Docs.Create.StandardCollectionDockingDocument([{ doc: freeformDoc, initialWidth: 600 }], { title: `Dashboard ${dashboardCount}` }, id, 'row'); const toggleTheme = ScriptField.MakeScript(`self.colorScheme = self.colorScheme ? undefined: ${ColorScheme.Dark}}`); @@ -607,10 +606,10 @@ export class MobileInterface extends React.Component { button.style.color = this._ink ? 'black' : 'white'; if (!this._ink) { - CurrentUserUtils.ActiveTool = InkTool.Pen; + Doc.ActiveTool = InkTool.Pen; this._ink = true; } else { - CurrentUserUtils.ActiveTool = InkTool.None; + Doc.ActiveTool = InkTool.None; this._ink = false; } }; @@ -762,7 +761,7 @@ export class MobileInterface extends React.Component { // For setting up the presentation document for the home menu @action setupDefaultPresentation = () => { - const presentation = CurrentUserUtils.ActivePresentation; + const presentation = Doc.ActivePresentation; if (presentation) { this.switchCurrentView(presentation); diff --git a/src/mobile/MobileMain.tsx b/src/mobile/MobileMain.tsx index 4a1e26078..f85f05f53 100644 --- a/src/mobile/MobileMain.tsx +++ b/src/mobile/MobileMain.tsx @@ -1,25 +1,29 @@ -import { MobileInterface } from "./MobileInterface"; -import { Docs } from "../client/documents/Documents"; -import { CurrentUserUtils } from "../client/util/CurrentUserUtils"; -import * as ReactDOM from 'react-dom'; import * as React from 'react'; -import { DocServer } from "../client/DocServer"; -import { AssignAllExtensions } from "../extensions/General/Extensions"; +import * as ReactDOM from 'react-dom'; +import { DocServer } from '../client/DocServer'; +import { Docs } from '../client/documents/Documents'; +import { CurrentUserUtils } from '../client/util/CurrentUserUtils'; +import { AssignAllExtensions } from '../extensions/General/Extensions'; +import { MobileInterface } from './MobileInterface'; AssignAllExtensions(); (async () => { const info = await CurrentUserUtils.loadCurrentUser(); - DocServer.init(window.location.protocol, window.location.hostname, 4321, info.email + " (mobile)"); + DocServer.init(window.location.protocol, window.location.hostname, 4321, info.email + ' (mobile)'); await Docs.Prototypes.initialize(); - if (info.id !== "__guest__") { + if (info.id !== '__guest__') { // a guest will not have an id registered await CurrentUserUtils.loadUserDocument(info.id); } - document.getElementById('root')!.addEventListener('wheel', event => { - if (event.ctrlKey) { - event.preventDefault(); - } - }, true); + document.getElementById('root')!.addEventListener( + 'wheel', + event => { + if (event.ctrlKey) { + event.preventDefault(); + } + }, + true + ); ReactDOM.render(<MobileInterface />, document.getElementById('root')); -})();
\ No newline at end of file +})(); |