github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-20 22:30:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get rid of some troublesome dependencies for now.

Browse Source
This commit is contained in:
Toby Zerner 2014-12-20 21:06:15 +10:30
parent ca124a509f
commit 4f9e48d894
4 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
framework/core/ember/Brocfile.js
View File

@ -8,7 +8,6 @@ app.import('vendor/bootstrap/dist/js/bootstrap.js');
app.import('vendor/spin.js/spin.js');
app.import('vendor/spin.js/jquery.spin.js');
app.import('vendor/moment/moment.js');
app.import('vendor/jquery-scrollparent/jquery.scrollparent.js');
app.import('vendor/json-api.js');
app.import('vendor/font-awesome/fonts/fontawesome-webfont.eot');

8
framework/core/ember/app/controllers/login.js
View File

@ -2,8 +2,10 @@ import Ember from 'ember';
// import NotificationMessage from '../models/notification-message';
export default Ember.Controller.extend(Ember.SimpleAuth.LoginControllerMixin, Ember.Evented, {
// export default Ember.Controller.extend(Ember.SimpleAuth.LoginControllerMixin, Ember.Evented, {
authenticatorFactory: 'authenticator:flarum'
// authenticatorFactory: 'authenticator:flarum'
});
// });
export default Ember.Controller.extend();

42
framework/core/ember/app/routes/application.js
View File

@ -1,28 +1,30 @@
import Ember from 'ember';
import ApplicationRouteMixin from 'simple-auth/mixins/application-route-mixin';
// import ApplicationRouteMixin from 'simple-auth/mixins/application-route-mixin';
export default Ember.Route.extend(ApplicationRouteMixin, {
// export default Ember.Route.extend(ApplicationRouteMixin, {
actions: {
// actions: {
login: function() {
return this.render('login', {
into: 'application',
outlet: 'modal'
});
},
// login: function() {
// return this.render('login', {
// into: 'application',
// outlet: 'modal'
// });
// },
doLogin: function() {
this.get('session').authenticate('authenticator:custom', {});
},
// doLogin: function() {
// this.get('session').authenticate('authenticator:custom', {});
// },
closeModal: function() {
return this.disconnectOutlet({
outlet: 'modal',
parentView: 'application'
});
}
// closeModal: function() {
// return this.disconnectOutlet({
// outlet: 'modal',
// parentView: 'application'
// });
// }
}
// }
});
// });
export default Ember.Route.extend();

1
framework/core/ember/package.json
View File

@ -26,7 +26,6 @@
"ember-cli-autoprefixer": "^0.1.0",
"ember-cli-ember-data": "0.1.0",
"ember-cli-ic-ajax": "0.1.1",
"ember-cli-simple-auth": "^0.6.4-1",
"express": "^4.1.1",
"glob": "^3.2.9",
"liquid-fire": "^0.9.2",