mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-25 18:51:40 +02:00
Code Issues 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 4d0e83c03b
commit 1d8cda3c17
4 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
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/spin.js');
app.import('vendor/spin.js/jquery.spin.js'); app.import('vendor/spin.js/jquery.spin.js');
app.import('vendor/moment/moment.js'); app.import('vendor/moment/moment.js');
app.import('vendor/jquery-scrollparent/jquery.scrollparent.js');
app.import('vendor/json-api.js'); app.import('vendor/json-api.js');
app.import('vendor/font-awesome/fonts/fontawesome-webfont.eot'); app.import('vendor/font-awesome/fonts/fontawesome-webfont.eot');

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

@@ -2,8 +2,10 @@ import Ember from 'ember';
// import NotificationMessage from '../models/notification-message'; // 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
ember/app/routes/application.js
View File

@@ -1,28 +1,30 @@
import Ember from 'ember'; 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() { // login: function() {
return this.render('login', { // return this.render('login', {
into: 'application', // into: 'application',
outlet: 'modal' // outlet: 'modal'
}); // });
}, // },
doLogin: function() { // doLogin: function() {
this.get('session').authenticate('authenticator:custom', {}); // this.get('session').authenticate('authenticator:custom', {});
}, // },
closeModal: function() { // closeModal: function() {
return this.disconnectOutlet({ // return this.disconnectOutlet({
outlet: 'modal', // outlet: 'modal',
parentView: 'application' // parentView: 'application'
}); // });
} // }
} // }
}); // });
export default Ember.Route.extend();

1
ember/package.json
View File

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