diff --git a/dashboard-ui/bower_components/jstree/dist/jstree.js b/dashboard-ui/bower_components/jstree/dist/jstree.js index 20ef21f779..426292e498 100644 --- a/dashboard-ui/bower_components/jstree/dist/jstree.js +++ b/dashboard-ui/bower_components/jstree/dist/jstree.js @@ -2495,7 +2495,7 @@ t = this; if(d.length) { if(animation && d.children(".jstree-children").length) { - d.children(".jstree-children").stop(true, true); + //d.children(".jstree-children").stop(true, true); } if(obj.children.length && !this._firstChild(d.children('.jstree-children')[0])) { this.draw_children(obj); @@ -2511,11 +2511,8 @@ d .children(".jstree-children").css("display","none").end() .removeClass("jstree-closed").addClass("jstree-open").attr("aria-expanded", true) - .children(".jstree-children").stop(true, true) - .slideDown(animation, function () { - this.style.display = ""; - t.trigger("after_open", { "node" : obj }); - }); + .children(".jstree-children").show(); + t.trigger("after_open", { "node": obj }); } } obj.state.opened = true; @@ -2603,11 +2600,9 @@ d .children(".jstree-children").attr("style","display:block !important").end() .removeClass("jstree-open").addClass("jstree-closed").attr("aria-expanded", false) - .children(".jstree-children").stop(true, true).slideUp(animation, function () { - this.style.display = ""; - d.children('.jstree-children').remove(); - t.trigger("after_close", { "node" : obj }); - }); + .children(".jstree-children").hide(); + d.children('.jstree-children').remove(); + t.trigger("after_close", { "node": obj }); } } obj.state.opened = false; diff --git a/dashboard-ui/css/nowplayingbar.css b/dashboard-ui/css/nowplayingbar.css index c40f260482..bc3ec04a74 100644 --- a/dashboard-ui/css/nowplayingbar.css +++ b/dashboard-ui/css/nowplayingbar.css @@ -195,16 +195,17 @@ .nowPlayingBarPositionSlider { position: relative; top: -15px; -} - -.nowPlayingBarPositionSlider #sliderContainer { width: 100%; - margin-left: 0 !important; } -.nowPlayingBarPositionSlider #progressContainer { - background-color: transparent !important; -} + .nowPlayingBarPositionSlider #sliderContainer { + width: 100%; + margin-left: 0 !important; + } + + .nowPlayingBarPositionSlider #progressContainer { + background-color: transparent !important; + } .nowPlayingBarRight { position: relative; diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 0ef23a4fa2..c9c2ddddc4 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1890,7 +1890,7 @@ var AppInfo = {}; define("paper-collapse-item", ["html!" + bowerPath + "/paper-collapse-item/paper-collapse-item.html"]); - define("jstree", [bowerPath + "/jstree/dist/jstree.min", "css!thirdparty/jstree/themes/default/style.min.css"]); + define("jstree", [bowerPath + "/jstree/dist/jstree", "css!thirdparty/jstree/themes/default/style.min.css"]); define('jqm', ['thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js']); define("jqmbase", ['css!thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.theme.css']);