External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-14 01:34:45 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4015 from mabashian/4013-backport-angular-upgrade

Browse Source 
[3.6.2 backport] Upgrades angular and auxiliary deps to 1.7.9
This commit is contained in:
Jake McDermott
2019-12-05 11:34:28 -05:00
committed by GitHub
parent 9bae9d32c7 2d4df3d50e
commit bc6d879976
3 changed files with 47 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/ui/client/src/shared/multi-select-list/select-list-item.directive.js
View File

@@ -31,20 +31,17 @@ export default
disabled: '=' disabled: '='
}, },
require: '^multiSelectList', require: '^multiSelectList',
template: '<input type="checkbox" data-multi-select-list-item ng-model="item.isSelected" ng-click="userInteractionSelect()" ng-disabled=disabled>', template: '<input type="checkbox" data-multi-select-list-item ng-model="item.isSelected" ng-change="userInteractionSelect(item)" ng-disabled=disabled>',
link: function(scope, element, attrs, multiSelectList) { link: function(scope, element, attrs, multiSelectList) {
scope.decoratedItem = multiSelectList.registerItem(scope.item); scope.decoratedItem = multiSelectList.registerItem(scope.item);
scope.$watch('item.isSelected', function(value) { scope.userInteractionSelect = function(item) {
if (value === true) { if (item.isSelected === true) {
multiSelectList.selectItem(scope.decoratedItem); multiSelectList.selectItem(scope.decoratedItem);
} else if (value === false) { } else if (item.isSelected === false) {
multiSelectList.deselectItem(scope.decoratedItem); multiSelectList.deselectItem(scope.decoratedItem);
} }
});
scope.userInteractionSelect = function() {
scope.$emit("selectedOrDeselected", scope.decoratedItem); scope.$emit("selectedOrDeselected", scope.decoratedItem);
}; };

51
awx/ui/package-lock.json generated
View File

@@ -149,9 +149,9 @@
"integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
}, },
"angular": { "angular": {
"version": "1.6.10", "version": "1.7.9",
"resolved": "https://registry.npmjs.org/angular/-/angular-1.6.10.tgz", "resolved": "https://registry.npmjs.org/angular/-/angular-1.7.9.tgz",
"integrity": "sha512-PCZ5/hVdvPQiYyH0VwsPjrErPHRcITnaXxhksceOXgtJeesKHLA7KDu4X/yvcAi+1zdGgGF+9pDxkJvghXI9Wg==" "integrity": "sha512-5se7ZpcOtu0MBFlzGv5dsM1quQDoDeUTwZrWjGtTNA7O88cD8TEk5IEKCTDa3uECV9XnvKREVUr7du1ACiWGFQ=="
}, },
"angular-breadcrumb": { "angular-breadcrumb": {
"version": "git+https://git@github.com/ansible/angular-breadcrumb.git#6c2b1ad45ad5fbe7adf39af1ef3b294ca8e207a9", "version": "git+https://git@github.com/ansible/angular-breadcrumb.git#6c2b1ad45ad5fbe7adf39af1ef3b294ca8e207a9",
@@ -166,6 +166,11 @@
"jquery": "^3.2.1" "jquery": "^3.2.1"
}, },
"dependencies": { "dependencies": {
"angular": {
"version": "1.6.10",
"resolved": "https://registry.npmjs.org/angular/-/angular-1.6.10.tgz",
"integrity": "sha512-PCZ5/hVdvPQiYyH0VwsPjrErPHRcITnaXxhksceOXgtJeesKHLA7KDu4X/yvcAi+1zdGgGF+9pDxkJvghXI9Wg=="
},
"jquery": { "jquery": {
"version": "3.3.1", "version": "3.3.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz", "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz",
@@ -174,9 +179,9 @@
} }
}, },
"angular-cookies": { "angular-cookies": {
"version": "1.6.10", "version": "1.7.9",
"resolved": "https://registry.npmjs.org/angular-cookies/-/angular-cookies-1.6.10.tgz", "resolved": "https://registry.npmjs.org/angular-cookies/-/angular-cookies-1.7.9.tgz",
"integrity": "sha512-ADfbqXLhwcaecAiWIaxpl8XWFJgWsrDl/ksSEkYm5dSoXHYlj3HKlAhPbjBv/foYS7pdI0apmSGHWrBPqdjF/g==" "integrity": "sha512-3eRq/aPrtCZKDWQnc3nW3sFoMbLiHkCkyDF2O9u7VXnqvVsUPaipk5R1ZqahgcSQHQrN/F5IU4T4nrz52qAZmA=="
}, },
"angular-drag-and-drop-lists": { "angular-drag-and-drop-lists": {
"version": "git+https://git@github.com/ansible/angular-drag-and-drop-lists.git#cceda38b836402ed4ce77fc287c23c8d02e950f6", "version": "git+https://git@github.com/ansible/angular-drag-and-drop-lists.git#cceda38b836402ed4ce77fc287c23c8d02e950f6",
@@ -213,9 +218,9 @@
} }
}, },
"angular-mocks": { "angular-mocks": {
"version": "1.6.10", "version": "1.7.9",
"resolved": "https://registry.npmjs.org/angular-mocks/-/angular-mocks-1.6.10.tgz", "resolved": "https://registry.npmjs.org/angular-mocks/-/angular-mocks-1.7.9.tgz",
"integrity": "sha512-1865/NmqHNogibNoglY1MGBjx882iu2hI46BBhYDWyz0C4TDM5ER8H8SnYwQKUUG4RXMDsJizszEQ2BEoYKV9w==", "integrity": "sha512-LQRqqiV3sZ7NTHBnNmLT0bXtE5e81t97+hkJ56oU0k3dqKv1s6F+nBWRlOVzqHWPGFOiPS8ZJVdrS8DFzHyNIA==",
"dev": true "dev": true
}, },
"angular-moment": { "angular-moment": {
@@ -236,9 +241,9 @@
} }
}, },
"angular-sanitize": { "angular-sanitize": {
"version": "1.6.10", "version": "1.7.9",
"resolved": "https://registry.npmjs.org/angular-sanitize/-/angular-sanitize-1.6.10.tgz", "resolved": "https://registry.npmjs.org/angular-sanitize/-/angular-sanitize-1.7.9.tgz",
"integrity": "sha512-01i1Xoq9ykUrsoYQMSB6dWZmPp9Df5hfCqMAGGzJBWZ7L2WY0OtUphdI0YvR8ZF9lAsWtGNtsEFilObjq5nTgQ==" "integrity": "sha512-nB/xe7JQWF9nLvhHommAICQ3eWrfRETo0EVGFESi952CDzDa+GAJ/2BFBNw44QqQPxj1Xua/uYKrbLsOGWZdbQ=="
}, },
"angular-scheduler": { "angular-scheduler": {
"version": "git+https://git@github.com/ansible/angular-scheduler.git#7628cb2fc9e6280811baa464f0020a636e65d702", "version": "git+https://git@github.com/ansible/angular-scheduler.git#7628cb2fc9e6280811baa464f0020a636e65d702",
@@ -253,6 +258,11 @@
"rrule": "github:jkbrzt/rrule#4ff63b2f8524fd6d5ba6e80db770953b5cd08a0c" "rrule": "github:jkbrzt/rrule#4ff63b2f8524fd6d5ba6e80db770953b5cd08a0c"
}, },
"dependencies": { "dependencies": {
"angular": {
"version": "1.6.10",
"resolved": "https://registry.npmjs.org/angular/-/angular-1.6.10.tgz",
"integrity": "sha512-PCZ5/hVdvPQiYyH0VwsPjrErPHRcITnaXxhksceOXgtJeesKHLA7KDu4X/yvcAi+1zdGgGF+9pDxkJvghXI9Wg=="
},
"angular-tz-extensions": { "angular-tz-extensions": {
"version": "github:ansible/angular-tz-extensions#fc60660f43ee9ff84da94ca71ab27ef0c20fd77d", "version": "github:ansible/angular-tz-extensions#fc60660f43ee9ff84da94ca71ab27ef0c20fd77d",
"from": "github:ansible/angular-tz-extensions#fc60660f43ee9ff84da94ca71ab27ef0c20fd77d", "from": "github:ansible/angular-tz-extensions#fc60660f43ee9ff84da94ca71ab27ef0c20fd77d",
@@ -301,6 +311,11 @@
"timezone-js": "github:ansible/timezone-js#6937de14ce0c193961538bb5b3b12b7ef62a358f" "timezone-js": "github:ansible/timezone-js#6937de14ce0c193961538bb5b3b12b7ef62a358f"
}, },
"dependencies": { "dependencies": {
"angular": {
"version": "1.6.10",
"resolved": "https://registry.npmjs.org/angular/-/angular-1.6.10.tgz",
"integrity": "sha512-PCZ5/hVdvPQiYyH0VwsPjrErPHRcITnaXxhksceOXgtJeesKHLA7KDu4X/yvcAi+1zdGgGF+9pDxkJvghXI9Wg=="
},
"jquery": { "jquery": {
"version": "3.3.1", "version": "3.3.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz", "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz",
@@ -9468,6 +9483,18 @@
"requires": { "requires": {
"angular": "~1.6.6", "angular": "~1.6.6",
"angular-sanitize": "~1.6.6" "angular-sanitize": "~1.6.6"
},
"dependencies": {
"angular": {
"version": "1.6.10",
"resolved": "https://registry.npmjs.org/angular/-/angular-1.6.10.tgz",
"integrity": "sha512-PCZ5/hVdvPQiYyH0VwsPjrErPHRcITnaXxhksceOXgtJeesKHLA7KDu4X/yvcAi+1zdGgGF+9pDxkJvghXI9Wg=="
},
"angular-sanitize": {
"version": "1.6.10",
"resolved": "https://registry.npmjs.org/angular-sanitize/-/angular-sanitize-1.6.10.tgz",
"integrity": "sha512-01i1Xoq9ykUrsoYQMSB6dWZmPp9Df5hfCqMAGGzJBWZ7L2WY0OtUphdI0YvR8ZF9lAsWtGNtsEFilObjq5nTgQ=="
}
} }
}, },
"ngtemplate-loader": { "ngtemplate-loader": {

8
awx/ui/package.json
View File

@@ -35,7 +35,7 @@
"pre-check": "npm run lint && npm run jshint && npm run unit && npm run test" "pre-check": "npm run lint && npm run jshint && npm run unit && npm run test"
}, },
"devDependencies": { "devDependencies": {
"angular-mocks": "~1.6.6", "angular-mocks": "^1.7.9",
"archiver": "^2.1.1", "archiver": "^2.1.1",
"axios": "^0.16.2", "axios": "^0.16.2",
"babel-core": "^6.26.0", "babel-core": "^6.26.0",
@@ -97,16 +97,16 @@
}, },
"dependencies": { "dependencies": {
"@uirouter/angularjs": "1.0.18", "@uirouter/angularjs": "1.0.18",
"angular": "~1.6.6", "angular": "^1.7.9",
"angular-breadcrumb": "git+https://git@github.com/ansible/angular-breadcrumb#0.4.1", "angular-breadcrumb": "git+https://git@github.com/ansible/angular-breadcrumb#0.4.1",
"angular-codemirror": "git+https://git@github.com/ansible/angular-codemirror#v1.1.2", "angular-codemirror": "git+https://git@github.com/ansible/angular-codemirror#v1.1.2",
"angular-cookies": "~1.6.6", "angular-cookies": "^1.7.9",
"angular-drag-and-drop-lists": "git+https://git@github.com/ansible/angular-drag-and-drop-lists#v1.4.1", "angular-drag-and-drop-lists": "git+https://git@github.com/ansible/angular-drag-and-drop-lists#v1.4.1",
"angular-duration-format": "^1.0.1", "angular-duration-format": "^1.0.1",
"angular-gettext": "^2.3.5", "angular-gettext": "^2.3.5",
"angular-moment": "^1.3.0", "angular-moment": "^1.3.0",
"angular-mousewheel": "^1.0.5", "angular-mousewheel": "^1.0.5",
"angular-sanitize": "~1.6.6", "angular-sanitize": "^1.7.9",
"angular-scheduler": "git+https://git@github.com/ansible/angular-scheduler#v0.3.3", "angular-scheduler": "git+https://git@github.com/ansible/angular-scheduler#v0.3.3",
"angular-tz-extensions": "git+https://git@github.com/ansible/angular-tz-extensions#v0.5.2", "angular-tz-extensions": "git+https://git@github.com/ansible/angular-tz-extensions#v0.5.2",
"angular-xeditable": "~0.8.0", "angular-xeditable": "~0.8.0",