github
/
AdminLTE
mirror of https://github.com/ColorlibHQ/AdminLTE
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix issue #405

pull/406/head 2.1.1
Abdullah Almsaeed 2015-05-09 00:02:45 -04:00
parent 7948e11145
commit e55c2b85aa
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/js/app.js vendored
View File

@ -444,7 +444,6 @@ function _init() {
//Listen to the click event //Listen to the click event
btn.on('click', function (e) { btn.on('click', function (e) {
e.preventDefault(); e.preventDefault();
e.stopPropagation();
//If the sidebar is not open //If the sidebar is not open
if (!sidebar.hasClass('control-sidebar-open') if (!sidebar.hasClass('control-sidebar-open')
&& !$('body').hasClass('control-sidebar-open')) { && !$('body').hasClass('control-sidebar-open')) {
@ -475,9 +474,6 @@ function _init() {
//Slide over content //Slide over content
if (slide) { if (slide) {
sidebar.addClass('control-sidebar-open'); sidebar.addClass('control-sidebar-open');
$(document).on('click', function () {
_this.close(sidebar, slide);
});
} else { } else {
//Push the content by adding the open class to the body instead //Push the content by adding the open class to the body instead
//of the sidebar itself //of the sidebar itself

2
dist/js/app.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
pages/charts/morris.html
View File

@ -711,7 +711,7 @@
<!-- Bootstrap 3.3.2 JS --> <!-- Bootstrap 3.3.2 JS -->
<script src="../../bootstrap/js/bootstrap.min.js" type="text/javascript"></script> <script src="../../bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<!-- Morris.js charts --> <!-- Morris.js charts -->
<script src="http://cdnjs.cloudflare.com/ajax/libs/raphael/2.1.0/raphael-min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/raphael/2.1.0/raphael-min.js"></script>
<script src="../../plugins/morris/morris.min.js" type="text/javascript"></script> <script src="../../plugins/morris/morris.min.js" type="text/javascript"></script>
<!-- FastClick --> <!-- FastClick -->
<script src='../../plugins/fastclick/fastclick.min.js'></script> <script src='../../plugins/fastclick/fastclick.min.js'></script>