Skip to content

Commit

Permalink
Merge pull request ElemeFE#113 from Leopoldthecoder/master
Browse files Browse the repository at this point in the history
doc fix
  • Loading branch information
baiyaaaaa authored Sep 21, 2016
2 parents 98f3935 + 947cd99 commit 98bb0a1
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 3 deletions.
1 change: 1 addition & 0 deletions examples/app.vue
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
created() {
window.addEventListener('hashchange', () => {
document.body.scrollTop = 0;
document.documentElement.scrollTop = 0;
});
}
};
Expand Down
2 changes: 2 additions & 0 deletions examples/components/footer-nav.vue
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,12 @@
.footer-nav-left {
float: left;
margin-left: -4px;
}
.footer-nav-right {
float: right;
margin-right: -4px;
}
</style>

Expand Down
5 changes: 3 additions & 2 deletions examples/docs/datetime-picker.md
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
v-model="value3"
type="datetimerange"
placeholder="选择时间范围"
style="width:260px">
style="width:350px">
</el-date-picker>
</div>
<div class="block">
Expand All @@ -180,7 +180,8 @@
type="datetimerange"
:picker-options="pickerOptions2"
placeholder="选择时间范围"
style="width:260px">
align="right"
style="width:350px">
</el-date-picker>
</div>
</template>
Expand Down
9 changes: 8 additions & 1 deletion examples/docs/tree.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,15 @@
if (node.level === -1) {
return resolve([{ name: 'Root1' }, { name: 'Root2' }]);
}
var hasChild = Math.random() > 0.5;
if (node.level > 4) return resolve([]);
var hasChild;
if (node.data.name === 'Root1') {
hasChild = true;
} else if (node.data.name === 'Root2') {
hasChild = false;
} else {
hasChild = Math.random() > 0.5;
}

setTimeout(function() {
var data;
Expand Down

0 comments on commit 98bb0a1

Please sign in to comment.