tcjlj/ZeroOmega
1
0
Fork 0
mirror of https://github.com/zero-peak/ZeroOmega.git synced 2025-02-02 02:58:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upgrade angular to 1.7.2.

Browse Source
This commit is contained in:
FelisCatus 2018-06-12 19:59:49 -07:00
parent 523645f339
commit cfa9e3123d
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
omega-web/bower.json
View File

@ -21,12 +21,14 @@
"tests" "tests"
], ],
"dependencies": { "dependencies": {
"angular": "~1.6.9", "angular": "~1.7.2",
"angular-animate": "~1.7.2",
"angular-loader": "~1.7.2",
"angular-i18n": "~1.7.2",
"angular-sanitize": "~1.7.2",
"angular-bootstrap": "~0.12.0", "angular-bootstrap": "~0.12.0",
"angular-animate": "~1.6.9",
"angular-ui-router": "~0.2.18", "angular-ui-router": "~0.2.18",
"angular-loader": "~1.6.9",
"angular-i18n": "~1.6.9",
"bootstrap": "~3.3.2", "bootstrap": "~3.3.2",
"script.js": "~2.5.3", "script.js": "~2.5.3",
"ngprogress": "~1.0.4", "ngprogress": "~1.0.4",
@ -37,7 +39,6 @@
"FileSaver": "*", "FileSaver": "*",
"angular-ui-utils": "bower-validate", "angular-ui-utils": "bower-validate",
"angular-ladda": "~0.2.1", "angular-ladda": "~0.2.1",
"angular-sanitize": "~1.6.9",
"shepherd.js": "~0.5.1", "shepherd.js": "~0.5.1",
"jqueryui-touch-punch": "*" "jqueryui-touch-punch": "*"
}, },
@ -126,6 +127,6 @@
} }
}, },
"resolutions": { "resolutions": {
"angular": "~1.6.9" "angular": "~1.7.2"
} }
} }

2
omega-web/src/omega/app.coffee
View File

@ -33,6 +33,8 @@ angular.module('omega').config ($stateProvider, $urlRouterProvider,
$httpProvider, $animateProvider, $compileProvider) -> $httpProvider, $animateProvider, $compileProvider) ->
$compileProvider.aHrefSanitizationWhitelist( $compileProvider.aHrefSanitizationWhitelist(
/^\s*(https?|ftp|mailto|chrome-extension):/) /^\s*(https?|ftp|mailto|chrome-extension):/)
$compileProvider.imgSrcSanitizationWhitelist(
/^\s*(https?|local|data|chrome-extension):/)
$animateProvider.classNameFilter(/angular-animate/) $animateProvider.classNameFilter(/angular-animate/)
$urlRouterProvider.otherwise '/about' $urlRouterProvider.otherwise '/about'