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

Get rid of last usages of cryptpad-common in pad/inner

Browse Source
This commit is contained in:
Caleb James DeLisle 2017-10-02 15:06:01 +03:00
parent 12e82e80ec
commit 7230c780a1
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
www/pad/inner.js
View File

@ -28,7 +28,8 @@ define([
'/bower_components/nthen/index.js', '/bower_components/nthen/index.js',
'/common/media-tag.js', '/common/media-tag.js',
'/api/config', '/api/config',
'/common/cryptpad-common.js', '/common/common-hash.js',
'/common/common-util.js',
'/bower_components/diff-dom/diffDOM.js', '/bower_components/diff-dom/diffDOM.js',
@ -46,7 +47,8 @@ define([
nThen, nThen,
MediaTag, MediaTag,
ApiConfig, ApiConfig,
Cryptpad) Hash,
Util)
{ {
var DiffDom = window.diffDOM; var DiffDom = window.diffDOM;
@ -406,11 +408,7 @@ define([
// apply patches, and try not to lose the cursor in the process! // apply patches, and try not to lose the cursor in the process!
framework.onContentUpdate(function (hjson) { framework.onContentUpdate(function (hjson) {
if (!Array.isArray(hjson)) { if (!Array.isArray(hjson)) { throw new Error(Messages.typeError); }
var errorText = Messages.typeError;
Cryptpad.errorLoadingScreen(errorText);
throw new Error(errorText);
}
var userDocStateDom = hjsonToDom(hjson); var userDocStateDom = hjsonToDom(hjson);
userDocStateDom.setAttribute("contenteditable", userDocStateDom.setAttribute("contenteditable",
@ -458,8 +456,8 @@ define([
ckeditor: editor, ckeditor: editor,
body: $('body'), body: $('body'),
onUploaded: function (ev, data) { onUploaded: function (ev, data) {
var parsed = Cryptpad.parsePadUrl(data.url); var parsed = Hash.parsePadUrl(data.url);
var hexFileName = Cryptpad.base64ToHex(parsed.hashData.channel); var hexFileName = Util.base64ToHex(parsed.hashData.channel);
var src = '/blob/' + hexFileName.slice(0,2) + '/' + hexFileName; var src = '/blob/' + hexFileName.slice(0,2) + '/' + hexFileName;
var mt = '<media-tag contenteditable="false" src="' + src + '" data-crypto-key="cryptpad:' + parsed.hashData.key + '" tabindex="1"></media-tag>'; var mt = '<media-tag contenteditable="false" src="' + src + '" data-crypto-key="cryptpad:' + parsed.hashData.key + '" tabindex="1"></media-tag>';
editor.insertElement(window.CKEDITOR.dom.element.createFromHtml(mt)); editor.insertElement(window.CKEDITOR.dom.element.createFromHtml(mt));