Merge pull request #842 from NativeScript/typescript-1.6-moduleresolution

Change from "classic" TS 1.6 imports to the default resolution scheme.

application-settings/application-settings.android.ts

@@ -1,4 +1,4 @@
-import Common = require("application-settings/application-settings-common");
+import Common = require("./application-settings-common");
 import utils = require("utils/utils");
 
 var sharedPreferences = utils.ad.getApplicationContext().getSharedPreferences("prefs.db", 0);
@@ -63,4 +63,4 @@ export var remove = function (key: string): void {
     var editor = sharedPreferences.edit();
     editor.remove(key);
     editor.commit();
-}
+}

application-settings/application-settings.ios.ts

@@ -1,4 +1,4 @@
-import Common = require("application-settings/application-settings-common");
+import Common = require("./application-settings-common");
 
 var userDefaults = NSUserDefaults.standardUserDefaults();
 
@@ -58,4 +58,4 @@ export var remove = function (key: string): void {
     Common.checkKey(key);
     userDefaults.removeObjectForKey(key);
     userDefaults.synchronize();
-}
+}

application/application.android.ts

@@ -1,4 +1,4 @@
-import appModule = require("application/application-common");
+import appModule = require("./application-common");
 import dts = require("application");
 import frame = require("ui/frame");
 import types = require("utils/types");

application/application.ios.ts

@@ -1,4 +1,4 @@
-import appModule = require("application/application-common");
+import appModule = require("./application-common");
 import frame = require("ui/frame");
 import types = require("utils/types");
 import view = require("ui/core/view");
@@ -229,4 +229,4 @@ exports.start = function () {
 
         definition.notify({ eventName: definition.uncaughtErrorEvent, object: <any>definition.ios, ios: error });
     }
-}
+}

color/color.android.ts

@@ -1,4 +1,4 @@
-import common = require("color/color-common");
+import common = require("./color-common");
 
 export class Color extends common.Color {
     get android(): number {
@@ -8,4 +8,4 @@ export class Color extends common.Color {
     public _argbFromString(hex: string): number {
         return android.graphics.Color.parseColor(hex);
     }
-}
+}

color/color.ios.ts

@@ -1,4 +1,4 @@
-import common = require("color/color-common");
+import common = require("./color-common");
 
 var AMP = "#";
 
@@ -26,4 +26,4 @@ export class Color extends common.Color {
 
         return intVal;
     }
-} 
+} 

connectivity/connectivity.android.ts

@@ -1,5 +1,5 @@
 import appModule = require("application");
-import common = require("connectivity/connectivity-common");
+import common = require("./connectivity-common");
 import utils = require("utils/utils");
 
 global.moduleMerge(common, exports);
@@ -46,4 +46,4 @@ export function startMonitoring(connectionTypeChangedCallback: (newConnectionTyp
 
 export function stopMonitoring(): void {
     appModule.android.unregisterBroadcastReceiver(android.net.ConnectivityManager.CONNECTIVITY_ACTION);
-}
+}

connectivity/connectivity.ios.ts

@@ -1,4 +1,4 @@
-import common = require("connectivity/connectivity-common");
+import common = require("./connectivity-common");
 
 global.moduleMerge(common, exports);
 
@@ -84,4 +84,4 @@ export function stopMonitoring(): void {
         _monitorReachabilityRef = undefined;
         _connectionTypeChangedCallback = undefined;;
     }
-}
+}

globals/globals.ts

@@ -9,7 +9,7 @@ import platform = require("platform");
 import types = require("utils/types");
 import timer = require("timer");
 import consoleModule = require("console");
-import xhr = require("xhr/xhr");
+import xhr = require("../xhr/xhr");
 import dialogs = require("ui/dialogs");
 
 global.setTimeout = timer.setTimeout;

gruntfile.js

@@ -309,12 +309,6 @@ module.exports = function(grunt) {
                 outDir: localCfg.outModulesDir,
                 options: {
                     fast: 'never',
-
-                    // Resolve non-relative modules like "ui/styling/style"
-                    // based on the project root (not on node_modules which
-                    // is the typescript 1.6+ default)
-                    additionalFlags: '--moduleResolution classic',
-
                     module: "commonjs",
                     target: "es5",
                     sourceMap: false,

http/http-request.d.ts

@@ -1,5 +1,7 @@
 //@private
 
-import http = require("http");
+declare module "http/http-request" {
+    import http = require("http");
 
-export declare var request: (options: http.HttpRequestOptions) => Promise<http.HttpResponse>;
+    export var request: (options: http.HttpRequestOptions) => Promise<http.HttpResponse>;
+}

image-source/image-source.android.ts

@@ -1,7 +1,7 @@
 import types = require("utils/types");
 import fs = require("file-system");
 import definition = require("image-source");
-import common = require("image-source/image-source-common");
+import common = require("./image-source-common");
 import enums = require("ui/enums");
 import utils = require("utils/utils");
 
@@ -114,4 +114,4 @@ function getTargetFromat(format: string): android.graphics.Bitmap.CompressFormat
         default:
             return android.graphics.Bitmap.CompressFormat.PNG;
     }
-}
+}

image-source/image-source.ios.ts

@@ -1,7 +1,7 @@
 import definition = require("image-source");
 import types = require("utils/types");
 import fs = require("file-system");
-import common = require("image-source/image-source-common");
+import common = require("./image-source-common");
 import enums = require("ui/enums");
 
 global.moduleMerge(common, exports);

location/location.android.ts

@@ -1,6 +1,6 @@
 import enums = require("ui/enums");
 import locationModule = require("location");
-import common = require("location/location-common");
+import common = require("./location-common");
 import utils = require("utils/utils");
 
 global.moduleMerge(common, exports);
@@ -212,4 +212,4 @@ export class AndroidLocationManager implements locationModule.AndroidLocationMan
 	constructor(manager: android.location.LocationManager) {
 		this._manager = manager;
 	}
-}
+}

location/location.ios.ts

@@ -1,6 +1,6 @@
 import enums = require("ui/enums");
 import locationModule = require("location");
-import common = require("location/location-common");
+import common = require("./location-common");
 
 global.moduleMerge(common, exports);
 
@@ -175,4 +175,4 @@ export class iOSLocationManager implements locationModule.iOSLocationManager {
 	constructor(manager: CLLocationManager) {
 		this._manager = manager;
 	}
-}
+}

text/formatted-string.android.ts

@@ -1,4 +1,4 @@
-import formattedStringCommon = require("text/formatted-string-common");
+import formattedStringCommon = require("./formatted-string-common");
 import spanModule = require("text/span");
 
 global.moduleMerge(formattedStringCommon, exports);
@@ -26,4 +26,4 @@ export class FormattedString extends formattedStringCommon.FormattedString {
         }
         this._formattedText = ssb;
     }
-}
+}

text/formatted-string.ios.ts

@@ -1,4 +1,4 @@
-import formattedStringCommon = require("text/formatted-string-common");
+import formattedStringCommon = require("./formatted-string-common");
 import spanModule = require("text/span");
 
 global.moduleMerge(formattedStringCommon, exports);
@@ -26,4 +26,4 @@ export class FormattedString extends formattedStringCommon.FormattedString {
         }
         this._formattedText = mas;
     }
-}
+}

text/span.android.ts

@@ -1,4 +1,4 @@
-import spanCommon = require("text/span-common");
+import spanCommon = require("./span-common");
 import enums = require("ui/enums");
 import formattedString = require("text/formatted-string");
 import utils = require("utils/utils");
@@ -54,4 +54,4 @@ export class Span extends spanCommon.Span {
             this.spanModifiers.push(new android.text.style.StrikethroughSpan());
         }
     }
-}
+}

text/span.ios.ts

@@ -1,4 +1,4 @@
-import spanCommon = require("text/span-common");
+import spanCommon = require("./span-common");
 import enums = require("ui/enums");
 import formattedString = require("text/formatted-string");
 
@@ -75,4 +75,4 @@ export class Span extends spanCommon.Span {
             });
         }
     }
-}
+}

ui/action-bar/action-bar-common.ts

@@ -5,7 +5,7 @@ import dependencyObservable = require("ui/core/dependency-observable");
 import enums = require("ui/enums");
 import proxy = require("ui/core/proxy");
 import view = require("ui/core/view");
-import style = require("ui/styling/style");
+import style = require("../styling/style");
 import observable = require("ui/core/dependency-observable");
 
 var ACTION_ITEMS = "actionItems";

ui/action-bar/action-bar.android.ts

@@ -1,4 +1,4 @@
-import common = require("ui/action-bar/action-bar-common");
+import common = require("./action-bar-common");
 import trace = require("trace");
 import frame = require("ui/frame");
 import types = require("utils/types");
@@ -304,4 +304,4 @@ function getIconVisibility(iconVisibility: string): boolean {
         default:
             return false;
     }
-}
+}

ui/action-bar/action-bar.ios.ts

@@ -1,4 +1,4 @@
-import common = require("ui/action-bar/action-bar-common");
+import common = require("./action-bar-common");
 import dts = require("ui/action-bar");
 import imageSource = require("image-source");
 import frameModule = require("ui/frame");

ui/activity-indicator/activity-indicator.android.ts

@@ -1,4 +1,4 @@
-import aiCommon = require("ui/activity-indicator/activity-indicator-common");
+import aiCommon = require("./activity-indicator-common");
 import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
 import enums = require("ui/enums");
@@ -31,4 +31,4 @@ export class ActivityIndicator extends aiCommon.ActivityIndicator {
     get android(): android.widget.ProgressBar {
         return this._android;
     }
-} 
+} 

ui/activity-indicator/activity-indicator.ios.ts

@@ -1,4 +1,4 @@
-import aiCommon = require("ui/activity-indicator/activity-indicator-common");
+import aiCommon = require("./activity-indicator-common");
 import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
 
@@ -31,4 +31,4 @@ export class ActivityIndicator extends aiCommon.ActivityIndicator  {
     get ios(): UIActivityIndicatorView {
         return this._ios;
     }
-} 
+} 

ui/animation/animation.android.ts

@@ -1,5 +1,5 @@
 import definition = require("ui/animation");
-import common = require("ui/animation/animation-common");
+import common = require("./animation-common");
 import utils = require("utils/utils");
 import color = require("color");
 import trace = require("trace");
@@ -240,4 +240,4 @@ export class Animation extends common.Animation implements definition.Animation
         this._propertyUpdateCallbacks = this._propertyUpdateCallbacks.concat(propertyUpdateCallbacks);
         this._propertyResetCallbacks = this._propertyResetCallbacks.concat(propertyResetCallbacks);
     }
-}
+}

ui/animation/animation.ios.ts

@@ -1,5 +1,5 @@
 import definition = require("ui/animation");
-import common = require("ui/animation/animation-common");
+import common = require("./animation-common");
 import trace = require("trace");
 
 global.moduleMerge(common, exports);

ui/builder/binding-builder.d.ts

@@ -0,0 +1,16 @@
+//@private
+declare module "ui/builder/binding-builder" {
+    export module bindingConstants {
+        export var sourceProperty: string;
+        export var targetProperty: string;
+        export var expression: string;
+        export var twoWay: string;
+        export var source: string;
+        export var bindingValueKey: string;
+        export var parentValueKey: string;
+        export var parentsValueKey: string;
+        export var newPropertyValueKey: string;
+    }
+
+    export function getBindingOptions(name: string, value: string): any;
+}

ui/builder/component-builder.ts

@@ -2,7 +2,7 @@
 import types = require("utils/types");
 import definition = require("ui/builder/component-builder");
 import fs = require("file-system");
-import bindingBuilder = require("ui/builder/binding-builder");
+import bindingBuilder = require("./binding-builder");
 import platform = require("platform");
 import pages = require("ui/page");
 

ui/button/button.android.ts

@@ -1,4 +1,4 @@
-import common = require("ui/button/button-common");
+import common = require("./button-common");
 import utils = require("utils/utils")
 
 global.moduleMerge(common, exports);

ui/button/button.ios.ts

@@ -1,4 +1,4 @@
-import common = require("ui/button/button-common");
+import common = require("./button-common");
 import stateChanged = require("ui/core/control-state-change");
 
 class TapHandlerImpl extends NSObject {
@@ -44,4 +44,4 @@ export class Button extends common.Button {
     get ios(): UIButton {
         return this._ios;
     }
-} 
+} 

ui/core/view-common.ts

@@ -1,14 +1,14 @@
 import types = require("utils/types");
 import definition = require("ui/core/view");
 import proxy = require("ui/core/proxy");
-import style = require("ui/styling/style");
+import style = require("../styling/style");
 import styling = require("ui/styling");
 import visualStateConstants = require("ui/styling/visual-state-constants");
 import trace = require("trace");
 import dependencyObservable = require("ui/core/dependency-observable");
 import gestures = require("ui/gestures");
 import bindable = require("ui/core/bindable");
-import styleScope = require("ui/styling/style-scope");
+import styleScope = require("../styling/style-scope");
 import enums = require("ui/enums");
 import utils = require("utils/utils");
 import color = require("color");

ui/core/view.android.ts

@@ -1,4 +1,4 @@
-import viewCommon = require("ui/core/view-common");
+import viewCommon = require("./view-common");
 import viewDefinition = require("ui/core/view");
 import trace = require("trace");
 import utils = require("utils/utils");
@@ -406,4 +406,4 @@ export class CustomLayoutView extends View implements viewDefinition.CustomLayou
             trace.notifyEvent(child, "childInLayoutRemovedFromNativeVisualTree");
         }
     }
-}
+}

ui/core/view.ios.ts

@@ -1,4 +1,4 @@
-import viewCommon = require("ui/core/view-common");
+import viewCommon = require("./view-common");
 import trace = require("trace");
 import utils = require("utils/utils");
 import dependencyObservable = require("ui/core/dependency-observable");

ui/date-picker/date-picker.android.ts

@@ -1,4 +1,4 @@
-import common = require("ui/date-picker/date-picker-common");
+import common = require("./date-picker-common");
 import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
 import types = require("utils/types");

ui/date-picker/date-picker.ios.ts

@@ -1,4 +1,4 @@
-import common = require("ui/date-picker/date-picker-common");
+import common = require("./date-picker-common");
 import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
 
@@ -111,4 +111,4 @@ class UIDatePickerChangeHandlerImpl extends NSObject {
     public static ObjCExposedMethods = {
         'valueChanged': { returns: interop.types.void, params: [UIDatePicker] }
     };
-}
+}

ui/dialogs/dialogs.android.ts

@@ -3,7 +3,7 @@
  */
 
 import dialogs = require("ui/dialogs");
-import dialogsCommon = require("ui/dialogs/dialogs-common");
+import dialogsCommon = require("./dialogs-common");
 import appmodule = require("application");
 import types = require("utils/types");
 
@@ -270,4 +270,4 @@ export function action(arg: any): Promise<string> {
             reject(ex);
         }
     });
-}
+}

ui/dialogs/dialogs.ios.ts

@@ -3,7 +3,7 @@
  */
 
 import dialogs = require("ui/dialogs");
-import dialogsCommon = require("ui/dialogs/dialogs-common");
+import dialogsCommon = require("./dialogs-common");
 import types = require("utils/types");
 import utils = require("utils/utils");
 import frame = require("ui/frame");
@@ -471,4 +471,4 @@ export function action(arg: any): Promise<string> {
             reject(ex);
         }
     });
-}
+}

ui/editable-text-base/editable-text-base.android.ts

@@ -1,4 +1,4 @@
-import common = require("ui/editable-text-base/editable-text-base-common");
+import common = require("./editable-text-base-common");
 import textBase = require("ui/text-base");
 import dependencyObservable = require("ui/core/dependency-observable");
 import enums = require("ui/enums");
@@ -268,4 +268,4 @@ export class EditableTextBase extends common.EditableTextBase {
 
         editableTextBase.android.setHint(data.newValue + "");
     }
-}  
+}  

ui/editable-text-base/editable-text-base.ios.ts

@@ -1,4 +1,4 @@
-import common = require("ui/editable-text-base/editable-text-base-common");
+import common = require("./editable-text-base-common");
 import textBase = require("ui/text-base");
 import dependencyObservable = require("ui/core/dependency-observable");
 import enums = require("ui/enums");
@@ -103,4 +103,4 @@ export class EditableTextBase extends common.EditableTextBase {
 
         (<UITextInputTraits>this.ios).autocorrectionType = newValue;
     }
-}   
+}   

ui/frame/frame.android.ts

@@ -1,4 +1,4 @@
-import frameCommon = require("ui/frame/frame-common");
+import frameCommon = require("./frame-common");
 import definition = require("ui/frame");
 import pages = require("ui/page");
 import trace = require("trace");

ui/frame/frame.ios.ts

@@ -1,4 +1,4 @@
-import frameCommon = require("ui/frame/frame-common");
+import frameCommon = require("./frame-common");
 import definition = require("ui/frame");
 import trace = require("trace");
 import pages = require("ui/page");

ui/gestures/gestures.android.ts

@@ -1,4 +1,4 @@
-import common = require("ui/gestures/gestures-common");
+import common = require("./gestures-common");
 import definition = require("ui/gestures");
 import observable = require("data/observable");
 import view = require("ui/core/view");
@@ -334,4 +334,4 @@ class PanGestureListener extends android.view.GestureDetector.SimpleOnGestureLis
         _executeCallback(this._observer, args);
         return true;
     }
-}
+}

ui/gestures/gestures.ios.ts

@@ -1,4 +1,4 @@
-import common = require("ui/gestures/gestures-common");
+import common = require("./gestures-common");
 import definition = require("ui/gestures");
 import view = require("ui/core/view");
 import observable = require("data/observable");

ui/html-view/html-view.android.ts

@@ -1,4 +1,4 @@
-import common = require("ui/html-view/html-view-common");
+import common = require("./html-view-common");
 import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
 import types = require("utils/types");
@@ -44,4 +44,4 @@ export class HtmlView extends common.HtmlView {
 
     }
 
-}
+}

ui/html-view/html-view.ios.ts

@@ -1,4 +1,4 @@
-import common = require("ui/html-view/html-view-common");
+import common = require("./html-view-common");
 import definition = require("ui/html-view");
 import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
@@ -80,4 +80,4 @@ export class HtmlView extends common.HtmlView {
             this.setMeasuredDimension(widthAndState, heightAndState);
         }
     }
-} 
+} 

ui/image-cache/image-cache.android.ts

@@ -1,4 +1,4 @@
-import common = require("ui/image-cache/image-cache-common");
+import common = require("./image-cache-common");
 
 class LruBitmapCache extends android.util.LruCache<string, android.graphics.Bitmap> {
     constructor(cacheSize: number) {
@@ -62,4 +62,4 @@ export class Cache extends common.Cache {
     public clear() {
         this._cache.evictAll();
     }
-}
+}

ui/image-cache/image-cache.ios.ts

@@ -1,4 +1,4 @@
-import common = require("ui/image-cache/image-cache-common");
+import common = require("./image-cache-common");
 import httpRequest = require("http/http-request");
 import utils = require("utils/utils");
 import trace = require("trace");
@@ -89,4 +89,4 @@ export class Cache extends common.Cache {
         this._cache.removeAllObjects();
         utils.GC();
     }
-}
+}

ui/image/image.android.ts

@@ -1,4 +1,4 @@
-import imageCommon = require("ui/image/image-common");
+import imageCommon = require("./image-common");
 import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
 import enums = require("ui/enums");
@@ -55,4 +55,4 @@ export class Image extends imageCommon.Image {
     public _setNativeImage(nativeImage: any) {
         this.android.setImageBitmap(nativeImage);
     }
-}
+}

ui/image/image.ios.ts

@@ -1,4 +1,4 @@
-import imageCommon = require("ui/image/image-common");
+import imageCommon = require("./image-common");
 import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
 import definition = require("ui/image");
@@ -132,4 +132,4 @@ export class Image extends imageCommon.Image {
         }
         return { width: scaleW, height: scaleH };
     }
-} 
+} 

ui/label/label.android.ts

@@ -1,4 +1,4 @@
-import common = require("ui/label/label-common");
+import common = require("./label-common");
 import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
 
@@ -39,4 +39,4 @@ export class Label extends common.Label {
         this._android.setSingleLine(true);
         this._android.setEllipsize(android.text.TextUtils.TruncateAt.END);
     }
-}
+}

ui/label/label.ios.ts

@@ -1,4 +1,4 @@
-import common = require("ui/label/label-common");
+import common = require("./label-common");
 import definition = require("ui/label");
 import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
@@ -109,4 +109,4 @@ export class Label extends common.Label {
             this.setMeasuredDimension(widthAndState, heightAndState);
         }
     }
-} 
+} 

ui/layouts/absolute-layout/absolute-layout.android.ts

@@ -1,6 +1,6 @@
 import utils = require("utils/utils");
 import view = require("ui/core/view");
-import common = require("ui/layouts/absolute-layout/absolute-layout-common");
+import common = require("./absolute-layout-common");
 import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
 
@@ -47,4 +47,4 @@ export class AbsoluteLayout extends common.AbsoluteLayout {
     public _createUI() {
         this._layout = new org.nativescript.widgets.AbsoluteLayout(this._context);
     }
-}
+}

ui/layouts/absolute-layout/absolute-layout.ios.ts

@@ -1,6 +1,6 @@
 import utils = require("utils/utils");
 import view = require("ui/core/view");
-import common = require("ui/layouts/absolute-layout/absolute-layout-common");
+import common = require("./absolute-layout-common");
 
 global.moduleMerge(common, exports);
 
@@ -75,4 +75,4 @@ export class AbsoluteLayout extends common.AbsoluteLayout {
             view.View.layoutChild(this, child, childLeft, childTop, childRight, childBottom);
         }
     }
-}
+}

ui/layouts/dock-layout/dock-layout.android.ts

@@ -2,7 +2,7 @@
 import view = require("ui/core/view");
 import enums = require("ui/enums");
 import proxy = require("ui/core/proxy");
-import common = require("ui/layouts/dock-layout/dock-layout-common");
+import common = require("./dock-layout-common");
 
 global.moduleMerge(common, exports);
 
@@ -63,4 +63,4 @@ export class DockLayout extends common.DockLayout {
     }
 }
 
-(<proxy.PropertyMetadata>common.DockLayout.stretchLastChildProperty.metadata).onSetNativeValue = DockLayout.setNativeStretchLastChildProperty;
+(<proxy.PropertyMetadata>common.DockLayout.stretchLastChildProperty.metadata).onSetNativeValue = DockLayout.setNativeStretchLastChildProperty;

ui/layouts/dock-layout/dock-layout.ios.ts

@@ -1,7 +1,7 @@
 import utils = require("utils/utils");
 import view = require("ui/core/view");
 import enums = require("ui/enums");
-import common = require("ui/layouts/dock-layout/dock-layout-common");
+import common = require("./dock-layout-common");
 
 global.moduleMerge(common, exports);
 
@@ -155,4 +155,4 @@ export class DockLayout extends common.DockLayout {
             view.View.layoutChild(this, childToStretch, x, y, x + remainingWidth, y + remainingHeight);
         }
     }
-}
+}

ui/layouts/grid-layout/grid-layout-common.ts

@@ -4,7 +4,7 @@ import dependencyObservable = require("ui/core/dependency-observable");
 import view = require("ui/core/view");
 import bindable = require("ui/core/bindable");
 import types = require("utils/types");
-import numberUtils = require("utils/number-utils");
+import numberUtils = require("../../../utils/number-utils");
 import proxy = require("ui/core/proxy");
 import {registerSpecialProperty} from "ui/builder/special-properties";
 

ui/layouts/grid-layout/grid-layout.android.ts

@@ -2,7 +2,7 @@
 import dependencyObservable = require("ui/core/dependency-observable");
 import view = require("ui/core/view");
 import proxy = require("ui/core/proxy");
-import common = require("ui/layouts/grid-layout/grid-layout-common");
+import common = require("./grid-layout-common");
 
 global.moduleMerge(common, exports);
 
@@ -119,4 +119,4 @@ export class GridLayout extends common.GridLayout {
             this._layout.removeColumnAt(index);
         }
     }
-}
+}

ui/layouts/grid-layout/grid-layout.ios.ts

@@ -1,7 +1,7 @@
 import utils = require("utils/utils");
 import enums = require("ui/enums");
 import view = require("ui/core/view");
-import common = require("ui/layouts/grid-layout/grid-layout-common");
+import common = require("./grid-layout-common");
 
 global.moduleMerge(common, exports);
 
@@ -912,4 +912,4 @@ class MeasureHelper {
 
         this.itemMeasured(measureSpec);
     }
-}
+}

ui/layouts/stack-layout/stack-layout.android.ts

@@ -1,6 +1,6 @@
 import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
-import common = require("ui/layouts/stack-layout/stack-layout-common");
+import common = require("./stack-layout-common");
 import enums = require("ui/enums");
 
 global.moduleMerge(common, exports);
@@ -28,4 +28,4 @@ export class StackLayout extends common.StackLayout {
     }
 }
 
-(<proxy.PropertyMetadata>common.StackLayout.orientationProperty.metadata).onSetNativeValue = StackLayout.setNativeOrientationProperty;
+(<proxy.PropertyMetadata>common.StackLayout.orientationProperty.metadata).onSetNativeValue = StackLayout.setNativeOrientationProperty;

ui/layouts/stack-layout/stack-layout.ios.ts

@@ -1,7 +1,7 @@
 import utils = require("utils/utils");
 import enums = require("ui/enums");
 import view = require("ui/core/view");
-import common = require("ui/layouts/stack-layout/stack-layout-common");
+import common = require("./stack-layout-common");
 
 global.moduleMerge(common, exports);
 
@@ -182,4 +182,4 @@ export class StackLayout extends common.StackLayout {
             childLeft += childWidth;
         }
     }
-}
+}

ui/layouts/wrap-layout/wrap-layout.android.ts

@@ -1,6 +1,6 @@
 import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
-import common = require("ui/layouts/wrap-layout/wrap-layout-common");
+import common = require("./wrap-layout-common");
 import enums = require("ui/enums");
 import utils = require("utils/utils");
 
@@ -43,4 +43,4 @@ export class WrapLayout extends common.WrapLayout {
 
 (<proxy.PropertyMetadata>common.WrapLayout.orientationProperty.metadata).onSetNativeValue = WrapLayout.setNativeOrientationProperty;
 (<proxy.PropertyMetadata>common.WrapLayout.itemWidthProperty.metadata).onSetNativeValue = WrapLayout.setNativeItemWidthProperty;
-(<proxy.PropertyMetadata>common.WrapLayout.itemHeightProperty.metadata).onSetNativeValue = WrapLayout.setNativeItemHeightProperty;
+(<proxy.PropertyMetadata>common.WrapLayout.itemHeightProperty.metadata).onSetNativeValue = WrapLayout.setNativeItemHeightProperty;

ui/layouts/wrap-layout/wrap-layout.ios.ts

@@ -1,7 +1,7 @@
 import utils = require("utils/utils");
 import view = require("ui/core/view");
 import enums = require("ui/enums");
-import common = require("ui/layouts/wrap-layout/wrap-layout-common");
+import common = require("./wrap-layout-common");
 
 global.moduleMerge(common, exports);
 
@@ -189,4 +189,4 @@ export class WrapLayout extends common.WrapLayout {
             }
         }
     }
-}
+}

ui/list-picker/list-picker.android.ts

@@ -1,4 +1,4 @@
-import common = require("ui/list-picker/list-picker-common");
+import common = require("./list-picker-common");
 import dependencyObservable = require("ui/core/dependency-observable");
 import types = require("utils/types");
 import utils = require("utils/utils")

ui/list-picker/list-picker.ios.ts

@@ -1,4 +1,4 @@
-import common = require("ui/list-picker/list-picker-common");
+import common = require("./list-picker-common");
 import dependencyObservable = require("ui/core/dependency-observable");
 import types = require("utils/types");
 

ui/list-view/list-view.android.ts

@@ -1,5 +1,5 @@
 import observable = require("data/observable");
-import common = require("ui/list-view/list-view-common");
+import common = require("./list-view-common");
 import viewModule = require("ui/core/view");
 import layoutBaseModule = require("ui/layouts/layout-base");
 import stackLayout = require("ui/layouts/stack-layout");

ui/list-view/list-view.ios.ts

@@ -1,6 +1,6 @@
 import observable = require("data/observable");
 import definition = require("ui/list-view");
-import common = require("ui/list-view/list-view-common");
+import common = require("./list-view-common");
 import utils = require("utils/utils");
 import view = require("ui/core/view");
 import proxy = require("ui/core/proxy");
@@ -252,4 +252,4 @@ export class ListView extends common.ListView {
         }
         return cellHeight;
     }
-}
+}

ui/page/page-common.ts

@@ -2,10 +2,10 @@
 import view = require("ui/core/view");
 import dts = require("ui/page");
 import frame = require("ui/frame");
-import styleModule = require("ui/styling/style");
-import styleScope = require("ui/styling/style-scope");
+import styleModule = require("../styling/style");
+import styleScope = require("../styling/style-scope");
 import fs = require("file-system");
-import frameCommon = require("ui/frame/frame-common");
+import frameCommon = require("../frame/frame-common");
 import actionBar = require("ui/action-bar");
 import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");

ui/page/page.android.ts

@@ -1,4 +1,4 @@
-import pageCommon = require("ui/page/page-common");
+import pageCommon = require("./page-common");
 import definition = require("ui/page");
 import view = require("ui/core/view");
 import trace = require("trace");
@@ -122,4 +122,4 @@ export class Page extends pageCommon.Page {
     public _updateActionBar(hidden: boolean) {
         this.actionBar.update();
     }
-}
+}

ui/page/page.d.ts

@@ -204,4 +204,4 @@ declare module "ui/page" {
          */
         exports?: any;
     }
-}
+}

ui/page/page.ios.ts

@@ -1,4 +1,4 @@
-import pageCommon = require("ui/page/page-common");
+import pageCommon = require("./page-common");
 import definition = require("ui/page");
 import {View} from "ui/core/view";
 import trace = require("trace");

ui/placeholder/placeholder.android.ts

@@ -1,5 +1,5 @@
 import definition = require("ui/placeholder");
-import common = require("ui/placeholder/placeholder-common");
+import common = require("./placeholder-common");
 
 global.moduleMerge(common, exports);
 
@@ -19,4 +19,4 @@ export class Placeholder extends common.Placeholder {
     get _nativeView(): android.view.View {
         return this._android;
     }
-}
+}

ui/placeholder/placeholder.ios.ts

@@ -1,5 +1,5 @@
 import definition = require("ui/placeholder");
-import common = require("ui/placeholder/placeholder-common");
+import common = require("./placeholder-common");
 
 global.moduleMerge(common, exports);
 
@@ -18,4 +18,4 @@ export class Placeholder extends common.Placeholder {
     get _nativeView(): UIView {
         return this.ios;
     }
-} 
+} 

ui/progress/progress.android.ts

@@ -1,4 +1,4 @@
-import common = require("ui/progress/progress-common");
+import common = require("./progress-common");
 import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
 

ui/progress/progress.ios.ts

@@ -1,4 +1,4 @@
-import common = require("ui/progress/progress-common");
+import common = require("./progress-common");
 import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
 
@@ -30,4 +30,4 @@ export class Progress extends common.Progress {
     get ios(): UIProgressView {
         return this._ios;
     }
-} 
+} 

ui/scroll-view/scroll-view.android.ts

@@ -1,7 +1,7 @@
 import dependencyObservable = require("ui/core/dependency-observable");
 import definition = require("ui/scroll-view");
 import contentView = require("ui/content-view");
-import common = require("ui/scroll-view/scroll-view-common");
+import common = require("./scroll-view-common");
 import utils = require("utils/utils");
 import enums = require("ui/enums");
 
@@ -116,4 +116,4 @@ export class ScrollView extends contentView.ContentView implements definition.Sc
             }
         }
     }
-}
+}

ui/scroll-view/scroll-view.ios.ts

@@ -1,7 +1,7 @@
 import view = require("ui/core/view");
 import definition = require("ui/scroll-view");
 import contentView = require("ui/content-view");
-import common = require("ui/scroll-view/scroll-view-common");
+import common = require("./scroll-view-common");
 import enums = require("ui/enums");
 import utils = require("utils/utils");
 
@@ -116,4 +116,4 @@ export class ScrollView extends contentView.ContentView implements definition.Sc
             view.View.layoutChild(this, this.content, 0, 0, width, Math.max(this._contentMeasuredHeight, height));
         }
     }
-}
+}

ui/search-bar/search-bar.android.ts

@@ -1,4 +1,4 @@
-import common = require("ui/search-bar/search-bar-common");
+import common = require("./search-bar-common");
 import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
 import color = require("color");

ui/search-bar/search-bar.ios.ts

@@ -1,4 +1,4 @@
-import common = require("ui/search-bar/search-bar-common");
+import common = require("./search-bar-common");
 import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
 import color = require("color");

ui/segmented-bar/segmented-bar.android.ts

@@ -1,5 +1,5 @@
 import definition = require("ui/segmented-bar");
-import common = require("ui/segmented-bar/segmented-bar-common");
+import common = require("./segmented-bar-common");
 import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
 import types = require("utils/types");

ui/segmented-bar/segmented-bar.ios.ts

@@ -1,5 +1,5 @@
 import definition = require("ui/segmented-bar");
-import common = require("ui/segmented-bar/segmented-bar-common");
+import common = require("./segmented-bar-common");
 import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
 import types = require("utils/types");
@@ -114,4 +114,4 @@ class SelectionHandlerImpl extends NSObject {
     public static ObjCExposedMethods = {
         "selected": { returns: interop.types.void, params: [UISegmentedControl] }
     };
-}
+}

ui/slider/slider.android.ts

@@ -1,4 +1,4 @@
-import common = require("ui/slider/slider-common");
+import common = require("./slider-common");
 import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
 
@@ -94,4 +94,4 @@ export class Slider extends common.Slider {
             this._supressNativeValue = false;
         }
     }
-}
+}

ui/slider/slider.ios.ts

@@ -1,4 +1,4 @@
-import common = require("ui/slider/slider-common");
+import common = require("./slider-common");
 import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
 
@@ -64,4 +64,4 @@ export class Slider extends common.Slider {
     get ios(): UISlider {
         return this._ios;
     }
-} 
+} 

ui/styling/background.android.ts

@@ -1,5 +1,5 @@
 import utils = require("utils/utils");
-import common = require("ui/styling/background-common");
+import common = require("./background-common");
 import dts = require("ui/styling/background");
 
 global.moduleMerge(common, exports);

ui/styling/background.ios.ts

@@ -1,6 +1,6 @@
 import viewModule = require("ui/core/view");
-import style = require("ui/styling/style");
-import common = require("ui/styling/background-common");
+import style = require("./style");
+import common = require("./background-common");
 
 global.moduleMerge(common, exports);
 

ui/styling/font-common.ts

@@ -1,6 +1,6 @@
 import enums = require("ui/enums");
 import definitios = require("ui/styling/font");
-import converters = require("ui/styling/converters");
+import converters = require("./converters");
 
 export class Font implements definitios.Font {
     public static default = undefined;
@@ -183,4 +183,4 @@ function parseFont(fontValue: string): ParsedFont {
     }
 
     return result;
-}
+}

ui/styling/font.android.ts

@@ -1,5 +1,5 @@
 import enums = require("ui/enums");
-import common = require("ui/styling/font-common");
+import common = require("./font-common");
 import application = require("application");
 import trace = require("trace");
 import types = require("utils/types");
@@ -121,4 +121,4 @@ export class Font extends common.Font {
 
         return result;
     }
-}
+}

ui/styling/font.ios.ts

@@ -1,5 +1,5 @@
 import enums = require("ui/enums");
-import common = require("ui/styling/font-common");
+import common = require("./font-common");
 import fs = require("file-system");
 
 var DEFAULT_SERIF = "Times New Roman";
@@ -164,4 +164,4 @@ export module ios {
 
         areSystemFontSetsValid = false;
     }
-}
+}

ui/styling/style-scope.d.ts

@@ -0,0 +1,20 @@
+//@private
+declare module "ui/styling/style-scope" {
+    import view = require("ui/core/view");
+    import cssSelector = require("ui/styling/css-selector");
+    import cssParser = require("css");
+
+    export class StyleScope {
+        public css: string;
+        public addCss(cssString: string, cssFileName: string): void;
+
+        public static createSelectorsFromCss(css: string, cssFileName: string): cssSelector.CssSelector[];
+        public static createSelectorsFromImports(tree: cssParser.SyntaxTree): cssSelector.CssSelector[];
+        public ensureSelectors();
+
+        public applySelectors(view: view.View): void
+        public getVisualStates(view: view.View): Object;
+    }
+
+    export function applyInlineSyle(view: view.View, style: string): void;
+}

ui/styling/style-scope.ts

@@ -2,7 +2,7 @@
 import trace = require("trace");
 import cssSelector = require("ui/styling/css-selector");
 import cssParser = require("css");
-import {VisualState} from "ui/styling/visual-state";
+import {VisualState} from "./visual-state";
 import application = require("application");
 import utils = require("utils/utils");
 import types = require("utils/types");

ui/styling/style.d.ts

@@ -0,0 +1,120 @@
+//@private
+declare module "ui/styling/style" {
+    import styling = require("ui/styling");
+    import {DependencyObservable, Property} from "ui/core/dependency-observable";
+    import {View} from "ui/core/view";
+    import {Color} from "color";
+    import stylers = require("ui/styling/stylers");
+    import styleProperty = require("ui/styling/style-property");
+
+    export interface Thickness {
+        left: number;
+        top: number;
+        right: number;
+        bottom: number;
+    }
+
+    export interface CommonLayoutParams {
+        width: number;
+        height: number;
+
+        leftMargin: number;
+        topMargin: number;
+        rightMargin: number;
+        bottomMargin: number;
+
+        horizontalAlignment: string;
+        verticalAlignment: string;
+    }
+
+    export class Style extends DependencyObservable implements styling.Style {
+        public color: Color;
+        public backgroundColor: Color;
+        public backgroundImage: string;
+        public backpublic: string;
+        public backgroundSize: string;
+        public backgroundPosition: string;
+        public backgroundRepeat: string;
+        public borderColor: Color;
+        public borderWidth: number;
+        public borderRadius: number;
+        public fontSize: number;
+        public fontFamily: string;
+        public fontStyle: string;
+        public fontWeight: string;
+        public font: string;
+        public textAlignment: string;
+        public minWidth: number;
+        public minHeight: number;
+        public width: number;
+        public height: number;
+        public margin: string;
+        public marginLeft: number;
+        public marginTop: number;
+        public marginRight: number;
+        public marginBottom: number;
+        public padding: string;
+        public paddingLeft: number;
+        public paddingTop: number;
+        public paddingRight: number;
+        public paddingBottom: number;
+        public horizontalAlignment: string;
+        public verticalAlignment: string;
+        public visibility: string;
+        public opacity: number;
+
+        new(parentView: View);
+
+        public _beginUpdate();
+        public _endUpdate();
+        public _resetCssValues(): void;
+        public _syncNativeProperties(): void;
+        public _inheritStyleProperty(property: Property): void;
+        public _inheritStyleProperties(): void;
+    }
+
+    export function registerHandler(property: Property, handler: styling.stylers.StylePropertyChangedHandler, className?: string);
+
+    export function registerNoStylingClass(className);
+    export function getHandler(property: Property, view: View): styling.stylers.StylePropertyChangedHandler;
+    // Property registration
+    export var colorProperty: styleProperty.Property;
+    export var backgroundImageProperty: styleProperty.Property;
+    export var backgroundColorProperty: styleProperty.Property;
+    export var backgroundRepeatProperty: styleProperty.Property;
+    export var backgroundSizeProperty: styleProperty.Property;
+    export var backgroundPositionProperty: styleProperty.Property;
+    export var borderColorProperty: styleProperty.Property;
+    export var borderWidthProperty: styleProperty.Property;
+    export var borderRadiusProperty: styleProperty.Property;
+    export var backgroundInternalProperty: styleProperty.Property;
+    export var fontSizeProperty: styleProperty.Property;
+    export var fontFamilyProperty: styleProperty.Property;
+    export var fontStyleProperty: styleProperty.Property;
+    export var fontWeightProperty: styleProperty.Property;
+    export var fontInternalProperty: styleProperty.Property;
+    export var textAlignmentProperty: styleProperty.Property;
+    export var minWidthProperty: styleProperty.Property;
+    export var minHeightProperty: styleProperty.Property;
+    export var visibilityProperty: styleProperty.Property;
+    export var opacityProperty: styleProperty.Property;
+
+    // Helper property holding most layout related properties available in CSS.
+    // When layout related properties are set in CSS we chache them and send them to the native view in a single call.
+    export var nativeLayoutParamsProperty: styleProperty.Property;
+    export var widthProperty: styleProperty.Property;
+    export var heightProperty: styleProperty.Property;
+    export var verticalAlignmentProperty: styleProperty.Property;
+    export var horizontalAlignmentProperty: styleProperty.Property;
+    export var marginLeftProperty: styleProperty.Property;
+    export var marginRightProperty: styleProperty.Property;
+    export var marginTopProperty: styleProperty.Property;
+    export var marginBottomProperty: styleProperty.Property;
+
+    // Helper property holding all paddings. When paddings are set through CSS we cache them and send them to the native view in a single call.
+    export var nativePaddingsProperty: styleProperty.Property;
+    export var paddingLeftProperty: styleProperty.Property;
+    export var paddingRightProperty: styleProperty.Property;
+    export var paddingTopProperty: styleProperty.Property;
+    export var paddingBottomProperty: styleProperty.Property;
+}

ui/styling/style.ts

@@ -6,7 +6,7 @@ import {View} from "ui/core/view";
 import {Color} from "color";
 import stylers = require("ui/styling/stylers");
 import styleProperty = require("ui/styling/style-property");
-import converters = require("ui/styling/converters");
+import converters = require("./converters");
 import enums = require("ui/enums");
 import imageSource = require("image-source");
 import utils = require("utils/utils");
@@ -908,4 +908,4 @@ styleProperty.registerShorthandCallback("margin", onMarginChanged);
 styleProperty.registerShorthandCallback("padding", onPaddingChanged);
 
 // register default stylers once all properties are defined.
-stylers._registerDefaultStylers();
+stylers._registerDefaultStylers();

ui/styling/stylers.android.ts

@@ -1,11 +1,11 @@
 import types = require("utils/types");
 import view = require("ui/core/view");
-import style = require("ui/styling/style");
+import style = require("./style");
 import definition = require("ui/styling");
-import stylersCommon = require("ui/styling/stylers-common");
+import stylersCommon = require("./stylers-common");
 import enums = require("ui/enums");
 import utils = require("utils/utils");
-import styleModule = require("ui/styling/style");
+import styleModule = require("./style");
 import font = require("ui/styling/font");
 import background = require("ui/styling/background");
 var btn;

ui/styling/stylers.ios.ts

@@ -1,7 +1,7 @@
 import view = require("ui/core/view");
-import style = require("ui/styling/style");
+import style = require("./style");
 import definition = require("ui/styling");
-import stylersCommon = require("ui/styling/stylers-common");
+import stylersCommon = require("./stylers-common");
 import enums = require("ui/enums");
 import font = require("ui/styling/font");
 import background = require("ui/styling/background");
@@ -499,4 +499,4 @@ export function _registerDefaultStylers() {
     TextViewStyler.registerHandlers();
     SegmentedBarStyler.registerHandlers();
     SearchBarStyler.registerHandlers();
-}
+}

ui/styling/styling.ts

@@ -1,8 +1,8 @@
-import styleModule = require("ui/styling/style");
-import stylePropertyModule = require("ui/styling/style-property");
-import stylersCommonModule = require("ui/styling/stylers-common");
-import visualStateConstatnsModule = require("ui/styling/visual-state-constants");
-import convertersModule = require("ui/styling/converters");
+import styleModule = require("./style");
+import stylePropertyModule = require("./style-property");
+import stylersCommonModule = require("./stylers-common");
+import visualStateConstatnsModule = require("./visual-state-constants");
+import convertersModule = require("./converters");
 
 // Exports form style-property module.
 export var Property = stylePropertyModule.Property;
@@ -42,4 +42,4 @@ export module visualStates {
 export module stylers {
     export var StylePropertyChangedHandler = stylersCommonModule.StylePropertyChangedHandler;
     export var registerHandler = styleModule.registerHandler;
-}
+}

ui/switch/switch.android.ts

@@ -1,4 +1,4 @@
-import common = require("ui/switch/switch-common");
+import common = require("./switch-common");
 import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
 import utils = require("utils/utils")

ui/switch/switch.ios.ts

@@ -1,4 +1,4 @@
-import common = require("ui/switch/switch-common");
+import common = require("./switch-common");
 import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
 
@@ -48,4 +48,4 @@ export class Switch extends common.Switch {
     get ios(): UISwitch {
         return this._ios;
     }
-} 
+} 

ui/tab-view/tab-view.android.ts

@@ -1,4 +1,4 @@
-import common = require("ui/tab-view/tab-view-common");
+import common = require("./tab-view-common");
 import definition = require("ui/tab-view");
 import dependencyObservable = require("ui/core/dependency-observable");
 import view = require("ui/core/view");
@@ -278,4 +278,4 @@ export class TabView extends common.TabView {
 
         return result;
     }
-}
+}

ui/tab-view/tab-view.ios.ts

@@ -1,4 +1,4 @@
-import common = require("ui/tab-view/tab-view-common");
+import common = require("./tab-view-common");
 import definition = require("ui/tab-view");
 import dependencyObservable = require("ui/core/dependency-observable");
 import trace = require("trace");
@@ -289,4 +289,4 @@ export class TabView extends common.TabView {
         }
     }
 
-}
+}

ui/text-field/text-field.android.ts

@@ -1,4 +1,4 @@
-import common = require("ui/text-field/text-field-common");
+import common = require("./text-field-common");
 import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
 
@@ -53,4 +53,4 @@ export class TextField extends common.TextField {
     public _onReturnPress() {
         this.notify({ eventName: TextField.returnPressEvent, object: this })
     }
-}
+}

ui/text-field/text-field.ios.ts

@@ -1,4 +1,4 @@
-import common = require("ui/text-field/text-field-common");
+import common = require("./text-field-common");
 import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
 import textBase = require("ui/text-base");
@@ -133,4 +133,4 @@ export class TextField extends common.TextField {
         var textField = <TextField>data.object;
         textField.ios.placeholder = data.newValue + "";
     }
-} 
+}