honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(render): misc minor fixes

This commit is contained in:
Victor Berchet 2015-04-02 15:29:40 +02:00
parent 09948f4403
commit 1037cef22e
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/angular2/src/render/dom/compiler/property_binding_parser.js vendored
View File

@ -1,7 +1,7 @@
import {isPresent, isBlank, RegExpWrapper, BaseException, StringWrapper} from 'angular2/src/facade/lang'; import {isPresent, RegExpWrapper} from 'angular2/src/facade/lang';
import {MapWrapper} from 'angular2/src/facade/collection'; import {MapWrapper} from 'angular2/src/facade/collection';
import {Parser, AST, ExpressionWithSource} from 'angular2/change_detection'; import {Parser} from 'angular2/change_detection';
import {CompileStep} from './compile_step'; import {CompileStep} from './compile_step';
import {CompileElement} from './compile_element'; import {CompileElement} from './compile_element';
@ -10,16 +10,14 @@ import {CompileControl} from './compile_control';
import {dashCaseToCamelCase} from '../util'; import {dashCaseToCamelCase} from '../util';
import {setterFactory} from './property_setter_factory'; import {setterFactory} from './property_setter_factory';
// Group 1 = "bind" // Group 1 = "bind-"
// Group 2 = "var" // Group 2 = "var-" or "#"
// Group 3 = "on" // Group 3 = "on-"
// Group 4 = the identifier after "bind", "var", or "on" // Group 4 = the identifier after "bind-", "var-/#", or "on-"
// Group 5 = idenitifer inside square braces // Group 5 = idenitifer inside square braces
// Group 6 = identifier inside parenthesis // Group 6 = identifier inside parenthesis
// Group 7 = "#"
// Group 8 = identifier after "#"
var BIND_NAME_REGEXP = RegExpWrapper.create( var BIND_NAME_REGEXP = RegExpWrapper.create(
'^(?:(?:(?:(bind)|(var)|(on))-(.+))|\\[([^\\]]+)\\]|\\(([^\\)]+)\\)|(#)(.+))$'); '^(?:(?:(?:(bind-)|(var-|#)|(on-))(.+))|\\[([^\\]]+)\\]|\\(([^\\)]+)\\))$');
/** /**
* Parses the property bindings on a single element. * Parses the property bindings on a single element.
@ -46,10 +44,9 @@ export class PropertyBindingParser extends CompileStep {
if (isPresent(bindParts[1])) { if (isPresent(bindParts[1])) {
// match: bind-prop // match: bind-prop
this._bindProperty(bindParts[4], attrValue, current, newAttrs); this._bindProperty(bindParts[4], attrValue, current, newAttrs);
} else if (isPresent(bindParts[2]) || isPresent(bindParts[7])) { } else if (isPresent(bindParts[2])) {
// match: var-name / var-name="iden" / #name / #name="iden" // match: var-name / var-name="iden" / #name / #name="iden"
var identifier = (isPresent(bindParts[4]) && bindParts[4] !== '') ? var identifier = bindParts[4];
bindParts[4] : bindParts[8];
var value = attrValue == '' ? '\$implicit' : attrValue; var value = attrValue == '' ? '\$implicit' : attrValue;
this._bindVariable(identifier, value, current, newAttrs); this._bindVariable(identifier, value, current, newAttrs);
} else if (isPresent(bindParts[3])) { } else if (isPresent(bindParts[3])) {

7
modules/angular2/test/render/dom/shadow_dom_emulation_integration_spec.js vendored
View File

@ -31,10 +31,10 @@ import {IntegrationTestbed} from './integration_testbed';
export function main() { export function main() {
describe('ShadowDom integration tests', function() { describe('ShadowDom integration tests', function() {
var urlResolver, styleUrlResolver, styleInliner, styleHost; var urlResolver, styleUrlResolver, styleInliner;
var strategies = { var strategies = {
"scoped" : () => new EmulatedScopedShadowDomStrategy(styleInliner, styleUrlResolver, styleHost), "scoped" : () => new EmulatedScopedShadowDomStrategy(styleInliner, styleUrlResolver, null),
"unscoped" : () => new EmulatedUnscopedShadowDomStrategy(styleUrlResolver, styleHost) "unscoped" : () => new EmulatedUnscopedShadowDomStrategy(styleUrlResolver, null)
} }
if (DOM.supportsNativeShadowDOM()) { if (DOM.supportsNativeShadowDOM()) {
StringMapWrapper.set(strategies, "native", () => new NativeShadowDomStrategy(styleUrlResolver)); StringMapWrapper.set(strategies, "native", () => new NativeShadowDomStrategy(styleUrlResolver));
@ -48,7 +48,6 @@ export function main() {
var testbed, renderer, rootEl, compile, strategy; var testbed, renderer, rootEl, compile, strategy;
beforeEach( () => { beforeEach( () => {
styleHost = el('<div></div>');
urlResolver = new UrlResolver(); urlResolver = new UrlResolver();
styleUrlResolver = new StyleUrlResolver(urlResolver); styleUrlResolver = new StyleUrlResolver(urlResolver);
styleInliner = new StyleInliner(null, styleUrlResolver, urlResolver); styleInliner = new StyleInliner(null, styleUrlResolver, urlResolver);