Merge branch 'master' of https://github.com/almasaeed2010/AdminLTE

build/js/BoxWidget.js

@@ -23,6 +23,7 @@
   var Selector = {
     data     : '.box',
     collapsed: '.collapsed-box',
+    header   : '.box-header',
     body     : '.box-body',
     footer   : '.box-footer',
     tools    : '.box-tools'
@@ -65,12 +66,13 @@
     $(this.element).removeClass(ClassName.collapsed)
 
     $(this.element)
-      .find(Selector.tools)
+      .children(Selector.header + ', ' + Selector.body + ', ' + Selector.footer)
+      .children(Selector.tools)
       .find('.' + expandIcon)
       .removeClass(expandIcon)
       .addClass(collapseIcon)
 
-    $(this.element).find(Selector.body + ', ' + Selector.footer)
+    $(this.element).children(Selector.body + ', ' + Selector.footer)
       .slideDown(this.options.animationSpeed, function () {
         $(this.element).trigger(expandedEvent)
       }.bind(this))
@@ -82,12 +84,13 @@
     var expandIcon     = this.options.expandIcon
 
     $(this.element)
-      .find(Selector.tools)
+      .children(Selector.header + ', ' + Selector.body + ', ' + Selector.footer)
+      .children(Selector.tools)
       .find('.' + collapseIcon)
       .removeClass(collapseIcon)
       .addClass(expandIcon)
 
-    $(this.element).find(Selector.body + ', ' + Selector.footer)
+    $(this.element).children(Selector.body + ', ' + Selector.footer)
       .slideUp(this.options.animationSpeed, function () {
         $(this.element).addClass(ClassName.collapsed)
         $(this.element).trigger(collapsedEvent)
@@ -110,12 +113,14 @@
 
     $(this.element).on('click', this.options.collapseTrigger, function (event) {
       if (event) event.preventDefault()
-      that.toggle()
+      that.toggle($(this))
+      return false
     })
 
     $(this.element).on('click', this.options.removeTrigger, function (event) {
       if (event) event.preventDefault()
-      that.remove()
+      that.remove($(this))
+      return false
     })
   }
 

build/js/Layout.js

@@ -130,9 +130,7 @@
 
         // Add slimscroll
         $(Selector.sidebar).slimScroll({
-          height: ($(window).height() - $(Selector.mainHeader).height()) + 'px',
-          color : 'rgba(0,0,0,0.2)',
-          size  : '3px'
+          height: ($(window).height() - $(Selector.mainHeader).height()) + 'px'
         })
       }
     }

composer.json

@@ -2,6 +2,7 @@
   "name": "almasaeed2010/adminlte",
   "description": "AdminLTE - admin control panel and dashboard that's based on Bootstrap 3",
   "homepage": "https://adminlte.io/",
+  "type": "template",
   "keywords": [
     "css",
     "js",
@@ -22,5 +23,8 @@
   "license": "MIT",
   "support": {
     "issues": "https://github.com/almasaeed2010/AdminLTE/issues"
+  },
+  "require": {
+    "composer/installers": "1.*"
   }
 }

pages/charts/chartjs.html

@@ -704,7 +704,7 @@
 <!-- Bootstrap 3.3.7 -->
 <script src="../../bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
 <!-- ChartJS -->
-<script src="../../bower_components/Chart.js/Chart.js"></script>
+<script src="../../bower_components/chart.js/Chart.js"></script>
 <!-- FastClick -->
 <script src="../../bower_components/fastclick/lib/fastclick.js"></script>
 <!-- AdminLTE App -->

pages/examples/login.html

@@ -89,7 +89,7 @@
     $('input').iCheck({
       checkboxClass: 'icheckbox_square-blue',
       radioClass: 'iradio_square-blue',
-      increaseArea: '20%' // optional
+      increaseArea: '20%' /* optional */
     });
   });
 </script>

pages/examples/register.html

@@ -94,7 +94,7 @@
     $('input').iCheck({
       checkboxClass: 'icheckbox_square-blue',
       radioClass: 'iradio_square-blue',
-      increaseArea: '20%' // optional
+      increaseArea: '20%' /* optional */
     });
   });
 </script>