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

Use CodeMirror in /slide #2

Browse Source 
Fix title errors in the slide app caused by the present mode
This commit is contained in:
yflory
2016-10-03 14:21:39 +02:00
parent 8c33218ceb
commit 391728ee6d
9 changed files with 98 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
www/slide/slide.js
View File

@@ -17,9 +17,11 @@ define([
var ifrw = $('#pad-iframe')[0].contentWindow;
var $modal;
var $content;
Slide.setModal = function ($m, $c) {
var $pad;
Slide.setModal = function ($m, $c, $p) {
$modal = Slide.$modal = $m;
$content = Slide.$content = $c;
$pad = Slide.$pad = $p;
};
Slide.onChange = function (f) {
@@ -110,16 +112,36 @@ define([
change(Slide.lastIndex, Slide.index);
};
var isPresentURL = Slide.isPresentURL = function () {
var hash = window.location.hash;
// Present mode has /present at the end of the hash
var urlLastFragment = hash.slice(hash.lastIndexOf('/')+1);
return urlLastFragment === "present";
};
var show = Slide.show = function (bool, content) {
Slide.shown = bool;
if (bool) {
Slide.update(content);
Slide.draw(Slide.index);
$modal.addClass('shown');
$(ifrw).focus();
change(null, Slide.index);
if (!isPresentURL()) {
window.location.hash += '/present';
}
$pad.contents().find('.cryptpad-present-button').hide();
$pad.contents().find('.cryptpad-source-button').show();
$pad.addClass('fullscreen');
$('.top-bar').hide();
return;
}
window.location.hash = window.location.hash.replace(/\/present$/, '');
change(Slide.index, null);
$pad.contents().find('.cryptpad-present-button').show();
$pad.contents().find('.cryptpad-source-button').hide();
$pad.removeClass('fullscreen');
$('.top-bar').show();
$modal.removeClass('shown');
};
@@ -161,9 +183,7 @@ define([
Slide.right();
break;
case 27: // esc
if (!Slide.readOnly) {
show(false);
}
show(false);
break;
default:
console.log(e.which);