@@ -12,7 +12,7 @@ $(function() {
12
12
$ ( this ) . html ( 'Select all' ) ;
13
13
}
14
14
} )
15
-
15
+
16
16
$ ( '#sidebar' ) . on ( 'click' , 'a' , function ( e ) {
17
17
if ( e . currentTarget . className . indexOf ( 'batch_del' ) !== - 1 ) {
18
18
e . preventDefault ( ) ;
@@ -51,24 +51,24 @@ $(function() {
51
51
if ( e . currentTarget . href . indexOf ( '/?' ) == - 1 ) {
52
52
return ;
53
53
}
54
-
54
+
55
55
e . preventDefault ( ) ;
56
-
56
+
57
57
var href ;
58
-
58
+
59
59
if ( ( e . currentTarget . href . indexOf ( '?' ) == - 1 ) ||
60
60
( e . currentTarget . href . indexOf ( '?' ) == ( e . currentTarget . href . length - 1 ) ) ) {
61
61
href = 'overview.php' ;
62
62
} else {
63
63
href = e . currentTarget . href . substr ( e . currentTarget . href . indexOf ( '?' ) + 1 ) ;
64
-
64
+
65
65
if ( href . indexOf ( '&' ) != - 1 ) {
66
66
href = href . replace ( '&' , '.php?' ) ;
67
67
} else {
68
68
href += '.php' ;
69
69
}
70
70
}
71
-
71
+
72
72
if ( href . indexOf ( 'flush.php' ) == 0 ) {
73
73
if ( confirm ( 'Are you sure you want to delete this key and all it\'s values?' ) ) {
74
74
$ . ajax ( {
@@ -90,24 +90,17 @@ $(function() {
90
90
} ) ;
91
91
92
92
$ ( '#server' ) . change ( function ( e ) {
93
- if ( location . href . indexOf ( '?' ) == - 1 ) {
94
- location . href = location . href + '?s=' + e . target . value ;
95
- } else if ( location . href . indexOf ( '&s=' ) == - 1 ) {
96
- location . href = location . href + '&s=' + e . target . value ;
97
- } else {
98
- location . href = location . href . replace ( / s = [ 0 - 9 ] * / , 's=' + e . target . value ) ;
99
- }
93
+ // always show overview when switching server, only keep var s (old database index might not exist on new server)
94
+ const base = location . href . split ( '?' , 1 ) [ 0 ] ;
95
+ location . href = base + '?overview&s=' + e . target . value ;
100
96
} ) ;
101
97
102
98
103
99
$ ( '#database' ) . change ( function ( e ) {
104
- if ( location . href . indexOf ( '?' ) == - 1 ) {
105
- location . href = location . href + '?d=' + e . target . value ;
106
- } else if ( location . href . indexOf ( '&d=' ) == - 1 ) {
107
- location . href = location . href + '&d=' + e . target . value ;
108
- } else {
109
- location . href = location . href . replace ( / d = [ 0 - 9 ] * / , 'd=' + e . target . value ) ;
110
- }
100
+ // always show overview when switching db, only keep vars s and d (whatever we are doing (show/edit key) won't be valid on new db)
101
+ const base = location . href . split ( '?' , 1 ) [ 0 ] ;
102
+ const s = location . href . match ( / s = [ 0 - 9 ] * / ) ;
103
+ location . href = base + '?overview&' + s + '&d=' + e . target . value ;
111
104
} ) ;
112
105
113
106
0 commit comments