projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
luci-theme-material: do not infer login state from url (#520)
[project/luci.git]
/
themes
/
luci-theme-material
/
htdocs
/
luci-static
/
material
/
js
/
script.js
diff --git
a/themes/luci-theme-material/htdocs/luci-static/material/js/script.js
b/themes/luci-theme-material/htdocs/luci-static/material/js/script.js
index
604c4da
..
fdd23e8
100755
(executable)
--- a/
themes/luci-theme-material/htdocs/luci-static/material/js/script.js
+++ b/
themes/luci-theme-material/htdocs/luci-static/material/js/script.js
@@
-144,11
+144,10
@@
function getCurrentNodeByUrl() {
var ret = false;
var getUrlNode = function (href){
function getCurrentNodeByUrl() {
var ret = false;
var getUrlNode = function (href){
- var linkPos = href.indexOf(";");
- if (linkPos == -1){
+ if (!$('body').hasClass('logged-in')){
return "login";
}else{
return "login";
}else{
- linkPos = href.indexOf("/", linkPos);
+
var
linkPos = href.indexOf("/", linkPos);
if (linkPos == -1){
return "overview";
}else{
if (linkPos == -1){
return "overview";
}else{
@@
-201,9
+200,9
@@
if (!ul.is(":visible")) {
menu.addClass("active");
ul.addClass("active");
if (!ul.is(":visible")) {
menu.addClass("active");
ul.addClass("active");
- ul.stop(true).slideDown();
+ ul.stop(true).slideDown(
"fast"
);
} else {
} else {
- ul.s
lideUp(
function () {
+ ul.s
top(true).slideUp("fast",
function () {
menu.removeClass("active");
ul.removeClass("active");
});
menu.removeClass("active");
ul.removeClass("active");
});
@@
-274,16
+273,16
@@
var showSide = false;
$(".showSide").click(function () {
if (showSide){
var showSide = false;
$(".showSide").click(function () {
if (showSide){
- $(".darkMask").stop(true).fadeOut();
+ $(".darkMask").stop(true).fadeOut(
"fast"
);
$(".main-left").stop(true).animate({
width: "0"
$(".main-left").stop(true).animate({
width: "0"
- });
+ }
,"fast"
);
showSide = false;
}else{
showSide = false;
}else{
- $(".darkMask").stop(true).fadeIn();
+ $(".darkMask").stop(true).fadeIn(
"fast"
);
$(".main-left").stop(true).animate({
width: "15rem"
$(".main-left").stop(true).animate({
width: "15rem"
- });
+ }
,"fast"
);
showSide = true;
}
});
showSide = true;
}
});
@@
-292,10
+291,10
@@
$(".darkMask").click(function () {
if (showSide){
showSide = false;
$(".darkMask").click(function () {
if (showSide){
showSide = false;
- $(".darkMask").stop(true).fadeOut();
+ $(".darkMask").stop(true).fadeOut(
"fast"
);
$(".main-left").stop(true).animate({
width: "0"
$(".main-left").stop(true).animate({
width: "0"
- });
+ }
,"fast"
);
}
});
}
});
@@
-342,4
+341,13
@@
break;
}
}
break;
}
}
+
+
+ document.addEventListener("touchmove", function(evt){
+ evt.preventDefault();
+ }, false);
+ var container = document.getElementById("maincontent");
+ container.addEventListener("touchmove", function(evt){
+ evt.stopPropagation();
+ }, false);
})(jQuery);
})(jQuery);