Fix typescript 1.6 compile errors.

hdeshev · hdeshev · commit 9fbcf5f14362 · 2015-09-18T11:20:17.000+03:00
- Remove unknown properties in object literals.
- Don't use module-level `delete` statements.
diff --git a/apps/tests/layouts/dock-layout-tests.ts b/apps/tests/layouts/dock-layout-tests.ts
@@ -50,9 +50,9 @@ export function setUpModule() {
 
 export function tearDownModule() {
     navHelper.goBack();
-    delete testPage;
-    delete rootLayout;
-    delete tmp;
+    testPage = null;
+    rootLayout = null;
+    tmp = null;
 }
 
 export function setUp() {
@@ -212,4 +212,4 @@ export function test_codesnippets() {
     dockLayout.addChild(btnDockedToRight);
     // ```
     // </snippet>
-}
+}
diff --git a/apps/tests/layouts/grid-layout-tests.ts b/apps/tests/layouts/grid-layout-tests.ts
@@ -52,9 +52,9 @@ export function setUpModule() {
 export function tearDownModule() {
     navHelper.goBack();
 
-    delete tmp;
-    delete newPage;
-    delete rootLayout;
+    tmp = null;
+    newPage = null;
+    rootLayout = null;
 }
 
 export function setUp() {
diff --git a/apps/tests/layouts/stack-layout-tests.ts b/apps/tests/layouts/stack-layout-tests.ts
@@ -29,11 +29,11 @@ export function setUpModule() {
 
 export function tearDownModule() {
     navHelper.goBack();
-    delete tmp;
-    delete newPage;
-    delete rootLayout;
-    delete btn1;
-    delete btn2;
+    tmp = null;
+    newPage = null;
+    rootLayout = null;
+    btn1 = null;
+    btn2 = null;
 }
 
 export function setUp() {
diff --git a/apps/tests/ui/scroll-view/scroll-view-tests.ts b/apps/tests/ui/scroll-view/scroll-view-tests.ts
@@ -49,9 +49,9 @@ export function setUpModule() {
 
 export function tearDownModule() {
     helper.goBack();
-    delete tmp;
-    delete newPage;
-    delete scrollView;
+    tmp = null;
+    newPage = null;
+    scrollView = null;
 }
 
 export function setUp() {
diff --git a/apps/tests/ui/style/style-properties-tests.ts b/apps/tests/ui/style/style-properties-tests.ts
@@ -25,8 +25,8 @@ export function setUpModule() {
 
 export function tearDownModule() {
     helper.goBack();
-    delete testBtn;
-    delete testPage;
+    testBtn = null;
+    testPage = null;
 }
 
 export function tearDown() {
@@ -362,4 +362,4 @@ function test_native_font(style: string, weight: string) {
         TKUnit.assertEqual((<UIButton>testView.ios).titleLabel.font.fontName.toLowerCase(), (fontName + "-" + fontNameSuffix).toLowerCase(), "native font " + weight + " " + style);
     }
     //TODO: If needed add tests for other platforms
-}
+}
diff --git a/data/observable/observable.d.ts b/data/observable/observable.d.ts
@@ -97,7 +97,7 @@ declare module "data/observable" {
          * Notifies all the registered listeners for the event provided in the data.eventName.
          * @param data The data associated with the event.
          */
-        notify(data: EventData): void;
+        notify<T extends EventData>(data: T): void;
 
         /**
          * Notifies all the registered listeners for the property change event.
@@ -119,4 +119,4 @@ declare module "data/observable" {
         _emit(eventNames: string);
         //@endprivate
     }
-}
+}
diff --git a/data/observable/observable.ts b/data/observable/observable.ts
@@ -118,7 +118,7 @@ export class Observable implements definition.Observable {
         this[data.propertyName] = data.value;
     }
 
-    public notify(data: definition.EventData) {
+    public notify<T extends definition.EventData>(data: T) {
         var observers = this._getEventList(data.eventName);
         if (!observers) {
             return;
@@ -197,4 +197,4 @@ export class Observable implements definition.Observable {
     public toString(): string {
         return this.typeName;
     }
-}
+}
diff --git a/ui/animation/animation.ios.ts b/ui/animation/animation.ios.ts
@@ -272,8 +272,7 @@ export class Animation extends common.Animation implements definition.Animation
                         value: Animation._affineTransform(CGAffineTransformIdentity, propertyAnimations[i].property, propertyAnimations[i].value),
                         duration: propertyAnimations[i].duration,
                         delay: propertyAnimations[i].delay,
-                        iterations: propertyAnimations[i].iterations,
-                        iosUIViewAnimationCurve: propertyAnimations[i].curve
+                        iterations: propertyAnimations[i].iterations
                     };
                     trace.write("Created new transform animation: " + common.Animation._getAnimationInfo(newTransformAnimation), trace.categories.Animation);
 
@@ -299,4 +298,4 @@ export class Animation extends common.Animation implements definition.Animation
 
         return result;
     }
-}
+}
diff --git a/ui/builder/component-builder.ts b/ui/builder/component-builder.ts
@@ -101,8 +101,6 @@ export function getComponentModule(elementName: string, namespace: string, attri
     }
 
     if (instance && instanceModule) {
-        var bindings = new Array<bindable.BindingOptions>();
-
         for (var attr in attributes) {
 
             var attrValue = <string>attributes[attr];
@@ -136,7 +134,7 @@ export function getComponentModule(elementName: string, namespace: string, attri
             }
         }
 
-        componentModule = { component: instance, exports: instanceModule, bindings: bindings };
+        componentModule = {component: instance, exports: instanceModule};
     }
 
     return componentModule;
diff --git a/ui/button/button.android.ts b/ui/button/button.android.ts
@@ -2,6 +2,10 @@
 
 global.moduleMerge(common, exports);
 
+interface Owned {
+    owner: any;
+}
+
 export class Button extends common.Button {
     private _android: android.widget.Button;
     private _isPressed: boolean;
@@ -22,7 +26,8 @@ export class Button extends common.Button {
 
         this._android = new android.widget.Button(this._context);
 
-        this._android.setOnClickListener(new android.view.View.OnClickListener({
+        this._android.setOnClickListener(new android.view.View.OnClickListener(
+            <Owned & android.view.View.IOnClickListener>{
             get owner() {
                 return that.get();
             },
@@ -34,4 +39,4 @@ export class Button extends common.Button {
             }
         }));
     }
-}
+}
diff --git a/ui/date-picker/date-picker.android.ts b/ui/date-picker/date-picker.android.ts
@@ -65,6 +65,10 @@ function onMinDatePropertyChanged(data: dependencyObservable.PropertyChangeData)
 
 global.moduleMerge(common, exports);
 
+interface Owned {
+    owner: any;
+}
+
 export class DatePicker extends common.DatePicker {
     private _android: android.widget.DatePicker;
     public _listener: android.widget.DatePicker.OnDateChangedListener;
@@ -78,7 +82,8 @@ export class DatePicker extends common.DatePicker {
 
         var that = new WeakRef(this);
 
-        this._listener = new android.widget.DatePicker.OnDateChangedListener({
+        this._listener = new android.widget.DatePicker.OnDateChangedListener(
+            <Owned & android.widget.DatePicker.IOnDateChangedListener>{
             get owner() {
                 return that.get();
             },
@@ -107,4 +112,4 @@ export class DatePicker extends common.DatePicker {
         this._android.setCalendarViewShown(false);
         this._android.init(0, 0, 0, this._listener);
     }
-} 
+} 
diff --git a/ui/list-picker/list-picker.android.ts b/ui/list-picker/list-picker.android.ts
@@ -4,6 +4,10 @@ import types = require("utils/types");
 
 global.moduleMerge(common, exports);
 
+interface Owned {
+    owner: any;
+}
+
 export class ListPicker extends common.ListPicker {
     private _android: android.widget.NumberPicker;
     private _valueChangedListener: android.widget.NumberPicker.OnValueChangeListener;
@@ -28,7 +32,8 @@ export class ListPicker extends common.ListPicker {
 
         var that = new WeakRef(this);
 
-        this._formatter = new android.widget.NumberPicker.Formatter({
+        this._formatter = new android.widget.NumberPicker.Formatter(
+            <Owned & android.widget.NumberPicker.IFormatter>{
             get owner(): ListPicker {
                 return that.get();
             },
@@ -43,7 +48,7 @@ export class ListPicker extends common.ListPicker {
         });
         this._android.setFormatter(this._formatter);
 
-        this._valueChangedListener = new android.widget.NumberPicker.OnValueChangeListener({
+        this._valueChangedListener = new android.widget.NumberPicker.OnValueChangeListener(<Owned & android.widget.NumberPicker.IOnValueChangeListener>{
             get owner() {
                 return that.get();
             },
@@ -106,4 +111,4 @@ export class ListPicker extends common.ListPicker {
         this._editText.invalidate(); //Force the EditText to redraw
         this.android.invalidate();
     }
-} 
+} 
diff --git a/ui/list-view/list-view.android.ts b/ui/list-view/list-view.android.ts
@@ -27,6 +27,10 @@ function onSeparatorColorPropertyChanged(data: dependencyObservable.PropertyChan
     }
 }
 
+interface Owned {
+    owner: any;
+}
+
 // register the setNativeValue callbacks
 (<proxy.PropertyMetadata>common.ListView.separatorColorProperty.metadata).onSetNativeValue = onSeparatorColorPropertyChanged;
 
@@ -50,7 +54,7 @@ export class ListView extends common.ListView {
         var that = new WeakRef(this);
 
         // TODO: This causes many marshalling calls, rewrite in Java and generate bindings
-        this.android.setOnScrollListener(new android.widget.AbsListView.OnScrollListener({
+        this.android.setOnScrollListener(new android.widget.AbsListView.OnScrollListener(<Owned & android.widget.AbsListView.IOnScrollListener>{
             onScrollStateChanged: function (view: android.widget.AbsListView, scrollState: number) {
                 var owner: ListView = this.owner;
                 if (!owner) {
diff --git a/ui/search-bar/search-bar.android.ts b/ui/search-bar/search-bar.android.ts
@@ -92,6 +92,10 @@ function _changeSearchViewHintColor(bar: android.widget.SearchView, color: numbe
 
 global.moduleMerge(common, exports);
 
+interface Owned {
+    owner: any;
+}
+
 export class SearchBar extends common.SearchBar {
     private _android: android.widget.SearchView;
 
@@ -101,7 +105,7 @@ export class SearchBar extends common.SearchBar {
         this._android.setIconified(false);
 
         var that = new WeakRef(this);
-        this._android.setOnQueryTextListener(new android.widget.SearchView.OnQueryTextListener({
+        this._android.setOnQueryTextListener(new android.widget.SearchView.OnQueryTextListener(<Owned & android.widget.SearchView.IOnQueryTextListener>{
             get owner() {
                 return that.get();
             },
@@ -132,7 +136,7 @@ export class SearchBar extends common.SearchBar {
             }
         }));
 
-        this._android.setOnCloseListener(new android.widget.SearchView.OnCloseListener({
+        this._android.setOnCloseListener(new android.widget.SearchView.OnCloseListener(<Owned & android.widget.SearchView.IOnCloseListener>{
             get owner() {
                 return that.get();
             },
@@ -156,4 +160,4 @@ export class SearchBar extends common.SearchBar {
     get android(): android.widget.SearchView {
         return this._android;
     }
-} 
+} 
diff --git a/ui/switch/switch.android.ts b/ui/switch/switch.android.ts
@@ -16,6 +16,10 @@ function onCheckedPropertyChanged(data: dependencyObservable.PropertyChangeData)
 
 global.moduleMerge(common, exports);
 
+interface Owned {
+    owner: any;
+}
+
 export class Switch extends common.Switch {
     private _android: android.widget.Switch;
 
@@ -28,7 +32,7 @@ export class Switch extends common.Switch {
 
         var that = new WeakRef(this);
 
-        this._android.setOnCheckedChangeListener(new android.widget.CompoundButton.OnCheckedChangeListener({
+        this._android.setOnCheckedChangeListener(new android.widget.CompoundButton.OnCheckedChangeListener(<Owned & android.widget.CompoundButton.IOnCheckedChangeListener>{
             get owner() {
                 return that.get();
             },
@@ -40,4 +44,4 @@ export class Switch extends common.Switch {
             }
         }));
     }
-} 
+} 
diff --git a/ui/time-picker/time-picker.android.ts b/ui/time-picker/time-picker.android.ts
@@ -18,6 +18,10 @@ function onMinutePropertyChanged(data: dependencyObservable.PropertyChangeData)
 
 global.moduleMerge(common, exports);
 
+interface Owned {
+    owner: any;
+}
+
 export class TimePicker extends common.TimePicker {
     private _android: android.widget.TimePicker;
     private _listener: android.widget.TimePicker.OnTimeChangedListener;
@@ -32,7 +36,8 @@ export class TimePicker extends common.TimePicker {
 
         var that = new WeakRef(this);
 
-        this._listener = new android.widget.TimePicker.OnTimeChangedListener({
+        this._listener = new android.widget.TimePicker.OnTimeChangedListener(
+            <Owned & android.widget.TimePicker.IOnTimeChangedListener>{
             get owner() {
                 return that.get();
             },
@@ -80,4 +85,4 @@ export class TimePicker extends common.TimePicker {
             this._isSettingTime = false;
         }
     }
-} 
+} 

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@ export function setUpModule() {`
`25`	`25`
`26`	`26`	`export function tearDownModule() {`
`27`	`27`	`helper.goBack();`
`28`		`- delete testBtn;`
`29`		`- delete testPage;`
	`28`	`+ testBtn = null;`
	`29`	`+ testPage = null;`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`export function tearDown() {`
`@@ -362,4 +362,4 @@ function test_native_font(style: string, weight: string) {`
`362`	`362`	`TKUnit.assertEqual((<UIButton>testView.ios).titleLabel.font.fontName.toLowerCase(), (fontName + "-" + fontNameSuffix).toLowerCase(), "native font " + weight + " " + style);`
`363`	`363`	`}`
`364`	`364`	`//TODO: If needed add tests for other platforms`
`365`		`-}`
	`365`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ export class Observable implements definition.Observable {`
`118`	`118`	`this[data.propertyName] = data.value;`
`119`	`119`	`}`
`120`	`120`
`121`		`- public notify(data: definition.EventData) {`
	`121`	`+ public notify<T extends definition.EventData>(data: T) {`
`122`	`122`	`var observers = this._getEventList(data.eventName);`
`123`	`123`	`if (!observers) {`
`124`	`124`	`return;`
`@@ -197,4 +197,4 @@ export class Observable implements definition.Observable {`
`197`	`197`	`public toString(): string {`
`198`	`198`	`return this.typeName;`
`199`	`199`	`}`
`200`		`-}`
	`200`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -101,8 +101,6 @@ export function getComponentModule(elementName: string, namespace: string, attri`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`if (instance && instanceModule) {`
`104`		`- var bindings = new Array<bindable.BindingOptions>();`
`105`		`-`
`106`	`104`	`for (var attr in attributes) {`
`107`	`105`
`108`	`106`	`var attrValue = <string>attributes[attr];`
`@@ -136,7 +134,7 @@ export function getComponentModule(elementName: string, namespace: string, attri`
`136`	`134`	`}`
`137`	`135`	`}`
`138`	`136`
`139`		`- componentModule = { component: instance, exports: instanceModule, bindings: bindings };`
	`137`	`+ componentModule = {component: instance, exports: instanceModule};`
`140`	`138`	`}`
`141`	`139`
`142`	`140`	`return componentModule;`