From 1d8cda3c17f4c417bea084414d9d1b30820d89b7 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Sat, 20 Dec 2014 21:06:15 +1030
Subject: [PATCH] Get rid of some troublesome dependencies for now.

---
 ember/Brocfile.js               |  1 -
 ember/app/controllers/login.js  |  8 ++++---
 ember/app/routes/application.js | 42 +++++++++++++++++----------------
 ember/package.json              |  1 -
 4 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/ember/Brocfile.js b/ember/Brocfile.js
index 29092de95..05add588c 100644
--- a/ember/Brocfile.js
+++ b/ember/Brocfile.js
@@ -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');
diff --git a/ember/app/controllers/login.js b/ember/app/controllers/login.js
index b7ffe1407..ee3e9310c 100644
--- a/ember/app/controllers/login.js
+++ b/ember/app/controllers/login.js
@@ -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();
\ No newline at end of file
diff --git a/ember/app/routes/application.js b/ember/app/routes/application.js
index 17c3eea4a..a68d741c1 100644
--- a/ember/app/routes/application.js
+++ b/ember/app/routes/application.js
@@ -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();
\ No newline at end of file
diff --git a/ember/package.json b/ember/package.json
index f57a0f604..bf89c3e6e 100644
--- a/ember/package.json
+++ b/ember/package.json
@@ -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",