From c39adb9bff586f1ac9c88779ae4ea60316532ffe Mon Sep 17 00:00:00 2001 From: ansuz Date: Thu, 16 Apr 2020 14:59:40 -0400 Subject: [PATCH 1/2] configure ckeditor to allow unsetting font size --- customize.dist/ckeditor-config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/customize.dist/ckeditor-config.js b/customize.dist/ckeditor-config.js index 5c4940c52..efbb116a4 100644 --- a/customize.dist/ckeditor-config.js +++ b/customize.dist/ckeditor-config.js @@ -11,6 +11,7 @@ CKEDITOR.editorConfig = function( config ) { config.removePlugins= 'resize,elementspath'; config.resize_enabled= false; //bottom-bar config.extraPlugins= 'autolink,colorbutton,colordialog,font,indentblock,justify,mediatag,print,blockbase64,mathjax,wordcount'; + config.fontSize_sizes = '(Default)/unset;8/8px;9/9px;10/10px;11/11px;12/12px;14/14px;16/16px;18/18px;20/20px;22/22px;24/24px;26/26px;28/28px;36/36px;48/48px;72/72px'; // XXX translation for default? config.toolbarGroups= [ // {"name":"clipboard","groups":["clipboard","undo"]}, //{"name":"editing","groups":["find","selection"]}, From d0c3f0fa84daed198dbeb1f5d99afc75fe35de9b Mon Sep 17 00:00:00 2001 From: ansuz Date: Fri, 17 Apr 2020 11:36:48 -0400 Subject: [PATCH 2/2] remove XXX notes --- www/common/onlyoffice/inner.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js index 20125d82c..dd34585d8 100644 --- a/www/common/onlyoffice/inner.js +++ b/www/common/onlyoffice/inner.js @@ -355,7 +355,6 @@ define([ APP.FM.handleFile(blob, data); }; - Messages.oo_login = 'Log in...'; // XXX var noLogin = false; var makeCheckpoint = function (force) { @@ -1120,12 +1119,12 @@ define([ var x2tSaveAndConvertData = function(data, filename, extension, finalFilename) { // Perform the x2t conversion - require(['/common/onlyoffice/x2t/x2t.js'], function() { // XXX why does this fail without an access-control-allow-origin header? + require(['/common/onlyoffice/x2t/x2t.js'], function() { // FIXME why does this fail without an access-control-allow-origin header? var x2t = window.Module; x2t.run(); if (x2tInitialized) { debug("x2t runtime already initialized"); - x2tSaveAndConvertDataInternal(x2t, data, filename, extension, finalFilename); // XXX shouldn't this return ? + return void x2tSaveAndConvertDataInternal(x2t, data, filename, extension, finalFilename); } x2t.onRuntimeInitialized = function() {