Merge pull request #51 from jmeas/router-resolve Makes use of the ui-router's resolve parameter.
Project: http://git-wip-us.apache.org/repos/asf/rave/repo Commit: http://git-wip-us.apache.org/repos/asf/rave/commit/03bce440 Tree: http://git-wip-us.apache.org/repos/asf/rave/tree/03bce440 Diff: http://git-wip-us.apache.org/repos/asf/rave/diff/03bce440 Branch: refs/heads/angular Commit: 03bce440b1ea028cc4e6f46ba4df893305d0d1ce Parents: 2cfbb8e 80ecabf Author: James Smith <[email protected]> Authored: Tue Aug 12 11:18:20 2014 -0400 Committer: James Smith <[email protected]> Committed: Tue Aug 12 11:18:20 2014 -0400 ---------------------------------------------------------------------- .../src/subapps/admin/categories/categories.js | 3 +++ .../admin/categories/controllers/categories.js | 22 +++------------ .../admin/categories/controllers/category.js | 28 +++++++++++++++----- .../admin/categories/controllers/create.js | 23 ++++++++++++++++ .../src/subapps/admin/categories/routes.js | 16 +++++++++-- .../admin/categories/templates/categories.html | 2 +- .../preferences/controllers/preferences.js | 10 +++---- .../src/subapps/admin/preferences/routes.js | 7 ++++- 8 files changed, 78 insertions(+), 33 deletions(-) ----------------------------------------------------------------------
