|
|
@ -224,7 +224,6 @@ define([
|
|
|
|
slideOptionsTmp.style = '';
|
|
|
|
slideOptionsTmp.style = '';
|
|
|
|
parseLess(mkLess(less), function (err, css) {
|
|
|
|
parseLess(mkLess(less), function (err, css) {
|
|
|
|
if (err) {
|
|
|
|
if (err) {
|
|
|
|
console.log(err);
|
|
|
|
|
|
|
|
Cryptpad.alert(
|
|
|
|
Cryptpad.alert(
|
|
|
|
'<strong>' + Messages.slide_invalidLess + '</strong>' +
|
|
|
|
'<strong>' + Messages.slide_invalidLess + '</strong>' +
|
|
|
|
'<br>' +
|
|
|
|
'<br>' +
|
|
|
@ -302,7 +301,6 @@ define([
|
|
|
|
if (textColor) { metadata.color = textColor; }
|
|
|
|
if (textColor) { metadata.color = textColor; }
|
|
|
|
metadataMgr.updateMetadata(metadata);
|
|
|
|
metadataMgr.updateMetadata(metadata);
|
|
|
|
framework.localChange();
|
|
|
|
framework.localChange();
|
|
|
|
console.log(metadataMgr.getMetadata());
|
|
|
|
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
var $back = $('<button>', {
|
|
|
|
var $back = $('<button>', {
|
|
|
@ -412,14 +410,9 @@ define([
|
|
|
|
|
|
|
|
|
|
|
|
CodeMirror.configureTheme();
|
|
|
|
CodeMirror.configureTheme();
|
|
|
|
|
|
|
|
|
|
|
|
var enterPresentationMode = function (shouldLog) {
|
|
|
|
var enterPresentationMode = function () { Slide.show(true, editor.getValue()); };
|
|
|
|
Slide.show(true, editor.getValue());
|
|
|
|
|
|
|
|
if (shouldLog) {
|
|
|
|
|
|
|
|
Cryptpad.log(Messages.presentSuccess);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (isPresentMode) { enterPresentationMode(true); }
|
|
|
|
if (isPresentMode) { enterPresentationMode(); }
|
|
|
|
|
|
|
|
|
|
|
|
framework.onContentUpdate(function (newContent) {
|
|
|
|
framework.onContentUpdate(function (newContent) {
|
|
|
|
CodeMirror.contentUpdate(newContent);
|
|
|
|
CodeMirror.contentUpdate(newContent);
|
|
|
@ -463,9 +456,7 @@ define([
|
|
|
|
Slide.setTitle(framework._.title);
|
|
|
|
Slide.setTitle(framework._.title);
|
|
|
|
|
|
|
|
|
|
|
|
framework._.toolbar.$rightside.append(
|
|
|
|
framework._.toolbar.$rightside.append(
|
|
|
|
framework._.sfCommon.createButton('present', true).click(function () {
|
|
|
|
framework._.sfCommon.createButton('present', true).click(enterPresentationMode)
|
|
|
|
enterPresentationMode(true);
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
);
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
|
|
editor.on('change', framework.localChange);
|
|
|
|
editor.on('change', framework.localChange);
|
|
|
|