dta_rapid 1.6.0 → 1.6.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/_includes/lists/suggestion-search.html +9 -2
- data/_includes/navigation/header.html +1 -1
- data/assets/js/log-in.js +8 -3
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 839d22b607f67127fbcafed91295f5cbea8bc1dc
|
|
4
|
+
data.tar.gz: b10bebddde4467f4c0e3f23e29761270347fc6af
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 48efc3177531f35be20d53acfb86f506af16fac1e438a60a7b40a258f98273ad423a37e94f5f8a5ef0e7a09d7377caa944762a88c17d52c85dd2c80d7c63d378
|
|
7
|
+
data.tar.gz: b1c76d79bad1f6ddc34b499c056bc5f759d8da318b386072a8cf1c3b7c1952b220a70028fce29eaf21eb89c88c580737d7865b2bee15713e0716facdcc5fc3c8
|
|
@@ -54,13 +54,20 @@
|
|
|
54
54
|
limit: 5,
|
|
55
55
|
templates: {
|
|
56
56
|
suggestion: function(result) {
|
|
57
|
-
|
|
57
|
+
var onclick = result.login ? "event.preventDefault();" : " ";
|
|
58
|
+
return `<div role="option" aria-selected="false" class="suggestion-search__item">
|
|
59
|
+
<a onclick="${onclick}" class="suggestion-search__link" href="${result.link}">${result.shortDescription}</a></div>`;
|
|
58
60
|
},
|
|
59
61
|
}
|
|
60
62
|
});
|
|
61
63
|
|
|
62
64
|
$('.suggestion-search__input').bind('typeahead:select', function(e, suggestion) {
|
|
63
|
-
|
|
65
|
+
var loggedOut = localStorage.getItem('loggedIn') !== 'true';
|
|
66
|
+
if (suggestion.login && loggedOut) {
|
|
67
|
+
window.location.href = "/account_login.html"
|
|
68
|
+
} else {
|
|
69
|
+
window.location.href = suggestion.link;
|
|
70
|
+
}
|
|
64
71
|
});
|
|
65
72
|
});
|
|
66
73
|
</script>
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
</g>
|
|
18
18
|
</svg>
|
|
19
19
|
</a>
|
|
20
|
-
<div class="col-xs-7 col-sm-9 col-md-10" style="padding-top: 0.5em; padding-bottom: 0.5em; text-align: right;"><a class="js-log-in" href="/my-account.html">
|
|
20
|
+
<div class="col-xs-7 col-sm-9 col-md-10" style="padding-top: 0.5em; padding-bottom: 0.5em; text-align: right;"><a class="js-log-in" href="/my-account.html">My Account</a></div>
|
|
21
21
|
</div>
|
|
22
22
|
</div>
|
|
23
23
|
</header>
|
data/assets/js/log-in.js
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
|
+
|
|
1
2
|
$(function () {
|
|
2
|
-
$('.js-log-in').text(localStorage.getItem('loggedIn') ? "My Account" : "Log in");
|
|
3
3
|
|
|
4
|
-
|
|
5
|
-
event.preventDefault();
|
|
4
|
+
var _logMeIn = function () {
|
|
6
5
|
var loggedIn = localStorage.getItem('loggedIn') === "true";
|
|
7
6
|
|
|
8
7
|
if (!loggedIn) {
|
|
@@ -10,6 +9,12 @@ $(function () {
|
|
|
10
9
|
} else {
|
|
11
10
|
window.location.href = "/my-account.html"
|
|
12
11
|
}
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
$('.js-log-in').on('click', function (event) {
|
|
15
|
+
event.preventDefault();
|
|
16
|
+
_logMeIn();
|
|
13
17
|
});
|
|
18
|
+
|
|
14
19
|
});
|
|
15
20
|
|