dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5 from ralphtheninja/CMeditor 

refactor: pass in ifrw.CodeMirror into andThen()
This commit is contained in:
ansuz 2016-01-20 11:14:26 +01:00
parent 663e987345 84c0ea6d26
commit 4242865abf
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
www/code/main.js
View File

@ -8,7 +8,6 @@ define([
'/customize/pad.js'
var $ = window.jQuery;
var ifrw = $('#pad-iframe')[0].contentWindow;
var CMeditor;
$(function () {
$(window).on('hashchange', function() {
@ -19,7 +18,7 @@ define([
return;
}
var andThen = function () {
var andThen = function (CMeditor) {
var key = Crypto.parseKey(window.location.hash.substring(1));
var editor = CMeditor.fromTextArea($('#pad-iframe').contents().find('#editor1')[0], {
lineNumbers: true,
@ -52,11 +51,11 @@ define([
var interval = 100;
var first = function () {
if (CMeditor = ifrw.CodeMirror) {
if (ifrw.CodeMirror) {
// it exists, call your continuation
andThen();
andThen(ifrw.CodeMirror);
} else {
console.log("CMeditor was not defined. Trying again in %sms", interval);
console.log("CodeMirror was not defined. Trying again in %sms", interval);
// try again in 'interval' ms
setTimeout(first, interval);
}