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

Replace initialState by a placeholder in slide and code

Browse Source
This commit is contained in:
yflory
2017-02-03 18:45:30 +01:00
parent 87abfac5e0
commit fbbf8a2829
7 changed files with 457 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
www/code/inner.html
View File

@@ -30,6 +30,7 @@
<script src="/bower_components/codemirror/addon/fold/xml-fold.js"></script>
<script src="/bower_components/codemirror/addon/fold/markdown-fold.js"></script>
<script src="/bower_components/codemirror/addon/fold/comment-fold.js"></script>
<script src="/bower_components/codemirror/addon/display/placeholder.js"></script>
<style>
html, body{
height: 100%;

6
www/code/main.js
View File

@@ -68,6 +68,7 @@ define([
mode: "javascript",
readOnly: true
});
editor.setOption('placeholder', Messages.codeInitialState);
var setMode = module.setMode = function (mode, $select) {
module.highlightMode = mode;
@@ -83,7 +84,7 @@ define([
}
};
editor.setValue(Messages.codeInitialState); // HERE
editor.setValue('');
var setTheme = module.setTheme = (function () {
var path = '/common/theme/';
@@ -148,7 +149,6 @@ define([
};
var config = {
//initialState: Messages.codeInitialState,
initialState: '{}',
websocketURL: Cryptpad.getWebsocketURL(),
channel: secret.channel,
@@ -570,7 +570,7 @@ define([
// Update the user list (metadata) from the hyperjson
updateMetadata(userDoc);
editor.setValue(newDoc || Messages.codeInitialState);
editor.setValue(newDoc || '');
if (Visible.isSupported()) {
Visible.onChange(function (yes) {

1
www/slide/inner.html
View File

@@ -33,6 +33,7 @@
<script src="/bower_components/codemirror/addon/fold/xml-fold.js"></script>
<script src="/bower_components/codemirror/addon/fold/markdown-fold.js"></script>
<script src="/bower_components/codemirror/addon/fold/comment-fold.js"></script>
<script src="/bower_components/codemirror/addon/display/placeholder.js"></script>
<style>
html, body{
height: 100%;

9
www/slide/main.js
View File

@@ -86,6 +86,7 @@ define([
mode: "javascript",
readOnly: true
});
editor.setOption('placeholder', Messages.slideInitialState);
var setMode = module.setMode = function (mode, $select) {
module.highlightMode = mode;
@@ -99,7 +100,7 @@ define([
};
setMode('markdown');
editor.setValue(Messages.slideInitialState); // HERE
editor.setValue('');
var setTheme = module.setTheme = (function () {
var path = '/common/theme/';
@@ -239,7 +240,7 @@ define([
var shjson = stringifyInner(textValue);
module.patchText(shjson);
Slide.update(textValue);
Slide.update(textValue || Messages.slideInitialState);
if (module.realtime.getUserDoc() !== shjson) {
console.error("realtime.getUserDoc() !== shjson");
@@ -642,8 +643,8 @@ define([
// Update the user list (metadata) from the hyperjson
updateMetadata(userDoc);
editor.setValue(newDoc || Messages.slideInitialState);
Slide.update(newDoc);
editor.setValue(newDoc || '');
Slide.update(newDoc || Messages.slideInitialState);
if (Visible.isSupported()) {
Visible.onChange(function (yes) {