Issue 13373052: Fix conflict resolution

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Issue 13373052: Fix conflict resolution

Can't Edit
Can't Publish+Mail
Start Review

Created:
10 years, 8 months ago by gary.poster

Modified:
10 years, 8 months ago

Reviewers:
mp+184916, jeff.pihach

Visibility:
Public.

Description

Fix conflict resolution Prior to this branch, conflict resolution did not play nicely with our new functionality to show modified fields and to hide/reveal save controls as appropriate. Specifically, these were two problems. * If you set a model value but choose the user's value, the user's value will not be seen as a modified value. * If you resolve a conflict that changes the DOM to match the model, the save dialog should disappear but does not. This branch addresses these issues entirely within the databinding code. In addition, I added a test of basic conflict handling. I cleaned up _getBinding further from my most recent branch. I bound the "resolve" method with the known arguments to make client code simpler. https://code.launchpad.net/~gary/juju-gui/fixConflictResolution/+merge/184916 (do not edit description out of merge proposal)

Patch Set 1 #

Total comments: 1

Patch Set 2 : Fix conflict resolution #

Created: 10 years, 8 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Stats (+109 lines, -25 lines)			Patch
A	[revision details]	View	1 chunk	+2 lines, -0 lines	0 comments	Download
M	app/views/databinding.js	View	4 chunks	+19 lines, -17 lines	0 comments	Download
M	app/views/inspector.js	View	1 chunk	+2 lines, -2 lines	0 comments	Download
M	test/test_databinding.js	View	3 chunks	+86 lines, -6 lines	0 comments	Download

Messages

Total messages: 3

Expand All Messages | Collapse All Messages

jeff.pihach

Love the new interactions! LGTM QA OK IE OK https://codereview.appspot.com/13373052/diff/1/app/views/databinding.js File app/views/databinding.js (right): https://codereview.appspot.com/13373052/diff/1/app/views/databinding.js#newcode814 app/views/databinding.js:814: ...

10 years, 8 months ago (2013-09-11 13:11:18 UTC) #2

gary.poster

10 years, 8 months ago (2013-09-11 13:27:06 UTC) #3

*** Submitted:

Fix conflict resolution

Prior to this branch, conflict resolution did not play nicely with our new
functionality to show modified fields and to hide/reveal save controls as
appropriate.  Specifically, these were two problems.

* If you set a model value but choose the user's value, the user's value will
not be seen as a modified value.
* If you resolve a conflict that changes the DOM to match the model, the save
dialog should disappear but does not.

This branch addresses these issues entirely within the databinding code.

In addition, I added a test of basic conflict handling.  I cleaned up
_getBinding further from my most recent branch.  I bound the "resolve" method
with the known arguments to make client code simpler.

R=jeff.pihach
CC=
https://codereview.appspot.com/13373052

Expand All Messages | Collapse All Messages