Merge lp://staging/~gary/juju-gui/sandboxEnv-4 into lp://staging/juju-gui/experimental
Proposed by
Gary Poster
Status: | Merged |
---|---|
Merged at revision: | 448 |
Proposed branch: | lp://staging/~gary/juju-gui/sandboxEnv-4 |
Merge into: | lp://staging/juju-gui/experimental |
Diff against target: |
1476 lines (+689/-276) 10 files modified
app/app.js (+43/-10) app/index.html (+1/-1) app/models/models.js (+20/-3) app/store/env/fakebackend.js (+114/-114) app/store/env/sandbox.js (+211/-104) app/views/charm-panel.js (+1/-1) test/test_app.js (+39/-0) test/test_fakebackend.js (+12/-37) test/test_sandbox.js (+221/-6) test/utils.js (+27/-0) |
To merge this branch: | bzr merge lp://staging/~gary/juju-gui/sandboxEnv-4 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju GUI Hackers | Pending | ||
Review via email:
|
Description of the change
Connect sandbox environment to app
Beyond some doc formatting changes, a few fly-by spelling corrections, some changes I needed for the tests to pass, and so on, this branch is about finally connecting the in-browser sandbox environment work with the app. I added the delta stream and made it possible to use the sandbox environment by using configuration value.
To post a comment you must log in.
Reviewers: mp+154827_ code.launchpad. net,
Message:
Please take a look.
Description:
Connect sandbox environment to app
I apologize for this branch's size. On one of my commits I decided to
change the docstring approach for my two files into the YUI approach,
because I liked it so much better. I didn't realize how big the changes
were.
Beyond that, a few other fly-by spelling corrections, some changes I
needed for the tests to pass, and so on, this branch is about finally
connecting the in-browser sandbox environment work with the app. I
added the delta stream and made it possible to use the sandbox
environment by using configuration value.
To QA, in config-debug.js add a "sandbox: true" flag, start up make
devel, and deploy some things. You can't do anything other than deploy
at the moment. :-)
https:/ /code.launchpad .net/~gary/ juju-gui/ sandboxEnv- 4/+merge/ 154827
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/7896045/
Affected files: models. js env/fakebackend .js env/sandbox. js charm-panel. js fakebackend. js sandbox. js
A [revision details]
M app/app.js
M app/index.html
M app/models/
M app/store/
M app/store/
M app/views/
M test/test_app.js
M test/test_
M test/test_
M test/utils.js