web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Completed adding of customization system and bottom infobar

Browse Source
This commit is contained in:
Caleb James DeLisle
2015-02-02 16:01:33 +01:00
parent 84164123b6
commit 51544db9a2
16 changed files with 189 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
www/pad/realtime-wysiwyg.js
View File

@@ -247,10 +247,11 @@ window.ErrorBox = ErrorBox;
return out;
};
var start = module.exports.start = function (websocketUrl, userName, channel, cryptKey)
var start = module.exports.start =
function (window, websocketUrl, userName, channel, cryptKey)
{
var passwd = 'y';
var wysiwygDiv = document.getElementById('cke_1_contents');
var wysiwygDiv = window.document.getElementById('cke_1_contents');
var ifr = wysiwygDiv.getElementsByTagName('iframe')[0];
var doc = ifr.contentWindow.document;
var socket = makeWebsocket(websocketUrl);
@@ -303,7 +304,7 @@ console.log(new Error().stack);
{ transformFunction: Otaml.transform });
var toolbar = realtime.toolbar =
Toolbar.create($('#cke_1_toolbox'), userName, realtime);
Toolbar.create(window.$('#cke_1_toolbox'), userName, realtime);
onEvent = function () {
if (isErrorState) { return; }