merge from dev
This commit is contained in:
@@ -17,7 +17,7 @@
|
||||
|
||||
var apiClient = ApiClient;
|
||||
|
||||
apiClient.getJSON(apiClient.getUrl('Startup/Configuration')).done(function (config) {
|
||||
apiClient.getJSON(apiClient.getUrl('Startup/Configuration')).then(function (config) {
|
||||
|
||||
config.UICulture = $('#selectLocalizationLanguage', page).val();
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
data: config,
|
||||
url: apiClient.getUrl('Startup/Configuration')
|
||||
|
||||
}).done(function () {
|
||||
}).then(function () {
|
||||
|
||||
Dashboard.navigate('wizarduser.html');
|
||||
|
||||
@@ -57,9 +57,9 @@
|
||||
|
||||
var promise2 = apiClient.getJSON(apiClient.getUrl("Localization/Options"));
|
||||
|
||||
$.when(promise1, promise2).done(function (response1, response2) {
|
||||
Promise.all([promise1, promise2]).then(function (responses) {
|
||||
|
||||
loadPage(page, response1[0], response2[0]);
|
||||
loadPage(page, responses[0], responses[1]);
|
||||
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user