infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Merge branch 'master' into soon

Browse Source
pull/1/head
yflory 8 years ago
parent 994f6991c8 605072cfbf
commit ed79b8870c
10 changed files with 49 additions and 55 deletions
Show Stats Download Patch File Download Diff File

5
.travis.yml
Unescape Escape View File

@ -6,9 +6,8 @@ env:
branches: branches:
only: only:
- master - master
- diffdom - soon
- beta - staging
- netflux
node_js: node_js:
- "4.2.1" - "4.2.1"
before_script: before_script:

19
TestSelenium.js
Unescape Escape View File

@ -19,12 +19,15 @@ if (process.env.SAUCE_USERNAME !== undefined) {
driver.get('http://localhost:3000/assert/'); driver.get('http://localhost:3000/assert/');
var report = driver.wait(WebDriver.until.elementLocated(WebDriver.By.className("report")), 5000); var report = driver.wait(WebDriver.until.elementLocated(WebDriver.By.className("report")), 5000);
report.getAttribute("class").then(function (cls) { report.getAttribute("class").then(function (cls) {
driver.quit(); report.getText().then(function (text) {
if (!cls) { console.log("\n-----\n" + text + "\n-----");
throw new Error("cls is null"); driver.quit();
} else if (cls.indexOf("failure") !== -1) { if (!cls) {
throw new Error("cls contains the word failure"); throw new Error("cls is null");
} else if (cls.indexOf("success") === -1) { } else if (cls.indexOf("failure") !== -1) {
throw new Error("cls does not contain the word success"); throw new Error("cls contains the word failure");
} } else if (cls.indexOf("success") === -1) {
throw new Error("cls does not contain the word success");
}
});
}); });

3
www/assert/main.js
Unescape Escape View File

@ -149,7 +149,8 @@ define([
console.log('* ' + msg); console.log('* ' + msg);
}); });
return false; // No, this is crappy, it's going to cause tests to fail basically all of the time.
//return false;
} }
return true; return true;
}, "expected all translation keys in default language to be present in all translations. See console for details."); }, "expected all translation keys in default language to be present in all translations. See console for details.");

1
www/code/index.html
Unescape Escape View File

@ -1,6 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html class="cp code"> <html class="cp code">
<head> <head>
<title>CryptPad</title>
<meta content="text/html; charset=utf-8" http-equiv="content-type"/> <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
<script data-main="main" src="/bower_components/requirejs/require.js"></script> <script data-main="main" src="/bower_components/requirejs/require.js"></script>
<script> <script>

20
www/code/main.js
Unescape Escape View File

@ -174,7 +174,9 @@ define([
defaultTitle: defaultName defaultTitle: defaultName
} }
}; };
obj.metadata.title = document.title; if (!initializing) {
obj.metadata.title = document.title;
}
// set mode too... // set mode too...
obj.highlightMode = module.highlightMode; obj.highlightMode = module.highlightMode;
@ -348,6 +350,7 @@ define([
var updateMetadata = function(shjson) { var updateMetadata = function(shjson) {
// Extract the user list (metadata) from the hyperjson // Extract the user list (metadata) from the hyperjson
var json = (shjson === "") ? "" : JSON.parse(shjson); var json = (shjson === "") ? "" : JSON.parse(shjson);
var titleUpdated = false;
if (json && json.metadata) { if (json && json.metadata) {
if (json.metadata.users) { if (json.metadata.users) {
var userData = json.metadata.users; var userData = json.metadata.users;
@ -358,9 +361,13 @@ define([
updateDefaultTitle(json.metadata.defaultTitle); updateDefaultTitle(json.metadata.defaultTitle);
} }
if (typeof json.metadata.title !== "undefined") { if (typeof json.metadata.title !== "undefined") {
updateTitle(json.metadata.title); updateTitle(json.metadata.title || defaultName);
titleUpdated = true;
} }
} }
if (!titleUpdated) {
updateTitle(defaultName);
}
}; };
var onInit = config.onInit = function (info) { var onInit = config.onInit = function (info) {
@ -500,15 +507,6 @@ define([
// set the hash // set the hash
if (!readOnly) { Cryptpad.replaceHash(editHash); } if (!readOnly) { Cryptpad.replaceHash(editHash); }
Cryptpad.getPadTitle(function (err, title) {
if (err) {
console.log("Unable to get pad title");
console.error(err);
return;
}
updateTitle(title || defaultName);
});
}; };
var unnotify = module.unnotify = function () { var unnotify = module.unnotify = function () {

1
www/pad/index.html
Unescape Escape View File

@ -1,6 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html class="cp pad"> <html class="cp pad">
<head> <head>
<title>CryptPad</title>
<meta content="text/html; charset=utf-8" http-equiv="content-type"/> <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
<link rel="icon" type="image/png" <link rel="icon" type="image/png"
href="/customize/main-favicon.png" href="/customize/main-favicon.png"

20
www/pad/main.js
Unescape Escape View File

@ -370,7 +370,9 @@ define([
defaultTitle: defaultName defaultTitle: defaultName
} }
}; };
hjson[3].metadata.title = document.title; if (!initializing) {
hjson[3].metadata.title = document.title;
}
return stringify(hjson); return stringify(hjson);
}; };
@ -438,6 +440,7 @@ define([
// Extract the user list (metadata) from the hyperjson // Extract the user list (metadata) from the hyperjson
var hjson = JSON.parse(shjson); var hjson = JSON.parse(shjson);
var peerMetadata = hjson[3]; var peerMetadata = hjson[3];
var titleUpdated = false;
if (peerMetadata && peerMetadata.metadata) { if (peerMetadata && peerMetadata.metadata) {
if (peerMetadata.metadata.users) { if (peerMetadata.metadata.users) {
var userData = peerMetadata.metadata.users; var userData = peerMetadata.metadata.users;
@ -448,9 +451,13 @@ define([
updateDefaultTitle(peerMetadata.metadata.defaultTitle); updateDefaultTitle(peerMetadata.metadata.defaultTitle);
} }
if (typeof peerMetadata.metadata.title !== "undefined") { if (typeof peerMetadata.metadata.title !== "undefined") {
updateTitle(peerMetadata.metadata.title); updateTitle(peerMetadata.metadata.title || defaultName);
titleUpdated = true;
} }
} }
if (!titleUpdated) {
updateTitle(defaultName);
}
}; };
var unnotify = function () { var unnotify = function () {
@ -622,15 +629,6 @@ define([
// set the hash // set the hash
if (!readOnly) { Cryptpad.replaceHash(editHash); } if (!readOnly) { Cryptpad.replaceHash(editHash); }
Cryptpad.getPadTitle(function (err, title) {
if (err) {
console.error(err);
console.log("Couldn't get pad title");
return;
}
updateTitle(title || defaultName);
});
}; };
// this should only ever get called once, when the chain syncs // this should only ever get called once, when the chain syncs

14
www/poll/main.js
Unescape Escape View File

@ -466,10 +466,13 @@ define([
var renameCb = function (err, title) { var renameCb = function (err, title) {
if (err) { return; } if (err) { return; }
document.title = title; document.title = title;
APP.proxy.info.title = title; APP.proxy.info.title = title === defaultName ? "" : title;
}; };
var suggestName = function (fallback) { var suggestName = function (fallback) {
if (document.title === defaultName) {
return fallback || "";
}
return document.title || defaultName || ""; return document.title || defaultName || "";
}; };
@ -692,15 +695,6 @@ define([
// set the hash // set the hash
if (!readOnly) { Cryptpad.replaceHash(editHash); } if (!readOnly) { Cryptpad.replaceHash(editHash); }
Cryptpad.getPadTitle(function (err, title) {
if (err) {
console.error(err);
console.log("Couldn't get pad title");
return;
}
updateTitle(title || defaultName);
});
}; };
var disconnect = function (info) { var disconnect = function (info) {

1
www/slide/index.html
Unescape Escape View File

@ -1,6 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html class="cp slide"> <html class="cp slide">
<head> <head>
<title>CryptPad</title>
<meta content="text/html; charset=utf-8" http-equiv="content-type"/> <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
<script data-main="main" src="/bower_components/requirejs/require.js"></script> <script data-main="main" src="/bower_components/requirejs/require.js"></script>
<script> <script>

20
www/slide/main.js
Unescape Escape View File

@ -215,7 +215,9 @@ define([
defaultTitle: defaultName defaultTitle: defaultName
} }
}; };
obj.metadata.title = APP.title; if (!initializing) {
obj.metadata.title = APP.title;
}
if (textColor) { if (textColor) {
obj.metadata.color = textColor; obj.metadata.color = textColor;
} }
@ -383,6 +385,7 @@ define([
var updateMetadata = function(shjson) { var updateMetadata = function(shjson) {
// Extract the user list (metadata) from the hyperjson // Extract the user list (metadata) from the hyperjson
var json = (shjson === "") ? "" : JSON.parse(shjson); var json = (shjson === "") ? "" : JSON.parse(shjson);
var titleUpdated = false;
if (json && json.metadata) { if (json && json.metadata) {
if (json.metadata.users) { if (json.metadata.users) {
var userData = json.metadata.users; var userData = json.metadata.users;
@ -393,10 +396,14 @@ define([
updateDefaultTitle(json.metadata.defaultTitle); updateDefaultTitle(json.metadata.defaultTitle);
} }
if (typeof json.metadata.title !== "undefined") { if (typeof json.metadata.title !== "undefined") {
updateTitle(json.metadata.title); updateTitle(json.metadata.title || defaultName);
titleUpdated = true;
} }
updateColors(json.metadata.color, json.metadata.backColor); updateColors(json.metadata.color, json.metadata.backColor);
} }
if (!titleUpdated) {
updateTitle(defaultName);
}
}; };
var renameCb = function (err, title) { var renameCb = function (err, title) {
@ -589,15 +596,6 @@ define([
if (!window.location.hash || window.location.hash === '#') { if (!window.location.hash || window.location.hash === '#') {
Cryptpad.replaceHash(editHash); Cryptpad.replaceHash(editHash);
} }
Cryptpad.getPadTitle(function (err, title) {
if (err) {
console.log("Unable to get pad title");
console.error(err);
return;
}
updateTitle(title || defaultName);
});
}; };
var unnotify = module.unnotify = function () { var unnotify = module.unnotify = function () {

Write Preview
Loading…
Cancel
Save