github/meteor-ionic
2
0
Fork 0
mirror of https://github.com/donl/meteor-ionic.git synced 2026-06-30 06:12:08 -06:00
Code Issues Projects Packages Wiki Activity Actions

fixed conflict in guide.md

Browse source
This commit is contained in:
Elie Steinbock 2015-07-08 23:48:57 +03:00
commit bd7b406fcd
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
GUIDE.md
View file

@ -371,4 +371,11 @@ You show alerts using the `ionPopup` component. This can be done as follows:
IonPopup.alert({title: 'title', subTitle: 'subTitle', template: 'some text to show the user'});
```
You can also use `IonPopup.confirm({})`, `IonPopup.prompt({})` and `IonPopup.close()`.
You can also use `IonPopup.confirm({})`, `IonPopup.prompt({})` and `IonPopup.close()`.
=======
If you'd like to have another element dismiss the modal, add `data-dismiss=modal` to it. For example, you can create a close button as follows:
```
<button class="button button-positive" data-dismiss=modal>
Close Modal
</button>
```

2
components/ionView/ionView.js
View file

@ -5,7 +5,7 @@ Template.ionView.rendered = function () {
// Reset our scroll position
var routePath = Router.current().route.path(Router.current().params);
if(IonScrollPositions[routePath]) {
$('.overflow-scroll').scrollTop(IonScrollPositions[routePath]);
$('.overflow-scroll').not('.nav-view-leaving .overflow-scroll').scrollTop(IonScrollPositions[routePath]);
delete IonScrollPositions[routePath];
}
};