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

fix merge errors and reach full jshint compliance

Browse Source
This commit is contained in:
ansuz
2016-10-04 16:58:10 +02:00
parent a30e17121d
commit dbc8f01b8b
7 changed files with 56 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
www/pad/main.js
View File

@@ -297,6 +297,18 @@ define([
var parsed = Cryptpad.parsePadUrl(window.location.href);
return Cryptpad.isDefaultName(parsed, document.title);
};
var getHeadingText = function () {
var text;
if (['h1', 'h2', 'h3'].some(function (t) {
var $header = $(inner).find(t + ':first-of-type');
if ($header.length && $header.text()) {
text = $header.text();
return true;
}
})) { return text; }
};
var suggestName = function () {
var parsed = Cryptpad.parsePadUrl(window.location.href);
var name = Cryptpad.getDefaultName(parsed, []);
@@ -477,17 +489,6 @@ define([
return new DOMParser().parseFromString(html, 'text/html');
};
var getHeadingText = function () {
var text;
if (['h1', 'h2', 'h3'].some(function (t) {
var $header = $(inner).find(t + ':first-of-type');
if ($header.length && $header.text()) {
text = $header.text();
return true;
}
})) { return text; }
};
var exportFile = function () {
var html = getHTML();
var suggestion = suggestName();
@@ -541,14 +542,15 @@ define([
var $import = Cryptpad.createButton('import', true, {}, importFile);
$rightside.append($import);
/* add a rename button */
var renameCb = function (err, title) {
if (err) { return; }
document.title = title;
editor.fire('change');
};
var $setTitle = Cryptpad.createButton('rename', true, {suggestName: suggestName}, renameCb);
$rightside.append($setTitle);
/* add a rename button */
var renameCb = function (err, title) {
if (err) { return; }
document.title = title;
editor.fire('change');
};
var $setTitle = Cryptpad.createButton('rename', true, {suggestName: suggestName}, renameCb);
$rightside.append($setTitle);
}
/* add a forget button */
var forgetCb = function (err, title) {