lp://staging/~gary/juju-gui/fixSuccessiveConflicts

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/juju-gui/experimental at revision 1031

Juju GUI Hackers: Pending requested 2013-09-11

Diff: 164 lines (+63/-26)

3 files modified

app/views/databinding.js (+5/-0)
app/views/inspector.js (+34/-26)
test/test_inspector_constraints.js (+24/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1033. By Gary Poster on 2013-09-11

more lint

1032. By Gary Poster on 2013-09-11

lint

1031. By Gary Poster on 2013-09-11

fix bug with handling successive conflicts

1030. By Gary Poster on 2013-09-11

optimize and fix databinding.deltaFromChange

This is a grabbag of three small changes. The biggest change is that I did some optimizations of databinding.deltaFromChange and fixed an edge case (with test). I also optimized _setupDependencies for that edge case, added some documentation about bindings (so I could refer to it myself), and optimized the bind/_bind pair a bit by removing redundant calls to code that iterates over all bindings (they are now done once in bind, rather than once per viewlet in _bind).

R=benji
CC=
https://codereview.appspot.com/13348056

1029. By Gary Poster on 2013-09-11

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

1028. By Huw Wilkins on 2013-09-11

Inspector visual polish

New icons for inspector tabs, section headings and "Destroy service" control.
New button styles.
New toggle button style.
Constraints fields are now full width.
New custom scrollbars in Chrome.
Added wide groove to top of controls.
Added grooves between fields.
Lots of inconsistent spacing fixed.
Made status bar wider and added rounded corners. Set height to a parameter, not based off font size.
Unit scaling dialogue no longer gets cut off.
Constraints inputs on ghost inspector are no longer greyed out (bug #1219767)

R=gary.poster
CC=
https://codereview.appspot.com/13352047

1027. By Gary Poster on 2013-09-11

Refactor and rename BindingEngine._storeChanged

This is a small clean-up branch in preparation to cleaning up some of the conflict resolution edge cases. It is largely about refactoring and renaming BindingEngine._storeChanged.

* BindingEngine._storeChanged is now called _nodeChangeHandler.
* That method simply calls out to the new method _nodeChanged. It takes a node rather than an event with a node.
* Factored _getBinding out of _nodeChanged to make the code read better and to test the functionality independently.
* Adjusted tests to use _nodeChanged.
* Refactored tests to reuse more code and clean up some lint.
* Added tests for _getBinding.

In addition to those related changes, I made one more peripheral change: I removed an unused argument to unsyncedFields.

R=benjamin.saller
CC=
https://codereview.appspot.com/13265045

1026. By Gary Poster on 2013-09-10

hide and show save controls

In the inspector, controls to save values are hidden when there are no changes, and revealed when there are. Changes can come from saving the form or from simply manually reverting values.

This also changes the "modified" asterisk to be removed when the user manually reverts values.

R=benjamin.saller
CC=
https://codereview.appspot.com/13368051

1025. By Gary Poster on 2013-09-09

highlight saved input fields

This highlights saved input fields with a quick green background animation.

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

1024. By Gary Poster on 2013-09-09

Fix inspector constraints save button

The inspector constraints tab had an odd bug: if you created a service and then looked at the inspector, opened the constraints tab, made a change, and clicked "Confirm," the button would save but then change the text to "Save Changes". After verifying with Luca the intended behavior was to have a "Confirm" text, this branch makes the button stay as is.

R=benji
CC=
https://codereview.appspot.com/13621043