ag-admin
/
OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4214 from tsiegleauq/angular722 

Update to angular 7.2.2
This commit is contained in:
Sean 2019-01-31 09:54:24 +01:00 committed by GitHub
parent d6ce448672 b5ea837e0a
commit eb21ae0136
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 44 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
client/package.json
View File

@ -23,64 +23,64 @@
"prettify-write": "prettier --config ./.prettierrc --write \"src/{app,environments}/**/*{.ts,.js,.json,.css,.scss}\"" "prettify-write": "prettier --config ./.prettierrc --write \"src/{app,environments}/**/*{.ts,.js,.json,.css,.scss}\""
}, },
"dependencies": { "dependencies": {
"@angular/animations": "^7.1.1", "@angular/animations": "^7.2.2",
"@angular/cdk": "^7.1.0", "@angular/cdk": "^7.3.0",
"@angular/common": "^7.1.1", "@angular/common": "^7.2.2",
"@angular/compiler": "^7.1.1", "@angular/compiler": "^7.2.2",
"@angular/core": "^7.1.1", "@angular/core": "^7.2.2",
"@angular/forms": "^7.1.1", "@angular/forms": "^7.2.2",
"@angular/http": "^7.1.1", "@angular/http": "^7.2.2",
"@angular/material": "^7.1.0", "@angular/material": "^7.3.0",
"@angular/platform-browser": "^7.1.1", "@angular/platform-browser": "^7.2.2",
"@angular/platform-browser-dynamic": "^7.1.1", "@angular/platform-browser-dynamic": "^7.2.2",
"@angular/pwa": "^0.12.1", "@angular/pwa": "^0.12.3",
"@angular/router": "^7.1.1", "@angular/router": "^7.2.2",
"@angular/service-worker": "^7.1.1", "@angular/service-worker": "^7.2.2",
"@ngx-pwa/local-storage": "^7.2.0", "@ngx-pwa/local-storage": "^7.4.1",
"@ngx-translate/core": "^11.0.1", "@ngx-translate/core": "^11.0.1",
"@ngx-translate/http-loader": "^4.0.0", "@ngx-translate/http-loader": "^4.0.0",
"@tinymce/tinymce-angular": "^2.3.1", "@tinymce/tinymce-angular": "^2.5.0",
"angular-tree-component": "^8.0.1", "angular-tree-component": "^8.2.0",
"core-js": "^2.5.4", "core-js": "^2.6.3",
"css-element-queries": "^1.1.1", "css-element-queries": "^1.1.1",
"file-saver": "^2.0.0", "file-saver": "^2.0.0",
"material-design-icons": "^3.0.1", "material-design-icons": "^3.0.1",
"ngx-file-drop": "^5.0.0", "ngx-file-drop": "^5.0.2",
"ngx-mat-select-search": "^1.4.2", "ngx-mat-select-search": "^1.5.2",
"ngx-papaparse": "^3.0.2", "ngx-papaparse": "^3.0.2",
"pdfmake": "^0.1.40", "pdfmake": "^0.1.41",
"po2json": "^1.0.0-alpha", "po2json": "^1.0.0-alpha",
"rxjs": "^6.3.3", "rxjs": "^6.4.0",
"tinymce": "^4.9.0", "tinymce": "^4.9.2",
"uuid": "^3.3.2", "uuid": "^3.3.2",
"zone.js": "^0.8.26" "zone.js": "^0.8.29"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "^0.12.1", "@angular-devkit/build-angular": "^0.12.3",
"@angular/cli": "^7.1.0", "@angular/cli": "^7.2.3",
"@angular/compiler-cli": "^7.1.1", "@angular/compiler-cli": "^7.2.2",
"@angular/language-service": "^7.1.1", "@angular/language-service": "^7.2.2",
"@compodoc/compodoc": "^1.1.7", "@compodoc/compodoc": "^1.1.7",
"@types/jasmine": "^2.8.12", "@types/jasmine": "^3.3.8",
"@types/jasminewd2": "^2.0.6", "@types/jasminewd2": "^2.0.6",
"@types/node": "^10.12.10", "@types/node": "^10.12.19",
"@types/yargs": "^12.0.1", "@types/yargs": "^12.0.8",
"codelyzer": "~4.5.0", "codelyzer": "~4.5.0",
"husky": "^1.1.4", "husky": "^1.3.1",
"jasmine-core": "~2.99.1", "jasmine-core": "~3.3.0",
"jasmine-spec-reporter": "~4.2.1", "jasmine-spec-reporter": "~4.2.1",
"karma": "^3.1.1", "karma": "^4.0.0",
"karma-chrome-launcher": "~2.2.0", "karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "^2.0.4", "karma-coverage-istanbul-reporter": "^2.0.4",
"karma-jasmine": "~1.1.1", "karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "^0.2.2", "karma-jasmine-html-reporter": "^1.4.0",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"prettier": "^1.15.3", "prettier": "^1.16.2",
"protractor": "^5.4.1", "protractor": "^5.4.2",
"ts-node": "~7.0.1", "ts-node": "~8.0.2",
"tslint": "~5.11.0", "tslint": "~5.12.1",
"tsutils": "^3.5.1", "tsutils": "^3.7.0",
"typescript": ">=3.1.1 <3.2", "typescript": "^3.2",
"webpack-bundle-analyzer": "^3.0.3" "webpack-bundle-analyzer": "^3.0.3"
} }
} }

9
client/src/app/core/services/data-store.service.ts
View File

@ -411,13 +411,4 @@ export class DataStoreService {
await this.storageService.set(DataStoreService.cachePrefix + 'DS', this.jsonStore); await this.storageService.set(DataStoreService.cachePrefix + 'DS', this.jsonStore);
await this.storageService.set(DataStoreService.cachePrefix + 'maxChangeId', changeId); await this.storageService.set(DataStoreService.cachePrefix + 'maxChangeId', changeId);
} }
/**
* Prints the whole dataStore
* @deprecated Shouldn't be used, will be removed later
*/
public printWhole(): void {
console.log('Everything in DataStore: ', this.modelStore);
console.log('changeId', this.maxChangeId);
}
} }

4
client/src/app/core/services/servertime.service.ts
View File

@ -3,7 +3,6 @@ import { Injectable } from '@angular/core';
import { OpenSlidesComponent } from 'app/openslides.component'; import { OpenSlidesComponent } from 'app/openslides.component';
import { HttpService } from './http.service'; import { HttpService } from './http.service';
import { environment } from 'environments/environment.prod'; import { environment } from 'environments/environment.prod';
import { isNumber } from 'util';
import { BehaviorSubject, Observable } from 'rxjs'; import { BehaviorSubject, Observable } from 'rxjs';
@Injectable({ @Injectable({
@ -46,7 +45,8 @@ export class ServertimeService extends OpenSlidesComponent {
private async refreshServertime(): Promise<void> { private async refreshServertime(): Promise<void> {
// servertime is the time in seconds. // servertime is the time in seconds.
const servertime = await this.http.get<number>(environment.urlPrefix + '/core/servertime/'); const servertime = await this.http.get<number>(environment.urlPrefix + '/core/servertime/');
if (!isNumber(servertime)) { // isNumber is deprecated: since node v4.0.0
if (typeof servertime !== 'number') {
throw new Error('The returned servertime is not a number'); throw new Error('The returned servertime is not a number');
} }
this.serverOffsetSubject.next(Math.floor(Date.now() - servertime * 1000)); this.serverOffsetSubject.next(Math.floor(Date.now() - servertime * 1000));

4
client/src/app/shared/models/base/base-model.ts
View File

@ -3,9 +3,7 @@ import { Deserializable } from './deserializable';
import { Displayable } from './displayable'; import { Displayable } from './displayable';
import { Identifiable } from './identifiable'; import { Identifiable } from './identifiable';
export interface ModelConstructor<T extends BaseModel<T>> { export type ModelConstructor<T extends BaseModel<T>> = new (...args: any[]) => T;
new (...args: any[]): T;
}
/** /**
* Abstract parent class to set rules and functions for all models. * Abstract parent class to set rules and functions for all models.

7
client/src/app/site/common/components/start/start.component.ts
View File

@ -70,13 +70,6 @@ export class StartComponent extends BaseComponent implements OnInit {
}); });
} }
/**
* function to print datastore
*/
public giveDataStore(): void {
this.DS.printWhole();
}
/** /**
* test translations in component * test translations in component
*/ */