CodeCow/sharedrop
1
0
Fork 0
mirror of https://github.com/szimek/sharedrop.git synced 2026-06-13 21:03:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'about_page' of github.com:cowbell/sharedrop into about_page

Browse Source
This commit is contained in:
Maciej Jarczok 2014-03-24 22:59:46 +01:00
commit acfaecbde3
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/index.html
View File

@ -66,6 +66,7 @@
<script src="/scripts/app/components/modal_dialog_component.js"></script>
<script src="/scripts/app/components/popover_confirm_component.js"></script>
<script src="/scripts/app/controllers/application_controller.js"></script>
<script src="/scripts/app/controllers/about_controller.js"></script>
<script src="/scripts/app/controllers/index_controller.js"></script>
<script src="/scripts/app/controllers/peer_controller.js"></script>
<script src="/scripts/app/models/peer.js"></script>

7
app/scripts/app.js
View File

@ -71,14 +71,15 @@ ShareDrop.App.IndexRoute = Ember.Route.extend({
actions: {
openModal: function(modalName) {
return this.render(modalName, {
into: 'index',
outlet: 'modal'
outlet: 'modal',
into: 'index'
});
},
closeModal: function() {
return this.disconnectOutlet({
outlet: 'modal'
outlet: 'modal',
parentView: 'index'
});
}
}

7
app/scripts/app/controllers/about_controller.js Normal file
View File

@ -0,0 +1,7 @@
ShareDrop.App.AboutController = Ember.Controller.extend({
actions: {
close: function() {
return this.send('closeModal');
}
}
});