Merge pull request #471 from bleathem/branch-4.0-dev

Updated 4.0-dev to PatternFly 3.25.0 and jQuery 3

Author: jeff-phillips-18

bower.json

@@ -47,13 +47,10 @@
     "datatables.net": "^1.10.12",
     "datatables.net-select": "~1.2.0",
     "lodash": "4.x",
-    "patternfly": "~4.0.0-rc.1"
+    "patternfly": "3.25.0"
   },
   "devDependencies": {
     "angular-mocks": "1.5.*",
     "angular-ui-router": "^1.0.0-beta.3"
-  },
-  "resolutions": {
-    "jquery": "~2.1.4"
   }
 }

misc/angular-bootstrap-prettify.js

@@ -254,7 +254,7 @@ directive.ngEmbedApp = ['$templateCache', '$browser', '$rootScope', '$location',
         }
       });
 
-      element.bind('$destroy', function() {
+      element.on('$destroy', function() {
         deregisterEmbedRootScope();
         embedRootScope.$destroy();
       });

npm-shrinkwrap.json

@@ -4,7 +4,10 @@
   "version": "4.0.0-rc.1",
   "license": "Apache-2.0",
   "description": "Angular extension of the PatternFly project.",
-  "keywords": ["angular", "patternfly"],
+  "keywords": [
+    "angular",
+    "patternfly"
+  ],
   "main": "index.js",
   "homepage": "https://github.com/patternfly/angular-patternfly",
   "dependencies": {
@@ -14,7 +17,7 @@
     "angular-ui-bootstrap": "2.3.x",
     "angular-svg-base-fix": "2.0.0",
     "lodash-amd": "4.x",
-    "patternfly": "~4.0.0-rc.1"
+    "patternfly": "3.25.0"
   },
   "devDependencies": {
     "angular-dragdrop": "1.0.13",
@@ -59,7 +62,7 @@
     "d3": "~3.5.17",
     "datatables.net": "^1.10.11",
     "datatables.net-select": "~1.2.0",
-    "jquery": "~2.1.4",
+    "jquery": "~3.2.1",
     "moment": "~2.14.1"
   },
   "scripts": {

package.json

@@ -362,7 +362,7 @@ angular.module('patternfly.charts').component('pfHeatmap', {
       ctrl.showLegend = ctrl.showLegend || (ctrl.showLegend === undefined);
       ctrl.loadingDone = false;
 
-      angular.element($window).bind('resize', function () {
+      angular.element($window).on('resize', function () {
         setSizes();
         redraw();
       });

src/charts/heatmap/heatmap.component.js

@@ -40,7 +40,7 @@ angular.module('patternfly.form').directive('pfRemainingCharsCount', function ($
         checkCharactersRemaining();
       });
 
-      $element.bind('keypress', function (event) {
+      $element.on('keypress', function (event) {
         // Once the charsMaxLimit has been met or exceeded, prevent all keypresses from working
         if (blockInputAtMaxLimit && $element.val().length >= charsMaxLimit) {
           // Except backspace

src/form/remaining-chars-count/remaining-chars-count.directive.js

@@ -550,7 +550,7 @@ angular.module('patternfly.navigation').component('pfVerticalNavigation', {
       checkNavState();
 
       // Need to bind to resize event
-      angular.element($window).bind('resize', function () {
+      angular.element($window).on('resize', function () {
         checkNavState();
       });
     };
@@ -562,4 +562,3 @@ angular.module('patternfly.navigation').component('pfVerticalNavigation', {
     };
   },
 });
-

src/navigation/vertical-navigation.component.js

@@ -160,10 +160,10 @@ angular.module('patternfly.utils').directive('pfFixedAccordion', function ($wind
       }, 100);
 
       // Update on window resizing
-      $element.bind('resize', function () {
+      $element.on('resize', function () {
         setCollapseHeights();
       });
-      angular.element($window).bind('resize', function () {
+      angular.element($window).on('resize', function () {
         setCollapseHeights();
       });
     }

src/utils/fixed-accordion.directive.js

@@ -31,7 +31,7 @@ describe('Component: pfAggregateStatusCard', function() {
       expect(angular.element(element).find('.card-pf-aggregate-status-count').html()).toBe("793");
 
       //Make sure a link renders in the title
-      expect(angular.element(element).find('.card-pf-title').find('a').size()).toBe(1);
+      expect(angular.element(element).find('.card-pf-title').find('a').length).toBe(1);
 
       //Make sure the class is getting set for the title icon
       expect(angular.element(element).find('.card-pf-title').find('.fa').hasClass('fa-shield')).toBeTruthy();
@@ -53,7 +53,7 @@ describe('Component: pfAggregateStatusCard', function() {
       element = compileCard('<pf-aggregate-status-card status="status"></pf-aggregate-status-card>', $scope);
 
       //Make sure a link renders in the title
-      expect(angular.element(element).find('.card-pf-title').find('a').size()).toBe(0);
+      expect(angular.element(element).find('.card-pf-title').find('a').length).toBe(0);
     });
 
     it("should set the notifications", function() {
@@ -81,13 +81,13 @@ describe('Component: pfAggregateStatusCard', function() {
       notifications = angular.element(element).find('.card-pf-aggregate-status-notification');
 
       //Make sure two notifications render
-      expect(notifications.size()).toBe(2);
+      expect(notifications.length).toBe(2);
 
       //First notification should have a link
-      expect(notifications.eq(0).find('a').size()).toBe(1);
+      expect(notifications.eq(0).find('a').length).toBe(1);
 
       //Second notification should not have a link
-      expect(notifications.eq(1).find('a').size()).toBe(0);
+      expect(notifications.eq(1).find('a').length).toBe(0);
 
       //first notification should have the following class
       expect(notifications.eq(0).find('span')).toHaveClass('pficon pficon-error-circle-o');
@@ -135,7 +135,7 @@ describe('Component: pfAggregateStatusCard', function() {
 
       // should show the main icon
       cardClass = angular.element(element).find('.fa-shield');
-      expect(cardClass.size()).toBe(1);
+      expect(cardClass.length).toBe(1);
 
       notifications = angular.element(element).find('.card-pf-aggregate-status-notification');
 
@@ -166,7 +166,7 @@ describe('Component: pfAggregateStatusCard', function() {
 
       // should not show the main icon
       cardClass = angular.element(element).find('.fa-shield');
-      expect(cardClass.size()).toBe(0);
+      expect(cardClass.length).toBe(0);
 
       notifications = angular.element(element).find('.card-pf-aggregate-status-notification');