Issue 13663043: fix successive conflict UX calls

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 13663043: fix successive conflict UX calls

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:
rharding, mp+185100

Visibility:
Public.

Description

fix successive conflict UX calls if you set a model value and then set a new one, the newest one will be lost. This branch fixes that problem, and adds a test for simpler conflict UX. https://code.launchpad.net/~gary/juju-gui/fixSuccessiveConflicts/+merge/185100 (do not edit description out of merge proposal)

Patch Set 1 #

Patch Set 2 : fix successive conflict UX calls #

Created: 10 years, 8 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Stats (+65 lines, -26 lines)			Patch
A	[revision details]	View	1 chunk	+2 lines, -0 lines	0 comments	Download
M	app/views/databinding.js	View	2 chunks	+5 lines, -0 lines	0 comments	Download
M	app/views/inspector.js	View	4 chunks	+34 lines, -26 lines	0 comments	Download
M	test/test_inspector_constraints.js	View	1 chunk	+24 lines, -0 lines	0 comments	Download

Messages

Total messages: 4

Expand All Messages | Collapse All Messages

rharding

Per irc, tests pass in IE10. Will review as a follow up.

10 years, 8 months ago (2013-09-11 16:43:17 UTC) #2

gary.poster

10 years, 8 months ago (2013-09-11 17:24:13 UTC) #4

*** Submitted:

fix successive conflict UX calls

if you set a model value and then set a new one, the newest one will be lost. 
This branch fixes that problem, and adds a test for simpler conflict UX.

R=rharding
CC=
https://codereview.appspot.com/13663043

Expand All Messages | Collapse All Messages