Created by Brad Crittenden and last modified
Get this branch:
bzr branch lp:~bac/juju-gui/1103207
Only Brad Crittenden can upload to this branch. If you are Brad Crittenden please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Brad Crittenden

Recent revisions

340. By Brad Crittenden on 2013-01-28

Merge from trunk

339. By Brad Crittenden on 2013-01-22

When adding a relation, the service menu is shown.

If adding a relation using the 'Build Relation' action from the service menu
on the originating service, the click on the target service produces two
events. The dragend event is handled properly and sets up the relation. Then
the click event calls serviceClick.

Attempts to use the stopPropagation, stopEvent, and preventDefault methods on
the d3.event did not produce the desired results.

This work-around is pretty hacky but it does work. A more general solution
should be found.

Also, attempts to change the test 'must be able to add a relation from the
service menu' to simulate the click events and ensure the service menu was not
left displayed did not work.

This branch is submitted as is in an attempt to finish the last card blocking
the charm announcement.


338. By Gary Poster on 2013-01-22

Switch to newer, clearer favicon

favicon provided by Huw. Originals available in shared Google juju-gui/graphic resources folder, https://drive.google.com/a/canonical.com/?tab=co#folders/0B9C9etoysSQla1dWRFNWeWlBWHc


337. By Francesco Banconi on 2013-01-22

Fix ambiguous relation selector

When there are ambiguous relations clicking
to select one or the other does nothing.
This bug affected only our production server,
devel and debug worked well. This is weird,
and I think we are encountering the strange
behavior described in
or similar: in some situation (e.g. our production
server, where js files are minified/compressed)
using the "on" method on NodeList does not work.
I am confused about the real reason for this bug.
However, the documentation says that we should
avoid using NodeList.on, in favor of using event
delegation, that is exactly what I did in this
branch. Tests are not included: we have a specific
card for adding tests for the relation module.

R=benji, gary.poster

336. By Benjamin Saller on 2013-01-22

Fix various breakage around menu handling

Fixed issues from merge around method name change and fixed strange
interaction issues with click and dragstart both interacting with the menu on
non-drag events (dragstart it seems is called on any bound targets click).

R=frankban, teknico

335. By Francesco Banconi on 2013-01-22

Allow creating non-FINAL release tarballs.

In the charm, when juju-gui-source is a branch,
a release tarball is created from the checkout
running "NO_BZR=1 make distfile".
The "distfile" target was included in the
released/unreleased check by our Makefile.
This means that trying to deploy the charm
from a branch whose CHANGES.yaml does not
include "unreleased:" always fails with
the error reported by therve:
"non-FINAL releases must have a most-recent
version number of unreleased in CHANGES.yaml".
This branch removes that check from the distfile
target: I think we should protect "dist", but
I don't see, given the problems described above,
a valid reason to continue preventing users
to create non-FINAL tarballs, even if the
branch is a final release.

R=teknico, bac

334. By Brad Crittenden on 2013-01-21

Set version back to unreleased.

333. By Brad Crittenden on 2013-01-21

Set version for release.

332. By Benjamin Saller on 2013-01-21

Support for service positions from server

Provides support for loading initial and updated position
from annotations stored on the server. Updates occur
via a shared codepath with the drag event handler
to ensure proper updates are applied over time.

There is still an issue with deltas interrupting the drag.

R=gary.poster, frankban

331. By Brad Crittenden on 2013-01-21

Fix a failing 'service menu' test.

The test set up was incorrect. Simple fix.


Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.