juju-gui

Merge lp:~rharding/juju-gui/clear-tab-1199790 into lp:juju-gui/experimental

  1. clear-tab-1199790
  2. Merge into trunk
Proposed by Richard Harding
Status: Merged
Merged at revision: 815
Proposed branch: lp:~rharding/juju-gui/clear-tab-1199790
Merge into: lp:juju-gui/experimental
Diff against target: 27 lines (+4/-2)
2 files modified
app/subapps/browser/views/charm.js (+2/-1)
app/subapps/browser/views/charmresults.js (+2/-1)
To merge this branch: bzr merge lp:~rharding/juju-gui/clear-tab-1199790
Reviewer Review Type Date Requested Status
Juju GUI Hackers Pending
Review via email: mp+174250@code.launchpad.net

Description of the change

TRIVIAL: selecting a charm resets hash.

- When clicking on a charm to view, it will reset the hash as well as part of
the navigate change data.
- This is not directly tested because it would require setting
window.location.hash which could cause issues with later tests. The navigate
change methods are all tested directly.

https://codereview.appspot.com/10911046/

To post a comment you must log in.
Revision history for this message
Richard Harding (rharding) wrote :

Reviewers: mp+174250_code.launchpad.net,

Message:
Please take a look.

Description:
TRIVIAL: selecting a charm resets hash.

- When clicking on a charm to view, it will reset the hash as well as
part of
the navigate change data.
- This is not directly tested because it would require setting
window.location.hash which could cause issues with later tests. The
navigate
change methods are all tested directly.

https://code.launchpad.net/~rharding/juju-gui/clear-tab-1199790/+merge/174250

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/10911046/

Affected files:
   A [revision details]
   M app/subapps/browser/views/charm.js
   M app/subapps/browser/views/charmresults.js

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>

Index: app/subapps/browser/views/charm.js
=== modified file 'app/subapps/browser/views/charm.js'
--- app/subapps/browser/views/charm.js 2013-07-03 17:35:21 +0000
+++ app/subapps/browser/views/charm.js 2013-07-11 16:51:45 +0000
@@ -271,7 +271,8 @@
        var charm = ev.currentTarget;
        var charmID = charm.getData('charmid');
        var change = {
- charmID: charmID
+ charmID: charmID,
+ hash: undefined
        };

        this.fire('viewNavigate', {change: change});

Index: app/subapps/browser/views/charmresults.js
=== modified file 'app/subapps/browser/views/charmresults.js'
--- app/subapps/browser/views/charmresults.js 2013-06-10 15:04:39 +0000
+++ app/subapps/browser/views/charmresults.js 2013-07-11 16:51:45 +0000
@@ -98,7 +98,8 @@
        }

        var change = {
- charmID: charmID
+ charmID: charmID,
+ hash: undefined
        };

        this.fire('viewNavigate', {change: change});

Revision history for this message
Richard Harding (rharding) wrote :

LGTM self-reviewing trivial.

https://codereview.appspot.com/10911046/

Revision history for this message
Richard Harding (rharding) wrote :

*** Submitted:

TRIVIAL: selecting a charm resets hash.

- When clicking on a charm to view, it will reset the hash as well as
part of
the navigate change data.
- This is not directly tested because it would require setting
window.location.hash which could cause issues with later tests. The
navigate
change methods are all tested directly.

R=
CC=
https://codereview.appspot.com/10911046

https://codereview.appspot.com/10911046/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/subapps/browser/views/charm.js'
2--- app/subapps/browser/views/charm.js 2013-07-10 09:14:57 +0000
3+++ app/subapps/browser/views/charm.js 2013-07-11 17:00:37 +0000
4@@ -277,7 +277,8 @@
5 var charm = ev.currentTarget;
6 var charmID = charm.getData('charmid');
7 var change = {
8- charmID: charmID
9+ charmID: charmID,
10+ hash: undefined
11 };
12
13 this.fire('viewNavigate', {change: change});
14
15=== modified file 'app/subapps/browser/views/charmresults.js'
16--- app/subapps/browser/views/charmresults.js 2013-06-10 15:04:39 +0000
17+++ app/subapps/browser/views/charmresults.js 2013-07-11 17:00:37 +0000
18@@ -98,7 +98,8 @@
19 }
20
21 var change = {
22- charmID: charmID
23+ charmID: charmID,
24+ hash: undefined
25 };
26
27 this.fire('viewNavigate', {change: change});

Subscribers

People subscribed via source and target branches