Merge pull request #57 from documize/refactor-folder-routers

Refactor space routes

Author: HarveyKandola

README.md

@@ -8,7 +8,7 @@ The mission is to bring software dev inspired features (refactoring, testing, li
 
 ## Latest version
 
-v0.29.0
+v0.30.0
 
 ## OS Support
 

app/app/components/back-to-home.js

@@ -52,22 +52,6 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
 		this.destroyTooltips();
     },
 
-	// positionToc() {
-	// 	let s = $(".document-structure");
-    //     let pos = s.position();
-	//
-	// 	$(window).scroll(_.throttle(function() {
-	// 		let windowpos = $(window).scrollTop();
-    //         if (windowpos - 200 >= pos.top) {
-    //             s.addClass("stuck-toc");
-    //             s.css('width', s.parent().width());
-    //         } else {
-    //             s.removeClass("stuck-toc");
-    //             s.css('width', 'auto');
-    //         }
-    //     }, 50));
-	// },
-
     onDocumentPageAdded(pageId) {
         this.send('onEntryClick', pageId);
     },

app/app/components/document/document-sidebar-toc.js

@@ -37,6 +37,10 @@ export default Ember.Component.extend(TooltipMixin, NotifierMixin, {
 	init() {
 		this._super(...arguments);
 
+		if (this.get('noFolder')) {
+			return;
+		}
+
 		let _this = this;
 		this.get('templateService').getSavedTemplates().then(function(saved) {
             let emptyTemplate = {
@@ -57,12 +61,20 @@ export default Ember.Component.extend(TooltipMixin, NotifierMixin, {
 	},
 
 	didRender() {
+		if (this.get('noFolder')) {
+			return;
+		}
+
 		if (this.get('folderService').get('canEditCurrentFolder')) {
 			this.addTooltip(document.getElementById("start-document-button"));
 		}
 	},
 
 	didInsertElement() {
+		if (this.get('noFolder')) {
+			return;
+		}
+
 		this.eventBus.subscribe('resized', this, 'positionTool');
 		this.eventBus.subscribe('scrolled', this, 'positionTool');
 	},

app/app/components/folder/folders-list.js

@@ -24,13 +24,18 @@ export default Ember.Component.extend(NotifierMixin, {
 		this.setupImport();
 	},
 
+	willDestroyElement() {
+		if (is.not.null(this.get('drop'))) {
+			this.get('drop').destroy();
+			this.set('drop', null);
+		}
+	},
+
 	setupImport() {
 		// already done init?
 		if (is.not.null(this.get('drop'))) {
-			if (is.not.null(this.get('drop'))) {
-				this.get('drop').destroy();
-				this.set('drop', null);
-			}
+			this.get('drop').destroy();
+			this.set('drop', null);
 		}
 
 		let self = this;

app/app/components/folder/start-document.js

@@ -1,11 +1,11 @@
 // Copyright 2016 Documize Inc. <[email protected]>. All rights reserved.
 //
-// This software (Documize Community Edition) is licensed under 
+// This software (Documize Community Edition) is licensed under
 // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
 //
 // You can operate outside the AGPL restrictions by purchasing
 // Documize Enterprise Edition and obtaining a commercial license
-// by contacting <[email protected]>. 
+// by contacting <[email protected]>.
 //
 // https://documize.com
 
@@ -38,11 +38,11 @@ export default Ember.Controller.extend({
 			this.get('session').authenticate('authenticator:documize', creds)
 				.then((response) => {
 					this.get('audit').record("logged-in");
-					this.transitionToRoute('folders.folder');
+					this.transitionToRoute('folders');
 					return response;
 				}).catch(() => {
 					this.set('invalidCredentials', true);
 				});
 		}
 	}
-});
+});

app/app/components/layout/zone-container.js

@@ -1,11 +1,11 @@
 // Copyright 2016 Documize Inc. <[email protected]>. All rights reserved.
 //
-// This software (Documize Community Edition) is licensed under 
+// This software (Documize Community Edition) is licensed under
 // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
 //
 // You can operate outside the AGPL restrictions by purchasing
 // Documize Enterprise Edition and obtaining a commercial license
-// by contacting <[email protected]>. 
+// by contacting <[email protected]>.
 //
 // https://documize.com
 
@@ -24,7 +24,11 @@ export default Ember.Route.extend({
 		if (config.environment === 'test') {
 			this.transitionTo('auth.login');
 		} else {
-			window.document.location = this.get("appMeta.allowAnonymousAccess") ? "/" : "/auth/login";
+			if (this.get("appMeta.allowAnonymousAccess")) {
+				this.transitionTo('folders');
+			} else {
+				this.transitionTo('auth.login');
+			}
 		}
 	}
-});
+});

app/app/pods/auth/login/controller.js

@@ -1,14 +1,15 @@
 // Copyright 2016 Documize Inc. <[email protected]>. All rights reserved.
 //
-// This software (Documize Community Edition) is licensed under 
+// This software (Documize Community Edition) is licensed under
 // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
 //
 // You can operate outside the AGPL restrictions by purchasing
 // Documize Enterprise Edition and obtaining a commercial license
-// by contacting <[email protected]>. 
+// by contacting <[email protected]>.
 //
 // https://documize.com
 
 import Ember from 'ember';
 
-export default Ember.Route.extend({});
+export default Ember.Route.extend({
+});

app/app/pods/auth/logout/route.js

@@ -1,11 +1,11 @@
 // Copyright 2016 Documize Inc. <[email protected]>. All rights reserved.
 //
-// This software (Documize Community Edition) is licensed under 
+// This software (Documize Community Edition) is licensed under
 // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
 //
 // You can operate outside the AGPL restrictions by purchasing
 // Documize Enterprise Edition and obtaining a commercial license
-// by contacting <[email protected]>. 
+// by contacting <[email protected]>.
 //
 // https://documize.com
 
@@ -17,10 +17,10 @@ export default Ember.Route.extend({
 	model({ token }) {
 		this.get("session").authenticate('authenticator:documize', decodeURIComponent(token))
 			.then(() => {
-				this.transitionTo('folders.folder');
+				this.transitionTo('folders');
 			}, () => {
 				this.transitionTo('auth.login');
 				console.log(">>>>> Documize SSO failure");
 			});
 	},
-});
+});