- Version fix

WRidder · May 4, 2015 · b57137e · b57137e
1 parent d2fc5c5
commit b57137e
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 18 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
  "name": "backgrid-columnmanager",
- "version": "0.2.1",
+ "version": "0.2.2",
  "homepage": "https:/WRidder/Backgrid.ColumnManager",
  "authors": [
  "Wilbert van de Ridder <[email protected]>"

diff --git a/docs/classes/Backgrid.Extension.ColumnManagerVisibilityControl.html b/docs/classes/Backgrid.Extension.ColumnManagerVisibilityControl.html
@@ -329,7 +329,7 @@ <h3 class="name"><code>close</code></h3>
 
 
 
- <a href="../files/D:_Github_backgrid-columnmanager_src_Backgrid.ColumnManager.js.html#l841"><code>D:\Github\backgrid-columnmanager\src\Backgrid.ColumnManager.js:841</code></a>
+ <a href="../files/D:_Github_backgrid-columnmanager_src_Backgrid.ColumnManager.js.html#l845"><code>D:\Github\backgrid-columnmanager\src\Backgrid.ColumnManager.js:845</code></a>
 
  </p>
 
@@ -420,7 +420,7 @@ <h3 class="name"><code>closeOnEsc</code></h3>
 
 
 
- <a href="../files/D:_Github_backgrid-columnmanager_src_Backgrid.ColumnManager.js.html#l861"><code>D:\Github\backgrid-columnmanager\src\Backgrid.ColumnManager.js:861</code></a>
+ <a href="../files/D:_Github_backgrid-columnmanager_src_Backgrid.ColumnManager.js.html#l865"><code>D:\Github\backgrid-columnmanager\src\Backgrid.ColumnManager.js:865</code></a>
 
  </p>
 
@@ -500,7 +500,7 @@ <h3 class="name"><code>deferClose</code></h3>
 
 
 
- <a href="../files/D:_Github_backgrid-columnmanager_src_Backgrid.ColumnManager.js.html#l874"><code>D:\Github\backgrid-columnmanager\src\Backgrid.ColumnManager.js:874</code></a>
+ <a href="../files/D:_Github_backgrid-columnmanager_src_Backgrid.ColumnManager.js.html#l878"><code>D:\Github\backgrid-columnmanager\src\Backgrid.ColumnManager.js:878</code></a>
 
  </p>
 
@@ -781,7 +781,7 @@ <h3 class="name"><code>open</code></h3>
 
 
 
- <a href="../files/D:_Github_backgrid-columnmanager_src_Backgrid.ColumnManager.js.html#l808"><code>D:\Github\backgrid-columnmanager\src\Backgrid.ColumnManager.js:808</code></a>
+ <a href="../files/D:_Github_backgrid-columnmanager_src_Backgrid.ColumnManager.js.html#l812"><code>D:\Github\backgrid-columnmanager\src\Backgrid.ColumnManager.js:812</code></a>
 
  </p>
 
@@ -916,7 +916,7 @@ <h3 class="name"><code>setup</code></h3>
 
 
 
- <a href="../files/D:_Github_backgrid-columnmanager_src_Backgrid.ColumnManager.js.html#l765"><code>D:\Github\backgrid-columnmanager\src\Backgrid.ColumnManager.js:765</code></a>
+ <a href="../files/D:_Github_backgrid-columnmanager_src_Backgrid.ColumnManager.js.html#l769"><code>D:\Github\backgrid-columnmanager\src\Backgrid.ColumnManager.js:769</code></a>
 
  </p>
 
@@ -972,7 +972,7 @@ <h3 class="name"><code>stopDeferClose</code></h3>
 
 
 
- <a href="../files/D:_Github_backgrid-columnmanager_src_Backgrid.ColumnManager.js.html#l882"><code>D:\Github\backgrid-columnmanager\src\Backgrid.ColumnManager.js:882</code></a>
+ <a href="../files/D:_Github_backgrid-columnmanager_src_Backgrid.ColumnManager.js.html#l886"><code>D:\Github\backgrid-columnmanager\src\Backgrid.ColumnManager.js:886</code></a>
 
  </p>
 
@@ -1038,7 +1038,7 @@ <h3 class="name"><code>stopPropagation</code></h3>
 
 
 
- <a href="../files/D:_Github_backgrid-columnmanager_src_Backgrid.ColumnManager.js.html#l780"><code>D:\Github\backgrid-columnmanager\src\Backgrid.ColumnManager.js:780</code></a>
+ <a href="../files/D:_Github_backgrid-columnmanager_src_Backgrid.ColumnManager.js.html#l784"><code>D:\Github\backgrid-columnmanager\src\Backgrid.ColumnManager.js:784</code></a>
 
  </p>
 
@@ -1126,7 +1126,7 @@ <h3 class="name"><code>toggle</code></h3>
 
 
 
- <a href="../files/D:_Github_backgrid-columnmanager_src_Backgrid.ColumnManager.js.html#l793"><code>D:\Github\backgrid-columnmanager\src\Backgrid.ColumnManager.js:793</code></a>
+ <a href="../files/D:_Github_backgrid-columnmanager_src_Backgrid.ColumnManager.js.html#l797"><code>D:\Github\backgrid-columnmanager\src\Backgrid.ColumnManager.js:797</code></a>
 
  </p>
 

diff --git a/docs/classes/Backgrid.Extension.ColumnVisibilityHeaderCell.html b/docs/classes/Backgrid.Extension.ColumnVisibilityHeaderCell.html
@@ -104,7 +104,7 @@ <h1>Backgrid.Extension.ColumnVisibilityHeaderCell Class</h1>
 
 
  <div class="foundat">
- Defined in: <a href="../files/D:_Github_backgrid-columnmanager_src_Backgrid.ColumnManager.js.html#l891"><code>D:\Github\backgrid-columnmanager\src\Backgrid.ColumnManager.js:891</code></a>
+ Defined in: <a href="../files/D:_Github_backgrid-columnmanager_src_Backgrid.ColumnManager.js.html#l895"><code>D:\Github\backgrid-columnmanager\src\Backgrid.ColumnManager.js:895</code></a>
  </div>
 
 

diff --git a/docs/modules/Backgrid.ColumnManager.html b/docs/modules/Backgrid.ColumnManager.html
@@ -100,7 +100,7 @@ <h1>Backgrid.ColumnManager Module</h1>
 
 
  <div class="foundat">
- Defined in: <a href="../files/D:_Github_backgrid-columnmanager_src_Backgrid.ColumnManager.js.html#l891"><code>D:\Github\backgrid-columnmanager\src\Backgrid.ColumnManager.js:891</code></a>
+ Defined in: <a href="../files/D:_Github_backgrid-columnmanager_src_Backgrid.ColumnManager.js.html#l895"><code>D:\Github\backgrid-columnmanager\src\Backgrid.ColumnManager.js:895</code></a>
  </div>
 
 

diff --git a/lib/Backgrid.ColumnManager.js b/lib/Backgrid.ColumnManager.js
@@ -612,7 +612,7 @@ return /******/ (function(modules) { // webpackBootstrap
  this.options = opts;
  this.columnManager = opts.columnManager;
  this.ItemView = (opts.DropdownItemView instanceof Backbone.View) ? opts.DropdownItemView : DropDownItemView;
- this.button = opts.button;
+ this.$dropdownButton = opts.$dropdownButton;
 
  this.on("dropdown:opened", this.open, this);
  this.on("dropdown:closed", this.close, this);
@@ -650,7 +650,7 @@ return /******/ (function(modules) { // webpackBootstrap
  this.$el.addClass("open");
 
  // Get button
- var $button = this.$el.parent().find(".dropdown-button").first();
+ var $button = this.$dropdownButton;
 
  // Align
  var align;
@@ -805,11 +805,15 @@ return /******/ (function(modules) { // webpackBootstrap
  this.$el.width(this.options.width + "px");
  }
 
+ // Create button element
+ this.$dropdownButton = $(this.options.buttonTemplate());
+
  var viewOptions = {
  columnManager: this.columnManager,
  DropdownItemView: this.options.DropdownItemView,
  dropdownItemTemplate: this.options.dropdownItemTemplate,
- align: this.options.dropdownAlign
+ align: this.options.dropdownAlign,
+ $dropdownButton: this.$dropdownButton
  };
 
  // Check if a different childView has been provided, if not, use default dropdown view
@@ -825,7 +829,7 @@ return /******/ (function(modules) { // webpackBootstrap
  this.$el.empty();
 
  // Render button
- this.$el.append(this.options.buttonTemplate());
+ this.$el.append(this.$dropdownButton);
 
  // Render inner view
  this.view.render(); // tell the inner view to render itself

diff --git a/lib/Backgrid.ColumnManager.min.js b/lib/Backgrid.ColumnManager.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "backgrid-columnmanager",
- "version": "0.2.1",
+ "version": "0.2.2",
  "description": "A backgrid column manager. Adds the ability to show/hide columns.",
  "main": "lib/Backgrid.ColumnManager.js",
  "scripts": {

diff --git a/src/Backgrid.ColumnManager.js b/src/Backgrid.ColumnManager.js
@@ -773,7 +773,7 @@ Backgrid.Extension.ColumnManagerVisibilityControl = Backbone.View.extend({
  this.$el.empty();
 
  // Render button
- this.$el.append(this.options.buttonTemplate());
+ this.$el.append(this.$dropdownButton);
 
  // Render inner view
  this.view.render(); // tell the inner view to render itself