Updating from master

dist/js/app.js

@@ -532,17 +532,24 @@ function _init() {
   $.AdminLTE.boxWidget = {
     selectors: $.AdminLTE.options.boxWidgetOptions.boxWidgetSelectors,
     icons: $.AdminLTE.options.boxWidgetOptions.boxWidgetIcons,
+<<<<<<< HEAD
     animationSpeed: $.AdminLTE.options.animationSpeed,
     activate: function () {
+=======
+    activate: function (_box) {
+>>>>>>> refs/remotes/origin/master
       var _this = this;
+      if (! _box) {
+        _box = document; // activate all boxes per default
+      }
       //Listen for collapse event triggers
-      $(_this.selectors.collapse).on('click', function (e) {
+      $(_box).find(_this.selectors.collapse).on('click', function (e) {
         e.preventDefault();
         _this.collapse($(this));
       });
 
       //Listen for remove event triggers
-      $(_this.selectors.remove).on('click', function (e) {
+      $(_box).find(_this.selectors.remove).on('click', function (e) {
         e.preventDefault();
         _this.remove($(this));
       });
@@ -661,6 +668,23 @@ function _init() {
 
 })(jQuery);
 
+/*
+ * EXPLICIT BOX ACTIVATION
+ * -----------------------
+ * This is a custom plugin to use with the component BOX. It allows you to activate
+ * a box inserted in the DOM after the app.js was loaded.
+ *
+ * @type plugin
+ * @usage $("#box-widget").activateBox();
+ */
+(function ($) {
+
+  $.fn.activateBox = function () {
+    $.AdminLTE.boxWidget.activate(this);
+  };
+
+})(jQuery);
+
 /*
  * TODO LIST CUSTOM PLUGIN
  * -----------------------

documentation/build/include/components.html

@@ -985,6 +985,13 @@
 &LT;/div>&LT;!-- /.box --></pre>
     </div><!-- /.col -->
   </div><!-- /.row -->
+  <p>
+    If you inserted a box into the document after <code>app.js</code> was loaded, you have to activate
+    the collapse/remove buttons explicitly by calling <code>.activateBox()</code>:
+  </p>
+  <pre class='prettyprint'><code class='html'>&LT;script>
+    $("#box-widget").activateBox();
+&LT;/script></code></pre>
 
   <h4>Loading States</h4>
   <div class="row">

documentation/index.html

@@ -1355,6 +1355,13 @@ AdminLTE/
 &LT;/div>&LT;!-- /.box --></pre>
     </div><!-- /.col -->
   </div><!-- /.row -->
+  <p>
+    If you inserted a box into the document after <code>app.js</code> was loaded, you have to activate
+    the collapse/remove buttons explicitly by calling <code>.activateBox()</code>:
+  </p>
+  <pre class='prettyprint'><code class='html'>&LT;script>
+    $("#box-widget").activateBox();
+&LT;/script></code></pre>
 
   <h4>Loading States</h4>
   <div class="row">