Skip to content

Commit

Permalink
Merge pull request #275 from donejs/upd
Browse files Browse the repository at this point in the history
Use `default` instead of `value` for initial default values
  • Loading branch information
matthewp committed Jan 18, 2018
2 parents 2c27775 + 179df21 commit 83294c5
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 10 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ language: node_js
addons:
firefox: "51.0"
node_js:
- "4"
- "6"
- "7"
- "8"
before_install:
- "export DISPLAY=:99.0"
Expand Down
4 changes: 2 additions & 2 deletions app/templates/src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import 'can-route-pushstate';

const AppViewModel = DefineMap.extend({
message: {
value: 'Hello World!',
default: 'Hello World!',
serialize: false
},
title: {
value: '<%= name %>',
default: '<%= name %>',
serialize: false
}
});
Expand Down
2 changes: 0 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
environment:
matrix:
# node.js
- nodejs_version: "4"
- nodejs_version: "6"
- nodejs_version: "7"
- nodejs_version: "8"
# Install scripts. (runs after repo cloning)
install:
Expand Down
2 changes: 1 addition & 1 deletion component/templates/component.component
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

export default DefineMap.extend({
message: {
value: 'This is the <%= tag %> component'
default: 'This is the <%= tag %> component'
}
});
</script>
Expand Down
2 changes: 1 addition & 1 deletion component/templates/modlet/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import view from './<%= name %>.stache';

export const ViewModel = DefineMap.extend({
message: {
value: 'This is the <%= tag %> component'
default: 'This is the <%= tag %> component'
}
});

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"devDependencies": {
"coveralls-send": "0.0.2",
"donejs": "*",
"donejs-cli": "^1.0.0-alpha.1",
"donejs-cli": "^2.0.0-pre.2",
"fs-extra": "^0.30.0",
"istanbul": "^0.4.2",
"mkdirp": "^0.5.1",
Expand Down
2 changes: 1 addition & 1 deletion test/app.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ function prepareRoutingTest(tmpDir){
insert(
path.join(tmpDir, 'src/index.stache'),
function(a){ return a.search('<h1>') !== -1; },
'<can-import from="can-stache/helpers/route" />' +
'<can-import from="can-stache-route-helpers" />' +
'<a id="goto-dashboard" href="{{routeUrl page=\'dashboard\'}}">Goto Dashboard</a>'
);
}
Expand Down

0 comments on commit 83294c5

Please sign in to comment.