diff --git a/application-settings/application-settings.android.ts b/application-settings/application-settings.android.ts index 074820010..c1a1dfcec 100644 --- a/application-settings/application-settings.android.ts +++ b/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(); -} \ No newline at end of file +} diff --git a/application-settings/application-settings.ios.ts b/application-settings/application-settings.ios.ts index 6e24cdfc8..5f07064fe 100644 --- a/application-settings/application-settings.ios.ts +++ b/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(); -} \ No newline at end of file +} diff --git a/application/application.android.ts b/application/application.android.ts index 85340b804..149b69cb0 100644 --- a/application/application.android.ts +++ b/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"); diff --git a/application/application.ios.ts b/application/application.ios.ts index 5dd1e1c2b..01c100d9a 100644 --- a/application/application.ios.ts +++ b/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: definition.ios, ios: error }); } -} \ No newline at end of file +} diff --git a/color/color.android.ts b/color/color.android.ts index cc68e837e..3c35298ea 100644 --- a/color/color.android.ts +++ b/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); } -} \ No newline at end of file +} diff --git a/color/color.ios.ts b/color/color.ios.ts index 0d1fc718d..20779f16c 100644 --- a/color/color.ios.ts +++ b/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; } -} \ No newline at end of file +} diff --git a/connectivity/connectivity.android.ts b/connectivity/connectivity.android.ts index eea544c57..8adb30296 100644 --- a/connectivity/connectivity.android.ts +++ b/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); -} \ No newline at end of file +} diff --git a/connectivity/connectivity.ios.ts b/connectivity/connectivity.ios.ts index 32f2d726c..887ba9756 100644 --- a/connectivity/connectivity.ios.ts +++ b/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;; } -} \ No newline at end of file +} diff --git a/globals/globals.ts b/globals/globals.ts index 96d926d16..aa072ec49 100644 --- a/globals/globals.ts +++ b/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; diff --git a/gruntfile.js b/gruntfile.js index f7af56631..c0e2773ed 100644 --- a/gruntfile.js +++ b/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, diff --git a/http/http-request.d.ts b/http/http-request.d.ts index 048b87557..d4547c486 100644 --- a/http/http-request.d.ts +++ b/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; \ No newline at end of file + export var request: (options: http.HttpRequestOptions) => Promise; +} diff --git a/image-source/image-source.android.ts b/image-source/image-source.android.ts index ffa6a89f6..50506e2a7 100644 --- a/image-source/image-source.android.ts +++ b/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; } -} \ No newline at end of file +} diff --git a/image-source/image-source.ios.ts b/image-source/image-source.ios.ts index 59273d2e0..0c2fcf105 100644 --- a/image-source/image-source.ios.ts +++ b/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); diff --git a/location/location.android.ts b/location/location.android.ts index 48aa1fa29..e59af53cb 100644 --- a/location/location.android.ts +++ b/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; } -} \ No newline at end of file +} diff --git a/location/location.ios.ts b/location/location.ios.ts index 6ab05b1e4..fff92fdef 100644 --- a/location/location.ios.ts +++ b/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; } -} \ No newline at end of file +} diff --git a/text/formatted-string.android.ts b/text/formatted-string.android.ts index aa139cf76..37665792e 100644 --- a/text/formatted-string.android.ts +++ b/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; } -} \ No newline at end of file +} diff --git a/text/formatted-string.ios.ts b/text/formatted-string.ios.ts index 9181946db..7402ee3bc 100644 --- a/text/formatted-string.ios.ts +++ b/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; } -} \ No newline at end of file +} diff --git a/text/span.android.ts b/text/span.android.ts index 0e7913498..f2266a970 100644 --- a/text/span.android.ts +++ b/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()); } } -} \ No newline at end of file +} diff --git a/text/span.ios.ts b/text/span.ios.ts index a38a8910b..6dc6cc0cf 100644 --- a/text/span.ios.ts +++ b/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 { }); } } -} \ No newline at end of file +} diff --git a/ui/action-bar/action-bar-common.ts b/ui/action-bar/action-bar-common.ts index 39225495b..e901b857f 100644 --- a/ui/action-bar/action-bar-common.ts +++ b/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"; diff --git a/ui/action-bar/action-bar.android.ts b/ui/action-bar/action-bar.android.ts index 3ac29466c..61fbdcb1e 100644 --- a/ui/action-bar/action-bar.android.ts +++ b/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; } -} \ No newline at end of file +} diff --git a/ui/action-bar/action-bar.ios.ts b/ui/action-bar/action-bar.ios.ts index 3cbb479a5..995bb729c 100644 --- a/ui/action-bar/action-bar.ios.ts +++ b/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"); diff --git a/ui/activity-indicator/activity-indicator.android.ts b/ui/activity-indicator/activity-indicator.android.ts index 8f6c044e3..d1202f6d2 100644 --- a/ui/activity-indicator/activity-indicator.android.ts +++ b/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; } -} \ No newline at end of file +} diff --git a/ui/activity-indicator/activity-indicator.ios.ts b/ui/activity-indicator/activity-indicator.ios.ts index d494de54e..fbd097270 100644 --- a/ui/activity-indicator/activity-indicator.ios.ts +++ b/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; } -} \ No newline at end of file +} diff --git a/ui/animation/animation.android.ts b/ui/animation/animation.android.ts index 006629cd4..56893dbb8 100644 --- a/ui/animation/animation.android.ts +++ b/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); } -} \ No newline at end of file +} diff --git a/ui/animation/animation.ios.ts b/ui/animation/animation.ios.ts index 6bd44ab00..8cace5da6 100644 --- a/ui/animation/animation.ios.ts +++ b/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); diff --git a/ui/builder/binding-builder.d.ts b/ui/builder/binding-builder.d.ts new file mode 100644 index 000000000..8917ecc1f --- /dev/null +++ b/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; +} diff --git a/ui/builder/component-builder.ts b/ui/builder/component-builder.ts index b44f929da..be858e545 100644 --- a/ui/builder/component-builder.ts +++ b/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"); diff --git a/ui/button/button.android.ts b/ui/button/button.android.ts index 199fba08b..3a98dd718 100644 --- a/ui/button/button.android.ts +++ b/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); diff --git a/ui/button/button.ios.ts b/ui/button/button.ios.ts index 151006ffc..d637d0071 100644 --- a/ui/button/button.ios.ts +++ b/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; } -} \ No newline at end of file +} diff --git a/ui/core/view-common.ts b/ui/core/view-common.ts index 7baf6c72a..330960ee0 100644 --- a/ui/core/view-common.ts +++ b/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"); diff --git a/ui/core/view.android.ts b/ui/core/view.android.ts index 7c38301a4..951226122 100644 --- a/ui/core/view.android.ts +++ b/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"); } } -} \ No newline at end of file +} diff --git a/ui/core/view.ios.ts b/ui/core/view.ios.ts index f7dd3e2d8..922b9de36 100644 --- a/ui/core/view.ios.ts +++ b/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"); diff --git a/ui/date-picker/date-picker.android.ts b/ui/date-picker/date-picker.android.ts index 5fd09f310..a377c4a8f 100644 --- a/ui/date-picker/date-picker.android.ts +++ b/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"); diff --git a/ui/date-picker/date-picker.ios.ts b/ui/date-picker/date-picker.ios.ts index c1c16e9d4..6c7c62856 100644 --- a/ui/date-picker/date-picker.ios.ts +++ b/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] } }; -} \ No newline at end of file +} diff --git a/ui/dialogs/dialogs.android.ts b/ui/dialogs/dialogs.android.ts index fb22fac05..1431dac06 100644 --- a/ui/dialogs/dialogs.android.ts +++ b/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 { reject(ex); } }); -} \ No newline at end of file +} diff --git a/ui/dialogs/dialogs.ios.ts b/ui/dialogs/dialogs.ios.ts index 3bf1efb23..4881bd9fc 100644 --- a/ui/dialogs/dialogs.ios.ts +++ b/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 { reject(ex); } }); -} \ No newline at end of file +} diff --git a/ui/editable-text-base/editable-text-base.android.ts b/ui/editable-text-base/editable-text-base.android.ts index b76a1318f..657a8c27c 100644 --- a/ui/editable-text-base/editable-text-base.android.ts +++ b/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 + ""); } -} \ No newline at end of file +} diff --git a/ui/editable-text-base/editable-text-base.ios.ts b/ui/editable-text-base/editable-text-base.ios.ts index eccd42de6..507ecea2f 100644 --- a/ui/editable-text-base/editable-text-base.ios.ts +++ b/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 { (this.ios).autocorrectionType = newValue; } -} \ No newline at end of file +} diff --git a/ui/frame/frame.android.ts b/ui/frame/frame.android.ts index 605815277..01be883ad 100644 --- a/ui/frame/frame.android.ts +++ b/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"); diff --git a/ui/frame/frame.ios.ts b/ui/frame/frame.ios.ts index eca7b9e8c..d8adcaae1 100644 --- a/ui/frame/frame.ios.ts +++ b/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"); diff --git a/ui/gestures/gestures.android.ts b/ui/gestures/gestures.android.ts index 40cc9e577..579242cbb 100644 --- a/ui/gestures/gestures.android.ts +++ b/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; } -} \ No newline at end of file +} diff --git a/ui/gestures/gestures.ios.ts b/ui/gestures/gestures.ios.ts index 260eb6055..ebc86826f 100644 --- a/ui/gestures/gestures.ios.ts +++ b/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"); diff --git a/ui/html-view/html-view.android.ts b/ui/html-view/html-view.android.ts index 8ac93fe1f..b0d123b6a 100644 --- a/ui/html-view/html-view.android.ts +++ b/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 { } -} \ No newline at end of file +} diff --git a/ui/html-view/html-view.ios.ts b/ui/html-view/html-view.ios.ts index ba42724e3..51b5098f1 100644 --- a/ui/html-view/html-view.ios.ts +++ b/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); } } -} \ No newline at end of file +} diff --git a/ui/image-cache/image-cache.android.ts b/ui/image-cache/image-cache.android.ts index 3fe96444d..145f5bcd2 100644 --- a/ui/image-cache/image-cache.android.ts +++ b/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 { constructor(cacheSize: number) { @@ -62,4 +62,4 @@ export class Cache extends common.Cache { public clear() { this._cache.evictAll(); } -} \ No newline at end of file +} diff --git a/ui/image-cache/image-cache.ios.ts b/ui/image-cache/image-cache.ios.ts index 76de2792d..1f651447f 100644 --- a/ui/image-cache/image-cache.ios.ts +++ b/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(); } -} \ No newline at end of file +} diff --git a/ui/image/image.android.ts b/ui/image/image.android.ts index a3faa8a8b..296d5c25d 100644 --- a/ui/image/image.android.ts +++ b/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); } -} \ No newline at end of file +} diff --git a/ui/image/image.ios.ts b/ui/image/image.ios.ts index c6b626e7b..90db82a12 100644 --- a/ui/image/image.ios.ts +++ b/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 }; } -} \ No newline at end of file +} diff --git a/ui/label/label.android.ts b/ui/label/label.android.ts index d44ef74f0..31e47cf4f 100644 --- a/ui/label/label.android.ts +++ b/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); } -} \ No newline at end of file +} diff --git a/ui/label/label.ios.ts b/ui/label/label.ios.ts index 23d84bc35..1d5d0d686 100644 --- a/ui/label/label.ios.ts +++ b/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); } } -} \ No newline at end of file +} diff --git a/ui/layouts/absolute-layout/absolute-layout.android.ts b/ui/layouts/absolute-layout/absolute-layout.android.ts index e2ed19ff6..bac014fdb 100644 --- a/ui/layouts/absolute-layout/absolute-layout.android.ts +++ b/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); } -} \ No newline at end of file +} diff --git a/ui/layouts/absolute-layout/absolute-layout.ios.ts b/ui/layouts/absolute-layout/absolute-layout.ios.ts index 801a6634b..202b2d72b 100644 --- a/ui/layouts/absolute-layout/absolute-layout.ios.ts +++ b/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); } } -} \ No newline at end of file +} diff --git a/ui/layouts/dock-layout/dock-layout.android.ts b/ui/layouts/dock-layout/dock-layout.android.ts index 253a9fcca..51d327413 100644 --- a/ui/layouts/dock-layout/dock-layout.android.ts +++ b/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 { } } -(common.DockLayout.stretchLastChildProperty.metadata).onSetNativeValue = DockLayout.setNativeStretchLastChildProperty; \ No newline at end of file +(common.DockLayout.stretchLastChildProperty.metadata).onSetNativeValue = DockLayout.setNativeStretchLastChildProperty; diff --git a/ui/layouts/dock-layout/dock-layout.ios.ts b/ui/layouts/dock-layout/dock-layout.ios.ts index 11247e143..ad485e9de 100644 --- a/ui/layouts/dock-layout/dock-layout.ios.ts +++ b/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); } } -} \ No newline at end of file +} diff --git a/ui/layouts/grid-layout/grid-layout-common.ts b/ui/layouts/grid-layout/grid-layout-common.ts index 867f56448..1c4c8a984 100644 --- a/ui/layouts/grid-layout/grid-layout-common.ts +++ b/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"; diff --git a/ui/layouts/grid-layout/grid-layout.android.ts b/ui/layouts/grid-layout/grid-layout.android.ts index 7f14cb1fe..1318dce87 100644 --- a/ui/layouts/grid-layout/grid-layout.android.ts +++ b/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); } } -} \ No newline at end of file +} diff --git a/ui/layouts/grid-layout/grid-layout.ios.ts b/ui/layouts/grid-layout/grid-layout.ios.ts index 957e1e737..1b20a3a3c 100644 --- a/ui/layouts/grid-layout/grid-layout.ios.ts +++ b/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); } -} \ No newline at end of file +} diff --git a/ui/layouts/stack-layout/stack-layout.android.ts b/ui/layouts/stack-layout/stack-layout.android.ts index fc44a7dc8..b3f9bed5e 100644 --- a/ui/layouts/stack-layout/stack-layout.android.ts +++ b/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 { } } -(common.StackLayout.orientationProperty.metadata).onSetNativeValue = StackLayout.setNativeOrientationProperty; \ No newline at end of file +(common.StackLayout.orientationProperty.metadata).onSetNativeValue = StackLayout.setNativeOrientationProperty; diff --git a/ui/layouts/stack-layout/stack-layout.ios.ts b/ui/layouts/stack-layout/stack-layout.ios.ts index d033b04d6..47d69460a 100644 --- a/ui/layouts/stack-layout/stack-layout.ios.ts +++ b/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; } } -} \ No newline at end of file +} diff --git a/ui/layouts/wrap-layout/wrap-layout.android.ts b/ui/layouts/wrap-layout/wrap-layout.android.ts index 341f901d3..4f3ebab05 100644 --- a/ui/layouts/wrap-layout/wrap-layout.android.ts +++ b/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 { (common.WrapLayout.orientationProperty.metadata).onSetNativeValue = WrapLayout.setNativeOrientationProperty; (common.WrapLayout.itemWidthProperty.metadata).onSetNativeValue = WrapLayout.setNativeItemWidthProperty; -(common.WrapLayout.itemHeightProperty.metadata).onSetNativeValue = WrapLayout.setNativeItemHeightProperty; \ No newline at end of file +(common.WrapLayout.itemHeightProperty.metadata).onSetNativeValue = WrapLayout.setNativeItemHeightProperty; diff --git a/ui/layouts/wrap-layout/wrap-layout.ios.ts b/ui/layouts/wrap-layout/wrap-layout.ios.ts index 7578747f0..4d07734d5 100644 --- a/ui/layouts/wrap-layout/wrap-layout.ios.ts +++ b/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 { } } } -} \ No newline at end of file +} diff --git a/ui/list-picker/list-picker.android.ts b/ui/list-picker/list-picker.android.ts index 0ac62c48b..760bcd026 100644 --- a/ui/list-picker/list-picker.android.ts +++ b/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") diff --git a/ui/list-picker/list-picker.ios.ts b/ui/list-picker/list-picker.ios.ts index 2a27fac07..9988a5f18 100644 --- a/ui/list-picker/list-picker.ios.ts +++ b/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"); diff --git a/ui/list-view/list-view.android.ts b/ui/list-view/list-view.android.ts index 764fb33c7..fd41b3a1b 100644 --- a/ui/list-view/list-view.android.ts +++ b/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"); diff --git a/ui/list-view/list-view.ios.ts b/ui/list-view/list-view.ios.ts index 7e81e9275..77b6c2fe8 100644 --- a/ui/list-view/list-view.ios.ts +++ b/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; } -} \ No newline at end of file +} diff --git a/ui/page/page-common.ts b/ui/page/page-common.ts index ff00961c6..2ba73ff82 100644 --- a/ui/page/page-common.ts +++ b/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"); diff --git a/ui/page/page.android.ts b/ui/page/page.android.ts index f40591a30..b19d1584c 100644 --- a/ui/page/page.android.ts +++ b/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(); } -} \ No newline at end of file +} diff --git a/ui/page/page.d.ts b/ui/page/page.d.ts index f5f6c06ee..e30c19ec3 100644 --- a/ui/page/page.d.ts +++ b/ui/page/page.d.ts @@ -204,4 +204,4 @@ declare module "ui/page" { */ exports?: any; } -} \ No newline at end of file +} diff --git a/ui/page/page.ios.ts b/ui/page/page.ios.ts index 4f06b755d..36a79f657 100644 --- a/ui/page/page.ios.ts +++ b/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"); diff --git a/ui/placeholder/placeholder.android.ts b/ui/placeholder/placeholder.android.ts index 86359c443..d3de56051 100644 --- a/ui/placeholder/placeholder.android.ts +++ b/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; } -} \ No newline at end of file +} diff --git a/ui/placeholder/placeholder.ios.ts b/ui/placeholder/placeholder.ios.ts index 76e3a1e8b..b4ca8eb2a 100644 --- a/ui/placeholder/placeholder.ios.ts +++ b/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; } -} \ No newline at end of file +} diff --git a/ui/progress/progress.android.ts b/ui/progress/progress.android.ts index 766c56beb..8e8bb6eaa 100644 --- a/ui/progress/progress.android.ts +++ b/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"); diff --git a/ui/progress/progress.ios.ts b/ui/progress/progress.ios.ts index 2c414070d..275c9a1eb 100644 --- a/ui/progress/progress.ios.ts +++ b/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; } -} \ No newline at end of file +} diff --git a/ui/scroll-view/scroll-view.android.ts b/ui/scroll-view/scroll-view.android.ts index ac0d1da84..76ee084f7 100644 --- a/ui/scroll-view/scroll-view.android.ts +++ b/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 } } } -} \ No newline at end of file +} diff --git a/ui/scroll-view/scroll-view.ios.ts b/ui/scroll-view/scroll-view.ios.ts index 8ea33a709..43e3385de 100644 --- a/ui/scroll-view/scroll-view.ios.ts +++ b/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)); } } -} \ No newline at end of file +} diff --git a/ui/search-bar/search-bar.android.ts b/ui/search-bar/search-bar.android.ts index f6a303011..4012c803e 100644 --- a/ui/search-bar/search-bar.android.ts +++ b/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"); diff --git a/ui/search-bar/search-bar.ios.ts b/ui/search-bar/search-bar.ios.ts index 58720e561..b7c648198 100644 --- a/ui/search-bar/search-bar.ios.ts +++ b/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"); diff --git a/ui/segmented-bar/segmented-bar.android.ts b/ui/segmented-bar/segmented-bar.android.ts index d26084f4e..1be3a7e73 100644 --- a/ui/segmented-bar/segmented-bar.android.ts +++ b/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"); diff --git a/ui/segmented-bar/segmented-bar.ios.ts b/ui/segmented-bar/segmented-bar.ios.ts index a08a2ff91..a93a65d14 100644 --- a/ui/segmented-bar/segmented-bar.ios.ts +++ b/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] } }; -} \ No newline at end of file +} diff --git a/ui/slider/slider.android.ts b/ui/slider/slider.android.ts index 60fd1fa33..4ae48883b 100644 --- a/ui/slider/slider.android.ts +++ b/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; } } -} \ No newline at end of file +} diff --git a/ui/slider/slider.ios.ts b/ui/slider/slider.ios.ts index 530e49f22..7d5f5ad6a 100644 --- a/ui/slider/slider.ios.ts +++ b/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; } -} \ No newline at end of file +} diff --git a/ui/styling/background.android.ts b/ui/styling/background.android.ts index 8ca7dc622..e832f468a 100644 --- a/ui/styling/background.android.ts +++ b/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); diff --git a/ui/styling/background.ios.ts b/ui/styling/background.ios.ts index 6203186ef..485060692 100644 --- a/ui/styling/background.ios.ts +++ b/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); diff --git a/ui/styling/font-common.ts b/ui/styling/font-common.ts index a5c9604e6..6fc122ff1 100644 --- a/ui/styling/font-common.ts +++ b/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; -} \ No newline at end of file +} diff --git a/ui/styling/font.android.ts b/ui/styling/font.android.ts index da4f4b7df..657a92073 100644 --- a/ui/styling/font.android.ts +++ b/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; } -} \ No newline at end of file +} diff --git a/ui/styling/font.ios.ts b/ui/styling/font.ios.ts index 3d334d32e..5355d261a 100644 --- a/ui/styling/font.ios.ts +++ b/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; } -} \ No newline at end of file +} diff --git a/ui/styling/style-scope.d.ts b/ui/styling/style-scope.d.ts new file mode 100644 index 000000000..8ced6d535 --- /dev/null +++ b/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; +} diff --git a/ui/styling/style-scope.ts b/ui/styling/style-scope.ts index 74c422782..b3f3976b5 100644 --- a/ui/styling/style-scope.ts +++ b/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"); diff --git a/ui/styling/style.d.ts b/ui/styling/style.d.ts new file mode 100644 index 000000000..7695725b8 --- /dev/null +++ b/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; +} diff --git a/ui/styling/style.ts b/ui/styling/style.ts index 08a4c557d..066732318 100644 --- a/ui/styling/style.ts +++ b/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(); \ No newline at end of file +stylers._registerDefaultStylers(); diff --git a/ui/styling/stylers.android.ts b/ui/styling/stylers.android.ts index a2c70bd4f..c95772608 100644 --- a/ui/styling/stylers.android.ts +++ b/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; diff --git a/ui/styling/stylers.ios.ts b/ui/styling/stylers.ios.ts index b31a22f19..1c151136e 100644 --- a/ui/styling/stylers.ios.ts +++ b/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(); -} \ No newline at end of file +} diff --git a/ui/styling/styling.ts b/ui/styling/styling.ts index 7c80af42d..a774e3a7b 100644 --- a/ui/styling/styling.ts +++ b/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; -} \ No newline at end of file +} diff --git a/ui/switch/switch.android.ts b/ui/switch/switch.android.ts index eeb431eff..fe78e2afb 100644 --- a/ui/switch/switch.android.ts +++ b/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") diff --git a/ui/switch/switch.ios.ts b/ui/switch/switch.ios.ts index 0c0acc6c5..9ac283568 100644 --- a/ui/switch/switch.ios.ts +++ b/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; } -} \ No newline at end of file +} diff --git a/ui/tab-view/tab-view.android.ts b/ui/tab-view/tab-view.android.ts index 4596bba9e..2d86354cc 100644 --- a/ui/tab-view/tab-view.android.ts +++ b/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; } -} \ No newline at end of file +} diff --git a/ui/tab-view/tab-view.ios.ts b/ui/tab-view/tab-view.ios.ts index 6f33a09a5..559400447 100644 --- a/ui/tab-view/tab-view.ios.ts +++ b/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 { } } -} \ No newline at end of file +} diff --git a/ui/text-field/text-field.android.ts b/ui/text-field/text-field.android.ts index 2f3990f75..1f29772f6 100644 --- a/ui/text-field/text-field.android.ts +++ b/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 }) } -} \ No newline at end of file +} diff --git a/ui/text-field/text-field.ios.ts b/ui/text-field/text-field.ios.ts index dcee39134..3264a3f96 100644 --- a/ui/text-field/text-field.ios.ts +++ b/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 = data.object; textField.ios.placeholder = data.newValue + ""; } -} \ No newline at end of file +} diff --git a/ui/text-view/text-view.android.ts b/ui/text-view/text-view.android.ts index e0a06f3c1..6d2f402e0 100644 --- a/ui/text-view/text-view.android.ts +++ b/ui/text-view/text-view.android.ts @@ -1,4 +1,4 @@ -import common = require("ui/text-view/text-view-common"); +import common = require("./text-view-common"); global.moduleMerge(common, exports); @@ -7,4 +7,4 @@ export class TextView extends common.TextView { this.android.setInputType(android.text.InputType.TYPE_CLASS_TEXT | android.text.InputType.TYPE_TEXT_VARIATION_NORMAL | android.text.InputType.TYPE_TEXT_FLAG_CAP_SENTENCES | android.text.InputType.TYPE_TEXT_FLAG_MULTI_LINE); this.android.setGravity(android.view.Gravity.TOP | android.view.Gravity.LEFT); } -} \ No newline at end of file +} diff --git a/ui/text-view/text-view.ios.ts b/ui/text-view/text-view.ios.ts index 1afc83ef1..700c2dd49 100644 --- a/ui/text-view/text-view.ios.ts +++ b/ui/text-view/text-view.ios.ts @@ -1,4 +1,4 @@ -import common = require("ui/text-view/text-view-common"); +import common = require("./text-view-common"); import dependencyObservable = require("ui/core/dependency-observable"); import textBase = require("ui/text-base"); import enums = require("ui/enums"); @@ -101,4 +101,4 @@ export class TextView extends common.TextView { this.ios.text = this.text + ""; (this.ios).isShowingHint = false; } -} \ No newline at end of file +} diff --git a/ui/time-picker/time-picker.android.ts b/ui/time-picker/time-picker.android.ts index 5bdc491eb..d2505d096 100644 --- a/ui/time-picker/time-picker.android.ts +++ b/ui/time-picker/time-picker.android.ts @@ -1,4 +1,4 @@ -import common = require("ui/time-picker/time-picker-common"); +import common = require("./time-picker-common"); import dependencyObservable = require("ui/core/dependency-observable"); import proxy = require("ui/core/proxy"); import utils = require("utils/utils") diff --git a/ui/time-picker/time-picker.ios.ts b/ui/time-picker/time-picker.ios.ts index 72c257bbf..5622c7b9c 100644 --- a/ui/time-picker/time-picker.ios.ts +++ b/ui/time-picker/time-picker.ios.ts @@ -1,4 +1,4 @@ -import common = require("ui/time-picker/time-picker-common"); +import common = require("./time-picker-common"); import dependencyObservable = require("ui/core/dependency-observable"); import proxy = require("ui/core/proxy"); @@ -74,4 +74,4 @@ class UITimePickerChangeHandlerImpl extends NSObject { public static ObjCExposedMethods = { 'valueChanged': { returns: interop.types.void, params: [UIDatePicker] } }; -} \ No newline at end of file +} diff --git a/ui/web-view/web-view.android.ts b/ui/web-view/web-view.android.ts index b2c468111..5eb7fc0e6 100644 --- a/ui/web-view/web-view.android.ts +++ b/ui/web-view/web-view.android.ts @@ -1,4 +1,4 @@ -import common = require("ui/web-view/web-view-common"); +import common = require("./web-view-common"); import trace = require("trace"); import utils = require("utils/utils"); import fs = require("file-system"); @@ -120,4 +120,4 @@ export class WebView extends common.WebView { public reload() { this._android.reload(); } -} \ No newline at end of file +} diff --git a/ui/web-view/web-view.ios.ts b/ui/web-view/web-view.ios.ts index e33e80414..0f1937abf 100644 --- a/ui/web-view/web-view.ios.ts +++ b/ui/web-view/web-view.ios.ts @@ -1,4 +1,4 @@ -import common = require("ui/web-view/web-view-common"); +import common = require("./web-view-common"); import trace = require("trace"); import utils = require("utils/utils"); import fs = require("file-system"); @@ -128,4 +128,4 @@ export class WebView extends common.WebView { public reload() { this._ios.reload(); } -} \ No newline at end of file +} diff --git a/utils/utils.android.ts b/utils/utils.android.ts index bb79d4406..54b3fb1b3 100644 --- a/utils/utils.android.ts +++ b/utils/utils.android.ts @@ -1,4 +1,4 @@ -import common = require("utils/utils-common"); +import common = require("./utils-common"); import trace = require("trace"); global.moduleMerge(common, exports); @@ -145,4 +145,4 @@ export function openUrl(location: string): boolean { return false; } return true; -} \ No newline at end of file +} diff --git a/utils/utils.ios.ts b/utils/utils.ios.ts index 0a477c981..3647b372d 100644 --- a/utils/utils.ios.ts +++ b/utils/utils.ios.ts @@ -1,4 +1,4 @@ -import common = require("utils/utils-common"); +import common = require("./utils-common"); import colorModule = require("color"); global.moduleMerge(common, exports); @@ -85,4 +85,4 @@ export function openUrl(location: string): boolean { console.error("Error in OpenURL", e); } return false; -} \ No newline at end of file +}