Merge pull request #424 from jeff-phillips-18/branch-4.0-dev

Cherry Pick Master Branch Changes since Alpha 2

Author: dlabrecq

.travis.yml

@@ -21,16 +21,3 @@ script:
 
 after_success:
   - ./scripts/publish-ghpages.sh -t docs
-
-# OpenShift expects its deployment branch to be "master-dist". This can be changed using:
-# rhc app-configure patternfly/angular --deployment-branch master-dist
-deploy:
-  provider: openshift
-  user: "$OPENSHIFT_USER"
-  password: "$OPENSHIFT_PWD"
-  domain: "patternfly"
-  app: angular
-  skip_cleanup: true
-  on: # The branch and repo that triggered the build
-    branch: master
-    condition: $TRAVIS_REPO_SLUG = "patternfly/angular-patternfly"

README.md

@@ -9,7 +9,7 @@
 This project will provide a set of common AngularJS directives for use with the PatternFly reference implementation.
 
 * Web site: https://www.patternfly.org
-* API Docs: http://angular-patternfly.rhcloud.com/#/api
+* API Docs: http://www.patternfly.org/angular-patternfly/#/api
 * Build Status: https://travis-ci.org/patternfly/angular-patternfly.svg?branch=master
 
 ## Getting started

src/charts/line/line-chart.component.js

@@ -62,6 +62,7 @@
            </div>
            <div class="col-md-3">
                  <button ng-click="addDataPoint()">Add Data Point</button>
+                 <button ng-click="resetData()">Reset Data</button>
            </div>
          </div>
        </div>
@@ -100,8 +101,8 @@
        $scope.data = {
          dataAvailable: true,
          xData: dates,
-         yData0: ['Created', 12, 10,10, 62, 17, 10, 15, 13, 17, 10, 12, 10, 10, 12, 17, 16, 15, 13, 17, 10],
-         yData1: ['Deleted', 10, 17, 76,14, 10, 10, 10, 10, 10, 10, 10, 17, 17, 14, 10, 10, 10, 10, 10, 10]
+         yData0: ['Created', 12, 10, 10, 62, 17, 10, 15, 13, 17, 10, 12, 10, 10, 12, 17, 16, 15, 13, 17, 10],
+         yData1: ['Deleted', 10, 17, 76, 14, 10, 10, 10, 10, 10, 10, 10, 17, 17, 14, 10, 10, 10, 10, 10, 10]
        };
 
        $scope.custShowXAxis = false;
@@ -113,6 +114,14 @@
          $scope.data.yData0.push(Math.round(Math.random() * 100));
          $scope.data.yData1.push(Math.round(Math.random() * 100));
        };
+
+       $scope.resetData = function () {
+         $scope.data = {
+           xData: dates,
+           yData0: ['Created', 12, 10, 10, 62],
+           yData1: ['Deleted', 10, 17, 76, 14]
+         };
+       };
      });
    </file>
  </example>
@@ -188,7 +197,7 @@ angular.module('patternfly.charts').component('pfLineChart', {
       }
 
       // Convert the given data to C3 chart format
-      ctrl.config.data = pfUtils.merge(ctrl.config.data, ctrl.getLineData(ctrl.chartData));
+      ctrl.config.data = ctrl.getLineData(ctrl.chartData);
 
       // Override defaults with callers specifications
       ctrl.defaultConfig = pfUtils.merge(ctrl.defaultConfig, ctrl.config);

src/filters/examples/filter.js

@@ -94,11 +94,12 @@
 
         var matchesFilter = function (item, filter) {
           var match = true;
+          var re = new RegExp(filter.value, 'i');
 
           if (filter.id === 'name') {
-            match = item.name.match(filter.value) !== null;
+            match = item.name.match(re) !== null;
           } else if (filter.id === 'address') {
-            match = item.address.match(filter.value) !== null;
+            match = item.address.match(re) !== null;
           } else if (filter.id === 'birthMonth') {
             match = item.birthMonth === filter.value;
           }

src/toolbars/examples/toolbar.js

@@ -234,13 +234,14 @@
 
       var matchesFilter = function (item, filter) {
         var match = true;
+        var re = new RegExp(filter.value, 'i');
 
         if (filter.id === 'name') {
-          match = item.name.match(filter.value) !== null;
+          match = item.name.match(re) !== null;
         } else if (filter.id === 'age') {
           match = item.age === parseInt(filter.value);
         } else if (filter.id === 'address') {
-          match = item.address.match(filter.value) !== null;
+          match = item.address.match(re) !== null;
         } else if (filter.id === 'birthMonth') {
           match = item.birthMonth === filter.value;
         }