Merge branch 'staging' into soon

pull/1/head
ansuz 4 years ago
commit 7b5c70b2ad

@ -2028,7 +2028,6 @@ define([
}); });
}; };
var provideFeedback = function () { var provideFeedback = function () {
if (typeof(window.Proxy) === 'undefined') { if (typeof(window.Proxy) === 'undefined') {
Feedback.send("NO_PROXIES"); Feedback.send("NO_PROXIES");
@ -2065,7 +2064,6 @@ define([
if (!common.hasCSSVariables()) { if (!common.hasCSSVariables()) {
Feedback.send('NO_CSS_VARIABLES'); Feedback.send('NO_CSS_VARIABLES');
} }
Feedback.reportScreenDimensions(); Feedback.reportScreenDimensions();
Feedback.reportLanguage(); Feedback.reportLanguage();
}; };

@ -3068,14 +3068,19 @@ define([
if (obj.error === 'GET_HK') { if (obj.error === 'GET_HK') {
data.noDrive = false; data.noDrive = false;
Store.init(clientId, data, _callback); Store.init(clientId, data, _callback);
Feedback.send("NO_DRIVE_ERROR", true);
return; return;
} }
} }
Feedback.send("NO_DRIVE", true);
callback(obj); callback(obj);
}); });
} }
initialized = true; initialized = true;
if (store.noDriveUid) {
Feedback.send('NO_DRIVE_CONVERSION', true);
}
store.data = data; store.data = data;
connect(clientId, data, function (ret) { connect(clientId, data, function (ret) {

Loading…
Cancel
Save