From 87549c77d4114841f48f243acf84aecf712b735f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matias=20Niemel=C3=A4?= Date: Wed, 18 Nov 2015 15:59:25 -0800 Subject: [PATCH] chore(core): proper camelcasing for `styleName` and `styleValue` --- .../src/platform/browser/browser_adapter.dart | 18 +++++++++--------- .../src/platform/browser/browser_adapter.ts | 6 +++--- .../angular2/src/platform/dom/dom_adapter.ts | 8 ++++---- .../platform/server/abstract_html_adapter.dart | 6 +++--- .../src/platform/server/parse5_adapter.ts | 16 ++++++++-------- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/modules/angular2/src/platform/browser/browser_adapter.dart b/modules/angular2/src/platform/browser/browser_adapter.dart index 507a6502de..551a7dc7be 100644 --- a/modules/angular2/src/platform/browser/browser_adapter.dart +++ b/modules/angular2/src/platform/browser/browser_adapter.dart @@ -332,21 +332,21 @@ class BrowserDomAdapter extends GenericBrowserDomAdapter { bool hasClass(Element element, String classname) => element.classes.contains(classname); - void setStyle(Element element, String stylename, String stylevalue) { - element.style.setProperty(stylename, stylevalue); + void setStyle(Element element, String styleName, String styleValue) { + element.style.setProperty(styleName, styleValue); } - bool hasStyle(Element element, String stylename, [String stylevalue]) { - var value = this.getStyle(element, stylename); - return isPresent(stylevalue) ? value == stylevalue : value.length > 0; + bool hasStyle(Element element, String styleName, [String styleValue]) { + var value = this.getStyle(element, styleName); + return isPresent(styleValue) ? value == styleValue : value.length > 0; } - void removeStyle(Element element, String stylename) { - element.style.removeProperty(stylename); + void removeStyle(Element element, String styleName) { + element.style.removeProperty(styleName); } - String getStyle(Element element, String stylename) { - return element.style.getPropertyValue(stylename); + String getStyle(Element element, String styleName) { + return element.style.getPropertyValue(styleName); } String tagName(Element element) => element.tagName; diff --git a/modules/angular2/src/platform/browser/browser_adapter.ts b/modules/angular2/src/platform/browser/browser_adapter.ts index 53f586fd5c..5aa9403d22 100644 --- a/modules/angular2/src/platform/browser/browser_adapter.ts +++ b/modules/angular2/src/platform/browser/browser_adapter.ts @@ -207,9 +207,9 @@ export class BrowserDomAdapter extends GenericBrowserDomAdapter { } removeStyle(element, stylename: string) { element.style[stylename] = null; } getStyle(element, stylename: string): string { return element.style[stylename]; } - hasStyle(element, stylename: string, stylevalue: string = null): boolean { - var value = this.getStyle(element, stylename) || ''; - return stylevalue ? value == stylevalue : value.length > 0; + hasStyle(element, styleName: string, styleValue: string = null): boolean { + var value = this.getStyle(element, styleName) || ''; + return styleValue ? value == styleValue : value.length > 0; } tagName(element): string { return element.tagName; } attributeMap(element): Map { diff --git a/modules/angular2/src/platform/dom/dom_adapter.ts b/modules/angular2/src/platform/dom/dom_adapter.ts index 968ea19c8c..8577e31632 100644 --- a/modules/angular2/src/platform/dom/dom_adapter.ts +++ b/modules/angular2/src/platform/dom/dom_adapter.ts @@ -86,10 +86,10 @@ export abstract class DomAdapter { abstract addClass(element, classname: string); abstract removeClass(element, classname: string); abstract hasClass(element, classname: string): boolean; - abstract setStyle(element, stylename: string, stylevalue: string); - abstract removeStyle(element, stylename: string); - abstract getStyle(element, stylename: string): string; - abstract hasStyle(element, stylename: string, stylevalue?: string): boolean; + abstract setStyle(element, styleName: string, styleValue: string); + abstract removeStyle(element, styleName: string); + abstract getStyle(element, styleName: string): string; + abstract hasStyle(element, styleName: string, styleValue?: string): boolean; abstract tagName(element): string; abstract attributeMap(element): Map; abstract hasAttribute(element, attribute: string): boolean; diff --git a/modules/angular2/src/platform/server/abstract_html_adapter.dart b/modules/angular2/src/platform/server/abstract_html_adapter.dart index d8af52c1cd..1481546fdf 100644 --- a/modules/angular2/src/platform/server/abstract_html_adapter.dart +++ b/modules/angular2/src/platform/server/abstract_html_adapter.dart @@ -263,7 +263,7 @@ abstract class AbstractHtml5LibAdapter implements DomAdapter { hasClass(element, String classname) => element.classes.contains(classname); - setStyle(element, String stylename, String stylevalue) { + setStyle(element, String styleName, String styleValue) { throw 'not implemented'; } @@ -271,11 +271,11 @@ abstract class AbstractHtml5LibAdapter implements DomAdapter { throw 'not implemented'; } - removeStyle(element, String stylename) { + removeStyle(element, String styleName) { throw 'not implemented'; } - getStyle(element, String stylename) { + getStyle(element, String styleName) { throw 'not implemented'; } diff --git a/modules/angular2/src/platform/server/parse5_adapter.ts b/modules/angular2/src/platform/server/parse5_adapter.ts index b9c4944a09..bf5886e549 100644 --- a/modules/angular2/src/platform/server/parse5_adapter.ts +++ b/modules/angular2/src/platform/server/parse5_adapter.ts @@ -371,9 +371,9 @@ export class Parse5DomAdapter extends DomAdapter { hasClass(element, classname: string): boolean { return ListWrapper.contains(this.classList(element), classname); } - hasStyle(element, stylename: string, stylevalue: string = null): boolean { - var value = this.getStyle(element, stylename) || ''; - return stylevalue ? value == stylevalue : value.length > 0; + hasStyle(element, styleName: string, styleValue: string = null): boolean { + var value = this.getStyle(element, styleName) || ''; + return styleValue ? value == styleValue : value.length > 0; } /** @internal */ _readStyleAttribute(element) { @@ -402,15 +402,15 @@ export class Parse5DomAdapter extends DomAdapter { } element.attribs["style"] = styleAttrValue; } - setStyle(element, stylename: string, stylevalue: string) { + setStyle(element, styleName: string, styleValue: string) { var styleMap = this._readStyleAttribute(element); - styleMap[stylename] = stylevalue; + styleMap[styleName] = styleValue; this._writeStyleAttribute(element, styleMap); } - removeStyle(element, stylename: string) { this.setStyle(element, stylename, null); } - getStyle(element, stylename: string): string { + removeStyle(element, styleName: string) { this.setStyle(element, styleName, null); } + getStyle(element, styleName: string): string { var styleMap = this._readStyleAttribute(element); - return styleMap.hasOwnProperty(stylename) ? styleMap[stylename] : ""; + return styleMap.hasOwnProperty(styleName) ? styleMap[styleName] : ""; } tagName(element): string { return element.tagName == "style" ? "STYLE" : element.tagName; } attributeMap(element): Map {