inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

update ng2-translate-version #1397 (#1805)

Browse Source 
* update ng2-translate-version #1397

* change karma.conf and build for ng2-translate 4.0.0
This commit is contained in:
Eugenio Romano
2017-04-10 17:42:33 +01:00
committed by Mario Romano
parent dba5d5a037
commit ab3d18e5c1
75 changed files with 74 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ng2-components/ng2-alfresco-core/gulpfile.ts
View File

@@ -165,7 +165,7 @@ gulp.task('build.bundles.app', (done) => {
typescript: 'node_modules/typescript/lib/typescript.js',
'@angular': 'node_modules/@angular',
rxjs: 'node_modules/rxjs',
'ng2-translate': 'node_modules/ng2-translate',
'ng2-translate/ng2-translate': 'node_modules/ng2-translate/',
'alfresco-js-api': 'node_modules/alfresco-js-api/dist/alfresco-js-api',
'ng2-alfresco-core': 'node_modules/ng2-alfresco-core/',
'ng2-activiti-diagrams': 'node_modules/ng2-activiti-diagrams/',

2
ng2-components/ng2-alfresco-core/karma-test-shim.js
View File

@@ -60,7 +60,7 @@ var map = {
// other libraries
'rxjs': 'npm:rxjs',
'ng2-translate': 'npm:ng2-translate',
'ng2-translate/ng2-translate': 'npm:ng2-translate/bundles/ng2-translate.umd.js',
'hammerjs': 'npm:hammerjs',
'alfresco-js-api': 'npm:alfresco-js-api/dist'

3
ng2-components/ng2-alfresco-core/karma.conf.js
View File

@@ -35,14 +35,11 @@ module.exports = function (config) {
'node_modules/alfresco-js-api/dist/alfresco-js-api.js',
{pattern: 'node_modules/ng2-translate/**/*.js', included: false, watched: false},
{pattern: 'node_modules/ng2-translate/**/*.js.map', included: false, watched: false},
'karma-test-shim.js',
// paths loaded via module imports
{pattern: 'src/**/*.js', included: false, watched: true},
{pattern: 'src/**/*.html', included: true, served: true, watched: true},
{pattern: 'src/**/*.css', included: true, served: true, watched: true},
// paths to support debugging with source maps in dev tools
{pattern: 'src/**/*.ts', included: false, watched: false},

2
ng2-components/ng2-alfresco-core/package.json
View File

@@ -73,7 +73,7 @@
"intl": "1.2.4",
"material-design-icons": "2.2.3",
"material-design-lite": "1.2.1",
"ng2-translate": "2.5.0",
"ng2-translate": "4.0.0",
"reflect-metadata": "0.1.10",
"rxjs": "5.0.0-beta.12",
"systemjs": "0.19.27",