Merge lp:~rharding/juju-gui/update-urls into lp:juju-gui/experimental
- update-urls
- Merge into trunk
| Status: | Merged |
|---|---|
| Merged at revision: | 556 |
| Proposed branch: | lp:~rharding/juju-gui/update-urls |
| Merge into: | lp:juju-gui/experimental |
| Diff against target: |
1368 lines (+529/-416) 13 files modified
app/modules-debug.js (+9/-0) app/subapps/browser/browser.js (+184/-68) app/subapps/browser/templates/browser_charm.handlebars (+3/-7) app/subapps/browser/templates/editorial.handlebars (+9/-0) app/subapps/browser/templates/sidebar.handlebars (+2/-4) app/subapps/browser/views/charm.js (+90/-16) app/subapps/browser/views/editorial.js (+166/-0) app/subapps/browser/views/fullscreen.js (+7/-24) app/subapps/browser/views/sidebar.js (+10/-154) app/subapps/browser/views/view.js (+0/-59) app/templates/charm-token.handlebars (+20/-18) test/test_browser_app.js (+0/-47) test/test_browser_charm_details.js (+29/-19) |
| To merge this branch: | bzr merge lp:~rharding/juju-gui/update-urls |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Juju GUI Hackers | Pending | ||
|
Review via email:
|
|||
Commit message
Description of the change
Rearchitect the browser to use routes more
- Use nested routes and route handling to build the browser UI
- Break up the Views in the browser subapp to be more singular per UX
component.
- Adjust tests to fit with this.
| Richard Harding (rharding) wrote : | # |
- 555. By Richard Harding
-
Garden
- 556. By Richard Harding
-
Garden
| Richard Harding (rharding) wrote : | # |
Please take a look.
| Richard Harding (rharding) wrote : | # |
Please take a look.
| Jeff Pihach (hatch) wrote : | # |
Thanks for the refactor - I have a few comments below that I'd like some
discussion on.
https:/
File app/subapps/
https:/
app/subapps/
unused
https:/
app/subapps/
should this not be
var containerID = this.get(
https:/
app/subapps/
'fullscreen') {
see comment in routes.
https:/
app/subapps/
maybe add a comment here as to what's happening here.
https:/
app/subapps/
maybe a comment here as to why this is necessary
https:/
app/subapps/
!== -1) {
see comment in routes
https:/
app/subapps/
maybe some documentation as to what's going on here.
https:/
app/subapps/
callbacks: 'fullscreen' },
It looks like these routes are identical and then you are using a string
search to determine the view to render. I would probably investigate
using a route like:
/bws/:viewSize/
and then viewSize will be available as a param in your callbacks so you
won't have to stringsearch for it. IMHO it should also simplify your
routes and callbacks.
https:/
File app/subapps/
https:/
app/subapps/
href="/
isFullscreen}
this url will need to be generated and then passed in with the hbs
params to work properly with both namespaces.
https:/
app/subapps/
isn't changelog one word?
https:/
File app/subapps/
https:/
app/subapps/
you accept ...
| Richard Harding (rharding) wrote : | # |
We had a chat about most of it. I've added a bunch of comment blocks to
help clear up some of the bits.
Some of this is missing for the follow up such as url generation and app
state tracking.
Thanks for catching a few hard coded bits for in progress I missed
cleaning up!
https:/
File app/subapps/
https:/
app/subapps/
href="/
isFullscreen}
On 2013/04/15 18:21:21, jeff.pihach wrote:
> this url will need to be generated and then passed in with the hbs
params to
> work properly with both namespaces.
Yes, url generation will come in a follow up branch.
https:/
app/subapps/
On 2013/04/15 18:21:21, jeff.pihach wrote:
> isn't changelog one word?
I would say so, but we're going off the UX docs given to us which lists
it as two. We can bring up the point to UX.
https:/
File app/subapps/
https:/
app/subapps/
On 2013/04/15 18:21:21, jeff.pihach wrote:
> you accept isFullscreen as a param and then overwrite it regardless.
Yep, hard coded for early dev and didn't back out.
- 557. By Richard Harding
-
Update per review
| Richard Harding (rharding) wrote : | # |
Please take a look.
| j.c.sackett (jcsackett) wrote : | # |
Thanks for this refactor; I have some comments and questions below.
https:/
File app/subapps/
https:/
app/subapps/
Don't we need a route like "/bws/sidebar/id*/* to match things like the
readme and interface routes above?
https:/
File app/subapps/
https:/
app/subapps/
there be no editorial content if
The sequence of if statements here seem odd; can't we just check the
subpath thing, and set our containerID &c based on that, as that will
also be false if fullscreen isn't even in the URL?
It's possible I'm just not really understanding some of this branch, as
I'm having trouble figuring out the situation in which we call
renderEditorial but don't want to renderEditorial.
https:/
File app/subapps/
https:/
app/subapps/
Does this (and the events change in views/charm.js) have to do with the
routes &c change, or just a driveby?
https:/
File app/subapps/
https:/
app/subapps/
node to insert our rendered content into.
These params don't match; _renderCharmView has "charm" and isFullScreen,
not container. It's getting container as an attr.
https:/
File app/subapps/
https:/
app/subapps/
Given views/charm.js has this same failure as apiFailure, and we're
using it here as a callback, we should probably define it in one place
and have both of those places use it.
https:/
File app/templates/
https:/
app/templates/
Can you update the token's less file to make sure pointer type remains
normal now that the entire thing is a link?
| Richard Harding (rharding) wrote : | # |
Comments below. Will have an updated branch in a bit.
https:/
File app/subapps/
https:/
app/subapps/
On 2013/04/15 21:06:34, j.c.sackett wrote:
> Don't we need a route like "/bws/sidebar/id*/* to match things like
the readme
> and interface routes above?
Short answer: yes
Longer: this functionality never worked and needs to be tied into the
rendering state of the charm details so it'll be implemented later.
https:/
File app/subapps/
https:/
app/subapps/
there be no editorial content if
On 2013/04/15 21:06:34, j.c.sackett wrote:
> The sequence of if statements here seem odd; can't we just check the
subpath
> thing, and set our containerID &c based on that, as that will also be
false if
> fullscreen isn't even in the URL?
> It's possible I'm just not really understanding some of this branch,
as I'm
> having trouble figuring out the situation in which we call
renderEditorial but
> don't want to renderEditorial.
Editorial is kind of a 'default' content. It's also going to be rendered
differently if it's for a fullscreen or sidebar view. Because of that we
track it's state here.
Render editorial is called manually from both sidebar() and
fullscreen(). It determines if it should go through with it based on the
current state.
/bws/sidebar/
to fill the sidebar while the charm details loads next to it.
/bws/fullscreen
don't need to render the editorial data so we bypass it.
https:/
File app/subapps/
https:/
app/subapps/
On 2013/04/15 21:06:34, j.c.sackett wrote:
> Does this (and the events change in views/charm.js) have to do with
the routes
> &c change, or just a driveby?
sorry, this was part of some debugging work where I had issues with the
double render causing events to bind twice and thus clicking this would
open and close the comments at once.
In debugging I moved the event to the h3 as a whole vs just the <a> and
missed reverting it, but it works so it didn't come out.
https:/
File app/subapps/
https:/
app/subapps/
node to insert our rendered content into.
On 2013/04/15 21:06:34, j.c.sackett wrote:
> These params don't match; ...
| j.c.sackett (jcsackett) wrote : | # |
On 2013/04/15 22:15:24, rharding wrote:
> Short answer: yes
> Longer: this functionality never worked and needs to be tied into the
rendering
> state of the charm details so it'll be implemented later.
Ok. Can you XXX or something to that effect?
> Editorial is kind of a 'default' content. It's also going to be
rendered
> differently if it's for a fullscreen or sidebar view. Because of that
we track
> it's state here.
> Render editorial is called manually from both sidebar() and
fullscreen(). It
> determines if it should go through with it based on the current state.
> /bws/sidebar/
to fill
> the sidebar while the charm details loads next to it.
> /bws/fullscreen
don't need
> to render the editorial data so we bypass it.
Ok. This still feels weird to me, but I understand it. Thanks.
> sorry, this was part of some debugging work where I had issues with
the double
> render causing events to bind twice and thus clicking this would open
and close
> the comments at once.
> In debugging I moved the event to the h3 as a whole vs just the <a>
and missed
> reverting it, but it works so it didn't come out.
I think it's fine as is, I was just double checking my understanding.
> Sorry, you're correct. This was tweaked and I didn't update the
docstring.
> Thanks!
Thanks for fixing!
> Yes, my goal is to move this to a view/utils but was trying to keep
from doing
> too much in the branch. I'll update this.
You can just XXX it for now and get it later, if you like. I just want
to make sure it gets handled.
> This is very temp. Actually you have to carefully click in a blank
area to
> trigger the link right now. I want to get UX/Huw follow up to fix it
up.
Ok, thanks.
| j.c.sackett (jcsackett) wrote : | # |
LGTM from discussion and with promised fixes. Thanks!
| Jeff Pihach (hatch) wrote : | # |
LGTM Thanks for all the work!
- 558. By Richard Harding
-
Updates per review
- 559. By Richard Harding
-
Updates per review
- 560. By Richard Harding
-
lint
- 561. By Richard Harding
-
Resolve conflicts from trunk
| Richard Harding (rharding) wrote : | # |
*** Submitted:
Rearchitect the browser to use routes more
- Use nested routes and route handling to build the browser UI
- Break up the Views in the browser subapp to be more singular per UX
component.
- Adjust tests to fit with this.
R=jeff.pihach, j.c.sackett
CC=
https:/
Preview Diff
| 1 | === modified file 'app/modules-debug.js' | |||
| 2 | --- app/modules-debug.js 2013-04-09 18:10:36 +0000 | |||
| 3 | +++ app/modules-debug.js 2013-04-16 00:07:30 +0000 | |||
| 4 | @@ -290,6 +290,15 @@ | |||
| 5 | 290 | 290 | ||
| 6 | 291 | 'subapp-browser-sidebar': { | 291 | 'subapp-browser-sidebar': { |
| 7 | 292 | fullpath: '/juju-ui/subapps/browser/views/sidebar.js', | 292 | fullpath: '/juju-ui/subapps/browser/views/sidebar.js', |
| 8 | 293 | requires: [ | ||
| 9 | 294 | 'subapp-browser-editorial', | ||
| 10 | 295 | 'subapp-browser-mainview', | ||
| 11 | 296 | 'subapp-browser-charmview' | ||
| 12 | 297 | ] | ||
| 13 | 298 | }, | ||
| 14 | 299 | |||
| 15 | 300 | 'subapp-browser-editorial': { | ||
| 16 | 301 | fullpath: '/juju-ui/subapps/browser/views/editorial.js', | ||
| 17 | 293 | requires: ['subapp-browser-sidebar'] | 302 | requires: ['subapp-browser-sidebar'] |
| 18 | 294 | }, | 303 | }, |
| 19 | 295 | 304 | ||
| 20 | 296 | 305 | ||
| 21 | === modified file 'app/subapps/browser/browser.js' | |||
| 22 | --- app/subapps/browser/browser.js 2013-04-04 19:16:03 +0000 | |||
| 23 | +++ app/subapps/browser/browser.js 2013-04-16 00:07:30 +0000 | |||
| 24 | @@ -9,7 +9,8 @@ | |||
| 25 | 9 | * | 9 | * |
| 26 | 10 | */ | 10 | */ |
| 27 | 11 | YUI.add('subapp-browser', function(Y) { | 11 | YUI.add('subapp-browser', function(Y) { |
| 29 | 12 | var ns = Y.namespace('juju.subapps'); | 12 | var ns = Y.namespace('juju.subapps'), |
| 30 | 13 | models = Y.namespace('juju.models'); | ||
| 31 | 13 | 14 | ||
| 32 | 14 | /** | 15 | /** |
| 33 | 15 | * Browser Sub App for the Juju Gui. | 16 | * Browser Sub App for the Juju Gui. |
| 34 | @@ -19,7 +20,6 @@ | |||
| 35 | 19 | * | 20 | * |
| 36 | 20 | */ | 21 | */ |
| 37 | 21 | ns.Browser = Y.Base.create('subapp-browser', Y.juju.SubApp, [], { | 22 | ns.Browser = Y.Base.create('subapp-browser', Y.juju.SubApp, [], { |
| 38 | 22 | |||
| 39 | 23 | /** | 23 | /** |
| 40 | 24 | * Some routes might have sub parts that hint to where a user wants focus. | 24 | * Some routes might have sub parts that hint to where a user wants focus. |
| 41 | 25 | * In particular we've got the tabs that might have focus. They are the | 25 | * In particular we've got the tabs that might have focus. They are the |
| 42 | @@ -49,7 +49,8 @@ | |||
| 43 | 49 | */ | 49 | */ |
| 44 | 50 | _getViewCfg: function(cfg) { | 50 | _getViewCfg: function(cfg) { |
| 45 | 51 | return Y.merge(cfg, { | 51 | return Y.merge(cfg, { |
| 47 | 52 | db: this.get('db') | 52 | db: this.get('db'), |
| 48 | 53 | store: this.get('store') | ||
| 49 | 53 | }); | 54 | }); |
| 50 | 54 | }, | 55 | }, |
| 51 | 55 | 56 | ||
| 52 | @@ -59,32 +60,42 @@ | |||
| 53 | 59 | * | 60 | * |
| 54 | 60 | */ | 61 | */ |
| 55 | 61 | views: { | 62 | views: { |
| 56 | 63 | charmDetails: { | ||
| 57 | 64 | type: 'juju.browser.views.BrowserCharmView', | ||
| 58 | 65 | preserve: false | ||
| 59 | 66 | }, | ||
| 60 | 62 | fullscreen: { | 67 | fullscreen: { |
| 61 | 63 | type: 'juju.browser.views.FullScreen', | 68 | type: 'juju.browser.views.FullScreen', |
| 62 | 64 | preserve: true | ||
| 63 | 65 | }, | ||
| 64 | 66 | fullscreenCharm: { | ||
| 65 | 67 | type: 'juju.browser.views.FullScreen', | ||
| 66 | 68 | preserve: false | 69 | preserve: false |
| 67 | 69 | }, | 70 | }, |
| 68 | 70 | sidebar: { | 71 | sidebar: { |
| 69 | 71 | type: 'juju.browser.views.Sidebar', | 72 | type: 'juju.browser.views.Sidebar', |
| 70 | 72 | preserve: true | ||
| 71 | 73 | }, | ||
| 72 | 74 | sidebarCharm: { | ||
| 73 | 75 | type: 'juju.browser.views.Sidebar', | ||
| 74 | 76 | preserve: false | 73 | preserve: false |
| 75 | 77 | } | 74 | } |
| 76 | 78 | }, | 75 | }, |
| 77 | 79 | 76 | ||
| 78 | 80 | /** | 77 | /** |
| 79 | 78 | Cleanup after ourselves on destroy. | ||
| 80 | 79 | |||
| 81 | 80 | @method destructor | ||
| 82 | 81 | |||
| 83 | 82 | */ | ||
| 84 | 83 | destructor: function() { | ||
| 85 | 84 | this._cacheCharms.destroy(); | ||
| 86 | 85 | }, | ||
| 87 | 86 | |||
| 88 | 87 | /** | ||
| 89 | 81 | * General app initializer | 88 | * General app initializer |
| 90 | 82 | * | 89 | * |
| 91 | 83 | * @method initializer | 90 | * @method initializer |
| 92 | 84 | * @param {Object} cfg general init config object. | 91 | * @param {Object} cfg general init config object. |
| 93 | 85 | * | 92 | * |
| 94 | 86 | */ | 93 | */ |
| 96 | 87 | initializer: function(cfg) {}, | 94 | initializer: function(cfg) { |
| 97 | 95 | // Hold onto charm data so we can pass model instances to other views when | ||
| 98 | 96 | // charms are selected. | ||
| 99 | 97 | this._cacheCharms = new models.BrowserCharmList(); | ||
| 100 | 98 | }, | ||
| 101 | 88 | 99 | ||
| 102 | 89 | /** | 100 | /** |
| 103 | 90 | * Render the fullscreen view to the client. | 101 | * Render the fullscreen view to the client. |
| 104 | @@ -96,35 +107,63 @@ | |||
| 105 | 96 | * | 107 | * |
| 106 | 97 | */ | 108 | */ |
| 107 | 98 | fullscreen: function(req, res, next) { | 109 | fullscreen: function(req, res, next) { |
| 137 | 99 | this.showView('fullscreen', this._getViewCfg()); | 110 | if (!this._fullscreen) { |
| 138 | 100 | next(); | 111 | this._fullscreen = this.showView('fullscreen', this._getViewCfg(), { |
| 139 | 101 | }, | 112 | 'callback': function(view) { |
| 140 | 102 | 113 | // if the fullscreen isn't the last part of the path, then ignore | |
| 141 | 103 | /** | 114 | // the editorial content. |
| 142 | 104 | * Render the fullscreen view of a specific charm to the client. | 115 | if (this._getSubPath(req.path) === 'fullscreen') { |
| 143 | 105 | * | 116 | this.renderEditorial(req, res, next); |
| 144 | 106 | * @method fullscreenCharm | 117 | } |
| 145 | 107 | * @param {Request} req current request object. | 118 | next(); |
| 146 | 108 | * @param {Response} res current response object. | 119 | } |
| 147 | 109 | * @param {function} next callable for the next route in the chain. | 120 | }); |
| 148 | 110 | * | 121 | } else { |
| 149 | 111 | */ | 122 | next(); |
| 150 | 112 | fullscreenCharm: function(req, res, next) { | 123 | } |
| 151 | 113 | var subpath = this._getSubPath(req.path); | 124 | }, |
| 152 | 114 | this.showView('fullscreenCharm', this._getViewCfg({ | 125 | |
| 153 | 115 | charmID: req.params.id, | 126 | /** |
| 154 | 116 | subpath: subpath | 127 | Render editorial content into the parent view when required. |
| 155 | 117 | })); | 128 | |
| 156 | 118 | next(); | 129 | The parent view is either fullscreen/sidebar which determines how the |
| 157 | 119 | }, | 130 | editorial content is to be rendered. |
| 158 | 120 | 131 | ||
| 159 | 121 | /** | 132 | @method renderEditorial |
| 160 | 122 | * Destroy the subapp instance. | 133 | @param {Request} req current request object. |
| 161 | 123 | * | 134 | @param {Response} res current response object. |
| 162 | 124 | * @method destructor | 135 | @param {function} next callable for the next route in the chain. |
| 163 | 125 | * | 136 | |
| 164 | 126 | */ | 137 | */ |
| 165 | 127 | destructor: function() {}, | 138 | renderEditorial: function(req, res, next) { |
| 166 | 139 | var container = this.get('container'), | ||
| 167 | 140 | editorialContainer, | ||
| 168 | 141 | extraCfg = {}; | ||
| 169 | 142 | |||
| 170 | 143 | if (req.path.indexOf('fullscreen') !== -1) { | ||
| 171 | 144 | // The fullscreen view requires that there be no editorial content if | ||
| 172 | 145 | // we're looking at a specific charm. The div we dump our content into | ||
| 173 | 146 | // is shared. So if the url is /fullscreen show editorial content, but | ||
| 174 | 147 | // if it's not, there's something else handling displaying the | ||
| 175 | 148 | // view-data. | ||
| 176 | 149 | editorialContainer = container.one(' .bws-view-data'); | ||
| 177 | 150 | extraCfg.isFullscreen = true; | ||
| 178 | 151 | } else { | ||
| 179 | 152 | // If this is the sidebar view, then the editorial content goes into a | ||
| 180 | 153 | // different div since we can view both editorial content and | ||
| 181 | 154 | // view-data (such as a charm details) side by side. | ||
| 182 | 155 | editorialContainer = container.one('.bws-content'); | ||
| 183 | 156 | } | ||
| 184 | 157 | |||
| 185 | 158 | if (!this._editorial) { | ||
| 186 | 159 | this._editorial = new Y.juju.browser.views.EditorialView( | ||
| 187 | 160 | this._getViewCfg(extraCfg)); | ||
| 188 | 161 | |||
| 189 | 162 | this._editorial.render(editorialContainer); | ||
| 190 | 163 | // Add any sidebar charms to the running cache. | ||
| 191 | 164 | this._cacheCharms.add(this._editorial._cacheCharms); | ||
| 192 | 165 | } | ||
| 193 | 166 | }, | ||
| 194 | 128 | 167 | ||
| 195 | 129 | /** | 168 | /** |
| 196 | 130 | * Handle the route for the sidebar view. | 169 | * Handle the route for the sidebar view. |
| 197 | @@ -136,8 +175,26 @@ | |||
| 198 | 136 | * | 175 | * |
| 199 | 137 | */ | 176 | */ |
| 200 | 138 | sidebar: function(req, res, next) { | 177 | sidebar: function(req, res, next) { |
| 203 | 139 | this.showView('sidebar', this._getViewCfg()); | 178 | // Clean up any details we've got. |
| 204 | 140 | next(); | 179 | if (this._details) { |
| 205 | 180 | this._details.destroy({remove: true}); | ||
| 206 | 181 | } | ||
| 207 | 182 | |||
| 208 | 183 | if (!this._sidebar) { | ||
| 209 | 184 | // Whenever the sidebar view is rendered it needs some editorial | ||
| 210 | 185 | // content to display to the user. We only need once instance though, | ||
| 211 | 186 | // so only render it on the first view. As users click on charm to | ||
| 212 | 187 | // charm and we generate urls /sidebar/precise/xxx we don't want to | ||
| 213 | 188 | // re-render the sidebar content. | ||
| 214 | 189 | this._sidebar = this.showView('sidebar', this._getViewCfg(), { | ||
| 215 | 190 | 'callback': function(view) { | ||
| 216 | 191 | this.renderEditorial(req, res, next); | ||
| 217 | 192 | next(); | ||
| 218 | 193 | } | ||
| 219 | 194 | }); | ||
| 220 | 195 | } else { | ||
| 221 | 196 | next(); | ||
| 222 | 197 | } | ||
| 223 | 141 | }, | 198 | }, |
| 224 | 142 | 199 | ||
| 225 | 143 | /** | 200 | /** |
| 226 | @@ -149,53 +206,112 @@ | |||
| 227 | 149 | * @param {function} next callable for the next route in the chain. | 206 | * @param {function} next callable for the next route in the chain. |
| 228 | 150 | * | 207 | * |
| 229 | 151 | */ | 208 | */ |
| 236 | 152 | sidebarCharm: function(req, res, next) { | 209 | charmDetails: function(req, res, next) { |
| 237 | 153 | var subpath = this._getSubPath(req.path); | 210 | var charmID = req.params.id; |
| 238 | 154 | this.showView('sidebarCharm', this._getViewCfg({ | 211 | var extraCfg = { |
| 239 | 155 | charmID: req.params.id, | 212 | charmID: charmID, |
| 240 | 156 | subpath: subpath | 213 | container: Y.Node.create('<div class="charmview"/>') |
| 241 | 157 | })); | 214 | }; |
| 242 | 215 | |||
| 243 | 216 | // The details view needs to know if we're using a fullscreen template | ||
| 244 | 217 | // or the sidebar version. | ||
| 245 | 218 | if (req.path.indexOf('fullscreen') !== -1) { | ||
| 246 | 219 | extraCfg.isFullscreen = true; | ||
| 247 | 220 | } | ||
| 248 | 221 | |||
| 249 | 222 | // Gotten from the sidebar creating the cache. | ||
| 250 | 223 | var model = this._cacheCharms.getById(charmID); | ||
| 251 | 224 | |||
| 252 | 225 | if (model) { | ||
| 253 | 226 | extraCfg.charm = model; | ||
| 254 | 227 | } | ||
| 255 | 228 | |||
| 256 | 229 | this._details = new Y.juju.browser.views.BrowserCharmView( | ||
| 257 | 230 | this._getViewCfg(extraCfg)); | ||
| 258 | 231 | this._details.render(); | ||
| 259 | 158 | next(); | 232 | next(); |
| 260 | 159 | } | 233 | } |
| 261 | 160 | 234 | ||
| 262 | 161 | }, { | 235 | }, { |
| 263 | 162 | ATTRS: { | 236 | ATTRS: { |
| 264 | 237 | /** | ||
| 265 | 238 | @attribute container | ||
| 266 | 239 | @default '#subapp-browser' | ||
| 267 | 240 | @type {String} | ||
| 268 | 241 | |||
| 269 | 242 | */ | ||
| 270 | 163 | container: { | 243 | container: { |
| 271 | 164 | value: '#subapp-browser' | 244 | value: '#subapp-browser' |
| 272 | 165 | }, | 245 | }, |
| 275 | 166 | urlNamespace: { | 246 | |
| 276 | 167 | value: 'charmstore' | 247 | /** |
| 277 | 248 | @attribute store | ||
| 278 | 249 | @default Charmworld0 | ||
| 279 | 250 | @type {Charmworld0} | ||
| 280 | 251 | |||
| 281 | 252 | */ | ||
| 282 | 253 | store: { | ||
| 283 | 254 | /** | ||
| 284 | 255 | We keep one instance of the store and will work on caching results | ||
| 285 | 256 | at the app level so that routes can share api calls. However, in | ||
| 286 | 257 | tests there's no config for talking to the api so we have to watch | ||
| 287 | 258 | out in test runs and allow the store to be broken. | ||
| 288 | 259 | |||
| 289 | 260 | method store.valueFn | ||
| 290 | 261 | |||
| 291 | 262 | */ | ||
| 292 | 263 | valueFn: function() { | ||
| 293 | 264 | var url = ''; | ||
| 294 | 265 | if (!window.juju_config || ! window.juju_config.charmworldURL) { | ||
| 295 | 266 | console.error('No juju config to fetch charmworld store url'); | ||
| 296 | 267 | } else { | ||
| 297 | 268 | url = window.juju_config.charmworldURL; | ||
| 298 | 269 | } | ||
| 299 | 270 | return new Y.juju.Charmworld0({ | ||
| 300 | 271 | 'apiHost': url | ||
| 301 | 272 | }); | ||
| 302 | 273 | } | ||
| 303 | 168 | }, | 274 | }, |
| 304 | 275 | |||
| 305 | 276 | /** | ||
| 306 | 277 | @attribute routes | ||
| 307 | 278 | @default Array of subapp routes. | ||
| 308 | 279 | @type {Array} | ||
| 309 | 280 | |||
| 310 | 281 | */ | ||
| 311 | 169 | routes: { | 282 | routes: { |
| 312 | 170 | value: [ | 283 | value: [ |
| 313 | 284 | // Double routes are needed to catch /fullscreen and /fullscreen/ | ||
| 314 | 171 | { path: '/bws/fullscreen/', callbacks: 'fullscreen' }, | 285 | { path: '/bws/fullscreen/', callbacks: 'fullscreen' }, |
| 323 | 172 | { path: '/bws/fullscreen/*id/configuration/', | 286 | { path: '/bws/fullscreen/*/', callbacks: 'fullscreen' }, |
| 324 | 173 | callbacks: 'fullscreenCharm' }, | 287 | { path: '/bws/fullscreen/*id/', callbacks: 'charmDetails' }, |
| 317 | 174 | { path: '/bws/fullscreen/*id/hooks/', callbacks: 'fullscreenCharm' }, | ||
| 318 | 175 | { path: '/bws/fullscreen/*id/interfaces/', | ||
| 319 | 176 | callbacks: 'fullscreenCharm' }, | ||
| 320 | 177 | { path: '/bws/fullscreen/*id/qa/', callbacks: 'fullscreenCharm' }, | ||
| 321 | 178 | { path: '/bws/fullscreen/*id/readme/', callbacks: 'fullscreenCharm' }, | ||
| 322 | 179 | { path: '/bws/fullscreen/*id/', callbacks: 'fullscreenCharm' }, | ||
| 325 | 180 | 288 | ||
| 326 | 181 | { path: '/bws/sidebar/', callbacks: 'sidebar' }, | 289 | { path: '/bws/sidebar/', callbacks: 'sidebar' }, |
| 336 | 182 | 290 | { path: '/bws/sidebar/*/', callbacks: 'sidebar' }, | |
| 337 | 183 | { path: '/bws/sidebar/*id/configuration/', | 291 | { path: '/bws/sidebar/*id/', callbacks: 'charmDetails' } |
| 329 | 184 | callbacks: 'sidebarCharm' }, | ||
| 330 | 185 | { path: '/bws/sidebar/*id/hooks/', callbacks: 'sidebarCharm' }, | ||
| 331 | 186 | { path: '/bws/sidebar/*id/interfaces/', | ||
| 332 | 187 | callbacks: 'sidebarCharm' }, | ||
| 333 | 188 | { path: '/bws/sidebar/*id/qa/', callbacks: 'sidebarCharm' }, | ||
| 334 | 189 | { path: '/bws/sidebar/*id/readme/', callbacks: 'sidebarCharm' }, | ||
| 335 | 190 | { path: '/bws/sidebar/*id/', callbacks: 'sidebarCharm' } | ||
| 338 | 191 | ] | 292 | ] |
| 339 | 293 | }, | ||
| 340 | 294 | |||
| 341 | 295 | /** | ||
| 342 | 296 | @attribute urlNamespace | ||
| 343 | 297 | @default 'charmstore' | ||
| 344 | 298 | @type {String} | ||
| 345 | 299 | |||
| 346 | 300 | */ | ||
| 347 | 301 | urlNamespace: { | ||
| 348 | 302 | value: 'charmstore' | ||
| 349 | 192 | } | 303 | } |
| 350 | 304 | |||
| 351 | 193 | } | 305 | } |
| 352 | 194 | }); | 306 | }); |
| 353 | 195 | 307 | ||
| 354 | 196 | }, '0.1.0', { | 308 | }, '0.1.0', { |
| 355 | 197 | requires: [ | 309 | requires: [ |
| 356 | 310 | 'juju-charm-store', | ||
| 357 | 311 | 'juju-models', | ||
| 358 | 198 | 'sub-app', | 312 | 'sub-app', |
| 359 | 313 | 'subapp-browser-charmview', | ||
| 360 | 314 | 'subapp-browser-editorial', | ||
| 361 | 199 | 'subapp-browser-fullscreen', | 315 | 'subapp-browser-fullscreen', |
| 362 | 200 | 'subapp-browser-sidebar' | 316 | 'subapp-browser-sidebar' |
| 363 | 201 | ] | 317 | ] |
| 364 | 202 | 318 | ||
| 365 | === modified file 'app/subapps/browser/templates/browser_charm.handlebars' | |||
| 366 | --- app/subapps/browser/templates/browser_charm.handlebars 2013-04-15 14:16:16 +0000 | |||
| 367 | +++ app/subapps/browser/templates/browser_charm.handlebars 2013-04-16 00:07:30 +0000 | |||
| 368 | @@ -1,7 +1,7 @@ | |||
| 369 | 1 | <div class="charm yui3-g"> | 1 | <div class="charm yui3-g"> |
| 370 | 2 | <div class="content yui3-u-{{#if isFullscreen}}5-6{{else}}1{{/if}}"> | 2 | <div class="content yui3-u-{{#if isFullscreen}}5-6{{else}}1{{/if}}"> |
| 371 | 3 | <div class="nav"> | 3 | <div class="nav"> |
| 373 | 4 | <a href="" class="back">{{#if isFullscreen}}Back{{else}}Close{{/if}}</a> | 4 | <a href="/bws/sidebar/" class="back">{{#if isFullscreen}}Back{{else}}Close{{/if}}</a> |
| 374 | 5 | <a href="" class="add">Add</a> | 5 | <a href="" class="add">Add</a> |
| 375 | 6 | <a href="" class="share"> | 6 | <a href="" class="share"> |
| 376 | 7 | <img src="/juju-ui/assets/images/share_icon.jpg" alt="Share" /> | 7 | <img src="/juju-ui/assets/images/share_icon.jpg" alt="Share" /> |
| 377 | @@ -36,11 +36,8 @@ | |||
| 378 | 36 | </div> | 36 | </div> |
| 379 | 37 | 37 | ||
| 380 | 38 | <div class="changelog"> | 38 | <div class="changelog"> |
| 386 | 39 | <h3 class="section-title"> | 39 | <h3 class="section-title" data-state="closed"> |
| 387 | 40 | {{#if recent_commits}} | 40 | Change log |
| 383 | 41 | <a href="" class="expandToggle" data-state="closed"> | ||
| 384 | 42 | {{/if}} | ||
| 385 | 43 | Change log | ||
| 388 | 44 | {{#if recent_commits}} | 41 | {{#if recent_commits}} |
| 389 | 45 | <span class="expand"> | 42 | <span class="expand"> |
| 390 | 46 | <span class="more"> | 43 | <span class="more"> |
| 391 | @@ -52,7 +49,6 @@ | |||
| 392 | 52 | alt="Contract" /> | 49 | alt="Contract" /> |
| 393 | 53 | </span> | 50 | </span> |
| 394 | 54 | </span> | 51 | </span> |
| 395 | 55 | </a> | ||
| 396 | 56 | {{/if}} | 52 | {{/if}} |
| 397 | 57 | </h3> | 53 | </h3> |
| 398 | 58 | {{#if recent_commits}} | 54 | {{#if recent_commits}} |
| 399 | 59 | 55 | ||
| 400 | === added file 'app/subapps/browser/templates/editorial.handlebars' | |||
| 401 | --- app/subapps/browser/templates/editorial.handlebars 1970-01-01 00:00:00 +0000 | |||
| 402 | +++ app/subapps/browser/templates/editorial.handlebars 2013-04-16 00:07:30 +0000 | |||
| 403 | @@ -0,0 +1,9 @@ | |||
| 404 | 1 | <div id="bws_editorial"> | ||
| 405 | 2 | {{#if isFullscreen}} | ||
| 406 | 3 | <p>Some static content</p> | ||
| 407 | 4 | {{/if}} | ||
| 408 | 5 | |||
| 409 | 6 | <div class="featured"></div> | ||
| 410 | 7 | <div class="popular"></div> | ||
| 411 | 8 | <div class="new"></div> | ||
| 412 | 9 | </div> | ||
| 413 | 0 | 10 | ||
| 414 | === modified file 'app/subapps/browser/templates/sidebar.handlebars' | |||
| 415 | --- app/subapps/browser/templates/sidebar.handlebars 2013-04-15 07:26:46 +0000 | |||
| 416 | +++ app/subapps/browser/templates/sidebar.handlebars 2013-04-16 00:07:30 +0000 | |||
| 417 | @@ -2,12 +2,10 @@ | |||
| 418 | 2 | <div id="bws-sidebar" class="yui3-u-1-4"> | 2 | <div id="bws-sidebar" class="yui3-u-1-4"> |
| 419 | 3 | <div class="bws-header"> | 3 | <div class="bws-header"> |
| 420 | 4 | </div> | 4 | </div> |
| 425 | 5 | <div class="bws-left"> | 5 | <div class="bws-content"> |
| 422 | 6 | <div class="featured"></div> | ||
| 423 | 7 | <div class="popular"></div> | ||
| 424 | 8 | <div class="new"></div> | ||
| 426 | 9 | </div> | 6 | </div> |
| 427 | 10 | </div> | 7 | </div> |
| 428 | 11 | <div class="bws-view-data yui3-u-3-4"> | 8 | <div class="bws-view-data yui3-u-3-4"> |
| 429 | 9 | <div></div> | ||
| 430 | 12 | </div> | 10 | </div> |
| 431 | 13 | </div> | 11 | </div> |
| 432 | 14 | 12 | ||
| 433 | === modified file 'app/subapps/browser/views/charm.js' | |||
| 434 | --- app/subapps/browser/views/charm.js 2013-04-12 07:01:02 +0000 | |||
| 435 | +++ app/subapps/browser/views/charm.js 2013-04-16 00:07:30 +0000 | |||
| 436 | @@ -3,6 +3,7 @@ | |||
| 437 | 3 | 3 | ||
| 438 | 4 | YUI.add('subapp-browser-charmview', function(Y) { | 4 | YUI.add('subapp-browser-charmview', function(Y) { |
| 439 | 5 | var ns = Y.namespace('juju.browser.views'), | 5 | var ns = Y.namespace('juju.browser.views'), |
| 440 | 6 | models = Y.namespace('juju.models'), | ||
| 441 | 6 | views = Y.namespace('juju.views'), | 7 | views = Y.namespace('juju.views'), |
| 442 | 7 | widgets = Y.namespace('juju.widgets'), | 8 | widgets = Y.namespace('juju.widgets'), |
| 443 | 8 | DATE_FORMAT = '%H:%M %d/%b/%y'; | 9 | DATE_FORMAT = '%H:%M %d/%b/%y'; |
| 444 | @@ -29,7 +30,7 @@ | |||
| 445 | 29 | * | 30 | * |
| 446 | 30 | */ | 31 | */ |
| 447 | 31 | events: { | 32 | events: { |
| 449 | 32 | '.changelog .expandToggle': { | 33 | '.changelog h3.section-title': { |
| 450 | 33 | click: '_toggleLog' | 34 | click: '_toggleLog' |
| 451 | 34 | }, | 35 | }, |
| 452 | 35 | '.charm .add': { | 36 | '.charm .add': { |
| 453 | @@ -55,6 +56,31 @@ | |||
| 454 | 55 | }, | 56 | }, |
| 455 | 56 | 57 | ||
| 456 | 57 | /** | 58 | /** |
| 457 | 59 | * Shared method to generate a message to the user based on a bad api | ||
| 458 | 60 | * call. | ||
| 459 | 61 | * | ||
| 460 | 62 | * @method apiFailure | ||
| 461 | 63 | * @param {Object} data the json decoded response text. | ||
| 462 | 64 | * @param {Object} request the original io_request object for debugging. | ||
| 463 | 65 | * | ||
| 464 | 66 | */ | ||
| 465 | 67 | apiFailure: function(data, request) { | ||
| 466 | 68 | var message; | ||
| 467 | 69 | if (data && data.type) { | ||
| 468 | 70 | message = 'Charm API error of type: ' + data.type; | ||
| 469 | 71 | } else { | ||
| 470 | 72 | message = 'Charm API server did not respond'; | ||
| 471 | 73 | } | ||
| 472 | 74 | this.get('db').notifications.add( | ||
| 473 | 75 | new models.Notification({ | ||
| 474 | 76 | title: 'Failed to load sidebar content.', | ||
| 475 | 77 | message: message, | ||
| 476 | 78 | level: 'error' | ||
| 477 | 79 | }) | ||
| 478 | 80 | ); | ||
| 479 | 81 | }, | ||
| 480 | 82 | |||
| 481 | 83 | /** | ||
| 482 | 58 | * The API retuns the questions and the scores. Combine the data into a | 84 | * The API retuns the questions and the scores. Combine the data into a |
| 483 | 59 | * single source to make looping in the handlebars templates nicer. | 85 | * single source to make looping in the handlebars templates nicer. |
| 484 | 60 | * | 86 | * |
| 485 | @@ -263,7 +289,6 @@ | |||
| 486 | 263 | 289 | ||
| 487 | 264 | } | 290 | } |
| 488 | 265 | }, this); | 291 | }, this); |
| 489 | 266 | |||
| 490 | 267 | }, | 292 | }, |
| 491 | 268 | 293 | ||
| 492 | 269 | /** | 294 | /** |
| 493 | @@ -334,29 +359,30 @@ | |||
| 494 | 334 | }, | 359 | }, |
| 495 | 335 | 360 | ||
| 496 | 336 | /** | 361 | /** |
| 498 | 337 | * Render out the view to the DOM. | 362 | * Render the view of a single charm details page. |
| 499 | 338 | * | 363 | * |
| 502 | 339 | * @method render | 364 | * @method _renderCharmView |
| 503 | 340 | * @param {Node} container optional specific container to render out to. | 365 | * @param {BrowserCharm} charm the charm model instance to view. |
| 504 | 366 | * @param {Boolean} isFullscreen is this display for the fullscreen | ||
| 505 | 367 | * experiecne? | ||
| 506 | 341 | * | 368 | * |
| 507 | 342 | */ | 369 | */ |
| 511 | 343 | render: function(container, isFullscreen) { | 370 | _renderCharmView: function(charm, isFullscreen) { |
| 512 | 344 | var charm = this.get('charm'); | 371 | this.set('charm', charm); |
| 513 | 345 | var tplData = charm.getAttrs(); | 372 | |
| 514 | 373 | var tplData = charm.getAttrs(), | ||
| 515 | 374 | container = this.get('container'); | ||
| 516 | 375 | |||
| 517 | 346 | tplData.isFullscreen = isFullscreen; | 376 | tplData.isFullscreen = isFullscreen; |
| 518 | 347 | tplData.prettyCommits = this._formatCommitsForHtml( | 377 | tplData.prettyCommits = this._formatCommitsForHtml( |
| 519 | 348 | tplData.recent_commits); | 378 | tplData.recent_commits); |
| 520 | 349 | 379 | ||
| 521 | 350 | var tpl = this.template(tplData); | 380 | var tpl = this.template(tplData); |
| 527 | 351 | var tplNode = Y.Node.create(tpl); | 381 | var tplNode = container.setHTML(tpl); |
| 528 | 352 | 382 | ||
| 529 | 353 | container.setHTML(tplNode); | 383 | // Set the content then update the container so that it reload |
| 525 | 354 | |||
| 526 | 355 | // Allow for specifying the container to use. This should reset the | ||
| 530 | 356 | // events. | 384 | // events. |
| 534 | 357 | if (container) { | 385 | Y.one('.bws-view-data').setHTML(tplNode); |
| 532 | 358 | this.set('container', container); | ||
| 533 | 359 | } | ||
| 535 | 360 | 386 | ||
| 536 | 361 | this.tabview = new widgets.browser.TabView({ | 387 | this.tabview = new widgets.browser.TabView({ |
| 537 | 362 | srcNode: tplNode.one('.tabs') | 388 | srcNode: tplNode.one('.tabs') |
| 538 | @@ -374,10 +400,45 @@ | |||
| 539 | 374 | } else { | 400 | } else { |
| 540 | 375 | this._noReadme(tplNode.one('#bws-readme')); | 401 | this._noReadme(tplNode.one('#bws-readme')); |
| 541 | 376 | } | 402 | } |
| 542 | 403 | }, | ||
| 543 | 404 | |||
| 544 | 405 | /** | ||
| 545 | 406 | Render out the view to the DOM. | ||
| 546 | 407 | |||
| 547 | 408 | The View might be given either a charmID, which means go fetch the | ||
| 548 | 409 | charm data, or a charm model instance, in which case the view has the | ||
| 549 | 410 | data it needs to render. | ||
| 550 | 411 | |||
| 551 | 412 | @method render | ||
| 552 | 413 | |||
| 553 | 414 | */ | ||
| 554 | 415 | render: function() { | ||
| 555 | 416 | var isFullscreen = this.get('isFullscreen'); | ||
| 556 | 417 | |||
| 557 | 418 | if (this.get('charm')) { | ||
| 558 | 419 | this._renderCharmView(this.get('charm'), isFullscreen); | ||
| 559 | 420 | } else { | ||
| 560 | 421 | this.get('store').charm(this.get('charmID'), { | ||
| 561 | 422 | 'success': function(data) { | ||
| 562 | 423 | var charm = new models.BrowserCharm(data); | ||
| 563 | 424 | this.set('charm', charm); | ||
| 564 | 425 | this._renderCharmView(this.get('charm'), isFullscreen); | ||
| 565 | 426 | }, | ||
| 566 | 427 | 'failure': this.apiFailure | ||
| 567 | 428 | }, this); | ||
| 568 | 429 | } | ||
| 569 | 377 | } | 430 | } |
| 570 | 378 | }, { | 431 | }, { |
| 571 | 379 | ATTRS: { | 432 | ATTRS: { |
| 572 | 380 | /** | 433 | /** |
| 573 | 434 | @attribute charmID | ||
| 574 | 435 | @default undefined | ||
| 575 | 436 | @type {Int} | ||
| 576 | 437 | |||
| 577 | 438 | */ | ||
| 578 | 439 | charmID: {}, | ||
| 579 | 440 | |||
| 580 | 441 | /** | ||
| 581 | 381 | * The charm we're viewing the details of. | 442 | * The charm we're viewing the details of. |
| 582 | 382 | * | 443 | * |
| 583 | 383 | * @attribute charm | 444 | * @attribute charm |
| 584 | @@ -388,6 +449,16 @@ | |||
| 585 | 388 | charm: {}, | 449 | charm: {}, |
| 586 | 389 | 450 | ||
| 587 | 390 | /** | 451 | /** |
| 588 | 452 | @attribute isFullscreen | ||
| 589 | 453 | @default false | ||
| 590 | 454 | @type {Boolean} | ||
| 591 | 455 | |||
| 592 | 456 | */ | ||
| 593 | 457 | ifFullscreen: { | ||
| 594 | 458 | value: false | ||
| 595 | 459 | }, | ||
| 596 | 460 | |||
| 597 | 461 | /** | ||
| 598 | 391 | * The store is the api endpoint for fetching data. | 462 | * The store is the api endpoint for fetching data. |
| 599 | 392 | * | 463 | * |
| 600 | 393 | * @attribute store | 464 | * @attribute store |
| 601 | @@ -408,9 +479,12 @@ | |||
| 602 | 408 | 'datatype-date-format', | 479 | 'datatype-date-format', |
| 603 | 409 | 'event-tracker', | 480 | 'event-tracker', |
| 604 | 410 | 'gallery-markdown', | 481 | 'gallery-markdown', |
| 605 | 482 | 'juju-charm-store', | ||
| 606 | 483 | 'juju-models', | ||
| 607 | 411 | 'juju-templates', | 484 | 'juju-templates', |
| 608 | 412 | 'juju-views', | 485 | 'juju-views', |
| 609 | 413 | 'juju-view-utils', | 486 | 'juju-view-utils', |
| 610 | 487 | 'node', | ||
| 611 | 414 | 'prettify', | 488 | 'prettify', |
| 612 | 415 | 'view' | 489 | 'view' |
| 613 | 416 | ] | 490 | ] |
| 614 | 417 | 491 | ||
| 615 | === added file 'app/subapps/browser/views/editorial.js' | |||
| 616 | --- app/subapps/browser/views/editorial.js 1970-01-01 00:00:00 +0000 | |||
| 617 | +++ app/subapps/browser/views/editorial.js 2013-04-16 00:07:30 +0000 | |||
| 618 | @@ -0,0 +1,166 @@ | |||
| 619 | 1 | 'use strict'; | ||
| 620 | 2 | |||
| 621 | 3 | |||
| 622 | 4 | /** | ||
| 623 | 5 | * Browser Editorial View. | ||
| 624 | 6 | * | ||
| 625 | 7 | * @module juju.browser | ||
| 626 | 8 | * @submodule views | ||
| 627 | 9 | * | ||
| 628 | 10 | */ | ||
| 629 | 11 | YUI.add('subapp-browser-editorial', function(Y) { | ||
| 630 | 12 | var ns = Y.namespace('juju.browser.views'), | ||
| 631 | 13 | models = Y.namespace('juju.models'), | ||
| 632 | 14 | views = Y.namespace('juju.views'), | ||
| 633 | 15 | widgets = Y.namespace('juju.widgets'); | ||
| 634 | 16 | |||
| 635 | 17 | |||
| 636 | 18 | /** | ||
| 637 | 19 | * Editorial view for landing pages. | ||
| 638 | 20 | * | ||
| 639 | 21 | * @class Editorial | ||
| 640 | 22 | * @extends {juju.browser.views.Editorial} | ||
| 641 | 23 | * | ||
| 642 | 24 | */ | ||
| 643 | 25 | ns.EditorialView = Y.Base.create('browser-view-sidebar', Y.View, [], { | ||
| 644 | 26 | template: views.Templates.editorial, | ||
| 645 | 27 | |||
| 646 | 28 | /** | ||
| 647 | 29 | * General YUI initializer. | ||
| 648 | 30 | * | ||
| 649 | 31 | * @method initializer | ||
| 650 | 32 | * @param {Object} cfg configuration object. | ||
| 651 | 33 | * | ||
| 652 | 34 | */ | ||
| 653 | 35 | initializer: function(cfg) { | ||
| 654 | 36 | // Hold onto charm data so we can pass model instances to other views when | ||
| 655 | 37 | // charms are selected. | ||
| 656 | 38 | this._cacheCharms = new models.BrowserCharmList(); | ||
| 657 | 39 | }, | ||
| 658 | 40 | |||
| 659 | 41 | /** | ||
| 660 | 42 | * Load the editorial content into the container specified. | ||
| 661 | 43 | * | ||
| 662 | 44 | * @method render | ||
| 663 | 45 | * @param {Node} container An optional node to override where it's going. | ||
| 664 | 46 | * | ||
| 665 | 47 | */ | ||
| 666 | 48 | render: function(container) { | ||
| 667 | 49 | var tpl = this.template(this.getAttrs()), | ||
| 668 | 50 | tplNode = Y.Node.create(tpl), | ||
| 669 | 51 | store = this.get('store'); | ||
| 670 | 52 | |||
| 671 | 53 | if (typeof container !== 'object') { | ||
| 672 | 54 | container = this.get('container'); | ||
| 673 | 55 | } else { | ||
| 674 | 56 | this.set('container', container); | ||
| 675 | 57 | } | ||
| 676 | 58 | |||
| 677 | 59 | // By default we grab the editorial content from the api to use for | ||
| 678 | 60 | // display. | ||
| 679 | 61 | this.get('store').sidebarEditorial({ | ||
| 680 | 62 | 'success': function(data) { | ||
| 681 | 63 | // Add featured charms | ||
| 682 | 64 | var featuredCharms = this.get('store').resultsToCharmlist( | ||
| 683 | 65 | data.result.featured); | ||
| 684 | 66 | var featuredContainer = tplNode.one('.featured'); | ||
| 685 | 67 | var featuredCharmContainer = new widgets.browser.CharmContainer({ | ||
| 686 | 68 | name: 'Featured Charms', | ||
| 687 | 69 | cutoff: 1, | ||
| 688 | 70 | children: featuredCharms.map(function(charm) { | ||
| 689 | 71 | return charm.getAttrs(); }) | ||
| 690 | 72 | }); | ||
| 691 | 73 | featuredCharmContainer.render(featuredContainer); | ||
| 692 | 74 | |||
| 693 | 75 | // Add popular charms | ||
| 694 | 76 | var popularCharms = this.get('store').resultsToCharmlist( | ||
| 695 | 77 | data.result.popular); | ||
| 696 | 78 | var popularContainer = tplNode.one('.popular'); | ||
| 697 | 79 | var popularCharmContainer = new widgets.browser.CharmContainer({ | ||
| 698 | 80 | name: 'Popular Charms', | ||
| 699 | 81 | cutoff: 2, | ||
| 700 | 82 | children: popularCharms.map(function(charm) { | ||
| 701 | 83 | return charm.getAttrs(); }) | ||
| 702 | 84 | }); | ||
| 703 | 85 | popularCharmContainer.render(popularContainer); | ||
| 704 | 86 | |||
| 705 | 87 | // Add in the charm tokens for the new as well. | ||
| 706 | 88 | var newContainer = tplNode.one('.new'); | ||
| 707 | 89 | var newCharms = this.get('store').resultsToCharmlist( | ||
| 708 | 90 | data.result['new']); | ||
| 709 | 91 | var newCharmContainer = new widgets.browser.CharmContainer({ | ||
| 710 | 92 | name: 'New Charms', | ||
| 711 | 93 | cutoff: 2, | ||
| 712 | 94 | children: newCharms.map(function(charm) { | ||
| 713 | 95 | return charm.getAttrs(); }) | ||
| 714 | 96 | }); | ||
| 715 | 97 | newCharmContainer.render(newContainer); | ||
| 716 | 98 | |||
| 717 | 99 | container.setHTML(tplNode); | ||
| 718 | 100 | |||
| 719 | 101 | // Add the charms to the cache for use in other views. | ||
| 720 | 102 | // Start with a reset to empty any current cached models. | ||
| 721 | 103 | this._cacheCharms.reset(newCharms); | ||
| 722 | 104 | this._cacheCharms.add(popularCharms); | ||
| 723 | 105 | this._cacheCharms.add(featuredCharms); | ||
| 724 | 106 | this.charmContainers = [ | ||
| 725 | 107 | featuredCharmContainer, | ||
| 726 | 108 | newCharmContainer, | ||
| 727 | 109 | popularCharmContainer | ||
| 728 | 110 | ]; | ||
| 729 | 111 | }, | ||
| 730 | 112 | |||
| 731 | 113 | 'failure': function(data, request) { | ||
| 732 | 114 | var message; | ||
| 733 | 115 | if (data && data.type) { | ||
| 734 | 116 | message = 'Charm API error of type: ' + data.type; | ||
| 735 | 117 | } else { | ||
| 736 | 118 | message = 'Charm API server did not respond'; | ||
| 737 | 119 | } | ||
| 738 | 120 | this.get('db').notifications.add( | ||
| 739 | 121 | new models.Notification({ | ||
| 740 | 122 | title: 'Failed to load sidebar content.', | ||
| 741 | 123 | message: message, | ||
| 742 | 124 | level: 'error' | ||
| 743 | 125 | }) | ||
| 744 | 126 | ); | ||
| 745 | 127 | } | ||
| 746 | 128 | }, this); | ||
| 747 | 129 | }, | ||
| 748 | 130 | |||
| 749 | 131 | /** | ||
| 750 | 132 | * Destroy this view and clear from the dom world. | ||
| 751 | 133 | * | ||
| 752 | 134 | * @method destructor | ||
| 753 | 135 | * | ||
| 754 | 136 | */ | ||
| 755 | 137 | destructor: function() { | ||
| 756 | 138 | if (this.charmContainers) { | ||
| 757 | 139 | Y.Array.each(this.charmContainers, function(container) { | ||
| 758 | 140 | container.destroy(); | ||
| 759 | 141 | }); | ||
| 760 | 142 | } | ||
| 761 | 143 | this._cacheCharms.destroy(); | ||
| 762 | 144 | } | ||
| 763 | 145 | }, { | ||
| 764 | 146 | ATTRS: { | ||
| 765 | 147 | isFullscreen: { | ||
| 766 | 148 | value: false | ||
| 767 | 149 | }, | ||
| 768 | 150 | store: { | ||
| 769 | 151 | |||
| 770 | 152 | } | ||
| 771 | 153 | } | ||
| 772 | 154 | }); | ||
| 773 | 155 | |||
| 774 | 156 | }, '0.1.0', { | ||
| 775 | 157 | requires: [ | ||
| 776 | 158 | 'browser-charm-container', | ||
| 777 | 159 | 'browser-charm-token', | ||
| 778 | 160 | 'browser-search-widget', | ||
| 779 | 161 | 'juju-charm-store', | ||
| 780 | 162 | 'juju-models', | ||
| 781 | 163 | 'juju-templates', | ||
| 782 | 164 | 'view' | ||
| 783 | 165 | ] | ||
| 784 | 166 | }); | ||
| 785 | 0 | 167 | ||
| 786 | === modified file 'app/subapps/browser/views/fullscreen.js' | |||
| 787 | --- app/subapps/browser/views/fullscreen.js 2013-04-03 15:03:56 +0000 | |||
| 788 | +++ app/subapps/browser/views/fullscreen.js 2013-04-16 00:07:30 +0000 | |||
| 789 | @@ -16,44 +16,27 @@ | |||
| 790 | 16 | * | 16 | * |
| 791 | 17 | */ | 17 | */ |
| 792 | 18 | ns.FullScreen = Y.Base.create('browser-view-fullscreen', ns.MainView, [], { | 18 | ns.FullScreen = Y.Base.create('browser-view-fullscreen', ns.MainView, [], { |
| 793 | 19 | _fullscreenTarget: '/bws/sidebar', | ||
| 794 | 20 | |||
| 795 | 21 | template: views.Templates.fullscreen, | 19 | template: views.Templates.fullscreen, |
| 796 | 22 | 20 | ||
| 797 | 23 | |||
| 798 | 24 | /** | 21 | /** |
| 800 | 25 | * The default view is the editorial rendering. Render this view out. | 22 | * Render out the view to the DOM. |
| 801 | 26 | * | 23 | * |
| 804 | 27 | * @method _renderEditorialView | 24 | * @method render |
| 805 | 28 | * @param {Node} container node to render out to. | 25 | * @param {Node} container optional specific container to render out to. |
| 806 | 29 | * | 26 | * |
| 807 | 30 | */ | 27 | */ |
| 809 | 31 | _renderEditorialView: function(container) { | 28 | render: function(container) { |
| 810 | 32 | var tpl = this.template(), | 29 | var tpl = this.template(), |
| 811 | 33 | tplNode = Y.Node.create(tpl); | 30 | tplNode = Y.Node.create(tpl); |
| 812 | 34 | 31 | ||
| 813 | 35 | this._renderSearchWidget(tplNode); | 32 | this._renderSearchWidget(tplNode); |
| 814 | 36 | 33 | ||
| 816 | 37 | if (!Y.Lang.isValue(container)) { | 34 | if (typeof container !== 'object') { |
| 817 | 38 | container = this.get('container'); | 35 | container = this.get('container'); |
| 818 | 36 | } else { | ||
| 819 | 37 | this.set('container', container); | ||
| 820 | 39 | } | 38 | } |
| 821 | 40 | container.setHTML(tplNode); | 39 | container.setHTML(tplNode); |
| 822 | 41 | }, | ||
| 823 | 42 | |||
| 824 | 43 | /** | ||
| 825 | 44 | * Render out the view to the DOM. | ||
| 826 | 45 | * | ||
| 827 | 46 | * @method render | ||
| 828 | 47 | * @param {Node} container optional specific container to render out to. | ||
| 829 | 48 | * | ||
| 830 | 49 | */ | ||
| 831 | 50 | render: function(container) { | ||
| 832 | 51 | if (this.get('charmID')) { | ||
| 833 | 52 | this._renderCharmView(container); | ||
| 834 | 53 | } else { | ||
| 835 | 54 | this._renderEditorialView(container); | ||
| 836 | 55 | } | ||
| 837 | 56 | |||
| 838 | 57 | // Bind our view to the events from the search widget used for controls. | 40 | // Bind our view to the events from the search widget used for controls. |
| 839 | 58 | this._bindSearchWidgetEvents(); | 41 | this._bindSearchWidgetEvents(); |
| 840 | 59 | } | 42 | } |
| 841 | 60 | 43 | ||
| 842 | === modified file 'app/subapps/browser/views/sidebar.js' | |||
| 843 | --- app/subapps/browser/views/sidebar.js 2013-04-11 14:48:10 +0000 | |||
| 844 | +++ app/subapps/browser/views/sidebar.js 2013-04-16 00:07:30 +0000 | |||
| 845 | @@ -10,9 +10,7 @@ | |||
| 846 | 10 | */ | 10 | */ |
| 847 | 11 | YUI.add('subapp-browser-sidebar', function(Y) { | 11 | YUI.add('subapp-browser-sidebar', function(Y) { |
| 848 | 12 | var ns = Y.namespace('juju.browser.views'), | 12 | var ns = Y.namespace('juju.browser.views'), |
| 852 | 13 | models = Y.namespace('juju.models'), | 13 | views = Y.namespace('juju.views'); |
| 850 | 14 | views = Y.namespace('juju.views'), | ||
| 851 | 15 | widgets = Y.namespace('juju.widgets'); | ||
| 853 | 16 | 14 | ||
| 854 | 17 | 15 | ||
| 855 | 18 | /** | 16 | /** |
| 856 | @@ -23,56 +21,17 @@ | |||
| 857 | 23 | * | 21 | * |
| 858 | 24 | */ | 22 | */ |
| 859 | 25 | ns.Sidebar = Y.Base.create('browser-view-sidebar', ns.MainView, [], { | 23 | ns.Sidebar = Y.Base.create('browser-view-sidebar', ns.MainView, [], { |
| 860 | 26 | _fullscreenTarget: '/bws/fullscreen', | ||
| 861 | 27 | |||
| 862 | 28 | template: views.Templates.sidebar, | 24 | template: views.Templates.sidebar, |
| 907 | 29 | visible: true, | 25 | |
| 908 | 30 | 26 | /** | |
| 909 | 31 | events: { | 27 | * Render out the view to the DOM. |
| 910 | 32 | '.charm-token': { | 28 | * |
| 911 | 33 | 'click': '_handleTokenSelect' | 29 | * @method render |
| 912 | 34 | } | 30 | * |
| 913 | 35 | }, | 31 | */ |
| 914 | 36 | 32 | render: function(container) { | |
| 871 | 37 | /** | ||
| 872 | 38 | * Event handler for selecting a charm from a list on the page. Forces a | ||
| 873 | 39 | * render of the charm details view for the user. | ||
| 874 | 40 | * | ||
| 875 | 41 | * @method _handleTokenSelect | ||
| 876 | 42 | * @param {Event} ev the click event from the charm token. | ||
| 877 | 43 | * | ||
| 878 | 44 | */ | ||
| 879 | 45 | _handleTokenSelect: function(ev) { | ||
| 880 | 46 | var id = ev.currentTarget.getData('charmid'); | ||
| 881 | 47 | var model = this._cacheCharms.getById(id); | ||
| 882 | 48 | var container = this.get('container'); | ||
| 883 | 49 | |||
| 884 | 50 | // Deselect the currently selected charm and highlight the new one. | ||
| 885 | 51 | var selected_charm = container.one('.yui3-charmtoken.active'); | ||
| 886 | 52 | if (selected_charm) { | ||
| 887 | 53 | selected_charm.removeClass('active'); | ||
| 888 | 54 | } | ||
| 889 | 55 | ev.currentTarget.ancestor('.yui3-charmtoken').addClass('active'); | ||
| 890 | 56 | |||
| 891 | 57 | // Show the details view for this model. | ||
| 892 | 58 | this._renderCharmDetails( | ||
| 893 | 59 | model, | ||
| 894 | 60 | container | ||
| 895 | 61 | ); | ||
| 896 | 62 | }, | ||
| 897 | 63 | |||
| 898 | 64 | /** | ||
| 899 | 65 | * Initially we load editorial content to populate the sidebar. Build this | ||
| 900 | 66 | * content. | ||
| 901 | 67 | * | ||
| 902 | 68 | * @method _renderEditorialView | ||
| 903 | 69 | * @param {Node} container A node to stick the rendered output into. | ||
| 904 | 70 | * | ||
| 905 | 71 | */ | ||
| 906 | 72 | _renderEditorialView: function(container) { | ||
| 915 | 73 | var tpl = this.template(), | 33 | var tpl = this.template(), |
| 918 | 74 | tplNode = Y.Node.create(tpl), | 34 | tplNode = Y.Node.create(tpl); |
| 917 | 75 | store = this.get('store'); | ||
| 919 | 76 | 35 | ||
| 920 | 77 | this._renderSearchWidget(tplNode); | 36 | this._renderSearchWidget(tplNode); |
| 921 | 78 | 37 | ||
| 922 | @@ -83,104 +42,6 @@ | |||
| 923 | 83 | } | 42 | } |
| 924 | 84 | 43 | ||
| 925 | 85 | container.setHTML(tplNode); | 44 | container.setHTML(tplNode); |
| 926 | 86 | |||
| 927 | 87 | // By default we grab the editorial content from the api to use for | ||
| 928 | 88 | // display. | ||
| 929 | 89 | this.get('store').sidebarEditorial({ | ||
| 930 | 90 | 'success': function(data) { | ||
| 931 | 91 | |||
| 932 | 92 | // Add featured charms | ||
| 933 | 93 | var featuredCharms = this.get('store').resultsToCharmlist( | ||
| 934 | 94 | data.result.featured); | ||
| 935 | 95 | var featuredContainer = container.one('.bws-left .featured'); | ||
| 936 | 96 | var featuredCharmContainer = new widgets.browser.CharmContainer({ | ||
| 937 | 97 | name: 'Featured Charms', | ||
| 938 | 98 | cutoff: 1, | ||
| 939 | 99 | children: featuredCharms.map(function(charm) { | ||
| 940 | 100 | return charm.getAttrs(); }) | ||
| 941 | 101 | }); | ||
| 942 | 102 | featuredCharmContainer.render(featuredContainer); | ||
| 943 | 103 | |||
| 944 | 104 | // Add popular charms | ||
| 945 | 105 | var popularCharms = this.get('store').resultsToCharmlist( | ||
| 946 | 106 | data.result.popular); | ||
| 947 | 107 | var popularContainer = container.one('.bws-left .popular'); | ||
| 948 | 108 | var popularCharmContainer = new widgets.browser.CharmContainer({ | ||
| 949 | 109 | name: 'Popular Charms', | ||
| 950 | 110 | cutoff: 2, | ||
| 951 | 111 | children: popularCharms.map(function(charm) { | ||
| 952 | 112 | return charm.getAttrs(); }) | ||
| 953 | 113 | }); | ||
| 954 | 114 | popularCharmContainer.render(popularContainer); | ||
| 955 | 115 | |||
| 956 | 116 | // Add in the charm tokens for the new as well. | ||
| 957 | 117 | var newContainer = container.one('.bws-left .new'); | ||
| 958 | 118 | var newCharms = this.get('store').resultsToCharmlist( | ||
| 959 | 119 | data.result['new']); | ||
| 960 | 120 | var newCharmContainer = new widgets.browser.CharmContainer({ | ||
| 961 | 121 | name: 'New Charms', | ||
| 962 | 122 | cutoff: 2, | ||
| 963 | 123 | children: newCharms.map(function(charm) { | ||
| 964 | 124 | return charm.getAttrs(); }) | ||
| 965 | 125 | }); | ||
| 966 | 126 | newCharmContainer.render(newContainer); | ||
| 967 | 127 | |||
| 968 | 128 | // Add the charms to the cache for use in other views. | ||
| 969 | 129 | // Start with a reset to empty any current cached models. | ||
| 970 | 130 | this._cacheCharms.reset(newCharms); | ||
| 971 | 131 | this._cacheCharms.add(popularCharms); | ||
| 972 | 132 | this._cacheCharms.add(featuredCharms); | ||
| 973 | 133 | this.charmContainers = [ | ||
| 974 | 134 | featuredCharmContainer, | ||
| 975 | 135 | newCharmContainer, | ||
| 976 | 136 | popularCharmContainer | ||
| 977 | 137 | ]; | ||
| 978 | 138 | }, | ||
| 979 | 139 | |||
| 980 | 140 | 'failure': function(data, request) { | ||
| 981 | 141 | var message; | ||
| 982 | 142 | if (data && data.type) { | ||
| 983 | 143 | message = 'Charm API error of type: ' + data.type; | ||
| 984 | 144 | } else { | ||
| 985 | 145 | message = 'Charm API server did not respond'; | ||
| 986 | 146 | } | ||
| 987 | 147 | this.get('db').notifications.add( | ||
| 988 | 148 | new models.Notification({ | ||
| 989 | 149 | title: 'Failed to load sidebar content.', | ||
| 990 | 150 | message: message, | ||
| 991 | 151 | level: 'error' | ||
| 992 | 152 | }) | ||
| 993 | 153 | ); | ||
| 994 | 154 | } | ||
| 995 | 155 | }, this); | ||
| 996 | 156 | }, | ||
| 997 | 157 | |||
| 998 | 158 | /** | ||
| 999 | 159 | * Destroy this view and clear from the dom world. | ||
| 1000 | 160 | * | ||
| 1001 | 161 | * @method destructor | ||
| 1002 | 162 | * | ||
| 1003 | 163 | */ | ||
| 1004 | 164 | destructor: function() { | ||
| 1005 | 165 | if (this.charmContainers) { | ||
| 1006 | 166 | Y.Array.each(this.charmContainers, function(container) { | ||
| 1007 | 167 | container.destroy(); | ||
| 1008 | 168 | }); | ||
| 1009 | 169 | } | ||
| 1010 | 170 | }, | ||
| 1011 | 171 | |||
| 1012 | 172 | /** | ||
| 1013 | 173 | * Render out the view to the DOM. | ||
| 1014 | 174 | * | ||
| 1015 | 175 | * @method render | ||
| 1016 | 176 | * | ||
| 1017 | 177 | */ | ||
| 1018 | 178 | render: function(container) { | ||
| 1019 | 179 | if (this.get('charmID')) { | ||
| 1020 | 180 | this._renderCharmView(container); | ||
| 1021 | 181 | } else { | ||
| 1022 | 182 | this._renderEditorialView(container); | ||
| 1023 | 183 | } | ||
| 1024 | 184 | // Bind our view to the events from the search widget used for controls. | 45 | // Bind our view to the events from the search widget used for controls. |
| 1025 | 185 | this._bindSearchWidgetEvents(); | 46 | this._bindSearchWidgetEvents(); |
| 1026 | 186 | } | 47 | } |
| 1027 | @@ -191,13 +52,8 @@ | |||
| 1028 | 191 | 52 | ||
| 1029 | 192 | }, '0.1.0', { | 53 | }, '0.1.0', { |
| 1030 | 193 | requires: [ | 54 | requires: [ |
| 1031 | 194 | 'browser-charm-container', | ||
| 1032 | 195 | 'browser-charm-token', | ||
| 1033 | 196 | 'browser-search-widget', | 55 | 'browser-search-widget', |
| 1034 | 197 | 'juju-charm-store', | ||
| 1035 | 198 | 'juju-models', | ||
| 1036 | 199 | 'juju-templates', | 56 | 'juju-templates', |
| 1037 | 200 | 'subapp-browser-charmview', | ||
| 1038 | 201 | 'subapp-browser-mainview', | 57 | 'subapp-browser-mainview', |
| 1039 | 202 | 'view' | 58 | 'view' |
| 1040 | 203 | ] | 59 | ] |
| 1041 | 204 | 60 | ||
| 1042 | === modified file 'app/subapps/browser/views/view.js' | |||
| 1043 | --- app/subapps/browser/views/view.js 2013-04-09 18:10:36 +0000 | |||
| 1044 | +++ app/subapps/browser/views/view.js 2013-04-16 00:07:30 +0000 | |||
| 1045 | @@ -78,63 +78,6 @@ | |||
| 1046 | 78 | ); | 78 | ); |
| 1047 | 79 | }, | 79 | }, |
| 1048 | 80 | 80 | ||
| 1049 | 81 | /** | ||
| 1050 | 82 | * Helper to just render the charm details pane. This is shared in the | ||
| 1051 | 83 | * sidebar/fullscreen views. | ||
| 1052 | 84 | * | ||
| 1053 | 85 | * @method _renderCharmDetails | ||
| 1054 | 86 | * @param {BrowserCharm} charm model instance to render from. | ||
| 1055 | 87 | * @param {Node} container node to look for a details div in to render to. | ||
| 1056 | 88 | * | ||
| 1057 | 89 | */ | ||
| 1058 | 90 | _renderCharmDetails: function(charm, container) { | ||
| 1059 | 91 | var detailsNode = container.one('.bws-view-data'); | ||
| 1060 | 92 | // Destroy any current details. | ||
| 1061 | 93 | if (this.details) { | ||
| 1062 | 94 | this.details.destroy(true); | ||
| 1063 | 95 | } | ||
| 1064 | 96 | this.details = new ns.BrowserCharmView({ | ||
| 1065 | 97 | charm: charm, | ||
| 1066 | 98 | store: this.get('store') | ||
| 1067 | 99 | }); | ||
| 1068 | 100 | this.details.render(detailsNode); | ||
| 1069 | 101 | }, | ||
| 1070 | 102 | |||
| 1071 | 103 | /** | ||
| 1072 | 104 | * Render the view of a single charm details page. | ||
| 1073 | 105 | * | ||
| 1074 | 106 | * @method _renderCharmView | ||
| 1075 | 107 | * @param {Node} container the node to insert our rendered content into. | ||
| 1076 | 108 | * | ||
| 1077 | 109 | */ | ||
| 1078 | 110 | _renderCharmView: function(container) { | ||
| 1079 | 111 | var tpl = this.template(), | ||
| 1080 | 112 | tplNode = Y.Node.create(tpl); | ||
| 1081 | 113 | |||
| 1082 | 114 | // Create/bind the search before we wait for the charm data to load so | ||
| 1083 | 115 | // that we're prepared for search events in case that request takes a | ||
| 1084 | 116 | // while or even fails. | ||
| 1085 | 117 | this._renderSearchWidget(tplNode); | ||
| 1086 | 118 | |||
| 1087 | 119 | // We need to have the template in the DOM for sub views to be able to | ||
| 1088 | 120 | // expect proper structure. | ||
| 1089 | 121 | if (!Y.Lang.isValue(container)) { | ||
| 1090 | 122 | container = this.get('container'); | ||
| 1091 | 123 | } | ||
| 1092 | 124 | container.setHTML(tplNode); | ||
| 1093 | 125 | |||
| 1094 | 126 | this.get('store').charm(this.get('charmID'), { | ||
| 1095 | 127 | 'success': function(data) { | ||
| 1096 | 128 | var charmView = new ns.BrowserCharmView({ | ||
| 1097 | 129 | charm: new models.BrowserCharm(data), | ||
| 1098 | 130 | store: this.get('store') | ||
| 1099 | 131 | }); | ||
| 1100 | 132 | charmView.render(tplNode.one('.bws-view-data'), this.isFullscreen()); | ||
| 1101 | 133 | container.setHTML(tplNode); | ||
| 1102 | 134 | }, | ||
| 1103 | 135 | 'failure': this.apiFailure | ||
| 1104 | 136 | }, this); | ||
| 1105 | 137 | }, | ||
| 1106 | 138 | 81 | ||
| 1107 | 139 | /** | 82 | /** |
| 1108 | 140 | * Render out the main search widget and controls shared across various | 83 | * Render out the main search widget and controls shared across various |
| 1109 | @@ -271,7 +214,6 @@ | |||
| 1110 | 271 | */ | 214 | */ |
| 1111 | 272 | charmID: {}, | 215 | charmID: {}, |
| 1112 | 273 | 216 | ||
| 1113 | 274 | |||
| 1114 | 275 | /** | 217 | /** |
| 1115 | 276 | * An instance of the Charmworld API object to hit for any data that | 218 | * An instance of the Charmworld API object to hit for any data that |
| 1116 | 277 | * needs fetching. | 219 | * needs fetching. |
| 1117 | @@ -295,7 +237,6 @@ | |||
| 1118 | 295 | * | 237 | * |
| 1119 | 296 | */ | 238 | */ |
| 1120 | 297 | subpath: {} | 239 | subpath: {} |
| 1121 | 298 | |||
| 1122 | 299 | } | 240 | } |
| 1123 | 300 | }); | 241 | }); |
| 1124 | 301 | 242 | ||
| 1125 | 302 | 243 | ||
| 1126 | === modified file 'app/templates/charm-token.handlebars' | |||
| 1127 | --- app/templates/charm-token.handlebars 2013-04-15 07:26:46 +0000 | |||
| 1128 | +++ app/templates/charm-token.handlebars 2013-04-16 00:07:30 +0000 | |||
| 1129 | @@ -1,19 +1,21 @@ | |||
| 1145 | 1 | <div class="charm-token yui3-g" data-charmid="{{id}}"> | 1 | <a href="/bws/sidebar/{{id}}"> |
| 1146 | 2 | <div class="yui3-u-1-4"> | 2 | <div class="charm-token yui3-g" data-charmid="{{id}}"> |
| 1147 | 3 | <img url="{{ iconfile }}" alt="Icon" /> | 3 | <div class="yui3-u-1-4"> |
| 1148 | 4 | </div> | 4 | <img url="{{ iconfile }}" alt="Icon" /> |
| 1149 | 5 | <div class="yui3-u-3-4"> | 5 | </div> |
| 1150 | 6 | <a href="" class="add hidden"> | 6 | <div class="yui3-u-3-4"> |
| 1151 | 7 | <img src="/juju-ui/assets/images/sidebar_add_icon.jpg" alt="Add" /> | 7 | <a href="" class="add hidden"> |
| 1152 | 8 | </a> | 8 | <img src="/juju-ui/assets/images/sidebar_add_icon.jpg" alt="Add" /> |
| 1153 | 9 | <h3 class="title"> | 9 | </a> |
| 1154 | 10 | {{ name }} | 10 | <h3 class="title"> |
| 1155 | 11 | </h3> | 11 | {{ name }} |
| 1156 | 12 | <div class="metadata"> | 12 | </h3> |
| 1157 | 13 | {{ recent_commit_count }} {{pluralize 'commit' recent_commit_count}}, | 13 | <div class="metadata"> |
| 1158 | 14 | {{ recent_download_count }} | 14 | {{ recent_commit_count }} {{pluralize 'commit' recent_commit_count}}, |
| 1159 | 15 | {{pluralize 'download' recent_download_count}} | 15 | {{ recent_download_count }} |
| 1160 | 16 | {{pluralize 'download' recent_download_count}} | ||
| 1161 | 17 | </div> | ||
| 1162 | 18 | <p class="description">{{truncate description 110 }}</p> | ||
| 1163 | 19 | </div> | ||
| 1164 | 16 | </div> | 20 | </div> |
| 1168 | 17 | <p class="description">{{truncate description 110 }}</p> | 21 | </a> |
| 1166 | 18 | </div> | ||
| 1167 | 19 | </div> | ||
| 1169 | 20 | 22 | ||
| 1170 | === modified file 'test/test_browser_app.js' | |||
| 1171 | --- test/test_browser_app.js 2013-04-11 14:48:10 +0000 | |||
| 1172 | +++ test/test_browser_app.js 2013-04-16 00:07:30 +0000 | |||
| 1173 | @@ -130,53 +130,6 @@ | |||
| 1174 | 130 | assert.isTrue(Y.Lang.isObject(container.one('input'))); | 130 | assert.isTrue(Y.Lang.isObject(container.one('input'))); |
| 1175 | 131 | }); | 131 | }); |
| 1176 | 132 | 132 | ||
| 1177 | 133 | it('caches models fetched from the api for later use', function() { | ||
| 1178 | 134 | var container = Y.one('#subapp-browser'); | ||
| 1179 | 135 | view = new Sidebar(); | ||
| 1180 | 136 | view._cacheCharms.size().should.eql(0); | ||
| 1181 | 137 | |||
| 1182 | 138 | // mock out the request data for the editorial view. We want to make | ||
| 1183 | 139 | // sure we're caching the results. | ||
| 1184 | 140 | view.get('store').set( | ||
| 1185 | 141 | 'datasource', | ||
| 1186 | 142 | new Y.DataSource.Local({source: sampleData})); | ||
| 1187 | 143 | view.render(container); | ||
| 1188 | 144 | |||
| 1189 | 145 | view._cacheCharms.size().should.eql(5); | ||
| 1190 | 146 | }); | ||
| 1191 | 147 | |||
| 1192 | 148 | it('handles details event when clicking on a charm token', function(done) { | ||
| 1193 | 149 | var container = Y.one('#subapp-browser'); | ||
| 1194 | 150 | view = new Sidebar(); | ||
| 1195 | 151 | |||
| 1196 | 152 | // Test is successful when it completes by hitting this callback we've | ||
| 1197 | 153 | // over written. | ||
| 1198 | 154 | view._handleTokenSelect = function(ev) { | ||
| 1199 | 155 | done(); | ||
| 1200 | 156 | }; | ||
| 1201 | 157 | |||
| 1202 | 158 | view.get('store').set( | ||
| 1203 | 159 | 'datasource', | ||
| 1204 | 160 | new Y.DataSource.Local({source: sampleData})); | ||
| 1205 | 161 | view.render(container); | ||
| 1206 | 162 | container.one('.charm-token').simulate('click'); | ||
| 1207 | 163 | }); | ||
| 1208 | 164 | |||
| 1209 | 165 | it('renders details when clicking on a charm token', function() { | ||
| 1210 | 166 | var container = Y.one('#subapp-browser'); | ||
| 1211 | 167 | view = new Sidebar(); | ||
| 1212 | 168 | |||
| 1213 | 169 | view.get('store').set( | ||
| 1214 | 170 | 'datasource', | ||
| 1215 | 171 | new Y.DataSource.Local({source: sampleData})); | ||
| 1216 | 172 | view.render(container); | ||
| 1217 | 173 | container.one('.charm-token').simulate('click'); | ||
| 1218 | 174 | |||
| 1219 | 175 | var details_node = container.one('.bws-view-data'); | ||
| 1220 | 176 | details_node.one('h1').get('text').should.eql('byobu-classroom'); | ||
| 1221 | 177 | details_node.all('.tabs').size().should.eql(1); | ||
| 1222 | 178 | }); | ||
| 1223 | 179 | |||
| 1224 | 180 | }); | 133 | }); |
| 1225 | 181 | })(); | 134 | })(); |
| 1226 | 182 | 135 | ||
| 1227 | 183 | 136 | ||
| 1228 | === modified file 'test/test_browser_charm_details.js' | |||
| 1229 | --- test/test_browser_charm_details.js 2013-04-15 07:26:46 +0000 | |||
| 1230 | +++ test/test_browser_charm_details.js 2013-04-16 00:07:30 +0000 | |||
| 1231 | @@ -23,9 +23,13 @@ | |||
| 1232 | 23 | }); | 23 | }); |
| 1233 | 24 | 24 | ||
| 1234 | 25 | beforeEach(function() { | 25 | beforeEach(function() { |
| 1238 | 26 | var docBody = Y.one(document.body); | 26 | var docBody = Y.one(document.body), |
| 1239 | 27 | Y.Node.create('<div id="testcontent">' + | 27 | testcontent = [ |
| 1240 | 28 | '</div>').appendTo(docBody); | 28 | '<div id=testcontent><div class="bws-view-data">', |
| 1241 | 29 | '</div></div>' | ||
| 1242 | 30 | ].join(); | ||
| 1243 | 31 | |||
| 1244 | 32 | Y.Node.create(testcontent).appendTo(docBody); | ||
| 1245 | 29 | 33 | ||
| 1246 | 30 | // Mock out a dummy location for the Store used in view instances. | 34 | // Mock out a dummy location for the Store used in view instances. |
| 1247 | 31 | window.juju_config = { | 35 | window.juju_config = { |
| 1248 | @@ -87,10 +91,11 @@ | |||
| 1249 | 87 | ], | 91 | ], |
| 1250 | 88 | id: 'precise/ceph-9' | 92 | id: 'precise/ceph-9' |
| 1251 | 89 | }), | 93 | }), |
| 1252 | 94 | container: Y.Node.create('<div class="charmview"/>'), | ||
| 1253 | 90 | store: fakeStore | 95 | store: fakeStore |
| 1254 | 91 | }); | 96 | }); |
| 1255 | 92 | 97 | ||
| 1257 | 93 | view.render(node); | 98 | view.render(); |
| 1258 | 94 | Y.one('#bws-readme').get('text').should.eql('README content.'); | 99 | Y.one('#bws-readme').get('text').should.eql('README content.'); |
| 1259 | 95 | }); | 100 | }); |
| 1260 | 96 | 101 | ||
| 1261 | @@ -102,7 +107,8 @@ | |||
| 1262 | 102 | 'hooks/install' | 107 | 'hooks/install' |
| 1263 | 103 | ], | 108 | ], |
| 1264 | 104 | id: 'precise/ceph-9' | 109 | id: 'precise/ceph-9' |
| 1266 | 105 | }) | 110 | }), |
| 1267 | 111 | container: Y.Node.create('<div class="charmview"/>') | ||
| 1268 | 106 | }); | 112 | }); |
| 1269 | 107 | 113 | ||
| 1270 | 108 | // Hook up to the callback for the click event. | 114 | // Hook up to the callback for the click event. |
| 1271 | @@ -112,8 +118,7 @@ | |||
| 1272 | 112 | done(); | 118 | done(); |
| 1273 | 113 | }; | 119 | }; |
| 1274 | 114 | 120 | ||
| 1277 | 115 | view.render(node); | 121 | view.render(); |
| 1276 | 116 | view.get('container').should.eql(node); | ||
| 1278 | 117 | node.one('.charm .add').simulate('click'); | 122 | node.one('.charm .add').simulate('click'); |
| 1279 | 118 | }); | 123 | }); |
| 1280 | 119 | 124 | ||
| 1281 | @@ -140,10 +145,11 @@ | |||
| 1282 | 140 | ], | 145 | ], |
| 1283 | 141 | id: 'precise/ceph-9' | 146 | id: 'precise/ceph-9' |
| 1284 | 142 | }), | 147 | }), |
| 1285 | 148 | container: Y.Node.create('<div class="charmview"/>'), | ||
| 1286 | 143 | store: fakeStore | 149 | store: fakeStore |
| 1287 | 144 | }); | 150 | }); |
| 1288 | 145 | 151 | ||
| 1290 | 146 | view.render(node); | 152 | view.render(); |
| 1291 | 147 | Y.one('#bws-hooks').all('select option').size().should.equal(3); | 153 | Y.one('#bws-hooks').all('select option').size().should.equal(3); |
| 1292 | 148 | 154 | ||
| 1293 | 149 | // Select the hooks install and the content should update. | 155 | // Select the hooks install and the content should update. |
| 1294 | @@ -180,10 +186,11 @@ | |||
| 1295 | 180 | ], | 186 | ], |
| 1296 | 181 | id: 'precise/ceph-9' | 187 | id: 'precise/ceph-9' |
| 1297 | 182 | }), | 188 | }), |
| 1298 | 189 | container: Y.Node.create('<div class="charmview"/>'), | ||
| 1299 | 183 | store: fakeStore | 190 | store: fakeStore |
| 1300 | 184 | }); | 191 | }); |
| 1301 | 185 | 192 | ||
| 1303 | 186 | view.render(node); | 193 | view.render(); |
| 1304 | 187 | Y.one('#bws-readme').get('innerHTML').should.eql( | 194 | Y.one('#bws-readme').get('innerHTML').should.eql( |
| 1305 | 188 | '<h1>README Header</h1>'); | 195 | '<h1>README Header</h1>'); |
| 1306 | 189 | }); | 196 | }); |
| 1307 | @@ -200,9 +207,10 @@ | |||
| 1308 | 200 | 'type': 'int' | 207 | 'type': 'int' |
| 1309 | 201 | } | 208 | } |
| 1310 | 202 | } | 209 | } |
| 1312 | 203 | }) | 210 | }), |
| 1313 | 211 | container: Y.Node.create('<div class="charmview"/>') | ||
| 1314 | 204 | }); | 212 | }); |
| 1316 | 205 | view.render(node); | 213 | view.render(); |
| 1317 | 206 | 214 | ||
| 1318 | 207 | Y.one('#bws-configuration dd div').get('text').should.eql( | 215 | Y.one('#bws-configuration dd div').get('text').should.eql( |
| 1319 | 208 | 'Default: 9160'); | 216 | 'Default: 9160'); |
| 1320 | @@ -235,9 +243,10 @@ | |||
| 1321 | 235 | charm: new models.BrowserCharm({ | 243 | charm: new models.BrowserCharm({ |
| 1322 | 236 | files: [], | 244 | files: [], |
| 1323 | 237 | id: 'precise/ceph-9' | 245 | id: 'precise/ceph-9' |
| 1325 | 238 | }) | 246 | }), |
| 1326 | 247 | container: Y.Node.create('<div class="charmview"/>') | ||
| 1327 | 239 | }); | 248 | }); |
| 1329 | 240 | view.render(node); | 249 | view.render(); |
| 1330 | 241 | 250 | ||
| 1331 | 242 | view._loadQAContent = function() { | 251 | view._loadQAContent = function() { |
| 1332 | 243 | // This test is just verifying that we don't timeout. The event fired, | 252 | // This test is just verifying that we don't timeout. The event fired, |
| 1333 | @@ -274,7 +283,8 @@ | |||
| 1334 | 274 | // We don't want any files so we don't have to mock/load them. | 283 | // We don't want any files so we don't have to mock/load them. |
| 1335 | 275 | data.files = []; | 284 | data.files = []; |
| 1336 | 276 | var view = new CharmView({ | 285 | var view = new CharmView({ |
| 1338 | 277 | charm: new models.BrowserCharm(data) | 286 | charm: new models.BrowserCharm(data), |
| 1339 | 287 | container: Y.Node.create('<div class="charmview"/>') | ||
| 1340 | 278 | }); | 288 | }); |
| 1341 | 279 | 289 | ||
| 1342 | 280 | // Hook up to the callback for the click event. | 290 | // Hook up to the callback for the click event. |
| 1343 | @@ -283,9 +293,8 @@ | |||
| 1344 | 283 | done(); | 293 | done(); |
| 1345 | 284 | }; | 294 | }; |
| 1346 | 285 | 295 | ||
| 1350 | 286 | view.render(node); | 296 | view.render(); |
| 1351 | 287 | view.get('container').should.eql(node); | 297 | node.one('.changelog .expand').simulate('click'); |
| 1349 | 288 | node.one('.changelog .expandToggle').simulate('click'); | ||
| 1352 | 289 | }); | 298 | }); |
| 1353 | 290 | 299 | ||
| 1354 | 291 | it('changelog is reformatted and displayed', function() { | 300 | it('changelog is reformatted and displayed', function() { |
| 1355 | @@ -295,10 +304,11 @@ | |||
| 1356 | 295 | // We don't want any files so we don't have to mock/load them. | 304 | // We don't want any files so we don't have to mock/load them. |
| 1357 | 296 | data.files = []; | 305 | data.files = []; |
| 1358 | 297 | view = new CharmView({ | 306 | view = new CharmView({ |
| 1360 | 298 | charm: new models.BrowserCharm(data) | 307 | charm: new models.BrowserCharm(data), |
| 1361 | 308 | container: Y.Node.create('<div class="charmview"/>') | ||
| 1362 | 299 | }); | 309 | }); |
| 1363 | 300 | 310 | ||
| 1365 | 301 | view.render(node); | 311 | view.render(); |
| 1366 | 302 | // Basics that we have the right number of nodes. | 312 | // Basics that we have the right number of nodes. |
| 1367 | 303 | node.all('.remaining li').size().should.eql(9); | 313 | node.all('.remaining li').size().should.eql(9); |
| 1368 | 304 | node.all('.first p').size().should.eql(1); | 314 | node.all('.first p').size().should.eql(1); |
Reviewers: mp+158713_
Message:
Please take a look.
Description:
TBD
https:/
(do not edit description out of merge proposal)
Please review this at https:/
Affected files:
A [revision details]
M app/modules-
M app/subapps/
M app/subapps/
A app/subapps/
M app/subapps/
M app/subapps/
A app/subapps/
M app/subapps/
M app/subapps/
M app/subapps/
M app/templates/
M test/test_
M test/test_