aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/MainView.tsx
diff options
context:
space:
mode:
authorSam Wilkins <samwilkins333@gmail.com>2019-07-02 15:17:52 -0400
committerSam Wilkins <samwilkins333@gmail.com>2019-07-02 15:17:52 -0400
commit9b6a8b6685e1bb98960f650997663e5bb8501c4a (patch)
treef232b800764281dff26850d0dfd0fc59bd8fb927 /src/client/views/MainView.tsx
parent49cf949250fb9b01a8457c2c3dee60b19f60c036 (diff)
made color selection undoable and display color updates based on first item in selected documents
Diffstat (limited to 'src/client/views/MainView.tsx')
-rw-r--r--src/client/views/MainView.tsx6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx
index 787e240b9..62377a3b0 100644
--- a/src/client/views/MainView.tsx
+++ b/src/client/views/MainView.tsx
@@ -291,7 +291,7 @@ export class MainView extends React.Component {
} else {
CollectionDockingView.Instance.AddRightSplit(doc, dataDoc);
}
- }
+ };
let flyout = <DocumentView
Document={CurrentUserUtils.UserDocument}
DataDoc={undefined}
@@ -392,8 +392,8 @@ export class MainView extends React.Component {
@action
- toggleColorPicker = () => {
- this._colorPickerDisplay = !this._colorPickerDisplay;
+ toggleColorPicker = (close = false) => {
+ this._colorPickerDisplay = close ? false : !this._colorPickerDisplay;
}
/* @TODO this should really be moved into a moveable toolbar component, but for now let's put it here to meet the deadline */