Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
commit
8e2e8b1653
|
@ -46,6 +46,7 @@ define(req, function($, Default, Language) {
|
|||
}
|
||||
|
||||
messages._languages = map;
|
||||
messages._languageUsed = language;
|
||||
|
||||
messages._checkTranslationState = function (cb) {
|
||||
if (typeof(cb) !== "function") { return; }
|
||||
|
|
|
@ -180,7 +180,11 @@ define([
|
|||
common.reportAppUsage = function () {
|
||||
var pattern = window.location.pathname.split('/')
|
||||
.filter(function (x) { return x; }).join('.');
|
||||
feedback(pattern);
|
||||
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
|
||||
|
|
Loading…
Reference in New Issue