Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add forward and background arrows to canvas to undo/redo #419

Merged
merged 9 commits into from
May 30, 2016

Conversation

OAGr
Copy link
Member

@OAGr OAGr commented May 24, 2016

These work, but there are some improvements to make in future releases:

  • Going back/forward in history should save after some timeout (right now it does not result in something being saved.
  • Clicking a deselected button can trigger highlight of surrounding text.

image

OAGr added 2 commits May 24, 2016 15:00
* master:
  Addressed comments from PR
  Added background color for copied region
  Replacement should happen on defaulted value, not unsafe ref.
  Using 1/4em unicode spaces so individuals can format names as they like.
  webpack-dev-server should be exactly at 1.14.0
  It shouldn't be possible for a non-hovered metric card to be in the editing state.
  fixed node modules.
@mmcdermott
Copy link
Contributor

This ready to go in? I recall you saying it shouldn't be merged to master yet (but maybe you meant production?)

OAGr added 3 commits May 26, 2016 11:02
* master: (27 commits)
  Added a comment to indicate some dead code.
  Renaming SimpleEditors as part of CR
  Basic changes for code review
  Add additional mac command key
  Stop breakage when empty cell is deleted
  Use NavHelper to ensure that backspace when nothing is selected will not go back in history
  MetricCardViewSection should always have relevant css attributes
  Force render of flowgrid on metric name change
  Cleaned text input css and made metric name not enterable when cannot be
  Catch event on undo
  Ensure that metric names update as is appropriate
  Refactor handleMouseDown and ensure that empty metrics are selected first click
  Fixed hasErrors mistype
  Only push updates of SimpleEditors when they are different than previous states
  Only render guesstimateForm if it is the correct metric
  Fixed a problem affecting dev where immutable invariants made space.organization a non-empty default object.
  Style TextInput correctly
  Removing broken npm deploy rules.
  TextForm editor should insertAtCaret with draftjs
  Fixing the persist edit state for the metric card name.
  ...
* master:
  Addressed comments form cr
  Pressing escape on name field should deselect
  Pressing enter on empty cell should not create new line
  Auto select metric card name and then value
  Css fixes to allow editing in Safari
  Remove undefined 'event' call in TextInput. Fixes firefox, safari.
  Eliminating unnecessary errors and using Signup for sign up.
  Disalow newlines in text value editor
const spaceGraphSelector = state => { return _.pick(state, 'spaces', 'metrics', 'guesstimates', 'simulations', 'users', 'organizations', 'userOrganizationMemberships', 'me') }
const spaceSelector = (state, props) => {return state.spaces.find(s => s.id.toString() === props.spaceId.toString())}
function _sameId(idA, idB){
return idA.toString() === idB.toString()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need this defensivity here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need it for at least one of the IDs, I forgot which.

@mmcdermott mmcdermott merged commit 1593748 into master May 30, 2016
@mmcdermott mmcdermott deleted the forward-backward-arrows branch May 30, 2016 23:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants