diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/views/MainView.tsx | 8 | ||||
| -rw-r--r-- | src/client/views/nodes/DocumentView.tsx | 2 | ||||
| -rw-r--r-- | src/client/views/nodes/PresBox.tsx | 1 | ||||
| -rw-r--r-- | src/new_fields/ListSpec.ts | 0 | ||||
| -rw-r--r-- | src/scraping/buxton/source/.Bill_Notes_NewO.docx.icloud | bin | 0 -> 172 bytes | |||
| -rw-r--r-- | src/scraping/buxton/source/.Bill_Notes_OLPC.docx.icloud | bin | 0 -> 172 bytes | |||
| -rw-r--r-- | src/scraping/buxton/source/Bill_Notes_NewO.docx | bin | 2150143 -> 0 bytes | |||
| -rw-r--r-- | src/scraping/buxton/source/Bill_Notes_OLPC.docx | bin | 6721592 -> 0 bytes |
8 files changed, 7 insertions, 4 deletions
diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx index cb81f9aad..de312318b 100644 --- a/src/client/views/MainView.tsx +++ b/src/client/views/MainView.tsx @@ -8,10 +8,10 @@ import * as React from 'react'; import { SketchPicker } from 'react-color'; import Measure from 'react-measure'; import { Doc, DocListCast, Opt, HeightSym } from '../../new_fields/Doc'; +import { listSpec } from "../../new_fields/Schema"; import { Id } from '../../new_fields/FieldSymbols'; import { InkTool } from '../../new_fields/InkField'; import { List } from '../../new_fields/List'; -import { listSpec } from '../../new_fields/Schema'; import { Cast, FieldValue, NumCast, BoolCast, StrCast } from '../../new_fields/Types'; import { CurrentUserUtils } from '../../server/authentication/models/current_user_utils'; import { RouteStore } from '../../server/RouteStore'; @@ -93,6 +93,7 @@ export class MainView extends React.Component { componentWillUnMount() { window.removeEventListener("keydown", KeyManager.Instance.handle); + //close presentation } constructor(props: Readonly<{}>) { @@ -457,7 +458,10 @@ export class MainView extends React.Component { } let isOpen = CollectionDockingView.Instance.Has(presDoc); if (isOpen) { - CollectionDockingView.Instance.CloseRightSplit(presDoc); + return; + // CollectionDockingView.Instance.CloseRightSplit(presDoc); + //why?? It's throwing an error that seems impossible to fix. + //ToDo: } else { CollectionDockingView.Instance.AddRightSplit(presDoc, undefined); } diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx index 6d4c18050..228efdc87 100644 --- a/src/client/views/nodes/DocumentView.tsx +++ b/src/client/views/nodes/DocumentView.tsx @@ -554,7 +554,7 @@ export class DocumentView extends DocComponent<DocumentViewProps, Document>(Docu subitems.push({ description: "Open Fields", event: this.fieldsClicked, icon: "layer-group" }); cm.addItem({ description: "Open...", subitems: subitems, icon: "external-link-alt" }); cm.addItem({ description: BoolCast(this.props.Document.ignoreAspect, false) || !this.props.Document.nativeWidth || !this.props.Document.nativeHeight ? "Freeze" : "Unfreeze", event: this.freezeNativeDimensions, icon: "snowflake" }); - cm.addItem({ description: "Pin to Presentation", event: () => PresBox.Instance.PinDoc(this.props.Document), icon: "map-pin" }); //this should work, and it does! A miracle! + cm.addItem({ description: "Pin to Presentation", event: () => PresBox.Instance.PinDoc(this.props.Document), icon: "map-pin" }); //I think this should work... and it does! A miracle! cm.addItem({ description: BoolCast(this.props.Document.lockedPosition) ? "Unlock Position" : "Lock Position", event: this.toggleLockPosition, icon: BoolCast(this.props.Document.lockedPosition) ? "unlock" : "lock" }); let makes: ContextMenuProps[] = []; makes.push({ description: "Make Background", event: this.makeBackground, icon: BoolCast(this.props.Document.lockedPosition) ? "unlock" : "lock" }); diff --git a/src/client/views/nodes/PresBox.tsx b/src/client/views/nodes/PresBox.tsx index 8316c4469..1bd2ad3c9 100644 --- a/src/client/views/nodes/PresBox.tsx +++ b/src/client/views/nodes/PresBox.tsx @@ -826,7 +826,6 @@ export class PresBox extends React.Component<FieldViewProps> { //FieldViewProps? render() { let width = "100%"; //NumCast(this.curPresentation.width) - console.log("The width is: " + width); return ( <div className="presentationView-cont" onPointerEnter={action(() => !this.persistOpacity && (this.opacity = 1))} onPointerLeave={action(() => !this.persistOpacity && (this.opacity = 0.4))} style={{ width: width, overflow: "hidden", opacity: this.opacity, transition: "0.7s opacity ease", pointerEvents: "all" }}> diff --git a/src/new_fields/ListSpec.ts b/src/new_fields/ListSpec.ts new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/src/new_fields/ListSpec.ts diff --git a/src/scraping/buxton/source/.Bill_Notes_NewO.docx.icloud b/src/scraping/buxton/source/.Bill_Notes_NewO.docx.icloud Binary files differnew file mode 100644 index 000000000..f71886d8c --- /dev/null +++ b/src/scraping/buxton/source/.Bill_Notes_NewO.docx.icloud diff --git a/src/scraping/buxton/source/.Bill_Notes_OLPC.docx.icloud b/src/scraping/buxton/source/.Bill_Notes_OLPC.docx.icloud Binary files differnew file mode 100644 index 000000000..30ddb3091 --- /dev/null +++ b/src/scraping/buxton/source/.Bill_Notes_OLPC.docx.icloud diff --git a/src/scraping/buxton/source/Bill_Notes_NewO.docx b/src/scraping/buxton/source/Bill_Notes_NewO.docx Binary files differdeleted file mode 100644 index 2f4a04e81..000000000 --- a/src/scraping/buxton/source/Bill_Notes_NewO.docx +++ /dev/null diff --git a/src/scraping/buxton/source/Bill_Notes_OLPC.docx b/src/scraping/buxton/source/Bill_Notes_OLPC.docx Binary files differdeleted file mode 100644 index 7a636e2d6..000000000 --- a/src/scraping/buxton/source/Bill_Notes_OLPC.docx +++ /dev/null |
