Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

7 years ago · e7ef1e1c2b
parent 7c49ca6e3f 2874ccb5dc
commit e7ef1e1c2b
2 changed files with 3 additions and 1 deletions
--- a/www/code/main.js
+++ b/www/code/main.js
@ -410,6 +410,7 @@ define([
                    }
                });

+/*
                // add the splitter
                if (!$iframe.has('.cp-splitter').length) {
                    var $preview = $iframe.find('#previewContainer');
@ -437,6 +438,7 @@ define([
                        });
                    });
                }
+*/

                Cryptpad.removeLoadingScreen();
                setEditable(true);
--- a/www/pad/ckeditor-inner.html
+++ b/www/pad/ckeditor-inner.html
@ -1,3 +1,3 @@
 <!DOCTYPE html>
 <html dir="ltr" lang="en"><head><title>Rich Text Editor, editor1</title><style data-cke-temp="1">html{cursor:text;*cursor:auto}
-img,input,textarea{cursor:default}</style><link type="text/css" rel="stylesheet" href="/customize/ckeditor-contents.css"><link type="text/css" rel="stylesheet" href="http://localhost:3000/bower_components/ckeditor/plugins/tableselection//styles/tableselection.css"></head><body><p><br></p></body></html>
+img,input,textarea{cursor:default}</style><link type="text/css" rel="stylesheet" href="/customize/ckeditor-contents.css"><link type="text/css" rel="stylesheet" href="/bower_components/ckeditor/plugins/tableselection/styles/tableselection.css"></head><body><p><br></p></body></html>