blitzwing/cryptpad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

Browse source
This commit is contained in:
yflory 2017-07-10 11:46:16 +02:00
commit 8e2e8b1653
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
customize.dist/messages.js
View file

@ -46,6 +46,7 @@ define(req, function($, Default, Language) {
}
messages._languages = map;
messages._languageUsed = language;
messages._checkTranslationState = function (cb) {
if (typeof(cb) !== "function") { return; }

8
www/common/cryptpad-common.js
View file

@ -180,7 +180,11 @@ define([
common.reportAppUsage = function () {
var pattern = window.location.pathname.split('/')
.filter(function (x) { return x; }).join('.');
if (/^#\/1\/view\//.test(window.location.hash)) {
feedback(pattern + '_VIEW');
} else {
feedback(pattern);
}
};
common.reportScreenDimensions = function () {
@ -188,6 +192,9 @@ define([
var w = window.innerWidth;
feedback('DIMENSIONS:' + h + 'x' + w);
};
common.reportLanguage = function () {
feedback('LANG_' + Messages._languageUsed);
};
common.getUid = function () {
if (store && store.getProxy() && store.getProxy().proxy) {
@ -1736,6 +1743,7 @@ define([
}
common.reportScreenDimensions();
common.reportLanguage();
$(function() {
// Race condition : if document.body is undefined when alertify.js is loaded, Alertify