removed open sans, chasing Code section refresh issue

app/app/components/document/document-page.js

@@ -18,10 +18,20 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
 	sectionService: Ember.inject.service('section'),
 	editMode: false,
 
-	didReceiveAttrs() {
+	init() {
-		let toEdit = this.get('toEdit');
+		this._super(...arguments);
 
-		if (toEdit === this.get('page.id') && this.get('isEditor')) {
+		let page = this.get('page');
+
+		this.get('documentService').getPageMeta(page.get('documentId'), page.get('id')).then((meta) => {
+			this.set('meta', meta);
+		});
+	},
+
+	didReceiveAttrs() {
+		this._super(...arguments);
+
+		if (this.get('toEdit') === this.get('page.id') && this.get('isEditor')) {
 			this.send('onEdit');
 		}
 	},
@@ -60,12 +70,7 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
 				return;
 			}
 
-			let page = this.get('page');
+			this.set('editMode', true);
-
-			this.get('documentService').getPageMeta(page.get('documentId'), page.get('id')).then((meta) => {
-				this.set('editMode', true);
-				this.set('meta', meta);
-			});
 		},
 
 		onCancelEdit() {
@@ -73,8 +78,8 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
 		},
 
 		onSavePage(page, meta) {
+			this.get('onSavePage')(page, meta);
 			this.set('editMode', false);
-			this.attrs.onSavePage(page, meta);
 		}
 	}
 });

app/app/components/document/document-tab.js

@@ -23,14 +23,22 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
 	},
 
 	didInsertElement() {
-		let self = this;
+		this.get('sectionService').refresh(this.get('document.id')).then((changes) => {
-		this.get('sectionService').refresh(this.get('document.id')).then(function (changes) {
+			if (this.get('isDestroyed') || this.get('isDestroying')) {
-			changes.forEach(function (newPage) {
+				return;
-				let oldPage = self.get('page');
+			}
-				if (!_.isUndefined(oldPage) && oldPage.get('id') === newPage.get('id')) {
+
+			let oldPage = this.get('page');
+
+			if (is.undefined(changes) || is.undefined(oldPage)) {
+				return;
+			}
+
+			changes.forEach((newPage) => {
+				if (oldPage.get('id') === newPage.get('id')) {
 					oldPage.set('body', newPage.get('body'));
 					oldPage.set('revised', newPage.get('revised'));
-					self.showNotification(`Refreshed ${oldPage.get('title')}`);
+					this.showNotification(`Refreshed ${oldPage.get('title')}`);
 				}
 			});
 		});
@@ -67,7 +75,6 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
 			};
 
 			this.attrs.onDeletePage(params);
-		},
+		}
-
 	}
 });

app/app/components/document/document-view.js

@@ -30,10 +30,14 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
 	toEdit: '',
 
 	didReceiveAttrs() {
+		this._super(...arguments);
+		
 		this.loadBlocks();
 	},
 
 	didRender() {
+		this._super(...arguments);
+		
 		this.contentLinkHandler();
 
 		let self = this;
@@ -43,6 +47,8 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
 	},
 
 	didInsertElement() {
+		this._super(...arguments);
+		
 		$(".start-section:not(.start-section-empty-state)").hoverIntent({interval: 100, over: function() {
 			// in
 			$(this).find('.start-button').velocity("transition.slideDownIn", {duration: 300});
@@ -63,6 +69,8 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
 	},
 
 	willDestroyElement() {
+		this._super(...arguments);
+		
 		this.destroyTooltips();
 	},
 

app/app/components/section/base-renderer.js

@@ -13,6 +13,8 @@ import Ember from 'ember';
 
 export default Ember.Component.extend({
     didReceiveAttrs() {
+        this._super(...arguments);
+        
         this.set('rendererType', 'section/' + this.get('page.contentType') + '/type-renderer');
-    },
+    }
 });

app/app/components/section/code/type-editor.js

@@ -90,7 +90,6 @@ export default Ember.Component.extend(TooltipMixin, {
         this.set('codeEditor', editor);
 
         let syntax = this.get("codeSyntax");
-
         if (is.not.undefined(syntax)) {
             CodeMirror.autoLoadMode(editor, syntax.mode);
             editor.setOption("mode", syntax.mode);

app/app/components/section/code/type-renderer.js

@@ -16,6 +16,8 @@ export default Ember.Component.extend({
     codeSyntax: "htmlmixed",
 
     didReceiveAttrs() {
+        this._super(...arguments);
+
         CodeMirror.modeURL = "/codemirror/mode/%N/%N.js";
 
         let page = this.get('page');
@@ -27,9 +29,22 @@ export default Ember.Component.extend({
             this.set('codeSyntax', cleanBody.substring(0, startPos));
             this.set('codeBody', cleanBody.substring(startPos + 2));
         }
+
+        _.each(_.sortBy(CodeMirror.modeInfo, 'name'), (item) => {
+            let i = {
+                mode: item.mode,
+                name: item.name
+            };
+
+            if (item.mode === this.get('codeSyntax')) {
+                this.set('codeSyntax', i);
+            }
+        });
     },
 
-    didRender() {
+    didInsertElement() {
+        this._super(...arguments);
+
         let page = this.get('page');
         let elem = `page-${page.id}-code`;
 
@@ -44,14 +59,18 @@ export default Ember.Component.extend({
             readOnly: true
         });
 
-        let syntax = this.get("codeSyntax");
-        CodeMirror.autoLoadMode(editor, syntax);
-        editor.setOption("mode", syntax);
-
         this.set('codeEditor', editor);
+
+        let syntax = this.get("codeSyntax");
+        if (is.not.undefined(syntax)) {
+            CodeMirror.autoLoadMode(editor, syntax.mode);
+            editor.setOption("mode", syntax.mode);
+        }
     },
 
     willDestroyElement() {
+        this._super(...arguments);
+
         this.set('codeEditor', null);
     }
 });

app/app/pods/document/index/controller.js

@@ -58,20 +58,17 @@ export default Ember.Controller.extend(NotifierMixin, {
 		},
 
 		onSavePage(page, meta) {
-			let self = this;
 			let documentId = this.get('model.document.id');
 			let model = {
 				page: page.toJSON({ includeId: true }),
 				meta: meta.toJSON({ includeId: true })
 			};
 
-			this.get('documentService').updatePage(documentId, page.get('id'), model).then(function () {
+			this.get('documentService').updatePage(documentId, page.get('id'), model).then(() => {
-				self.audit.record("edited-page");
+				this.get('target.router').refresh();
-				self.get('documentService').getPages(documentId).then((pages) => {
-					self.set('model.pages', pages);
-					self.get('target.router').refresh();
-				});
 			});
+
+			this.audit.record("edited-page");
 		},
 
 		onPageDeleted(deletePage) {

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

@@ -67,8 +67,8 @@
 						{{document/document-view document=model.document links=model.links pages=model.pages
 							folder=model.folder folders=model.folders sections=model.sections isEditor=model.isEditor pageId=pageId
 							onSavePage=(action 'onSavePage') onInsertSection=(action 'onInsertSection') 
-							onSavePageAsBlock=(action 'onSavePageAsBlock') onDeleteBlock=(action 'onDeleteBlock') onCopyPage=(action 'onCopyPage') onMovePage=(action 'onMovePage') 
+							onSavePageAsBlock=(action 'onSavePageAsBlock') onDeleteBlock=(action 'onDeleteBlock') 
-							onDeletePage=(action 'onPageDeleted')}}
+							onCopyPage=(action 'onCopyPage') onMovePage=(action 'onMovePage') onDeletePage=(action 'onPageDeleted')}}
 					</div>
 				</div>
 			</div>

app/app/pods/document/route.js

@@ -35,11 +35,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
 
 						this.get('folderService').setCurrentFolder(folder).then(() => {
 							this.set('isEditor', this.get('folderService').get('canEditCurrentFolder'));
-
+							resolve();
-							this.get('documentService').getPages(this.get('documentId')).then((pages) => {
-								this.set('pages', pages);
-								resolve();
-							});
 						});
 					});
 				});
@@ -54,7 +50,6 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
 			document: this.get('document'),
 			page: this.get('pageId'),
 			isEditor: this.get('isEditor'),
-			pages: this.get('pages'),
 			links: this.get('linkService').getDocumentLinks(this.get('documentId')),
 			sections: this.get('sectionService').getAll()
 		});

app/app/pods/document/section/route.js

@@ -16,16 +16,13 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
 	documentService: Ember.inject.service('document'),
 	folderService: Ember.inject.service('folder'),
 	userService: Ember.inject.service('user'),
-	pageId: '',
 
 	model(params) {
 		return Ember.RSVP.hash({
 			folders: this.modelFor('document').folders,
 			folder: this.modelFor('document').folder,
 			document: this.modelFor('document').document,
-			pageId: this.modelFor('document').page,
 			isEditor: this.get('folderService').get('canEditCurrentFolder'),
-			pages: this.modelFor('document').pages,
 			links: this.modelFor('document').links,
 			sections: this.modelFor('document').sections,
 			page: this.get('documentService').getPage(this.modelFor('document').document.get('id'), params.page_id),

app/app/services/document.js

@@ -232,7 +232,6 @@ export default Ember.Service.extend({
 
 	// Returns all document pages with content
 	getPages(documentId) {
-
 		return this.get('ajax').request(`documents/${documentId}/pages`, {
 			method: 'GET'
 		}).then((response) => {

app/app/styles/font.scss

@@ -1,34 +1,6 @@
 .font-fixed-width {
 	font-family: 'courier new', courier;
 }
-@font-face {
-	font-family: 'open_sansbold';
-	src: url('font/opensans/opensans-bold-webfont.eot');
-	src: url('font/opensans/opensans-bold-webfont.eot?#iefix') format('embedded-opentype'), url('font/opensans/opensans-bold-webfont.woff2') format('woff2'), url('font/opensans/opensans-bold-webfont.woff') format('woff'), url('font/opensans/opensans-bold-webfont.ttf') format('truetype'), url('font/opensans/opensans-bold-webfont.svg#open_sansbold') format('svg');
-	font-weight: normal;
-	font-style: normal;
-}
-@font-face {
-	font-family: 'open_sanslight';
-	src: url('font/opensans/opensans-light-webfont.eot');
-	src: url('font/opensans/opensans-light-webfont.eot?#iefix') format('embedded-opentype'), url('font/opensans/opensans-light-webfont.woff2') format('woff2'), url('font/opensans/opensans-light-webfont.woff') format('woff'), url('font/opensans/opensans-light-webfont.ttf') format('truetype'), url('font/opensans/opensans-light-webfont.svg#open_sanslight') format('svg');
-	font-weight: normal;
-	font-style: normal;
-}
-@font-face {
-	font-family: 'open_sansregular';
-	src: url('font/opensans/opensans-regular-webfont.eot');
-	src: url('font/opensans/opensans-regular-webfont.eot?#iefix') format('embedded-opentype'), url('font/opensans/opensans-regular-webfont.woff2') format('woff2'), url('font/opensans/opensans-regular-webfont.woff') format('woff'), url('font/opensans/opensans-regular-webfont.ttf') format('truetype'), url('font/opensans/opensans-regular-webfont.svg#open_sansregular') format('svg');
-	font-weight: normal;
-	font-style: normal;
-}
-@font-face {
-	font-family: 'open_sanssemibold';
-	src: url('font/opensans/opensans-semibold-webfont.eot');
-	src: url('font/opensans/opensans-semibold-webfont.eot?#iefix') format('embedded-opentype'), url('font/opensans/opensans-semibold-webfont.woff2') format('woff2'), url('font/opensans/opensans-semibold-webfont.woff') format('woff'), url('font/opensans/opensans-semibold-webfont.ttf') format('truetype'), url('font/opensans/opensans-semibold-webfont.svg#open_sanssemibold') format('svg');
-	font-weight: normal;
-	font-style: normal;
-}
 
 $font-regular: Helvetica;
 $font-semibold: Helvetica;

app/app/styles/section/code.scss

@@ -2,47 +2,45 @@
 	margin-top: 6px;
 
 	> .syntax-selector {
-		position: absolute;
+		margin-bottom: 15px;
-		top: 24px;
-		right: 90px;
 	}
 }
 
 /* BASICS */
 .CodeMirror {
-  /* Set height, width, borders, and global font properties here */
+	/* Set height, width, borders, and global font properties here */
-  font-family: monospace;
+	font-family: monospace;
-  height: 300px;
+	height: 300px;
-  color: black;
+	color: black;
 }
 
 /* PADDING */
 
 .CodeMirror-lines {
-  padding: 4px 0; /* Vertical padding around content */
+	padding: 4px 0; /* Vertical padding around content */
 }
 .CodeMirror pre {
-  padding: 0 4px; /* Horizontal padding of content */
+	padding: 0 4px; /* Horizontal padding of content */
 }
 
 .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
-  background-color: white; /* The little square between H and V scrollbars */
+	background-color: white; /* The little square between H and V scrollbars */
 }
 
 /* GUTTER */
 
 .CodeMirror-gutters {
-  border-right: 1px solid #ddd;
+	border-right: 1px solid #ddd;
-  background-color: #f7f7f7;
+	background-color: #f7f7f7;
-  white-space: nowrap;
+	white-space: nowrap;
 }
 .CodeMirror-linenumbers {}
 .CodeMirror-linenumber {
-  padding: 0 3px 0 5px;
+	padding: 0 3px 0 5px;
-  min-width: 20px;
+	min-width: 20px;
-  text-align: right;
+	text-align: right;
-  color: #999;
+	color: #999;
-  white-space: nowrap;
+	white-space: nowrap;
 }
 
 .CodeMirror-guttermarker { color: black; }
@@ -51,45 +49,45 @@
 /* CURSOR */
 
 .CodeMirror-cursor {
-  border-left: 1px solid black;
+	border-left: 1px solid black;
-  border-right: none;
+	border-right: none;
-  width: 0;
+	width: 0;
 }
 /* Shown when moving in bi-directional text */
 .CodeMirror div.CodeMirror-secondarycursor {
-  border-left: 1px solid silver;
+	border-left: 1px solid silver;
 }
 .cm-fat-cursor .CodeMirror-cursor {
-  width: auto;
+	width: auto;
-  border: 0;
+	border: 0;
-  background: #7e7;
+	background: #7e7;
 }
 .cm-fat-cursor div.CodeMirror-cursors {
-  z-index: 1;
+	z-index: 1;
 }
 
 .cm-animate-fat-cursor {
-  width: auto;
+	width: auto;
-  border: 0;
+	border: 0;
-  -webkit-animation: blink 1.06s steps(1) infinite;
+	-webkit-animation: blink 1.06s steps(1) infinite;
-  -moz-animation: blink 1.06s steps(1) infinite;
+	-moz-animation: blink 1.06s steps(1) infinite;
-  animation: blink 1.06s steps(1) infinite;
+	animation: blink 1.06s steps(1) infinite;
-  background-color: #7e7;
+	background-color: #7e7;
 }
 @-moz-keyframes blink {
-  0% {}
+	0% {}
-  50% { background-color: transparent; }
+	50% { background-color: transparent; }
-  100% {}
+	100% {}
 }
 @-webkit-keyframes blink {
-  0% {}
+	0% {}
-  50% { background-color: transparent; }
+	50% { background-color: transparent; }
-  100% {}
+	100% {}
 }
 @keyframes blink {
-  0% {}
+	0% {}
-  50% { background-color: transparent; }
+	50% { background-color: transparent; }
-  100% {}
+	100% {}
 }
 
 /* Can style cursor different in overwrite (non-insert) mode */
@@ -98,8 +96,8 @@
 .cm-tab { display: inline-block; text-decoration: inherit; }
 
 .CodeMirror-ruler {
-  border-left: 1px solid #ccc;
+	border-left: 1px solid #ccc;
-  position: absolute;
+	position: absolute;
 }
 
 /* DEFAULT THEME */
@@ -150,132 +148,132 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 /* STOP */
 
 /* The rest of this file contains styles related to the mechanics of
-   the editor. You probably shouldn't touch them. */
+	 the editor. You probably shouldn't touch them. */
 
 .CodeMirror {
-  position: relative;
+	position: relative;
-  overflow: hidden;
+	overflow: hidden;
-  background: white;
+	background: white;
 }
 
 .CodeMirror-scroll {
-  overflow: scroll !important; /* Things will break if this is overridden */
+	overflow: scroll !important; /* Things will break if this is overridden */
-  /* 30px is the magic margin used to hide the element's real scrollbars */
+	/* 30px is the magic margin used to hide the element's real scrollbars */
-  /* See overflow: hidden in .CodeMirror */
+	/* See overflow: hidden in .CodeMirror */
-  margin-bottom: -30px; margin-right: -30px;
+	margin-bottom: -30px; margin-right: -30px;
-  padding-bottom: 30px;
+	padding-bottom: 30px;
-  height: 100%;
+	height: 100%;
-  outline: none; /* Prevent dragging from highlighting the element */
+	outline: none; /* Prevent dragging from highlighting the element */
-  position: relative;
+	position: relative;
 }
 .CodeMirror-sizer {
-  position: relative;
+	position: relative;
-  border-right: 30px solid transparent;
+	border-right: 30px solid transparent;
 }
 
 /* The fake, visible scrollbars. Used to force redraw during scrolling
-   before actual scrolling happens, thus preventing shaking and
+	 before actual scrolling happens, thus preventing shaking and
-   flickering artifacts. */
+	 flickering artifacts. */
 .CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
-  position: absolute;
+	position: absolute;
-  z-index: 6;
+	z-index: 6;
-  display: none;
+	display: none;
 }
 .CodeMirror-vscrollbar {
-  right: 0; top: 0;
+	right: 0; top: 0;
-  overflow-x: hidden;
+	overflow-x: hidden;
-  overflow-y: scroll;
+	overflow-y: scroll;
 }
 .CodeMirror-hscrollbar {
-  bottom: 0; left: 0;
+	bottom: 0; left: 0;
-  overflow-y: hidden;
+	overflow-y: hidden;
-  overflow-x: scroll;
+	overflow-x: scroll;
 }
 .CodeMirror-scrollbar-filler {
-  right: 0; bottom: 0;
+	right: 0; bottom: 0;
 }
 .CodeMirror-gutter-filler {
-  left: 0; bottom: 0;
+	left: 0; bottom: 0;
 }
 
 .CodeMirror-gutters {
-  position: absolute; left: 0; top: 0;
+	position: absolute; left: 0; top: 0;
-  z-index: 3;
+	z-index: 3;
 }
 .CodeMirror-gutter {
-  white-space: normal;
+	white-space: normal;
-  height: 100%;
+	height: 100%;
-  display: inline-block;
+	display: inline-block;
-  margin-bottom: -30px;
+	margin-bottom: -30px;
-  /* Hack to make IE7 behave */
+	/* Hack to make IE7 behave */
-  *zoom:1;
+	*zoom:1;
-  *display:inline;
+	*display:inline;
 }
 .CodeMirror-gutter-wrapper {
-  position: absolute;
+	position: absolute;
-  z-index: 4;
+	z-index: 4;
-  background: none !important;
+	background: none !important;
-  border: none !important;
+	border: none !important;
 }
 .CodeMirror-gutter-background {
-  position: absolute;
+	position: absolute;
-  top: 0; bottom: 0;
+	top: 0; bottom: 0;
-  z-index: 4;
+	z-index: 4;
 }
 .CodeMirror-gutter-elt {
-  position: absolute;
+	position: absolute;
-  cursor: default;
+	cursor: default;
-  z-index: 4;
+	z-index: 4;
 }
 .CodeMirror-gutter-wrapper {
-  -webkit-user-select: none;
+	-webkit-user-select: none;
-  -moz-user-select: none;
+	-moz-user-select: none;
-  user-select: none;
+	user-select: none;
 }
 
 .CodeMirror-lines {
-  cursor: text;
+	cursor: text;
-  min-height: 1px; /* prevents collapsing before first draw */
+	min-height: 1px; /* prevents collapsing before first draw */
 }
 .CodeMirror pre {
-  /* Reset some styles that the rest of the page might have set */
+	/* Reset some styles that the rest of the page might have set */
-  -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;
+	-moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;
-  border-width: 0;
+	border-width: 0;
-  background: transparent;
+	background: transparent;
-  font-family: inherit;
+	font-family: inherit;
-  font-size: inherit;
+	font-size: inherit;
-  margin: 0;
+	margin: 0;
-  white-space: pre;
+	white-space: pre;
-  word-wrap: normal;
+	word-wrap: normal;
-  line-height: inherit;
+	line-height: inherit;
-  color: inherit;
+	color: inherit;
-  z-index: 2;
+	z-index: 2;
-  position: relative;
+	position: relative;
-  overflow: visible;
+	overflow: visible;
-  -webkit-tap-highlight-color: transparent;
+	-webkit-tap-highlight-color: transparent;
 }
 .CodeMirror-wrap pre {
-  word-wrap: break-word;
+	word-wrap: break-word;
-  white-space: pre-wrap;
+	white-space: pre-wrap;
-  word-break: normal;
+	word-break: normal;
 }
 
 .CodeMirror-linebackground {
-  position: absolute;
+	position: absolute;
-  left: 0; right: 0; top: 0; bottom: 0;
+	left: 0; right: 0; top: 0; bottom: 0;
-  z-index: 0;
+	z-index: 0;
 }
 
 .CodeMirror-linewidget {
-  position: relative;
+	position: relative;
-  z-index: 2;
+	z-index: 2;
-  overflow: auto;
+	overflow: auto;
 }
 
 .CodeMirror-widget {}
 
 .CodeMirror-code {
-  outline: none;
+	outline: none;
 }
 
 /* Force content-box sizing for the elements where we expect it */
@@ -284,32 +282,32 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 .CodeMirror-gutter,
 .CodeMirror-gutters,
 .CodeMirror-linenumber {
-  -moz-box-sizing: content-box;
+	-moz-box-sizing: content-box;
-  box-sizing: content-box;
+	box-sizing: content-box;
 }
 
 .CodeMirror-measure {
-  position: absolute;
+	position: absolute;
-  width: 100%;
+	width: 100%;
-  height: 0;
+	height: 0;
-  overflow: hidden;
+	overflow: hidden;
-  visibility: hidden;
+	visibility: hidden;
 }
 
 .CodeMirror-cursor { position: absolute; }
 .CodeMirror-measure pre { position: static; }
 
 div.CodeMirror-cursors {
-  visibility: hidden;
+	visibility: hidden;
-  position: relative;
+	position: relative;
-  z-index: 3;
+	z-index: 3;
 }
 div.CodeMirror-dragcursors {
-  visibility: visible;
+	visibility: visible;
 }
 
 .CodeMirror-focused div.CodeMirror-cursors {
-  visibility: visible;
+	visibility: visible;
 }
 
 .CodeMirror-selected { background: #d9d9d9; }
@@ -319,8 +317,8 @@ div.CodeMirror-dragcursors {
 .CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection { background: #d7d4f0; }
 
 .cm-searching {
-  background: #ffa;
+	background: #ffa;
-  background: rgba(255, 255, 0, .4);
+	background: rgba(255, 255, 0, .4);
 }
 
 /* IE7 hack to prevent it from returning funny offsetTops on the spans */
@@ -330,10 +328,10 @@ div.CodeMirror-dragcursors {
 .cm-force-border { padding-right: .1px; }
 
 @media print {
-  /* Hide the cursor when printing */
+	/* Hide the cursor when printing */
-  .CodeMirror div.CodeMirror-cursors {
+	.CodeMirror div.CodeMirror-cursors {
-    visibility: hidden;
+		visibility: hidden;
-  }
+	}
 }
 
 /* See issue #2901 */
@@ -372,23 +370,23 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
 /* Color scheme for code-mirror */
 
 .cm-s-solarized {
-  line-height: 1.45em;
+	line-height: 1.45em;
-  color-profile: sRGB;
+	color-profile: sRGB;
-  rendering-intent: auto;
+	rendering-intent: auto;
 }
 .cm-s-solarized.cm-s-dark {
-  color: #839496;
+	color: #839496;
-  background-color:  #002b36;
+	background-color:  #002b36;
-  text-shadow: #002b36 0 1px;
+	text-shadow: #002b36 0 1px;
 }
 .cm-s-solarized.cm-s-light {
-  background-color: #fdf6e3;
+	background-color: #fdf6e3;
-  color: #657b83;
+	color: #657b83;
-  text-shadow: #eee8d5 0 1px;
+	text-shadow: #eee8d5 0 1px;
 }
 
 .cm-s-solarized .CodeMirror-widget {
-  text-shadow: none;
+	text-shadow: none;
 }
 
 .cm-s-solarized .cm-header { color: #586e75; }
@@ -420,22 +418,22 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
 .cm-s-solarized .cm-tag { color: #93a1a1; }
 .cm-s-solarized .cm-attribute { color: #2aa198; }
 .cm-s-solarized .cm-hr {
-  color: transparent;
+	color: transparent;
-  border-top: 1px solid #586e75;
+	border-top: 1px solid #586e75;
-  display: block;
+	display: block;
 }
 .cm-s-solarized .cm-link { color: #93a1a1; cursor: pointer; }
 .cm-s-solarized .cm-special { color: #6c71c4; }
 .cm-s-solarized .cm-em {
-  color: #999;
+	color: #999;
-  text-decoration: underline;
+	text-decoration: underline;
-  text-decoration-style: dotted;
+	text-decoration-style: dotted;
 }
 .cm-s-solarized .cm-strong { color: #eee; }
 .cm-s-solarized .cm-error,
 .cm-s-solarized .cm-invalidchar {
-  color: #586e75;
+	color: #586e75;
-  border-bottom: 1px dotted #dc322f;
+	border-bottom: 1px dotted #dc322f;
 }
 
 .cm-s-solarized.cm-s-dark div.CodeMirror-selected { background: #073642; }
@@ -450,45 +448,45 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
 
 /* Little shadow on the view-port of the buffer view */
 .cm-s-solarized.CodeMirror {
-  -moz-box-shadow: inset 7px 0 12px -6px #000;
+	-moz-box-shadow: inset 7px 0 12px -6px #000;
-  -webkit-box-shadow: inset 7px 0 12px -6px #000;
+	-webkit-box-shadow: inset 7px 0 12px -6px #000;
-  box-shadow: inset 7px 0 12px -6px #000;
+	box-shadow: inset 7px 0 12px -6px #000;
 }
 
 /* Gutter border and some shadow from it  */
 .cm-s-solarized .CodeMirror-gutters {
-  border-right: 1px solid;
+	border-right: 1px solid;
 }
 
 /* Gutter colors and line number styling based of color scheme (dark / light) */
 
 /* Dark */
 .cm-s-solarized.cm-s-dark .CodeMirror-gutters {
-  background-color:  #002b36;
+	background-color:  #002b36;
-  border-color: #00232c;
+	border-color: #00232c;
 }
 
 .cm-s-solarized.cm-s-dark .CodeMirror-linenumber {
-  text-shadow: #021014 0 -1px;
+	text-shadow: #021014 0 -1px;
 }
 
 /* Light */
 .cm-s-solarized.cm-s-light .CodeMirror-gutters {
-  background-color: #fdf6e3;
+	background-color: #fdf6e3;
-  border-color: #eee8d5;
+	border-color: #eee8d5;
 }
 
 /* Common */
 .cm-s-solarized .CodeMirror-linenumber {
-  color: #586e75;
+	color: #586e75;
-  padding: 0 5px;
+	padding: 0 5px;
 }
 .cm-s-solarized .CodeMirror-guttermarker-subtle { color: #586e75; }
 .cm-s-solarized.cm-s-dark .CodeMirror-guttermarker { color: #ddd; }
 .cm-s-solarized.cm-s-light .CodeMirror-guttermarker { color: #cb4b16; }
 
 .cm-s-solarized .CodeMirror-gutter .CodeMirror-gutter-text {
-  color: #586e75;
+	color: #586e75;
 }
 
 .cm-s-solarized .CodeMirror-cursor { border-left: 1px solid #819090; }
@@ -498,8 +496,8 @@ Active line. Negative margin compensates left padding of the text in the
 view-port
 */
 .cm-s-solarized.cm-s-dark .CodeMirror-activeline-background {
-  background: rgba(255, 255, 255, 0.10);
+	background: rgba(255, 255, 255, 0.10);
 }
 .cm-s-solarized.cm-s-light .CodeMirror-activeline-background {
-  background: rgba(0, 0, 0, 0.10);
+	background: rgba(0, 0, 0, 0.10);
 }

app/app/styles/view/layout.scss

@@ -81,7 +81,6 @@
 			font-size: 1rem;
 			font-style: normal;
 			line-height: 2.6rem;
-			font-family: open_sansregular;
 		}
 	}
 
@@ -112,7 +111,7 @@
 		> .pin {
 			cursor: pointer;
 			margin: 20px 0 20px 9px;
-		    padding: 11px 3px;
+		    padding: 14px 3px;
 			height: 40px;
 			width: 40px;
 			text-align: center;

app/public/assets/font/opensans/LICENSE.txt

@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

core/api/endpoint/page_endpoint.go

@@ -499,7 +499,7 @@ func UpdateDocumentPage(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	tx, err := request.Db.Beginx()
+	p.Context.Transaction, err = request.Db.Beginx()
 	if err != nil {
 		writeTransactionError(w, method, err)
 		return
@@ -522,17 +522,14 @@ func UpdateDocumentPage(w http.ResponseWriter, r *http.Request) {
 	}
 	model.Page.Body = output
 
-	p.Context.Transaction = tx
-
 	var skipRevision bool
 	skipRevision, err = strconv.ParseBool(r.URL.Query().Get("r"))
 
 	refID := util.UniqueID()
 	err = p.UpdatePage(model.Page, refID, p.Context.UserID, skipRevision)
-
 	if err != nil {
 		writeGeneralSQLError(w, method, err)
-		log.IfErr(tx.Rollback())
+		log.IfErr(p.Context.Transaction.Rollback())
 		return
 	}
 
@@ -544,7 +541,7 @@ func UpdateDocumentPage(w http.ResponseWriter, r *http.Request) {
 		SourceType:   entity.ActivitySourceTypeDocument,
 		ActivityType: entity.ActivityTypeEdited})
 
-	log.IfErr(tx.Commit())
+	log.IfErr(p.Context.Transaction.Commit())
 
 	updatedPage, err := p.GetPage(pageID)