Merge branch 'master-local' into master-dist

Author: patternfly-build

dist/angular-patternfly.js

@@ -12757,7 +12757,9 @@ angular.module('patternfly.pagination').component('pfPagination', {
   angular.module('patternfly.tableview.demo').controller('TableCtrl', ['$scope', '$timeout', 'itemsService',
   function ($scope, $timeout, itemsService) {
           $scope.dtOptions = {
-            order: [[2, "asc"]],
+            // order column(s) should NOT account for 1st checkbox column, table component will adjust col. numbers accordingly
+            // Sort by City, then Name
+            order: [[3, "asc"], [1, "desc"]],
           };
 
           $scope.columns = [
@@ -13602,7 +13604,7 @@ angular.module('patternfly.pagination').component('pfPagination', {
   templateUrl: 'table/tableview/table-view.html',
   controller: ["DTOptionsBuilder", "DTColumnDefBuilder", "$element", "pfUtils", "$log", "$filter", "$timeout", "$sce", function (DTOptionsBuilder, DTColumnDefBuilder, $element, pfUtils, $log, $filter, $timeout, $sce) {
     'use strict';
-    var ctrl = this, prevDtOptions, prevItems, prevPageConfig;
+    var ctrl = this, prevDtOptions, prevItems, prevPageConfig, prevShowCheckboxes;
 
     // Once datatables is out of active development I'll remove log statements
     ctrl.debug = false;
@@ -13613,7 +13615,7 @@ angular.module('patternfly.pagination').component('pfPagination', {
     ctrl.defaultDtOptions = {
       autoWidth: false,
       destroy: true,
-      order: [[1, "asc"]],
+      order: [[0, "asc"]],  //default to 1st (col 0) for sorting, updateConfigOptions() will adjust based on showCheckboxes
       dom: "t",
       paging: false,
       select: {
@@ -13705,20 +13707,23 @@ angular.module('patternfly.pagination').component('pfPagination', {
         ctrl.dtOptions.displayLength = Number(ctrl.dtOptions.displayLength);
       }
 
+      _.defaults(ctrl.dtOptions, ctrl.defaultDtOptions);
+      _.defaults(ctrl.config, ctrl.defaultConfig);
+
+      if (ctrl.config.showCheckboxes !== prevShowCheckboxes) {
+        // adjust column numbers based on whether or not there is a checkbox column
+        // multi-col order may be used.  Ex:  [[ 0, 'asc' ], [ 1, 'desc' ]]
+        _.each(ctrl.dtOptions.order, function (col) {
+          col[0] = ctrl.config.showCheckboxes ? col[0] + 1 : col[0] - 1;
+          col[0] = col[0] < 0 ? 0 : col[0];  //no negative col numbers
+        });
+      }
+
       // Need to deep watch changes in dtOptions and items
       prevDtOptions = angular.copy(ctrl.dtOptions);
       prevItems = angular.copy(ctrl.items);
       prevPageConfig = angular.copy(ctrl.pageConfig);
-
-      // Setting bound variables to new variables loses it's one way binding
-      //   ctrl.dtOptions = pfUtils.merge(ctrl.defaultDtOptions, ctrl.dtOptions);
-      //   ctrl.config = pfUtils.merge(ctrl.defaultConfig, ctrl.config);
-
-      // Instead, use _.defaults to update the existing variable
-      _.defaults(ctrl.dtOptions, ctrl.defaultDtOptions);
-      _.defaults(ctrl.config, ctrl.defaultConfig);
-      // may need to use _.defaultsDeep, but not currently available in
-      // lodash-amd a-pf is using
+      prevShowCheckboxes = angular.copy(ctrl.config.showCheckboxes);
 
       if (!validSelectionMatchProp()) {
         angular.forEach(ctrl.columns, function (col) {

dist/angular-patternfly.min.js

@@ -12757,7 +12757,9 @@ angular.module('patternfly.pagination').component('pfPagination', {
   angular.module('patternfly.tableview.demo').controller('TableCtrl', ['$scope', '$timeout', 'itemsService',
   function ($scope, $timeout, itemsService) {
           $scope.dtOptions = {
-            order: [[2, "asc"]],
+            // order column(s) should NOT account for 1st checkbox column, table component will adjust col. numbers accordingly
+            // Sort by City, then Name
+            order: [[3, "asc"], [1, "desc"]],
           };
 
           $scope.columns = [
@@ -13602,7 +13604,7 @@ angular.module('patternfly.pagination').component('pfPagination', {
   templateUrl: 'table/tableview/table-view.html',
   controller: ["DTOptionsBuilder", "DTColumnDefBuilder", "$element", "pfUtils", "$log", "$filter", "$timeout", "$sce", function (DTOptionsBuilder, DTColumnDefBuilder, $element, pfUtils, $log, $filter, $timeout, $sce) {
     'use strict';
-    var ctrl = this, prevDtOptions, prevItems, prevPageConfig;
+    var ctrl = this, prevDtOptions, prevItems, prevPageConfig, prevShowCheckboxes;
 
     // Once datatables is out of active development I'll remove log statements
     ctrl.debug = false;
@@ -13613,7 +13615,7 @@ angular.module('patternfly.pagination').component('pfPagination', {
     ctrl.defaultDtOptions = {
       autoWidth: false,
       destroy: true,
-      order: [[1, "asc"]],
+      order: [[0, "asc"]],  //default to 1st (col 0) for sorting, updateConfigOptions() will adjust based on showCheckboxes
       dom: "t",
       paging: false,
       select: {
@@ -13705,20 +13707,23 @@ angular.module('patternfly.pagination').component('pfPagination', {
         ctrl.dtOptions.displayLength = Number(ctrl.dtOptions.displayLength);
       }
 
+      _.defaults(ctrl.dtOptions, ctrl.defaultDtOptions);
+      _.defaults(ctrl.config, ctrl.defaultConfig);
+
+      if (ctrl.config.showCheckboxes !== prevShowCheckboxes) {
+        // adjust column numbers based on whether or not there is a checkbox column
+        // multi-col order may be used.  Ex:  [[ 0, 'asc' ], [ 1, 'desc' ]]
+        _.each(ctrl.dtOptions.order, function (col) {
+          col[0] = ctrl.config.showCheckboxes ? col[0] + 1 : col[0] - 1;
+          col[0] = col[0] < 0 ? 0 : col[0];  //no negative col numbers
+        });
+      }
+
       // Need to deep watch changes in dtOptions and items
       prevDtOptions = angular.copy(ctrl.dtOptions);
       prevItems = angular.copy(ctrl.items);
       prevPageConfig = angular.copy(ctrl.pageConfig);
-
-      // Setting bound variables to new variables loses it's one way binding
-      //   ctrl.dtOptions = pfUtils.merge(ctrl.defaultDtOptions, ctrl.dtOptions);
-      //   ctrl.config = pfUtils.merge(ctrl.defaultConfig, ctrl.config);
-
-      // Instead, use _.defaults to update the existing variable
-      _.defaults(ctrl.dtOptions, ctrl.defaultDtOptions);
-      _.defaults(ctrl.config, ctrl.defaultConfig);
-      // may need to use _.defaultsDeep, but not currently available in
-      // lodash-amd a-pf is using
+      prevShowCheckboxes = angular.copy(ctrl.config.showCheckboxes);
 
       if (!validSelectionMatchProp()) {
         angular.forEach(ctrl.columns, function (col) {

dist/docs/grunt-scripts/angular-patternfly.js

@@ -1,4 +1,4 @@
-<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/autofocus/autofocus.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/3b1bbdc/src/autofocus/autofocus.js#L39" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfFocused</code>
+<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/autofocus/autofocus.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/c10f16d/src/autofocus/autofocus.js#L39" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfFocused</code>
 <div><span class="hint">directive in module <code ng:non-bindable="">patternfly</code>
 </span>
 </div>

dist/docs/js/docs-setup.js

@@ -1,4 +1,4 @@
-<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/canvas-view/examples/canvas.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/3b1bbdc/src/canvas-view/examples/canvas.js#L335" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCanvas</code>
+<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/canvas-view/examples/canvas.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/c10f16d/src/canvas-view/examples/canvas.js#L335" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCanvas</code>
 <div><span class="hint">directive in module <code ng:non-bindable="">patternfly.canvas</code>
 </span>
 </div>

dist/docs/partials/api/patternfly.autofocus.pfFocused.html

@@ -1,4 +1,4 @@
-<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/canvas-view/examples/canvasEditor.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/3b1bbdc/src/canvas-view/examples/canvasEditor.js#L344" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCanvasEditor</code>
+<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/canvas-view/examples/canvasEditor.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/c10f16d/src/canvas-view/examples/canvasEditor.js#L344" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCanvasEditor</code>
 <div><span class="hint">directive in module <code ng:non-bindable="">patternfly.canvas</code>
 </span>
 </div>

dist/docs/partials/api/patternfly.canvas.component.pfCanvas.html

@@ -1,4 +1,4 @@
-<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/aggregate-status/aggregate-status-card.component.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/3b1bbdc/src/card/aggregate-status/aggregate-status-card.component.js#L205" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfAggregateStatusCard</code>
+<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/aggregate-status/aggregate-status-card.component.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/c10f16d/src/card/aggregate-status/aggregate-status-card.component.js#L205" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfAggregateStatusCard</code>
 <div><span class="hint">directive in module <code ng:non-bindable="">patternfly.card</code>
 </span>
 </div>

dist/docs/partials/api/patternfly.canvas.component.pfCanvasEditor.html

@@ -1,4 +1,4 @@
-<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/examples/card-timeframe.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/3b1bbdc/src/card/examples/card-timeframe.js#L96" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCard - Timeframe Filters</code>
+<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/examples/card-timeframe.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/c10f16d/src/card/examples/card-timeframe.js#L96" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCard - Timeframe Filters</code>
 <div><span class="hint">directive in module <code ng:non-bindable="">patternfly.card</code>
 </span>
 </div>

dist/docs/partials/api/patternfly.card.component.pfAggregateStatusCard.html

@@ -1,4 +1,4 @@
-<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/examples/card-trend.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/3b1bbdc/src/card/examples/card-trend.js#L167" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCard - Trends</code>
+<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/examples/card-trend.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/c10f16d/src/card/examples/card-trend.js#L167" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCard - Trends</code>
 <div><span class="hint">directive in module <code ng:non-bindable="">patternfly.card</code>
 </span>
 </div>