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

move text/ and hack/ to Netflux

Browse Source
This commit is contained in:
ansuz 2016-04-22 09:47:26 +02:00
parent 4c95602347
commit d4943511fe
2 changed files with 48 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
www/hack/main.js
View File

@ -1,20 +1,27 @@
define([ define([
'/api/config?cb=' + Math.random().toString(16).substring(2), '/api/config?cb=' + Math.random().toString(16).substring(2),
'/common/RealtimeTextarea.js', '/common/realtime-input.js',
'/common/crypto.js', '/common/crypto.js',
'/common/TextPatcher.js', '/common/TextPatcher.js',
'/bower_components/jquery/dist/jquery.min.js' '/bower_components/jquery/dist/jquery.min.js'
], function (Config, Realtime, Crypto, TextPatcher) { ], function (Config, Realtime, Crypto, TextPatcher) {
var $ = window.jQuery; var $ = window.jQuery;
/*
$(window).on('hashchange', function() { $(window).on('hashchange', function() {
window.location.reload(); window.location.reload();
}); });*/
if (window.location.href.indexOf('#') === -1) {
window.location.href = window.location.href + '#' + Crypto.genKey();
return;
}
var key = Crypto.parseKey(window.location.hash.substring(1)); var key;
var channel = '';
if (window.location.href.indexOf('#') === -1) {
key = Crypto.genKey();
//window.location.href = window.location.href + '#' + Crypto.genKey();
//return;
} else {
var hash = window.location.hash.substr(1);
channel = hash.substr(0,32);
key = hash.substr(32);
}
var $textarea = $('textarea'), var $textarea = $('textarea'),
$run = $('#run'); $run = $('#run');
@ -29,13 +36,14 @@ define([
transformFunction transformFunction
*/ */
var userName = Crypto.rand64(8);
var config = { var config = {
textarea: $textarea[0], initialState: '',
websocketURL: Config.websocketURL + '_old', websocketURL: Config.websocketURL,
webrtcURL: Config.webrtcURL, userName: userName,
userName: Crypto.rand64(8), channel: channel,
channel: key.channel, cryptKey: key,
cryptKey: key.cryptKey,
}; };
var initializing = true; var initializing = true;
@ -44,7 +52,9 @@ define([
setEditable(false); setEditable(false);
var onInit = config.onInit = function (info) { }; var onInit = config.onInit = function (info) {
window.location.hash = info.channel + key;
};
var onRemote = config.onRemote = function (info) { var onRemote = config.onRemote = function (info) {
if (initializing) { return; } if (initializing) { return; }

31
www/text/main.js
View File

@ -1,6 +1,6 @@
define([ define([
'/api/config?cb=' + Math.random().toString(16).substring(2), '/api/config?cb=' + Math.random().toString(16).substring(2),
'/common/RealtimeTextSocket.js', '/common/realtime-input.js',
'/common/messages.js', '/common/messages.js',
'/common/crypto.js', '/common/crypto.js',
'/common/TextPatcher.js', '/common/TextPatcher.js',
@ -11,22 +11,37 @@ define([
$(window).on('hashchange', function() { $(window).on('hashchange', function() {
window.location.reload(); window.location.reload();
}); });
/*
if (window.location.href.indexOf('#') === -1) { if (window.location.href.indexOf('#') === -1) {
window.location.href = window.location.href + '#' + Crypto.genKey(); window.location.href = window.location.href + '#' + Crypto.genKey();
return; return;
}*/
var key;
var channel = '';
if (window.location.href.indexOf('#') === -1) {
key = Crypto.genKey();
} else {
var hash = window.location.hash.substr(1);
channel = hash.substr(0, 32);
key = hash.substr(32);
} }
var module = window.APP = {}; var module = window.APP = {};
var key = Crypto.parseKey(window.location.hash.substring(1));
var userName = module.userName = Crypto.rand64(8);
var initializing = true; var initializing = true;
var $textarea = $('textarea'); var $textarea = $('textarea');
var config = module.config = { var config = module.config = {
initialState: '',
textarea: $textarea[0], textarea: $textarea[0],
websocketURL: Config.websocketURL + '_old', websocketURL: Config.websocketURL,
userName: Crypto.rand64(8), userName: userName,
channel: key.channel, channel: channel,
cryptKey: key.cryptKey cryptKey: key,
}; };
var setEditable = function (bool) { $textarea.attr('disabled', !bool); }; var setEditable = function (bool) { $textarea.attr('disabled', !bool); };
@ -34,7 +49,9 @@ define([
setEditable(false); setEditable(false);
var onInit = config.onInit = function (info) { }; var onInit = config.onInit = function (info) {
window.location.hash = info.channel + key;
};
var onRemote = config.onRemote = function (info) { var onRemote = config.onRemote = function (info) {
if (initializing) { return; } if (initializing) { return; }