Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Call per page clean up if that is defined.
[controller.git]
/
opendaylight
/
web
/
root
/
src
/
main
/
resources
/
js
/
one.js
diff --git
a/opendaylight/web/root/src/main/resources/js/one.js
b/opendaylight/web/root/src/main/resources/js/one.js
index b996e732332af1d821b6e92c28ab6f4f6d993484..d517c7f7d4a02bd1fd16b96d8ac455fcc6e94b1d 100644
(file)
--- a/
opendaylight/web/root/src/main/resources/js/one.js
+++ b/
opendaylight/web/root/src/main/resources/js/one.js
@@
-284,7
+284,7
@@
one.lib.alert = function(alert) {
INITIALIZATION
executable JS code starts here
*/
INITIALIZATION
executable JS code starts here
*/
-//O
NE
root page
+//O
penDaylight
root page
one.main = {};
one.main.constants = {
one.main = {};
one.main.constants = {
@@
-371,6
+371,9
@@
one.main.menu = {
one.main.page = {
load : function(page) {
one.main.page = {
load : function(page) {
+ if (one.f !== undefined && one.f.cleanUp !== undefined) {
+ one.f.cleanUp();
+ }
// clear page related
delete one.f;
$('.dashlet', '#main').empty();
// clear page related
delete one.f;
$('.dashlet', '#main').empty();
@@
-706,9
+709,9
@@
$("#logout").click(function() {
$.ajaxSetup({
complete : function(xhr,textStatus) {
$.ajaxSetup({
complete : function(xhr,textStatus) {
-
var page = xhr.getResponseHeader('X-Page-Location
');
- if
(page == '/login
') {
- location.href = '/
login
';
+
var mime = xhr.getResponseHeader('Content-Type
');
+ if
(mime.substring(0, 9) == 'text/html
') {
+ location.href = '/';
}
}
});
}
}
});