fix initialization routines

pull/1/head
ansuz 9 years ago
parent f1915d3b7c
commit 4a05a859e6

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

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

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

Loading…
Cancel
Save