pkp/pkp-lib#3594 Only load NotoSans font in TinyMCE when enable_cdn i…

…s true
NateWr · Jun 4, 2018 · 8468a51 · 8468a51
1 parent dccc046
commit 8468a51
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/src/components/Form/fields/FieldRichTextarea.vue b/src/components/Form/fields/FieldRichTextarea.vue
@@ -65,7 +65,6 @@ export default {
 					menubar: false,
 					statusbar: false,
 					entity_encoding: 'raw',
-					content_css: '/static/tinymce-content.css',
 				};
 			},
 		},
@@ -87,8 +86,13 @@ export default {
 		 * @return Object
 		 */
 		compiledInit: function () {
+			let contentCSS = '/static/tinymce-content.css';
+			if ($.pkp.app.cdnEnabled) {
+				contentCSS = contentCSS + ', /static/tinymce-content-font.css';
+			}
 			return {
 				height: this.size === 'large' ? 500 : 200,
+				content_css: contentCSS,
 				...this.init,
 			};
 		},

diff --git a/src/main.js b/src/main.js
@@ -72,6 +72,7 @@ window.$.pkp = {
 	app: {
 		currentLocale: 'en_US',
 		primaryLocale: 'en_US',
+		cdnEnabled: true,
 		formLocales: [
 			{
 				key: 'en_US',

diff --git a/static/tinymce-content-font.css b/static/tinymce-content-font.css
@@ -0,0 +1 @@
+@import url('//fonts.googleapis.com/css?family=Noto+Sans:400,400italic,700,700italic');
diff --git a/static/tinymce-content.css b/static/tinymce-content.css
@@ -1,5 +1,3 @@
-@import url('//fonts.googleapis.com/css?family=Noto+Sans:400,400italic,700,700italic');
-
 body {
 	font-family: "Noto Sans", Arial, Helvetica, sans-serif;
 	font-size: 14px;