Fix print button in slide
parent
3bd5f01e53
commit
a5a73ce326
|
@ -299,7 +299,6 @@ define([
|
|||
var MutationObserver = window.MutationObserver;
|
||||
var addTippy = function (el) {
|
||||
if (el.nodeName === 'IFRAME') { return; }
|
||||
console.log(el);
|
||||
Tippy(el, {
|
||||
position: 'bottom',
|
||||
distance: 0,
|
||||
|
|
|
@ -227,7 +227,6 @@ define([
|
|||
if (!isId) { return; }
|
||||
|
||||
var decryptedMsg = channel.encryptor.decrypt(msg);
|
||||
console.log(decryptedMsg);
|
||||
var parsed = JSON.parse(decryptedMsg);
|
||||
if (parsed[0] !== Types.mapId && parsed[0] !== Types.mapIdAck) { return; }
|
||||
if (parsed[2] !== sender || !parsed[1]) { return; }
|
||||
|
|
|
@ -95,7 +95,7 @@ define([
|
|||
}
|
||||
});
|
||||
|
||||
Slide.setModal(APP, $modal, $content, $pad, ifrw, slideOptions, initialState);
|
||||
Slide.setModal($modal, $content, $pad, ifrw, slideOptions, initialState);
|
||||
|
||||
var enterPresentationMode = function (shouldLog) {
|
||||
Slide.show(true, editor.getValue());
|
||||
|
@ -282,7 +282,6 @@ define([
|
|||
// Slide number
|
||||
$('<input>', {type: 'checkbox', id: 'checkNumber', checked: slideOptionsTmp.slide}).on('change', function () {
|
||||
var c = this.checked;
|
||||
console.log(c);
|
||||
slideOptionsTmp.slide = c;
|
||||
}).appendTo($p).css('width', 'auto');
|
||||
$('<label>', {'for': 'checkNumber'}).text(Messages.printSlideNumber).appendTo($p);
|
||||
|
@ -350,6 +349,8 @@ define([
|
|||
};
|
||||
Title = Cryptpad.createTitle(titleCfg, config.onLocal, Cryptpad);
|
||||
|
||||
Slide.setTitle(Title);
|
||||
|
||||
Metadata = Cryptpad.createMetadata(UserList, Title, metadataCfg, Cryptpad);
|
||||
|
||||
var configTb = {
|
||||
|
@ -472,9 +473,7 @@ define([
|
|||
//$('body').append(createPrintDialog());
|
||||
}).append($('<span>', {'class': 'drawer'}).text(Messages.printText));
|
||||
|
||||
// TODO reenable this when it is working again
|
||||
$printButton = $printButton;
|
||||
//$drawer.append($printButton);
|
||||
$drawer.append($printButton);
|
||||
|
||||
var $slideOptions = $('<button>', {
|
||||
title: Messages.slideOptionsTitle,
|
||||
|
|
|
@ -9,7 +9,6 @@ define([
|
|||
content: [],
|
||||
changeHandlers: [],
|
||||
};
|
||||
var APP;
|
||||
var ifrw;
|
||||
var $modal;
|
||||
var $content;
|
||||
|
@ -19,6 +18,7 @@ define([
|
|||
var separator = '<hr data-pewpew="pezpez">';
|
||||
var separatorReg = /<hr data\-pewpew="pezpez">/g;
|
||||
var slideClass = 'slide-frame';
|
||||
var Title;
|
||||
|
||||
Slide.onChange = function (f) {
|
||||
if (typeof(f) === 'function') {
|
||||
|
@ -98,7 +98,7 @@ define([
|
|||
$('<div>', {'class': 'slideDate'}).text(new Date().toLocaleDateString()).appendTo($(el));
|
||||
}
|
||||
if (options.title) {
|
||||
$('<div>', {'class': 'slideTitle'}).text(APP.title).appendTo($(el));
|
||||
$('<div>', {'class': 'slideTitle'}).text(Title.title).appendTo($(el));
|
||||
}
|
||||
});
|
||||
$content.removeClass('transition');
|
||||
|
@ -304,17 +304,20 @@ define([
|
|||
};
|
||||
|
||||
|
||||
Slide.setModal = function (appObj, $m, $c, $p, iframe, opt, ph) {
|
||||
Slide.setModal = function ($m, $c, $p, iframe, opt, ph) {
|
||||
$modal = Slide.$modal = $m;
|
||||
$content = Slide.$content = $c;
|
||||
$pad = Slide.$pad = $p;
|
||||
ifrw = Slide.ifrw = iframe;
|
||||
placeholder = Slide.placeholder = ph;
|
||||
options = Slide.options = opt;
|
||||
APP = appObj;
|
||||
addEvent();
|
||||
addSwipeEvents();
|
||||
};
|
||||
|
||||
Slide.setTitle = function (titleObj) {
|
||||
Title = titleObj;
|
||||
};
|
||||
|
||||
return Slide;
|
||||
});
|
||||
|
|
|
@ -63,6 +63,7 @@ body {
|
|||
display:block;
|
||||
}
|
||||
html, body {
|
||||
height: auto;
|
||||
max-height: none;
|
||||
overflow: visible;
|
||||
}
|
||||
|
@ -74,6 +75,20 @@ body {
|
|||
visibility: visible;
|
||||
}
|
||||
}
|
||||
.cp #modal {
|
||||
display: none !important;
|
||||
}
|
||||
.cp {
|
||||
flex: 1 !important;
|
||||
overflow: visible !important;
|
||||
}
|
||||
.userlist-drawer {
|
||||
display: none !important;
|
||||
}
|
||||
#editorContainer {
|
||||
height: auto;
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -163,7 +178,7 @@ body {
|
|||
.slide-container {
|
||||
width: 90vw;
|
||||
height: 100vh;
|
||||
margin: 0vh 5vw;
|
||||
margin: 0vh 5vw !important;
|
||||
display: flex;
|
||||
&:last-child {
|
||||
height: ~"calc(100vh - 2px)";
|
||||
|
|
Loading…
Reference in New Issue