web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/brandones/cryptpad into brandones-master

Browse Source
This commit is contained in:
yflory 2017-01-13 10:07:04 +01:00
commit 18bea1db23
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
www/pad/index.html
View File

@ -3,6 +3,7 @@
<head> <head>
<title>CryptPad</title> <title>CryptPad</title>
<meta content="text/html; charset=utf-8" http-equiv="content-type"/> <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="icon" type="image/png" <link rel="icon" type="image/png"
href="/customize/main-favicon.png" href="/customize/main-favicon.png"
data-main-favicon="/customize/main-favicon.png" data-main-favicon="/customize/main-favicon.png"

3
www/pad/inner.html
View File

@ -6,6 +6,9 @@
<script src="/bower_components/jquery/dist/jquery.min.js"></script> <script src="/bower_components/jquery/dist/jquery.min.js"></script>
<script src="/bower_components/ckeditor/ckeditor.js"></script> <script src="/bower_components/ckeditor/ckeditor.js"></script>
<style> <style>
html, body {
margin: 0px;
}
#cke_1_top { #cke_1_top {
overflow: visible; overflow: visible;
} }

10
www/pad/main.js
View File

@ -763,9 +763,17 @@ define([
var first = function () { var first = function () {
Ckeditor = ifrw.CKEDITOR; Ckeditor = ifrw.CKEDITOR;
if (Ckeditor) { if (Ckeditor) {
//andThen(Ckeditor); //andThen(Ckeditor);
// mobile configuration
Ckeditor.config.toolbarCanCollapse = true;
Ckeditor.config.height = '72vh';
if (screen.height < 800) {
Ckeditor.config.toolbarStartupExpanded = false;
$('meta[name=viewport]').attr('content', 'width=device-width, initial-scale=1.0, user-scalable=no');
} else {
$('meta[name=viewport]').attr('content', 'width=device-width, initial-scale=1.0, user-scalable=yes');
}
second(Ckeditor); second(Ckeditor);
} else { } else {
console.log("Ckeditor was not defined. Trying again in %sms",interval); console.log("Ckeditor was not defined. Trying again in %sms",interval);