Fix up post-Enterprise Edition merge

gui/app/components/document/settings-general.js

@@ -32,7 +32,7 @@ export default Component.extend(Notifier, {
 			if (this.get('hasNameError')) return;
 			if (!this.get('permissions.documentEdit')) return;
 
-			this.set('document.name', this.get('docName'));
+			this.set('document.name', this.get('docName').trim());
 			this.set('document.excerpt', this.get('docExcerpt').trim());
 
 			let cb = this.get('onSaveDocument');

gui/app/components/folder/settings-general.js

@@ -62,14 +62,6 @@ export default Component.extend(AuthMixin, Notifier, {
 			this.set('spaceType', t);
 		},
 
-		// onSetLikes(l) {
-		// 	this.set('allowLikes', l);
-
-		// 	schedule('afterRender', () => {
-		// 		if (l) this.$('#space-likes-prompt').focus();
-		// 	});
-		// },
-
 		onSave() {
 			if (!this.get('isSpaceAdmin')) return;
 

gui/app/pods/document/index/template.hbs

@@ -96,4 +96,3 @@
 		onPageLevelChange=(action "onPageLevelChange")
 		onPageSequenceChange=(action "onPageSequenceChange")}}
 {{/layout/master-content}}
-

gui/app/templates/components/document/document-page.hbs

@@ -1,7 +1,5 @@
 <div id="page-{{page.id}}" data-id={{page.id}} data-type={{page.contentType}}>
-
 	{{#if editMode}}
-
 		<div class="wysiwyg">
 			{{document/document-editor
 				document=document
@@ -11,9 +9,7 @@
 				onCancel=(action "onCancelEdit")
 				onAction=(action "onSavePage")}}
 		</div>
-
 	{{else}}
-
 		{{document/page-heading
 			page=page
 			meta=meta
@@ -37,7 +33,5 @@
 		<div class="wysiwyg">
 			{{section/base-renderer page=page}}
 		</div>
-
 	{{/if}}
-
 </div>