Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(router-view): add router-view layouts feature #25

Merged
merged 3 commits into from
Jun 8, 2016
Merged

feat(router-view): add router-view layouts feature #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5a0ad4
feat(router-view): add router-view layouts feature
charlespockert May 11, 2016
71fac0a
chore(router-view): add routing/layout unit tests
charlespockert May 16, 2016
4d5ae52
chore(router-view): refactor and update unit tests
charlespockert Jun 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
243 changes: 176 additions & 67 deletions config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,97 +15,206 @@ System.config({
},

map: {
"aurelia-dependency-injection": "npm:aurelia-dependency-injection@1.0.0-beta.1.1.4",
"aurelia-logging": "npm:aurelia-logging@1.0.0-beta.1.1.2",
"aurelia-metadata": "npm:aurelia-metadata@1.0.0-beta.1.1.5",
"aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.1.1",
"aurelia-path": "npm:aurelia-path@1.0.0-beta.1.1.1",
"aurelia-polyfills": "npm:aurelia-polyfills@1.0.0-beta.1.0.6",
"aurelia-router": "npm:aurelia-router@1.0.0-beta.1.1.0",
"aurelia-templating": "npm:aurelia-templating@1.0.0-beta.1.1.2",
"babel": "npm:babel-core@5.8.35",
"babel-runtime": "npm:babel-runtime@5.8.35",
"core-js": "npm:core-js@2.0.3",
"aurelia-dependency-injection": "npm:aurelia-dependency-injection@1.0.0-beta.1.2.3",
"aurelia-event-aggregator": "npm:aurelia-event-aggregator@1.0.0-beta.1.2.1",
"aurelia-framework": "npm:aurelia-framework@1.0.0-beta.1.2.5",
"aurelia-history": "npm:aurelia-history@1.0.0-beta.1.2.1",
"aurelia-history-browser": "npm:aurelia-history-browser@1.0.0-beta.1.2.1",
"aurelia-loader-default": "npm:aurelia-loader-default@1.0.0-beta.1.2.2",
"aurelia-logging": "npm:aurelia-logging@1.0.0-beta.1.2.1",
"aurelia-logging-console": "npm:aurelia-logging-console@1.0.0-beta.1.2.2",
"aurelia-metadata": "npm:aurelia-metadata@1.0.0-beta.1.2.1",
"aurelia-pal": "github:aurelia/pal@1.0.0-beta.1.2.2",
"aurelia-pal-browser": "github:aurelia/pal-browser@1.0.0-beta.2.0.1",
"aurelia-path": "npm:aurelia-path@1.0.0-beta.1.2.2",
"aurelia-polyfills": "npm:aurelia-polyfills@1.0.0-beta.1.1.6",
"aurelia-router": "npm:aurelia-router@1.0.0-beta.1.2.4",
"aurelia-templating": "github:aurelia/templating@1.0.0-beta.2.0.1",
"aurelia-templating-binding": "npm:aurelia-templating-binding@1.0.0-beta.1.2.4",
"aurelia-templating-resources": "npm:aurelia-templating-resources@1.0.0-beta.1.2.6",
"aurelia-templating-router": "npm:aurelia-templating-router@1.0.0-beta.1.2.1",
"aurelia-testing": "npm:aurelia-testing@0.2.2",
"babel": "npm:babel-core@5.8.38",
"babel-runtime": "npm:babel-runtime@5.8.38",
"core-js": "npm:core-js@2.4.0",
"github:aurelia/pal-browser@1.0.0-beta.2.0.1": {
"aurelia-pal": "github:aurelia/pal@1.0.0-beta.1.2.2"
},
"github:aurelia/templating@1.0.0-beta.2.0.1": {
"aurelia-binding": "npm:aurelia-binding@1.0.0-beta.1.3.6",
"aurelia-dependency-injection": "npm:aurelia-dependency-injection@1.0.0-beta.1.2.3",
"aurelia-loader": "npm:aurelia-loader@1.0.0-beta.1.2.0",
"aurelia-logging": "npm:aurelia-logging@1.0.0-beta.1.2.1",
"aurelia-metadata": "npm:aurelia-metadata@1.0.0-beta.1.2.1",
"aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.2.2",
"aurelia-path": "npm:aurelia-path@1.0.0-beta.1.2.2",
"aurelia-task-queue": "npm:aurelia-task-queue@1.0.0-beta.1.2.1"
},
"github:jspm/nodelibs-assert@0.1.0": {
"assert": "npm:assert@1.3.0"
"assert": "npm:assert@1.4.1"
},
"github:jspm/nodelibs-buffer@0.1.0": {
"buffer": "npm:buffer@3.6.0"
},
"github:jspm/nodelibs-path@0.1.0": {
"path-browserify": "npm:path-browserify@0.0.0"
},
"github:jspm/nodelibs-process@0.1.2": {
"process": "npm:process@0.11.2"
"process": "npm:process@0.11.3"
},
"github:jspm/nodelibs-util@0.1.0": {
"util": "npm:util@0.10.3"
},
"npm:assert@1.3.0": {
"npm:assert@1.4.1": {
"assert": "github:jspm/nodelibs-assert@0.1.0",
"buffer": "github:jspm/nodelibs-buffer@0.1.0",
"process": "github:jspm/nodelibs-process@0.1.2",
"util": "npm:util@0.10.3"
},
"npm:aurelia-binding@1.0.0-beta.1.2.1": {
"aurelia-metadata": "npm:aurelia-metadata@1.0.0-beta.1.1.5",
"aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.1.1",
"aurelia-task-queue": "npm:aurelia-task-queue@1.0.0-beta.1.1.1"
},
"npm:aurelia-dependency-injection@1.0.0-beta.1.1.4": {
"aurelia-logging": "npm:aurelia-logging@1.0.0-beta.1.1.2",
"aurelia-metadata": "npm:aurelia-metadata@1.0.0-beta.1.1.5",
"aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.1.1"
},
"npm:aurelia-event-aggregator@1.0.0-beta.1.1.0": {
"aurelia-logging": "npm:aurelia-logging@1.0.0-beta.1.1.2"
},
"npm:aurelia-loader@1.0.0-beta.1.1.1": {
"aurelia-metadata": "npm:aurelia-metadata@1.0.0-beta.1.1.5",
"aurelia-path": "npm:aurelia-path@1.0.0-beta.1.1.1"
},
"npm:aurelia-metadata@1.0.0-beta.1.1.5": {
"aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.1.1"
},
"npm:aurelia-polyfills@1.0.0-beta.1.0.6": {
"aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.1.1"
},
"npm:aurelia-route-recognizer@1.0.0-beta.1.1.0": {
"aurelia-path": "npm:aurelia-path@1.0.0-beta.1.1.1",
"core-js": "npm:core-js@2.0.3"
},
"npm:aurelia-router@1.0.0-beta.1.1.0": {
"aurelia-dependency-injection": "npm:aurelia-dependency-injection@1.0.0-beta.1.1.4",
"aurelia-event-aggregator": "npm:aurelia-event-aggregator@1.0.0-beta.1.1.0",
"aurelia-history": "npm:aurelia-history@1.0.0-beta.1.1.1",
"aurelia-logging": "npm:aurelia-logging@1.0.0-beta.1.1.2",
"aurelia-path": "npm:aurelia-path@1.0.0-beta.1.1.1",
"aurelia-route-recognizer": "npm:aurelia-route-recognizer@1.0.0-beta.1.1.0",
"core-js": "npm:core-js@2.0.3"
},
"npm:aurelia-task-queue@1.0.0-beta.1.1.1": {
"aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.1.1"
},
"npm:aurelia-templating@1.0.0-beta.1.1.2": {
"aurelia-binding": "npm:aurelia-binding@1.0.0-beta.1.2.1",
"aurelia-dependency-injection": "npm:aurelia-dependency-injection@1.0.0-beta.1.1.4",
"aurelia-loader": "npm:aurelia-loader@1.0.0-beta.1.1.1",
"aurelia-logging": "npm:aurelia-logging@1.0.0-beta.1.1.2",
"aurelia-metadata": "npm:aurelia-metadata@1.0.0-beta.1.1.5",
"aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.1.1",
"aurelia-path": "npm:aurelia-path@1.0.0-beta.1.1.1",
"aurelia-task-queue": "npm:aurelia-task-queue@1.0.0-beta.1.1.1"
},
"npm:babel-runtime@5.8.35": {
"npm:aurelia-binding@1.0.0-beta.1.3.6": {
"aurelia-logging": "npm:aurelia-logging@1.0.0-beta.1.2.1",
"aurelia-metadata": "npm:aurelia-metadata@1.0.0-beta.1.2.1",
"aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.2.2",
"aurelia-task-queue": "npm:aurelia-task-queue@1.0.0-beta.1.2.1"
},
"npm:aurelia-bootstrapper@1.0.0-beta.1.2.1": {
"aurelia-event-aggregator": "npm:aurelia-event-aggregator@1.0.0-beta.1.2.1",
"aurelia-framework": "npm:aurelia-framework@1.0.0-beta.1.2.5",
"aurelia-history": "npm:aurelia-history@1.0.0-beta.1.2.1",
"aurelia-history-browser": "npm:aurelia-history-browser@1.0.0-beta.1.2.1",
"aurelia-loader-default": "npm:aurelia-loader-default@1.0.0-beta.1.2.2",
"aurelia-logging-console": "npm:aurelia-logging-console@1.0.0-beta.1.2.2",
"aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.2.2",
"aurelia-pal-browser": "npm:aurelia-pal-browser@1.0.0-beta.2.0.1",
"aurelia-polyfills": "npm:aurelia-polyfills@1.0.0-beta.1.1.6",
"aurelia-router": "npm:aurelia-router@1.0.0-beta.1.2.4",
"aurelia-templating": "github:aurelia/templating@1.0.0-beta.2.0.1",
"aurelia-templating-binding": "npm:aurelia-templating-binding@1.0.0-beta.1.2.4",
"aurelia-templating-resources": "npm:aurelia-templating-resources@1.0.0-beta.1.2.6",
"aurelia-templating-router": "npm:aurelia-templating-router@1.0.0-beta.1.2.1"
},
"npm:aurelia-dependency-injection@1.0.0-beta.1.2.3": {
"aurelia-logging": "npm:aurelia-logging@1.0.0-beta.1.2.1",
"aurelia-metadata": "npm:aurelia-metadata@1.0.0-beta.1.2.1",
"aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.2.2"
},
"npm:aurelia-event-aggregator@1.0.0-beta.1.2.1": {
"aurelia-logging": "npm:aurelia-logging@1.0.0-beta.1.2.1"
},
"npm:aurelia-framework@1.0.0-beta.1.2.5": {
"aurelia-binding": "npm:aurelia-binding@1.0.0-beta.1.3.6",
"aurelia-dependency-injection": "npm:aurelia-dependency-injection@1.0.0-beta.1.2.3",
"aurelia-loader": "npm:aurelia-loader@1.0.0-beta.1.2.0",
"aurelia-logging": "npm:aurelia-logging@1.0.0-beta.1.2.1",
"aurelia-metadata": "npm:aurelia-metadata@1.0.0-beta.1.2.1",
"aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.2.2",
"aurelia-path": "npm:aurelia-path@1.0.0-beta.1.2.2",
"aurelia-task-queue": "npm:aurelia-task-queue@1.0.0-beta.1.2.1",
"aurelia-templating": "github:aurelia/templating@1.0.0-beta.2.0.1"
},
"npm:aurelia-history-browser@1.0.0-beta.1.2.1": {
"aurelia-history": "npm:aurelia-history@1.0.0-beta.1.2.1",
"aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.2.2"
},
"npm:aurelia-loader-default@1.0.0-beta.1.2.2": {
"aurelia-loader": "npm:aurelia-loader@1.0.0-beta.1.2.0",
"aurelia-metadata": "npm:aurelia-metadata@1.0.0-beta.1.2.1",
"aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.2.2"
},
"npm:aurelia-loader@1.0.0-beta.1.2.0": {
"aurelia-metadata": "npm:aurelia-metadata@1.0.0-beta.1.2.1",
"aurelia-path": "npm:aurelia-path@1.0.0-beta.1.2.2"
},
"npm:aurelia-logging-console@1.0.0-beta.1.2.2": {
"aurelia-logging": "npm:aurelia-logging@1.0.0-beta.1.2.1"
},
"npm:aurelia-metadata@1.0.0-beta.1.2.1": {
"aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.2.2"
},
"npm:aurelia-pal-browser@1.0.0-beta.2.0.1": {
"aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.2.2"
},
"npm:aurelia-polyfills@1.0.0-beta.1.1.6": {
"aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.2.2"
},
"npm:aurelia-route-recognizer@1.0.0-beta.1.2.1": {
"aurelia-path": "npm:aurelia-path@1.0.0-beta.1.2.2"
},
"npm:aurelia-router@1.0.0-beta.1.2.4": {
"aurelia-dependency-injection": "npm:aurelia-dependency-injection@1.0.0-beta.1.2.3",
"aurelia-event-aggregator": "npm:aurelia-event-aggregator@1.0.0-beta.1.2.1",
"aurelia-history": "npm:aurelia-history@1.0.0-beta.1.2.1",
"aurelia-logging": "npm:aurelia-logging@1.0.0-beta.1.2.1",
"aurelia-path": "npm:aurelia-path@1.0.0-beta.1.2.2",
"aurelia-route-recognizer": "npm:aurelia-route-recognizer@1.0.0-beta.1.2.1"
},
"npm:aurelia-task-queue@1.0.0-beta.1.2.1": {
"aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.2.2"
},
"npm:aurelia-templating-binding@1.0.0-beta.1.2.4": {
"aurelia-binding": "npm:aurelia-binding@1.0.0-beta.1.3.6",
"aurelia-logging": "npm:aurelia-logging@1.0.0-beta.1.2.1",
"aurelia-templating": "github:aurelia/templating@1.0.0-beta.2.0.1"
},
"npm:aurelia-templating-resources@1.0.0-beta.1.2.6": {
"aurelia-binding": "npm:aurelia-binding@1.0.0-beta.1.3.6",
"aurelia-dependency-injection": "npm:aurelia-dependency-injection@1.0.0-beta.1.2.3",
"aurelia-loader": "npm:aurelia-loader@1.0.0-beta.1.2.0",
"aurelia-logging": "npm:aurelia-logging@1.0.0-beta.1.2.1",
"aurelia-metadata": "npm:aurelia-metadata@1.0.0-beta.1.2.1",
"aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.2.2",
"aurelia-path": "npm:aurelia-path@1.0.0-beta.1.2.2",
"aurelia-task-queue": "npm:aurelia-task-queue@1.0.0-beta.1.2.1",
"aurelia-templating": "github:aurelia/templating@1.0.0-beta.2.0.1"
},
"npm:aurelia-templating-router@1.0.0-beta.1.2.1": {
"aurelia-dependency-injection": "npm:aurelia-dependency-injection@1.0.0-beta.1.2.3",
"aurelia-logging": "npm:aurelia-logging@1.0.0-beta.1.2.1",
"aurelia-metadata": "npm:aurelia-metadata@1.0.0-beta.1.2.1",
"aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.2.2",
"aurelia-path": "npm:aurelia-path@1.0.0-beta.1.2.2",
"aurelia-router": "npm:aurelia-router@1.0.0-beta.1.2.4",
"aurelia-templating": "github:aurelia/templating@1.0.0-beta.2.0.1"
},
"github:aurelia/templating@1.0.0-beta.2.0.1": {
"aurelia-binding": "npm:aurelia-binding@1.0.0-beta.1.3.6",
"aurelia-dependency-injection": "npm:aurelia-dependency-injection@1.0.0-beta.1.2.3",
"aurelia-loader": "npm:aurelia-loader@1.0.0-beta.1.2.0",
"aurelia-logging": "npm:aurelia-logging@1.0.0-beta.1.2.1",
"aurelia-metadata": "npm:aurelia-metadata@1.0.0-beta.1.2.1",
"aurelia-pal": "github:aurelia/pal@1.0.0-beta.1.2.2",
"aurelia-path": "npm:aurelia-path@1.0.0-beta.1.2.2",
"aurelia-task-queue": "npm:aurelia-task-queue@1.0.0-beta.1.2.1"
},
"npm:aurelia-testing@0.2.2": {
"aurelia-bootstrapper": "npm:aurelia-bootstrapper@1.0.0-beta.1.2.1",
"aurelia-framework": "npm:aurelia-framework@1.0.0-beta.1.2.5",
"aurelia-templating": "github:aurelia/templating@1.0.0-beta.2.0.1"
},
"npm:babel-runtime@5.8.38": {
"process": "github:jspm/nodelibs-process@0.1.2"
},
"npm:buffer@3.6.0": {
"base64-js": "npm:base64-js@0.0.8",
"child_process": "github:jspm/nodelibs-child_process@0.1.0",
"fs": "github:jspm/nodelibs-fs@0.1.2",
"ieee754": "npm:ieee754@1.1.6",
"isarray": "npm:isarray@1.0.0",
"process": "github:jspm/nodelibs-process@0.1.2"
},
"npm:core-js@2.0.3": {
"npm:core-js@2.4.0": {
"fs": "github:jspm/nodelibs-fs@0.1.2",
"path": "github:jspm/nodelibs-path@0.1.0",
"process": "github:jspm/nodelibs-process@0.1.2",
"systemjs-json": "github:systemjs/plugin-json@0.1.0"
"systemjs-json": "github:systemjs/plugin-json@0.1.2"
},
"npm:inherits@2.0.1": {
"util": "github:jspm/nodelibs-util@0.1.0"
},
"npm:path-browserify@0.0.0": {
"process": "github:jspm/nodelibs-process@0.1.2"
},
"npm:process@0.11.2": {
"npm:process@0.11.3": {
"assert": "github:jspm/nodelibs-assert@0.1.0"
},
"npm:util@0.10.3": {
Expand Down
4 changes: 2 additions & 2 deletions karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ module.exports = function(config) {
jspm: {
// Edit this to your needs
loadFiles: ['test/setup.js', 'test/**/*.js'],
serveFiles: ['src/**/*.js'],
serveFiles: ['src/**/*.js']
},


// list of files / patterns to load in the browser
files: [],
files: ['test/**/*.html'],


// list of files to exclude
Expand Down