Skip to content

Commit f9cb724

Browse files
author
vakrilov
committed
cssClasses renamed to ngCssClasses
1 parent 48e5fb8 commit f9cb724

File tree

2 files changed

+12
-15
lines changed

2 files changed

+12
-15
lines changed

Diff for: nativescript-angular/element-registry.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export interface ViewClassMeta {
1212
export interface ViewExtensions {
1313
nodeName: string;
1414
templateParent: NgView;
15-
cssClasses: Map<string, boolean>;
15+
ngCssClasses: Map<string, boolean>;
1616
meta: ViewClassMeta;
1717
}
1818

@@ -22,7 +22,7 @@ export interface ViewClass {
2222

2323
const defaultViewMeta: ViewClassMeta = {
2424
skipAddToDom: false,
25-
}
25+
};
2626

2727
const elementMap: Map<string, { resolver: ViewResolver, meta?: ViewClassMeta }> = new Map<string, { resolver: ViewResolver, meta?: ViewClassMeta }>();
2828
const camelCaseSplit = /([a-z0-9])([A-Z])/g;

Diff for: nativescript-angular/view-util.ts

+10-13
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@ import {View} from "ui/core/view";
33
import {Placeholder} from "ui/placeholder";
44
import {ContentView} from 'ui/content-view';
55
import {LayoutBase} from 'ui/layouts/layout-base';
6-
import {ViewClass, getViewClass, getViewMeta, isKnownView, ViewExtensions, NgView, ViewClassMeta} from './element-registry';
6+
import {ViewClass, getViewClass, getViewMeta, isKnownView, ViewExtensions, NgView} from './element-registry';
77
import {getSpecialPropertySetter} from "ui/builder/special-properties";
8-
import * as styleProperty from "ui/styling/style-property";
98
import {StyleProperty, getPropertyByName, withStyleProperty} from "ui/styling/style-property";
109
import {ValueSource} from "ui/core/dependency-observable";
11-
import { ActionBar, ActionItem, NavigationButton } from "ui/action-bar";
12-
import {device, platformNames, Device} from "platform";
10+
import {platformNames, Device} from "platform";
1311
import {rendererLog as traceLog, styleError} from "./trace";
1412

1513
const IOS_PREFX: string = "@ios:";
@@ -160,7 +158,7 @@ export class ViewUtil {
160158
}
161159

162160
private platformFilter(attribute: string): string {
163-
var lowered = attribute.toLowerCase();
161+
let lowered = attribute.toLowerCase();
164162
if (lowered.indexOf(IOS_PREFX) === 0) {
165163
if (this.isIos) {
166164
return attribute.substr(IOS_PREFX.length);
@@ -194,7 +192,7 @@ export class ViewUtil {
194192
let propMap = this.getProperties(view);
195193
let i = 0;
196194
while (i < properties.length - 1 && isDefined(view)) {
197-
var prop = properties[i];
195+
let prop = properties[i];
198196
if (propMap.has(prop)) {
199197
prop = propMap.get(prop);
200198
}
@@ -237,7 +235,7 @@ export class ViewUtil {
237235
return value;
238236
}
239237

240-
var valueAsNumber = +value;
238+
let valueAsNumber = +value;
241239
if (!isNaN(valueAsNumber)) {
242240
return valueAsNumber;
243241
} else if (value && (value.toLowerCase() === "true" || value.toLowerCase() === "false")) {
@@ -254,8 +252,8 @@ export class ViewUtil {
254252
}
255253

256254
if (!propertyMaps.has(type)) {
257-
var propMap = new Map<string, string>();
258-
for (var propName in instance) {
255+
let propMap = new Map<string, string>();
256+
for (let propName in instance) {
259257
propMap.set(propName.toLowerCase(), propName);
260258
}
261259
propertyMaps.set(type, propMap);
@@ -264,10 +262,10 @@ export class ViewUtil {
264262
}
265263

266264
private cssClasses(view: NgView) {
267-
if (!view.cssClasses) {
268-
view.cssClasses = new Map<string, boolean>();
265+
if (!view.ngCssClasses) {
266+
view.ngCssClasses = new Map<string, boolean>();
269267
}
270-
return view.cssClasses;
268+
return view.ngCssClasses;
271269
}
272270

273271
public addClass(view: NgView, className: string): void {
@@ -317,7 +315,6 @@ export class ViewUtil {
317315
withStyleProperty(name, resolvedValue, (property, value) => {
318316
if (isString(property)) {
319317
//Fall back to resolving property by name.
320-
const propertyName = <string>property;
321318
const resolvedProperty = getPropertyByName(name);
322319
if (resolvedProperty) {
323320
this.setStyleValue(view, resolvedProperty, resolvedValue);

0 commit comments

Comments
 (0)