Fix secure iframes on Edge

This commit is contained in:
yflory
2017-09-08 15:54:54 +02:00
parent 290d668ceb
commit 05793c220c
6 changed files with 27 additions and 10 deletions

View File

@@ -608,7 +608,6 @@ define([
initializing = false;
onLocal(); // push local state to avoid parse errors later.
console.log(editor.getValue());
Slide.update(editor.getValue());
Cryptpad.removeLoadingScreen();
@@ -736,9 +735,11 @@ define([
onConnectError();
}
});
common.isPresentUrl(function (err, val) {
isPresentMode = val;
andThen(editor, CodeMirror, common);
common.getSframeChannel().onReady(function () {
common.isPresentUrl(function (err, val) {
isPresentMode = val;
andThen(editor, CodeMirror, common);
});
});
});
};

View File

@@ -239,8 +239,6 @@ define([
});
};
$(window).resize(Slide.updateFontSize);
// Swipe
var addSwipeEvents = function () {
var touch = {
@@ -294,6 +292,7 @@ define([
options = Slide.options = opt;
addEvent();
addSwipeEvents();
$(window).resize(Slide.updateFontSize);
};
Slide.setTitle = function (titleObj) {