Skip to content

Commit ab04d81

Browse files
Use the navigate function in commons instead of calling/initializing router (#211)
1 parent 9411673 commit ab04d81

File tree

5 files changed

+7
-9
lines changed

5 files changed

+7
-9
lines changed

src/main/resources/static/js/add-instances.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ jQuery(document).ready(function () {
22
var frontendServiceUrl = $('#frontendServiceUrl').text();
33
var frontendServicePath = "/backend";
44
function instanceModel() {
5-
var router = new Navigo(null, true, '#');
65

76
var self = this;
87
self.instance = {
@@ -32,7 +31,7 @@ jQuery(document).ready(function () {
3231
},
3332
success: function (responseData, XMLHttpRequest, textStatus) {
3433
$.jGrowl(responseData.message, { sticky: false, theme: 'Notify' });
35-
router.navigate('switch-backend');
34+
navigateToRoute('switch-backend');
3635
}
3736
});
3837
}

src/main/resources/static/js/common.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ function reloadRoute() {
141141
routes[currentUrl]();
142142
}
143143

144-
function navigateRoute(route) {
144+
function navigateToRoute(route) {
145145
router.navigate(route);
146146
}
147147
// End ## Routing ##

src/main/resources/static/js/login.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
jQuery(document).ready(function () {
2-
var router = new Navigo(null, true, '#');
32

43
function checkBackendSecured() {
54
var callback = {
@@ -9,11 +8,11 @@ jQuery(document).ready(function () {
98
var currentUser = getCurrentUserInSession();
109
var ldapEnabled = responseData.security;
1110
if (ldapEnabled == false || (ldapEnabled == true && currentUser != null)) {
12-
router.navigate('subscriptions');
11+
navigateToRoute('subscriptions');
1312
}
1413
},
1514
error: function (responseData) {
16-
router.navigate('subscriptions');
15+
navigateToRoute('subscriptions');
1716
},
1817
complete: function () {
1918
}
@@ -53,7 +52,7 @@ jQuery(document).ready(function () {
5352
var currentUser = JSON.parse(ko.toJSON(responseData)).user;
5453
$.jGrowl("Welcome " + currentUser, { sticky: false, theme: 'Notify' });
5554
doIfUserLoggedIn(currentUser);
56-
router.navigate('subscriptions');
55+
navigateToRoute('subscriptions');
5756
},
5857
error: function (XMLHttpRequest, textStatus, errorThrown) {
5958
window.logMessages("Bad credentials");

src/main/resources/static/js/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jQuery(document).ready(function () {
1818
var callback = {
1919
complete: function () {
2020
doIfUserLoggedOut();
21-
router.navigate('*');
21+
navigateToRoute('*');
2222
}
2323
};
2424
var ajaxHttpSender = new AjaxHttpSender();

src/main/resources/static/js/switch-instances.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jQuery(document).ready(function () {
4646
}
4747
self.submit = function () {
4848
sessionStorage.selectedActive = selected.name;
49-
navigateRoute('subscriptions');
49+
navigateToRoute('subscriptions');
5050
}
5151
}
5252

0 commit comments

Comments
 (0)