refactor: remove various leftover unused or deprecated code (#11091)
This commit is contained in:
parent
0cf5ece7f8
commit
4d7d2a2daa
|
@ -442,8 +442,6 @@ export class CompileDirectiveMetadata implements CompileMetadataWithIdentifier {
|
|||
hostProperties[matches[1]] = value;
|
||||
} else if (isPresent(matches[2])) {
|
||||
hostListeners[matches[2]] = value;
|
||||
} else if (isPresent(matches[3])) { // DEPRECATED: remove this if statement post RC5
|
||||
hostProperties['@' + matches[3]] = value;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
@ -57,10 +57,6 @@ export class Token {
|
|||
|
||||
isKeyword(): boolean { return this.type == TokenType.Keyword; }
|
||||
|
||||
isKeywordDeprecatedVar(): boolean {
|
||||
return this.type == TokenType.Keyword && this.strValue == 'var';
|
||||
}
|
||||
|
||||
isKeywordLet(): boolean { return this.type == TokenType.Keyword && this.strValue == 'let'; }
|
||||
|
||||
isKeywordNull(): boolean { return this.type == TokenType.Keyword && this.strValue == 'null'; }
|
||||
|
@ -392,4 +388,4 @@ function unescape(code: number): number {
|
|||
default:
|
||||
return code;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -821,12 +821,6 @@ class TemplateParseVisitor implements html.Visitor {
|
|||
boundPropertyName = partValue.substr(1);
|
||||
bindingType = PropertyBindingType.Animation;
|
||||
securityContext = SecurityContext.NONE;
|
||||
if (boundPropertyName[0] == '@') {
|
||||
this._reportError(
|
||||
`Assigning animation triggers within host data as attributes such as "@prop": "exp" is invalid. Use host bindings (e.g. "[@prop]": "exp") instead.`,
|
||||
sourceSpan, ParseErrorLevel.FATAL);
|
||||
boundPropertyName = boundPropertyName.substr(1);
|
||||
}
|
||||
} else {
|
||||
boundPropertyName = this._schemaRegistry.getMappedPropName(partValue);
|
||||
securityContext = this._schemaRegistry.securityContext(elementName, boundPropertyName);
|
||||
|
|
|
@ -301,21 +301,6 @@ Can't bind to 'invalidProp' since it isn't a known property of 'my-component'.
|
|||
/Assigning animation triggers via @prop="exp" attributes with an expression is invalid. Use property bindings \(e.g. \[@prop\]="exp"\) or use an attribute without a value \(e.g. @prop\) instead. \("<div \[ERROR ->\]@something="value2">"\): TestComp@0:5/);
|
||||
});
|
||||
|
||||
it('should throw an error when host attributes contain a non property-bound animation trigger',
|
||||
() => {
|
||||
expect(() => {
|
||||
var dirA = CompileDirectiveMetadata.create({
|
||||
selector: 'div',
|
||||
type: new CompileTypeMetadata({moduleUrl: someModuleUrl, name: 'DirA'}),
|
||||
host: {'@prop': 'expr'}
|
||||
});
|
||||
|
||||
humanizeTplAst(parse('<div></div>', [dirA]));
|
||||
})
|
||||
.toThrowError(
|
||||
/Assigning animation triggers within host data as attributes such as "@prop": "exp" is invalid. Use host bindings \(e.g. "\[@prop\]": "exp"\) instead. \("\[ERROR ->\]<div><\/div>"\): TestComp@0:0, Directive DirA/);
|
||||
});
|
||||
|
||||
it('should not issue a warning when host attributes contain a valid property-bound animation trigger',
|
||||
() => {
|
||||
var dirA = CompileDirectiveMetadata.create({
|
||||
|
|
|
@ -112,24 +112,6 @@ export function beforeEachProviders(fn: Function): void {
|
|||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Allows overriding default providers of the test injector,
|
||||
* which are defined in test_injector.js
|
||||
*
|
||||
* @deprecated Use `TestBed.configureTestingModule instead.
|
||||
*/
|
||||
export function addProviders(providers: Array<any>): void {
|
||||
if (!providers) return;
|
||||
TestBed.configureTestingModule({providers: providers});
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @deprecated
|
||||
*/
|
||||
export function beforeEachBindings(fn: Function): void {
|
||||
beforeEachProviders(fn);
|
||||
}
|
||||
|
||||
function _it(jsmFn: Function, name: string, testFn: Function, testTimeOut: number): void {
|
||||
if (runnerStack.length == 0) {
|
||||
|
|
|
@ -114,8 +114,6 @@ export class UpgradeAdapter {
|
|||
/* @internal */
|
||||
private providers: Provider[] = [];
|
||||
|
||||
// the ng2AppModule param should be required once the deprecated @Component.directives prop is
|
||||
// removed
|
||||
constructor(private ng2AppModule: Type<any>) {
|
||||
if (!ng2AppModule) {
|
||||
throw new BaseException(
|
||||
|
|
|
@ -284,41 +284,6 @@ export function main() {
|
|||
ref.dispose();
|
||||
});
|
||||
}));
|
||||
|
||||
|
||||
// this test should be removed ones the deprecated @Components.directives prop is removed
|
||||
// we should rewrite all of the tests in this file to use modules instead.
|
||||
it('should downgrade ng2 component that is part of a module', async(() => {
|
||||
const ng1Module = angular.module('ng1', []);
|
||||
|
||||
ng1Module.component('ng1Component', {template: '<ng2-component></ng2-component>'});
|
||||
|
||||
const SpecialValue = new OpaqueToken('special test value');
|
||||
|
||||
const Ng2Component = Component({
|
||||
selector: 'ng2-component',
|
||||
template: '<span>test: {{value}}</span>'
|
||||
}).Class({
|
||||
constructor: [
|
||||
Inject(SpecialValue), function Ng2Component(value: number) { this.value = value; }
|
||||
]
|
||||
});
|
||||
const Ng2AppModule =
|
||||
NgModule({
|
||||
declarations: [Ng2Component],
|
||||
imports: [BrowserModule],
|
||||
providers: [{provide: SpecialValue, useValue: 23}]
|
||||
}).Class({constructor: function Ng2AppModule() {}, ngDoBootstrap: function() {}});
|
||||
|
||||
const adapter = new UpgradeAdapter(Ng2AppModule);
|
||||
ng1Module.directive('ng2Component', adapter.downgradeNg2Component(Ng2Component));
|
||||
var element = html('<ng1-component></ng1-component>');
|
||||
adapter.bootstrap(element, ['ng1']).ready((ref) => {
|
||||
expect(multiTrim(document.body.getElementsByTagName('ng2-component')[0].innerHTML))
|
||||
.toEqual('<span>test: 23</span>');
|
||||
ref.dispose();
|
||||
});
|
||||
}));
|
||||
});
|
||||
|
||||
describe('upgrade ng1 component', () => {
|
||||
|
|
|
@ -16,7 +16,6 @@ System.config({
|
|||
'@angular/common': {main: 'index.js', defaultExtension: 'js'},
|
||||
'@angular/platform-browser': {main: 'index.js', defaultExtension: 'js'},
|
||||
'@angular/platform-browser-dynamic': {main: 'index.js', defaultExtension: 'js'},
|
||||
'@angular/router-deprecated': {main: 'index.js', defaultExtension: 'js'},
|
||||
'rxjs': {
|
||||
defaultExtension: 'js'
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue