mirror of https://github.com/xwiki-labs/cryptpad
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
This commit is contained in:
commit
e7ef1e1c2b
|
@ -410,6 +410,7 @@ define([
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/*
|
||||||
// add the splitter
|
// add the splitter
|
||||||
if (!$iframe.has('.cp-splitter').length) {
|
if (!$iframe.has('.cp-splitter').length) {
|
||||||
var $preview = $iframe.find('#previewContainer');
|
var $preview = $iframe.find('#previewContainer');
|
||||||
|
@ -437,6 +438,7 @@ define([
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
Cryptpad.removeLoadingScreen();
|
Cryptpad.removeLoadingScreen();
|
||||||
setEditable(true);
|
setEditable(true);
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html dir="ltr" lang="en"><head><title>Rich Text Editor, editor1</title><style data-cke-temp="1">html{cursor:text;*cursor:auto}
|
<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>
|
||||||
|
|
Loading…
Reference in New Issue