PTNFLY-1122 : Fix pfSelect options and ng-model watches

dist/angular-patternfly.js

@@ -3593,27 +3593,31 @@ angular.module('patternfly.select', []).directive('pfSelect', ["$timeout", funct
     link: function (scope, element, attrs, ngModel) {
       var optionCollectionList, optionCollection, $render = ngModel.$render;
 
+      var selectpickerRefresh = function (argument) {
+        scope.$applyAsync(function () {
+          element.selectpicker('refresh');
+        });
+      };
+
       element.selectpicker(scope.selectPickerOptions);
 
       ngModel.$render = function () {
         $render.apply(this, arguments);
-        $timeout(function () {
-          element.selectpicker('refresh');
-        }, 0, false);
+        selectpickerRefresh();
       };
 
       if (attrs.ngOptions) {
         optionCollectionList = attrs.ngOptions.split('in ');
         optionCollection = optionCollectionList[optionCollectionList.length - 1];
 
-        scope.$watchCollection(optionCollection, function () {
-          element.selectpicker('refresh');
-        });
+        scope.$parent.$watchCollection(optionCollection, selectpickerRefresh);
       }
 
-      attrs.$observe('disabled', function () {
-        element.selectpicker('refresh');
-      });
+      if (attrs.ngModel) {
+        scope.$parent.$watch(attrs.ngModel, selectpickerRefresh);
+      }
+
+      attrs.$observe('disabled', selectpickerRefresh);
     }
   };
 }]);

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

@@ -3593,27 +3593,31 @@ angular.module('patternfly.select', []).directive('pfSelect', ["$timeout", funct
     link: function (scope, element, attrs, ngModel) {
       var optionCollectionList, optionCollection, $render = ngModel.$render;
 
+      var selectpickerRefresh = function (argument) {
+        scope.$applyAsync(function () {
+          element.selectpicker('refresh');
+        });
+      };
+
       element.selectpicker(scope.selectPickerOptions);
 
       ngModel.$render = function () {
         $render.apply(this, arguments);
-        $timeout(function () {
-          element.selectpicker('refresh');
-        }, 0, false);
+        selectpickerRefresh();
       };
 
       if (attrs.ngOptions) {
         optionCollectionList = attrs.ngOptions.split('in ');
         optionCollection = optionCollectionList[optionCollectionList.length - 1];
 
-        scope.$watchCollection(optionCollection, function () {
-          element.selectpicker('refresh');
-        });
+        scope.$parent.$watchCollection(optionCollection, selectpickerRefresh);
       }
 
-      attrs.$observe('disabled', function () {
-        element.selectpicker('refresh');
-      });
+      if (attrs.ngModel) {
+        scope.$parent.$watch(attrs.ngModel, selectpickerRefresh);
+      }
+
+      attrs.$observe('disabled', selectpickerRefresh);
     }
   };
 }]);

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

@@ -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/753c6c0/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/7271e2f/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/partials/api/patternfly.card.directive.pfAggregateStatusCard.html

@@ -1,4 +1,4 @@
-<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/aggregate-status/aggregate-status-card.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/753c6c0/src/card/aggregate-status/aggregate-status-card.directive.js#L129" 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.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/7271e2f/src/card/aggregate-status/aggregate-status-card.directive.js#L129" 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.card.directive.pfCard.html

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

dist/docs/partials/api/patternfly.charts.directive.pfC3Chart.html

@@ -1,4 +1,4 @@
-<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/c3/c3-chart.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/753c6c0/src/charts/c3/c3-chart.directive.js#L65" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfC3Chart</code>
+<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/c3/c3-chart.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/7271e2f/src/charts/c3/c3-chart.directive.js#L65" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfC3Chart</code>
 <div><span class="hint">directive in module <code ng:non-bindable="">patternfly.charts</code>
 </span>
 </div>

dist/docs/partials/api/patternfly.charts.directive.pfDonutPctChart.html

@@ -1,4 +1,4 @@
-<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/donut/donut-pct-chart-directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/753c6c0/src/charts/donut/donut-pct-chart-directive.js#L233" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfDonutPctChart</code>
+<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/donut/donut-pct-chart-directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/7271e2f/src/charts/donut/donut-pct-chart-directive.js#L233" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfDonutPctChart</code>
 <div><span class="hint">directive in module <code ng:non-bindable="">patternfly.charts</code>
 </span>
 </div>

dist/docs/partials/api/patternfly.charts.directive.pfHeatMap.html

@@ -1,4 +1,4 @@
-<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/heatmap/heatmap.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/753c6c0/src/charts/heatmap/heatmap.directive.js#L135" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfHeatMap</code>
+<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/heatmap/heatmap.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/7271e2f/src/charts/heatmap/heatmap.directive.js#L135" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfHeatMap</code>
 <div><span class="hint">directive in module <code ng:non-bindable="">patternfly.charts</code>
 </span>
 </div>

dist/docs/partials/api/patternfly.charts.directive.pfSparklineChart.html

@@ -1,4 +1,4 @@
-<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/sparkline/sparkline-chart.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/753c6c0/src/charts/sparkline/sparkline-chart.directive.js#L133" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfSparklineChart</code>
+<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/sparkline/sparkline-chart.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/7271e2f/src/charts/sparkline/sparkline-chart.directive.js#L133" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfSparklineChart</code>
 <div><span class="hint">directive in module <code ng:non-bindable="">patternfly.charts</code>
 </span>
 </div>

dist/docs/partials/api/patternfly.charts.directive.pfTrendsChart.html

@@ -1,4 +1,4 @@
-<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/trends/trends-chart.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/753c6c0/src/charts/trends/trends-chart.directive.js#L164" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfTrendsChart</code>
+<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/trends/trends-chart.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/7271e2f/src/charts/trends/trends-chart.directive.js#L164" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfTrendsChart</code>
 <div><span class="hint">directive in module <code ng:non-bindable="">patternfly.charts</code>
 </span>
 </div>

dist/docs/partials/api/patternfly.charts.directive.pfUtilizationBarChart.html

@@ -1,4 +1,4 @@
-<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/utilization-bar/utilization-bar-chart.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/753c6c0/src/charts/utilization-bar/utilization-bar-chart.directive.js#L117" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfUtilizationBarChart</code>
+<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/utilization-bar/utilization-bar-chart.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/7271e2f/src/charts/utilization-bar/utilization-bar-chart.directive.js#L117" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfUtilizationBarChart</code>
 <div><span class="hint">directive in module <code ng:non-bindable="">patternfly.charts</code>
 </span>
 </div>

dist/docs/partials/api/patternfly.charts.directive.pfUtilizationTrendChart.html

@@ -1,4 +1,4 @@
-<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/utilization-trend/utilization-trend-chart-directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/753c6c0/src/charts/utilization-trend/utilization-trend-chart-directive.js#L184" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfUtilizationTrendChart</code>
+<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/utilization-trend/utilization-trend-chart-directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/7271e2f/src/charts/utilization-trend/utilization-trend-chart-directive.js#L184" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfUtilizationTrendChart</code>
 <div><span class="hint">directive in module <code ng:non-bindable="">patternfly.charts</code>
 </span>
 </div>

dist/docs/partials/api/patternfly.filters.directive.pfFilter.html

@@ -1,4 +1,4 @@
-<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/filters/filter-directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/753c6c0/src/filters/filter-directive.js#L172" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfFilter</code>
+<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/filters/filter-directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/7271e2f/src/filters/filter-directive.js#L172" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfFilter</code>
 <div><span class="hint">directive in module <code ng:non-bindable="">patternfly.filters</code>
 </span>
 </div>

dist/docs/partials/api/patternfly.filters.directive.pfFilterFields.html

@@ -1,4 +1,4 @@
-<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/filters/filter-fields-directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/753c6c0/src/filters/filter-fields-directive.js#L23" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfFilterFields</code>
+<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/filters/filter-fields-directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/7271e2f/src/filters/filter-fields-directive.js#L23" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfFilterFields</code>
 <div><span class="hint">directive in module <code ng:non-bindable="">patternfly.filters</code>
 </span>
 </div>

dist/docs/partials/api/patternfly.filters.directive.pfFilterResults.html

@@ -1,4 +1,4 @@
-<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/filters/filter-results-directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/753c6c0/src/filters/filter-results-directive.js#L25" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfFilterResults</code>
+<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/filters/filter-results-directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/7271e2f/src/filters/filter-results-directive.js#L25" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfFilterResults</code>
 <div><span class="hint">directive in module <code ng:non-bindable="">patternfly.filters</code>
 </span>
 </div>

dist/docs/partials/api/patternfly.form.directive.pfDatepicker.html

@@ -1,4 +1,4 @@
-<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/form/datepicker/datepicker.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/753c6c0/src/form/datepicker/datepicker.directive.js#L38" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfDatepicker</code>
+<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/form/datepicker/datepicker.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/7271e2f/src/form/datepicker/datepicker.directive.js#L38" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfDatepicker</code>
 <div><span class="hint">directive in module <code ng:non-bindable="">patternfly.form</code>
 </span>
 </div>

dist/docs/partials/api/patternfly.form.directive.pfFormButtons.html

@@ -1,4 +1,4 @@
-<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/form/form-buttons/form-buttons.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/753c6c0/src/form/form-buttons/form-buttons.directive.js#L55" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfFormButtons</code>
+<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/form/form-buttons/form-buttons.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/7271e2f/src/form/form-buttons/form-buttons.directive.js#L55" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfFormButtons</code>
 <div><span class="hint">directive in module <code ng:non-bindable="">patternfly.form</code>
 </span>
 </div>

dist/docs/partials/api/patternfly.form.directive.pfFormGroup.html

@@ -1,4 +1,4 @@
-<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/form/form-group/form-group.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/753c6c0/src/form/form-group/form-group.directive.js#L47" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfFormGroup</code>
+<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/form/form-group/form-group.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/7271e2f/src/form/form-group/form-group.directive.js#L47" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfFormGroup</code>
 <div><span class="hint">directive in module <code ng:non-bindable="">patternfly.form</code>
 </span>
 </div>

dist/docs/partials/api/patternfly.form.directive.pfRemainingCharsCount.html

@@ -1,4 +1,4 @@
-<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/form/remaining-chars-count/remaining-chars-count.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/753c6c0/src/form/remaining-chars-count/remaining-chars-count.directive.js#L124" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfRemainingCharsCount</code>
+<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/form/remaining-chars-count/remaining-chars-count.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/7271e2f/src/form/remaining-chars-count/remaining-chars-count.directive.js#L124" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfRemainingCharsCount</code>
 <div><span class="hint">directive in module <code ng:non-bindable="">patternfly.form</code>
 </span>
 </div>

dist/docs/partials/api/patternfly.notification.Notification.html

@@ -1,4 +1,4 @@
-<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/notification/notification.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/753c6c0/src/notification/notification.js#L82" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">Notification</code>
+<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/notification/notification.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/7271e2f/src/notification/notification.js#L82" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">Notification</code>
 <div><span class="hint">service in module <code ng:non-bindable="">patternfly.notification</code>
 </span>
 </div>