fix initialization routines

This commit is contained in:
ansuz 2016-02-12 16:21:52 +01:00
parent f1915d3b7c
commit 4a05a859e6
3 changed files with 12 additions and 12 deletions

View File

@ -15,7 +15,7 @@ define([
var module = { exports: {} };
var sheetToJson = function (ifrWindow) {
var xx = ifrWindow.sh[0].jS
var xx = ifrWindow.sh[0].jS;
var m = [];
for (var i = 0; i < xx.spreadsheets.length; i++) {
m[i]=[];

View File

@ -31,7 +31,7 @@ define([
var to,
delay = 500;
return function (content) {
to && clearTimeout(to);
if (to) { clearTimeout(to); }
to = setTimeout(function () {
$style.text(content);
},delay);

View File

@ -13,7 +13,7 @@ define([
], function (Config, Messages, Crypto, realtimeInput, Convert, Toolbar, Cursor) {
var $ = window.jQuery;
var ifrw = $('#pad-iframe')[0].contentWindow;
window.Ckeditor = ifrw.CKEDITOR;
//window.Ckeditor = ifrw.CKEDITOR;
var DiffDom = window.diffDOM;
var userName = Crypto.rand64(8),
@ -46,7 +46,7 @@ define([
});
editor.on('instanceReady', function () {
editor.on('instanceReady', function (Ckeditor) {
editor.execCommand('maximize');
var documentBody = ifrw.$('iframe')[0].contentDocument.body;
@ -74,10 +74,10 @@ define([
applyHjson(shjson);
//cursor.find();
cursor.find();
// put the cursor back where you left it
//cursor.replace();
cursor.replace();
};
var onInit = function (info) {
@ -138,22 +138,22 @@ define([
$textarea.val(JSON.stringify(hjson));
rti.bumpSharejs();
//cursor.update()
cursor.update();
});
/*['mouseup', 'keyup'].forEach(function (type) {
['mouseup', 'keyup'].forEach(function (type) {
editor.document.on(type, function (e) {
cursor.update();
});
});*/
});
});
};
var interval = 100;
var first = function () {
if (Ckeditor = ifrw.CKEDITOR) {
andThen();
Ckeditor = ifrw.CKEDITOR;
if (Ckeditor) {
andThen(Ckeditor);
} else {
console.log("Ckeditor was not defined. Trying again in %sms",interval);
setTimeout(first, interval);