admin-lte 2.4.12 → 2.4.18

package/bower_components/select2/src/js/select2/selection/base.js

@@ -21,8 +21,8 @@ define([
 
     this._tabindex = 0;
 
-    if (this.$element.data('old-tabindex') != null) {
-      this._tabindex = this.$element.data('old-tabindex');
+    if (Utils.GetData(this.$element[0], 'old-tabindex') != null) {
+      this._tabindex = Utils.GetData(this.$element[0], 'old-tabindex');
     } else if (this.$element.attr('tabindex') != null) {
       this._tabindex = this.$element.attr('tabindex');
     }
@@ -81,7 +81,7 @@ define([
       self.$selection.removeAttr('aria-activedescendant');
       self.$selection.removeAttr('aria-owns');
 
-      self.$selection.focus();
+      self.$selection.trigger('focus');
 
       self._detachCloseHandler(container);
     });
@@ -130,7 +130,7 @@ define([
           return;
         }
 
-        var $element = $this.data('element');
+        var $element = Utils.GetData(this, 'element');
 
         $element.select2('close');
       });

package/bower_components/select2/src/js/select2/selection/eventRelay.js

@@ -9,10 +9,13 @@ define([
       'open', 'opening',
       'close', 'closing',
       'select', 'selecting',
-      'unselect', 'unselecting'
+      'unselect', 'unselecting',
+      'clear', 'clearing'
     ];
 
-    var preventableEvents = ['opening', 'closing', 'selecting', 'unselecting'];
+    var preventableEvents = [
+      'opening', 'closing', 'selecting', 'unselecting', 'clearing'
+    ];
 
     decorated.call(this, container, $container);
 

package/bower_components/select2/src/js/select2/selection/multiple.js

@@ -44,7 +44,7 @@ define([
         var $remove = $(this);
         var $selection = $remove.parent();
 
-        var data = $selection.data('data');
+        var data = Utils.GetData($selection[0], 'data');
 
         self.trigger('unselect', {
           originalEvent: evt,
@@ -55,7 +55,9 @@ define([
   };
 
   MultipleSelection.prototype.clear = function () {
-    this.$selection.find('.select2-selection__rendered').empty();
+    var $rendered = this.$selection.find('.select2-selection__rendered');
+    $rendered.empty();
+    $rendered.removeAttr('title');
   };
 
   MultipleSelection.prototype.display = function (data, container) {
@@ -93,9 +95,9 @@ define([
       var formatted = this.display(selection, $selection);
 
       $selection.append(formatted);
-      $selection.prop('title', selection.title || selection.text);
+      $selection.attr('title', selection.title || selection.text);
 
-      $selection.data('data', selection);
+      Utils.StoreData($selection[0], 'data', selection);
 
       $selections.push($selection);
     }

package/bower_components/select2/src/js/select2/selection/search.js

@@ -81,7 +81,7 @@ define([
           .prev('.select2-selection__choice');
 
         if ($previousChoice.length > 0) {
-          var item = $previousChoice.data('data');
+          var item = Utils.GetData($previousChoice[0], 'data');
 
           self.searchRemoveChoice(item);
 
@@ -175,7 +175,7 @@ define([
 
     this.resizeSearch();
     if (searchHadFocus) {
-      this.$search.focus();
+      this.$search.trigger('focus');
     }
   };
 

package/bower_components/select2/src/js/select2/selection/single.js

@@ -32,7 +32,10 @@ define([
 
     var id = container.id + '-container';
 
-    this.$selection.find('.select2-selection__rendered').attr('id', id);
+    this.$selection.find('.select2-selection__rendered')
+      .attr('id', id)
+      .attr('role', 'textbox')
+      .attr('aria-readonly', 'true');
     this.$selection.attr('aria-labelledby', id);
 
     this.$selection.on('mousedown', function (evt) {
@@ -56,17 +59,15 @@ define([
 
     container.on('focus', function (evt) {
       if (!container.isOpen()) {
-        self.$selection.focus();
+        self.$selection.trigger('focus');
       }
     });
-
-    container.on('selection:update', function (params) {
-      self.update(params.data);
-    });
   };
 
   SingleSelection.prototype.clear = function () {
-    this.$selection.find('.select2-selection__rendered').empty();
+    var $rendered = this.$selection.find('.select2-selection__rendered');
+    $rendered.empty();
+    $rendered.removeAttr('title'); // clear tooltip on empty
   };
 
   SingleSelection.prototype.display = function (data, container) {
@@ -92,7 +93,7 @@ define([
     var formatted = this.display(selection, $rendered);
 
     $rendered.empty().append(formatted);
-    $rendered.prop('title', selection.title || selection.text);
+    $rendered.attr('title', selection.title || selection.text);
   };
 
   return SingleSelection;

package/bower_components/select2/src/js/select2/utils.js

@@ -74,10 +74,10 @@ define([
     DecoratedClass.prototype = new ctr();
 
     for (var m = 0; m < superMethods.length; m++) {
-        var superMethod = superMethods[m];
+      var superMethod = superMethods[m];
 
-        DecoratedClass.prototype[superMethod] =
-          SuperClass.prototype[superMethod];
+      DecoratedClass.prototype[superMethod] =
+        SuperClass.prototype[superMethod];
     }
 
     var calledMethod = function (methodName) {
@@ -272,5 +272,67 @@ define([
     $element.append($nodes);
   };
 
+  // Cache objects in Utils.__cache instead of $.data (see #4346)
+  Utils.__cache = {};
+
+  var id = 0;
+  Utils.GetUniqueElementId = function (element) {
+    // Get a unique element Id. If element has no id,
+    // creates a new unique number, stores it in the id
+    // attribute and returns the new id.
+    // If an id already exists, it simply returns it.
+
+    var select2Id = element.getAttribute('data-select2-id');
+    if (select2Id == null) {
+      // If element has id, use it.
+      if (element.id) {
+        select2Id = element.id;
+        element.setAttribute('data-select2-id', select2Id);
+      } else {
+        element.setAttribute('data-select2-id', ++id);
+        select2Id = id.toString();
+      }
+    }
+    return select2Id;
+  };
+
+  Utils.StoreData = function (element, name, value) {
+    // Stores an item in the cache for a specified element.
+    // name is the cache key.
+    var id = Utils.GetUniqueElementId(element);
+    if (!Utils.__cache[id]) {
+      Utils.__cache[id] = {};
+    }
+
+    Utils.__cache[id][name] = value;
+  };
+
+  Utils.GetData = function (element, name) {
+    // Retrieves a value from the cache by its key (name)
+    // name is optional. If no name specified, return
+    // all cache items for the specified element.
+    // and for a specified element.
+    var id = Utils.GetUniqueElementId(element);
+    if (name) {
+      if (Utils.__cache[id]) {
+        if (Utils.__cache[id][name] != null) {
+          return Utils.__cache[id][name];
+        }
+        return $(element).data(name); // Fallback to HTML5 data attribs.
+      }
+      return $(element).data(name); // Fallback to HTML5 data attribs.
+    } else {
+      return Utils.__cache[id];
+    }
+  };
+
+  Utils.RemoveData = function (element) {
+    // Removes all cached items for a specified element.
+    var id = Utils.GetUniqueElementId(element);
+    if (Utils.__cache[id] != null) {
+      delete Utils.__cache[id];
+    }
+  };
+
   return Utils;
 });

package/bower_components/select2/src/js/wrapper.start.js

@@ -5,7 +5,7 @@
  * Released under the MIT license
  * https://github.com/select2/select2/blob/master/LICENSE.md
  */
-(function (factory) {
+;(function (factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module.
     define(['jquery'], factory);

package/bower_components/select2/src/scss/core.scss

@@ -36,12 +36,14 @@
 .select2-hidden-accessible {
   border: 0 !important;
   clip: rect(0 0 0 0) !important;
+  -webkit-clip-path: inset(50%) !important;
+  clip-path: inset(50%) !important;
   height: 1px !important;
-  margin: -1px !important;
   overflow: hidden !important;
   padding: 0 !important;
   position: absolute !important;
   width: 1px !important;
+  white-space: nowrap !important;
 }
 
 @import "theme/default/layout";

package/bower_components/select2/src/scss/theme/classic/_multiple.scss

@@ -56,9 +56,6 @@
   .select2-selection--multiple {
     .select2-selection__choice {
       float: right;
-    }
-
-    .select2-selection__choice {
       margin-left: 5px;
       margin-right: auto;
     }

package/bower_components/select2/src/scss/theme/default/_multiple.scss

@@ -16,14 +16,6 @@
     }
   }
 
-  .select2-selection__placeholder {
-    color: #999;
-
-    margin-top: 5px;
-
-    float: left;
-  }
-
   .select2-selection__clear {
     cursor: pointer;
     float: right;
@@ -63,7 +55,7 @@
 
 &[dir="rtl"] {
   .select2-selection--multiple {
-    .select2-selection__choice, .select2-selection__placeholder, .select2-search--inline {
+    .select2-selection__choice, .select2-search--inline {
       float: right;
     }
 

package/build/js/ControlSidebar.js

@@ -12,7 +12,7 @@
   var DataKey = 'lte.controlsidebar';
 
   var Default = {
-    slide: true
+    controlsidebarSlide: true
   };
 
   var Selector = {
@@ -26,7 +26,8 @@
   };
 
   var ClassName = {
-    open : 'control-sidebar-open',
+    open: 'control-sidebar-open',
+    transition: 'control-sidebar-hold-transition',
     fixed: 'fixed'
   };
 
@@ -72,8 +73,11 @@
 
   ControlSidebar.prototype.expand = function () {
     $(Selector.sidebar).show();
-    if (!this.options.slide) {
-      $('body').addClass(ClassName.open);
+    if (!this.options.controlsidebarSlide) {
+      $('body').addClass(ClassName.transition).addClass(ClassName.open).delay(50).queue(function(){
+        $('body').removeClass(ClassName.transition);
+        $(this).dequeue()
+      })
     } else {
       $(Selector.sidebar).addClass(ClassName.open);
     }
@@ -83,7 +87,14 @@
   };
 
   ControlSidebar.prototype.collapse = function () {
-    $('body, ' + Selector.sidebar).removeClass(ClassName.open);
+    if (!this.options.controlsidebarSlide) {
+      $('body').addClass(ClassName.transition).removeClass(ClassName.open).delay(50).queue(function(){
+        $('body').removeClass(ClassName.transition);
+        $(this).dequeue()
+      })
+    } else {
+      $(Selector.sidebar).removeClass(ClassName.open);
+    }
     $(Selector.sidebar).fadeOut();
     $(this.element).trigger($.Event(Event.collapsed));
   };

package/build/js/Layout.js

@@ -23,6 +23,8 @@
     layoutBoxed   : '.layout-boxed',
     mainFooter    : '.main-footer',
     mainHeader    : '.main-header',
+    mainSidebar   : '.main-sidebar',
+    slimScrollDiv : 'slimScrollDiv',
     sidebar       : '.sidebar',
     controlSidebar: '.control-sidebar',
     fixed         : '.fixed',
@@ -84,11 +86,11 @@
     $(Selector.layoutBoxed + ' > ' + Selector.wrapper).css('overflow', 'hidden');
 
     // Get window height and the wrapper height
-    var footerHeight = $(Selector.mainFooter).outerHeight() || 0;
+    var footerHeight  = $(Selector.mainFooter).outerHeight() || 0;
     var headerHeight  = $(Selector.mainHeader).outerHeight() || 0;
     var neg           = headerHeight + footerHeight;
     var windowHeight  = $(window).height();
-    var sidebarHeight = $(Selector.sidebar).height() || 0;
+    var sidebarHeight = $(Selector.sidebar).outerHeight() || 0;
 
     // Set the min-height of the content and sidebar based on
     // the height of the document.
@@ -130,9 +132,11 @@
         // $(Selector.sidebar).slimScroll({ destroy: true }).height('auto')
 
         // Add slimscroll
-        $(Selector.sidebar).slimScroll({
-          height: ($(window).height() - $(Selector.mainHeader).height()) + 'px'
-        });
+        if ($(Selector.mainSidebar).find(Selector.slimScrollDiv).length === 0) {
+          $(Selector.sidebar).slimScroll({
+            height: ($(window).height() - $(Selector.mainHeader).height()) + 'px'
+          });
+        }
       }
     }
   };

package/build/js/Tree.js

@@ -82,8 +82,9 @@
     }
 
     parent.addClass(ClassName.open);
-    tree.slideDown(this.options.animationSpeed, function () {
+    tree.stop().slideDown(this.options.animationSpeed, function () {
       $(this.element).trigger(expandedEvent);
+      parent.height('auto');
     }.bind(this));
   };
 
@@ -92,9 +93,12 @@
 
     //tree.find(Selector.open).removeClass(ClassName.open);
     parentLi.removeClass(ClassName.open);
-    tree.slideUp(this.options.animationSpeed, function () {
+    tree.stop().slideUp(this.options.animationSpeed, function () {
       //tree.find(Selector.open + ' > ' + Selector.treeview).slideUp();
       $(this.element).trigger(collapsedEvent);
+
+      // Collapse child items
+      parentLi.find(Selector.treeview).removeClass(ClassName.open).find(Selector.treeviewMenu).hide();
     }.bind(this));
   };
 

package/build/less/AdminLTE-without-plugins.less

@@ -1,5 +1,5 @@
 /*!
- * AdminLTE v2.4.12
+ * AdminLTE v2.4.18
  * Without Third-Party Plugins
  * 
  *   Author:  Colorlib

package/build/less/AdminLTE.less

@@ -1,5 +1,5 @@
 /*!
- * AdminLTE v2.4.12
+ * AdminLTE v2.4.18
  * 
  *   Author:  Colorlib
  *   Support: <https://github.com/ColorlibHQ/AdminLTE/issues>

package/build/less/boxes.less

@@ -203,9 +203,9 @@
     margin-right: 5px;
   }
   > .box-tools {
-    position: absolute;
-    right: 10px;
-    top: 5px;
+    float: right;
+    margin-top: -5px;
+    margin-bottom: -5px;
     [data-toggle="tooltip"] {
       position: relative;
     }

package/build/less/control-sidebar.less

@@ -41,6 +41,14 @@
 }
 
 // Open without slide over content
+.control-sidebar-hold-transition {
+  .control-sidebar-bg,
+  .control-sidebar,
+  .content-wrapper {
+    transition: none;
+  }
+
+}
 .control-sidebar-open {
   .control-sidebar-bg,
   .control-sidebar {

package/build/less/core.less

@@ -70,11 +70,17 @@ body {
 }
 
 .content-wrapper  {
-  min-height: ~"calc(100% - 102px)";
+  min-height: ~"calc(100vh - 101px)";
   background-color: @content-bg;
   z-index: 800;
 }
 
+@media (max-width: @screen-header-collapse) {
+  .content-wrapper  {
+    min-height: ~"calc(100vh - 151px)";
+  }
+}
+
 .main-footer {
   background: #fff;
   padding: 15px;

package/build/less/header.less

@@ -81,6 +81,14 @@
     &:active {
       background: transparent;
     }
+
+    &.fa5 {
+      font-family: "Font Awesome\ 5 Free";
+      &:before {
+        content: "\f0c9";
+        font-weight: 900;
+      }
+    }
   }
   .sidebar-toggle .icon-bar {
     display: none;
@@ -119,14 +127,47 @@
     padding: 0 15px;
     font-weight: 300;
     overflow: hidden;
+
+    img {
+      padding: 4px;
+      object-fit: contain;
+      margin: 0 auto;
+    }
+
     //Add support to sidebar mini by allowing the user to create
     //2 logo designs. mini and lg
     .logo-lg {
       //should be visibile when sidebar isn't collapsed
       display: block;
+
+      img {
+        max-width: 200px;
+        max-height: 50px;
+      }
+      .brandlogo-image {
+        margin-top: 8px;
+        margin-right: 10px;
+        margin-left: -5px;
+      }
     }
     .logo-mini {
       display: none;
+
+      img {
+        max-width: 50px;
+        max-height: 50px;
+      }
+      .brandlogo-image {
+        margin-top: 8px;
+        margin-right: 10px;
+        margin-left: 10px;
+      }
+    }
+
+    .brandlogo-image {
+      float: left;
+      height: 34px;
+      width: auto;
     }
   }
   //Navbar Brand. Alternative logo with layout-top-nav

package/build/less/miscellaneous.less

@@ -609,3 +609,29 @@
 hr {
   border-top: 1px solid @hr-border;
 }
+
+// bootstrap slider
+
+#red .slider-selection {
+    background: #f56954;
+}
+
+#blue .slider-selection {
+    background: #3c8dbc;
+}
+
+#green .slider-selection {
+    background: #00a65a;
+}
+
+#yellow .slider-selection {
+    background: #f39c12;
+}
+
+#aqua .slider-selection {
+    background: #00c0ef;
+}
+
+#purple .slider-selection {
+    background: #932ab6;
+}

package/build/less/sidebar-mini.less

@@ -57,6 +57,7 @@
       .sidebar-menu > li > a > span,
       .sidebar-menu > li > .treeview-menu,
       .sidebar-menu > li > a > .pull-right,
+      .sidebar-menu > li > a > span > .pull-right,
       .sidebar-menu li.header {
         display: none !important;
         -webkit-transform: translateZ(0);