Make moduleMerge a global function - this saves a total of 83 requires upon application loading.

application/application-common.ts

@@ -6,7 +6,7 @@ import styleScope = require("ui/styling/style-scope");
 import observable = require("data/observable");
 
 var events = new observable.Observable();
-require("utils/module-merge").merge(events, exports);
+global.moduleMerge(events, exports);
 
 export var launchEvent = "launch";
 export var suspendEvent = "suspend";

application/application.android.ts

@@ -4,9 +4,7 @@ import frame = require("ui/frame");
 import types = require("utils/types");
 import observable = require("data/observable");
 
-// merge the exports of the application_common file with the exports of this file
+global.moduleMerge(appModule, exports);
-declare var exports;
-require("utils/module-merge").merge(appModule, exports);
 
 export var mainModule: string;
 

application/application.ios.ts

@@ -5,9 +5,7 @@ import types = require("utils/types");
 import view = require("ui/core/view");
 import definition = require("application");
 
-// merge the exports of the application_common file with the exports of this file
+global.moduleMerge(appModule, exports);
-declare var exports;
-require("utils/module-merge").merge(appModule, exports);
 
 export var mainModule: string;
 

apps/tests/application-tests.android.ts

@@ -3,9 +3,7 @@ import app = require("application");
 import TKUnit = require("./TKUnit"); 
 import commonTests = require("./application-tests-common");
 
-// merge the exports of the application_common file with the exports of this file
+global.moduleMerge(commonTests, exports);
-declare var exports;
-require("utils/module-merge").merge(commonTests, exports);
 
 // <snippet module="application" title="application">
 // ### Using the Android-specific implementation

apps/tests/application-tests.ios.ts

@@ -3,9 +3,7 @@ import app = require("application");
 import TKUnit = require("./TKUnit");
 import commonTests = require("./application-tests-common");
 
-// merge the exports of the application_common file with the exports of this file
+global.moduleMerge(commonTests, exports);
-declare var exports;
-require("utils/module-merge").merge(commonTests, exports);
 
 // <snippet module="application" title="application">
 // ### Adding a Notification Observer (iOS)

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

@@ -1,4 +1,2 @@
 import actionTestsCommon = require("./action-bar-tests-common");
-
+global.moduleMerge(actionTestsCommon, exports);
-declare var exports;
-require("utils/module-merge").merge(actionTestsCommon, exports);

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

@@ -6,8 +6,7 @@ import helper = require("../helper");
 import view = require("ui/core/view");
 import actionBar = require("ui/action-bar");
 
-declare var exports;
+global.moduleMerge(actionTestsCommon, exports);
-require("utils/module-merge").merge(actionTestsCommon, exports);
 
 export function test_NavBar_isVisible_when_MenuItems_areSet() {
 

apps/tests/ui/page/page-tests.android.ts

@@ -5,8 +5,7 @@ import PageTestCommon = require("./page-tests-common");
 import helper = require("../helper");
 import frame = require("ui/frame");
 
-declare var exports;
+global.moduleMerge(PageTestCommon, exports);
-require("utils/module-merge").merge(PageTestCommon, exports);
 
 export var test_NavigateToNewPage_WithAndroidCache = function () {
     var testPage: PageModule.Page;

apps/tests/ui/page/page-tests.ios.ts

@@ -4,8 +4,7 @@ import TKUnit = require("../../TKUnit");
 import LabelModule = require("ui/label");
 import helper = require("../helper");
 
-declare var exports;
+global.moduleMerge(PageTestCommon, exports);
-require("utils/module-merge").merge(PageTestCommon, exports);
 
 export function test_NavigateToNewPage_InnerControl() {
     var testPage: PageModule.Page;

apps/tests/ui/view/view-tests.android.ts

@@ -12,9 +12,7 @@ import trace = require("trace");
 // enable the trace, it is disabled by default
 trace.enable();
 
-// merge the exports of the view-tests-common file with the exports of this file
+global.moduleMerge(commonTests, exports);
-declare var exports;
-require("utils/module-merge").merge(commonTests, exports);
 
 export var test_event_onAttached_IsRaised = function () {
     var listener = new Listener("_onAttached");

apps/tests/ui/view/view-tests.ios.ts

@@ -1,9 +1,7 @@
 import commonTests = require("./view-tests-common");
 import view = require("ui/core/view");
 
-// merge the exports of the application_common file with the exports of this file
+global.moduleMerge(commonTests, exports);
-declare var exports;
-require("utils/module-merge").merge(commonTests, exports);
 
 export function getNativeBorderWidth(v: view.View): number {
     return (<UIView>v.ios).layer.borderWidth;

connectivity/connectivity.android.ts

@@ -2,8 +2,7 @@
 import common = require("connectivity/connectivity-common");
 import utils = require("utils/utils");
 
-declare var exports;
+global.moduleMerge(common, exports);
-require("utils/module-merge").merge(common, exports);
 
 var WIFI = "WIFI";
 var MOBILE = "MOBILE";

connectivity/connectivity.ios.ts

@@ -1,7 +1,6 @@
 import common = require("connectivity/connectivity-common");
 
-declare var exports;
+global.moduleMerge(common, exports);
-require("utils/module-merge").merge(common, exports);
 
 // Get Connection Type
 declare var sockaddr;

globals/globals.ts

@@ -3,6 +3,17 @@ import timer = require("timer");
 import consoleModule = require("console");
 import xhr = require("xhr/xhr");
 import dialogs = require("ui/dialogs");
+var fetchModule = require("fetch");
+
+// This method iterates all the keys in the source exports object and copies them to the destination exports one.
+// Note: the method will not check for naming collisions and will override any already existing entries in the destination exports.
+global.moduleMerge = function (sourceExports: any, destExports: any) {
+    for (var key in sourceExports) {
+        destExports[key] = sourceExports[key];
+    }
+}
+
+global.moduleMerge(fetchModule, global);
 
 global.setTimeout = timer.setTimeout;
 global.clearTimeout = timer.clearTimeout;
@@ -18,9 +29,6 @@ global.XMLHttpRequest = xhr.XMLHttpRequest;
 global.FormData = xhr.FormData;
 global.alert = dialogs.alert;
 
-var fetchModule = require("fetch");
-require("utils/module-merge").merge(fetchModule, global);
-
 export function Deprecated(target: Object, key?: string | symbol, descriptor?: any) {
     if (descriptor) {
         var originalMethod = descriptor.value;

http/http.ts

@@ -1,9 +1,7 @@
 import image = require("image-source");
 import httpRequest = require("http/http-request");
 
-// merge the exports of the request file with the exports of this file
+global.moduleMerge(httpRequest, exports);
-declare var exports;
-require("utils/module-merge").merge(httpRequest, exports);
 
 export function getString(arg: any): Promise<string> {
     return new Promise<string>((resolve, reject) => {

image-source/image-source.android.ts

@@ -5,9 +5,7 @@ import common = require("image-source/image-source-common");
 import enums = require("ui/enums");
 import utils = require("utils/utils");
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 export class ImageSource implements definition.ImageSource {
     public android: android.graphics.Bitmap;

image-source/image-source.ios.ts

@@ -4,9 +4,7 @@ import fs = require("file-system");
 import common = require("image-source/image-source-common");
 import enums = require("ui/enums");
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 export class ImageSource implements definition.ImageSource {
     public android: android.graphics.Bitmap;

location/location-common.ts

@@ -2,11 +2,6 @@
 //import locationManagerModule = require("location/location-manager");
 import defModule = require("location");
 
-// merge the exports of the types module with the exports of this file
-//import merger = require("utils/module-merge");
-//declare var exports;
-//merger.merge(locationManagerModule, exports);
-
 var defaultGetLocationTimeout = 20000;
 
 export class Location implements defModule.Location {

location/location.android.ts

@@ -3,9 +3,7 @@ import locationModule = require("location");
 import common = require("location/location-common");
 import utils = require("utils/utils");
 
-import merger = require("utils/module-merge");
+global.moduleMerge(common, exports);
-declare var exports;
-merger.merge(common, exports);
 
 export class LocationManager implements locationModule.LocationManager {
 	get android(): locationModule.AndroidLocationManager {

location/location.ios.ts

@@ -2,9 +2,7 @@
 import locationModule = require("location");
 import common = require("location/location-common");
 
-import merger = require("utils/module-merge");
+global.moduleMerge(common, exports);
-declare var exports;
-merger.merge(common, exports);
 
 class LocationListenerImpl extends NSObject implements CLLocationManagerDelegate {
     public static ObjCProtocols = [CLLocationManagerDelegate];

text/formatted-string.android.ts

@@ -1,8 +1,7 @@
 import formattedStringCommon = require("text/formatted-string-common");
 import spanModule = require("text/span");
 
-declare var exports;
+global.moduleMerge(formattedStringCommon, exports);
-require("utils/module-merge").merge(formattedStringCommon, exports);
 
 export class FormattedString extends formattedStringCommon.FormattedString {
     public createFormattedStringCore() {

text/formatted-string.ios.ts

@@ -1,8 +1,7 @@
 import formattedStringCommon = require("text/formatted-string-common");
 import spanModule = require("text/span");
 
-declare var exports;
+global.moduleMerge(formattedStringCommon, exports);
-require("utils/module-merge").merge(formattedStringCommon, exports);
 
 export class FormattedString extends formattedStringCommon.FormattedString {
     public createFormattedStringCore() {

text/span.android.ts

@@ -3,8 +3,7 @@ import enums = require("ui/enums");
 import formattedString = require("text/formatted-string");
 import utils = require("utils/utils");
 
-declare var exports;
+global.moduleMerge(spanCommon, exports);
-require("utils/module-merge").merge(spanCommon, exports);
 
 export class Span extends spanCommon.Span {
     public updateSpanModifiers(parent: formattedString.FormattedString) {

text/span.ios.ts

@@ -2,8 +2,7 @@ import spanCommon = require("text/span-common");
 import enums = require("ui/enums");
 import formattedString = require("text/formatted-string");
 
-declare var exports;
+global.moduleMerge(spanCommon, exports);
-require("utils/module-merge").merge(spanCommon, exports);
 
 export class Span extends spanCommon.Span {
     public updateSpanModifiers(parent: formattedString.FormattedString) {

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

@@ -11,8 +11,7 @@ import dts = require("ui/action-bar");
 var ACTION_ITEM_ID_OFFSET = 1000;
 var API_LVL = android.os.Build.VERSION.SDK_INT;
 
-declare var exports;
+global.moduleMerge(common, exports);
-require("utils/module-merge").merge(common, exports);
 
 export class ActionItem extends common.ActionItemBase implements dts.ActionItem {
     private _androidPosition: dts.AndroidActionItemSettings = { position: enums.AndroidActionItemPosition.actionBar };

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

@@ -6,8 +6,7 @@ import enums = require("ui/enums");
 import view = require("ui/core/view");
 import utils = require("utils/utils");
 
-declare var exports;
+global.moduleMerge(common, exports);
-require("utils/module-merge").merge(common, exports);
 
 export class ActionItem extends common.ActionItemBase implements dts.ActionItem {
     private _ios: dts.IOSActionItemSettings = { position: enums.IOSActionItemPosition.left };

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

@@ -17,9 +17,7 @@ function onBusyPropertyChanged(data: dependencyObservable.PropertyChangeData) {
 // register the setNativeValue callback
 (<proxy.PropertyMetadata>aiCommon.ActivityIndicator.busyProperty.metadata).onSetNativeValue = onBusyPropertyChanged;
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(aiCommon, exports);
-declare var exports;
-require("utils/module-merge").merge(aiCommon, exports);
 
 export class ActivityIndicator extends aiCommon.ActivityIndicator {
     private _android: android.widget.ProgressBar;

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

@@ -18,9 +18,7 @@ function onBusyPropertyChanged(data: dependencyObservable.PropertyChangeData) {
 // register the setNativeValue callback
 (<proxy.PropertyMetadata>aiCommon.ActivityIndicator.busyProperty.metadata).onSetNativeValue = onBusyPropertyChanged;
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(aiCommon, exports);
-declare var exports;
-require("utils/module-merge").merge(aiCommon, exports);
 
 export class ActivityIndicator extends aiCommon.ActivityIndicator  {
     private _ios: UIActivityIndicatorView;

ui/button/button.android.ts

@@ -2,9 +2,7 @@
 import utils = require("utils/utils");
 import trace = require("trace");
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 export class Button extends common.Button {
     private _android: android.widget.Button;

ui/button/button.ios.ts

@@ -22,9 +22,7 @@ class TapHandlerImpl extends NSObject {
     };
 }
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 export class Button extends common.Button {
     private _ios: UIButton;

ui/core/view.android.ts

@@ -6,9 +6,7 @@ import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
 import gestures = require("ui/gestures");
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(viewCommon, exports);
-declare var exports;
-require("utils/module-merge").merge(viewCommon, exports);
 
 var ANDROID = "_android";
 var NATIVE_VIEW = "_nativeView";

ui/core/view.ios.ts

@@ -5,9 +5,7 @@ import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
 import background = require("ui/styling/background");
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(viewCommon, exports);
-declare var exports;
-require("utils/module-merge").merge(viewCommon, exports);
 
 function onIdPropertyChanged(data: dependencyObservable.PropertyChangeData) {
     var view = <View>data.object;

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

@@ -63,9 +63,7 @@ function onMinDatePropertyChanged(data: dependencyObservable.PropertyChangeData)
 
 (<proxy.PropertyMetadata>common.DatePicker.minDateProperty.metadata).onSetNativeValue = onMinDatePropertyChanged;
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 export class DatePicker extends common.DatePicker {
     private _android: android.widget.DatePicker;

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

@@ -59,9 +59,7 @@ function onMinDatePropertyChanged(data: dependencyObservable.PropertyChangeData)
 
 (<proxy.PropertyMetadata>common.DatePicker.minDateProperty.metadata).onSetNativeValue = onMinDatePropertyChanged;
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 export class DatePicker extends common.DatePicker {
     private _ios: UIDatePicker;

ui/dialogs/dialogs.android.ts

@@ -3,13 +3,11 @@
  */
 
 import dialogs = require("ui/dialogs");
-import dialogs_common = require("ui/dialogs/dialogs-common");
+import dialogsCommon = require("ui/dialogs/dialogs-common");
 import appmodule = require("application");
 import types = require("utils/types");
 
-// merge the exports of the request file with the exports of this file
+global.moduleMerge(dialogsCommon, exports);
-declare var exports;
-require("utils/module-merge").merge(dialogs_common, exports);
 
 function createAlertDialog(options?: dialogs.DialogOptions): android.app.AlertDialog.Builder {
     var alert = new android.app.AlertDialog.Builder(appmodule.android.foregroundActivity);
@@ -56,7 +54,7 @@ function addButtonsToAlertDialog(alert: android.app.AlertDialog.Builder, options
 export function alert(arg: any): Promise<void> {
     return new Promise<void>((resolve, reject) => {
         try {
-            var options = types.isString(arg) ? { title: dialogs_common.ALERT, okButtonText: dialogs_common.OK, message: arg } : arg;
+            var options = types.isString(arg) ? { title: dialogsCommon.ALERT, okButtonText: dialogsCommon.OK, message: arg } : arg;
 
             var alert = createAlertDialog(options);
 
@@ -78,7 +76,7 @@ export function alert(arg: any): Promise<void> {
 export function confirm(arg: any): Promise<boolean> {
     return new Promise<boolean>((resolve, reject) => {
         try {
-            var options = types.isString(arg) ? { title: dialogs_common.CONFIRM, okButtonText: dialogs_common.OK, cancelButtonText: dialogs_common.CANCEL, message: arg } : arg;
+            var options = types.isString(arg) ? { title: dialogsCommon.CONFIRM, okButtonText: dialogsCommon.OK, cancelButtonText: dialogsCommon.CANCEL, message: arg } : arg;
             var alert = createAlertDialog(options);
 
             addButtonsToAlertDialog(alert, options, function (result) { resolve(result); });
@@ -95,9 +93,9 @@ export function prompt(arg: any): Promise<dialogs.PromptResult> {
     var options: dialogs.PromptOptions;
 
     var defaultOptions = {
-        title: dialogs_common.PROMPT,
+        title: dialogsCommon.PROMPT,
-        okButtonText: dialogs_common.OK,
+        okButtonText: dialogsCommon.OK,
-        cancelButtonText: dialogs_common.CANCEL,
+        cancelButtonText: dialogsCommon.CANCEL,
         inputType: dialogs.inputType.text,
     };
 
@@ -146,7 +144,7 @@ export function prompt(arg: any): Promise<dialogs.PromptResult> {
 export function login(arg: any): Promise<dialogs.LoginResult> {
     var options: dialogs.LoginOptions;
 
-    var defaultOptions = { title: dialogs_common.LOGIN, okButtonText: dialogs_common.OK, cancelButtonText: dialogs_common.CANCEL };
+    var defaultOptions = { title: dialogsCommon.LOGIN, okButtonText: dialogsCommon.OK, cancelButtonText: dialogsCommon.CANCEL };
 
     if (arguments.length === 1) {
         if (types.isString(arguments[0])) {
@@ -211,7 +209,7 @@ export function action(arg: any): Promise<string> {
 
     var options: dialogs.ActionOptions;
 
-    var defaultOptions = { cancelButtonText: dialogs_common.CANCEL };
+    var defaultOptions = { cancelButtonText: dialogsCommon.CANCEL };
 
     if (arguments.length === 1) {
         if (types.isString(arguments[0])) {

ui/dialogs/dialogs.ios.ts

@@ -3,14 +3,12 @@
  */
 
 import dialogs = require("ui/dialogs");
-import dialogs_common = require("ui/dialogs/dialogs-common");
+import dialogsCommon = require("ui/dialogs/dialogs-common");
 import types = require("utils/types");
 import utils = require("utils/utils");
 import frame = require("ui/frame");
 
-// merge the exports of the request file with the exports of this file
+global.moduleMerge(dialogsCommon, exports);
-declare var exports;
-require("utils/module-merge").merge(dialogs_common, exports);
 
 class UIAlertViewDelegateImpl extends NSObject implements UIAlertViewDelegate {
     public static ObjCProtocols = [UIAlertViewDelegate];
@@ -140,7 +138,7 @@ function addButtonsToAlertController(alertController: UIAlertController, options
 export function alert(arg: any): Promise<void> {
     return new Promise<void>((resolve, reject) => {
         try {
-            var options = types.isString(arg) ? { title: dialogs_common.ALERT, okButtonText: dialogs_common.OK, message: arg } : arg;
+            var options = types.isString(arg) ? { title: dialogsCommon.ALERT, okButtonText: dialogsCommon.OK, message: arg } : arg;
 
             if (utils.ios.MajorVersion < 8) {
                 var alert = createUIAlertView(options);
@@ -175,7 +173,7 @@ export function alert(arg: any): Promise<void> {
 export function confirm(arg: any): Promise<boolean> {
     return new Promise<boolean>((resolve, reject) => {
         try {
-            var options = types.isString(arg) ? { title: dialogs_common.CONFIRM, okButtonText: dialogs_common.OK, cancelButtonText: dialogs_common.CANCEL, message: arg } : arg;
+            var options = types.isString(arg) ? { title: dialogsCommon.CONFIRM, okButtonText: dialogsCommon.OK, cancelButtonText: dialogsCommon.CANCEL, message: arg } : arg;
 
             if (utils.ios.MajorVersion < 8) {
                 var alert = createUIAlertView(options);
@@ -211,9 +209,9 @@ export function prompt(arg: any): Promise<dialogs.PromptResult> {
     var options: dialogs.PromptOptions;
 
     var defaultOptions = {
-        title: dialogs_common.PROMPT,
+        title: dialogsCommon.PROMPT,
-        okButtonText: dialogs_common.OK,
+        okButtonText: dialogsCommon.OK,
-        cancelButtonText: dialogs_common.CANCEL,
+        cancelButtonText: dialogsCommon.CANCEL,
         inputType: dialogs.inputType.text,
     };
 
@@ -287,7 +285,7 @@ export function prompt(arg: any): Promise<dialogs.PromptResult> {
 export function login(arg: any): Promise<dialogs.LoginResult> {
     var options: dialogs.LoginOptions;
 
-    var defaultOptions = { title: dialogs_common.LOGIN, okButtonText: dialogs_common.OK, cancelButtonText: dialogs_common.CANCEL };
+    var defaultOptions = { title: dialogsCommon.LOGIN, okButtonText: dialogsCommon.OK, cancelButtonText: dialogsCommon.CANCEL };
 
     if (arguments.length === 1) {
         if (types.isString(arguments[0])) {
@@ -389,7 +387,7 @@ function showUIAlertController(alertController: UIAlertController) {
 export function action(arg: any): Promise<string> {
     var options: dialogs.ActionOptions;
 
-    var defaultOptions = { cancelButtonText: dialogs_common.CANCEL };
+    var defaultOptions = { cancelButtonText: dialogsCommon.CANCEL };
 
     if (arguments.length === 1) {
         if (types.isString(arguments[0])) {

ui/frame/frame.android.ts

@@ -7,8 +7,7 @@ import utils = require("utils/utils");
 import view = require("ui/core/view");
 import application = require("application");
 
-declare var exports;
+global.moduleMerge(frameCommon, exports);
-require("utils/module-merge").merge(frameCommon, exports);
 
 var TAG = "_fragmentTag";
 var OWNER = "_owner";

ui/frame/frame.ios.ts

@@ -7,8 +7,7 @@ import utils = require("utils/utils");
 import view = require("ui/core/view");
 import types = require("utils/types");
 
-declare var exports;
+global.moduleMerge(frameCommon, exports);
-require("utils/module-merge").merge(frameCommon, exports);
 
 var ENTRY = "_entry";
 

ui/gestures/gestures.android.ts

@@ -4,9 +4,7 @@ import observable = require("data/observable");
 import view = require("ui/core/view");
 import trace = require("trace");
 
-// merge the exports of the request file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 var SWIPE_THRESHOLD = 100;
 var SWIPE_VELOCITY_THRESHOLD = 100;

ui/gestures/gestures.ios.ts

@@ -4,9 +4,7 @@ import view = require("ui/core/view");
 import observable = require("data/observable");
 import trace = require("trace");
 
-// merge the exports of the request file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 class UIGestureRecognizerImpl extends NSObject {
     static new(): UIGestureRecognizerImpl {

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

@@ -19,9 +19,7 @@ function onHtmlPropertyChanged(data: dependencyObservable.PropertyChangeData) {
 // register the setNativeValue callback
 (<proxy.PropertyMetadata>common.HtmlView.htmlProperty.metadata).onSetNativeValue = onHtmlPropertyChanged;
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 export class HtmlView extends common.HtmlView {
     private _android: android.widget.TextView;

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

@@ -24,9 +24,7 @@ function onHtmlPropertyChanged(data: dependencyObservable.PropertyChangeData) {
 // register the setNativeValue callback
 (<proxy.PropertyMetadata>common.HtmlView.htmlProperty.metadata).onSetNativeValue = onHtmlPropertyChanged;
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 export class HtmlView extends common.HtmlView {
     private _ios: UILabel;

ui/image/image.android.ts

@@ -3,9 +3,7 @@ import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
 import enums = require("ui/enums");
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(imageCommon, exports);
-declare var exports;
-require("utils/module-merge").merge(imageCommon, exports);
 
 function onStretchPropertyChanged(data: dependencyObservable.PropertyChangeData) {
     var image = <Image>data.object;

ui/image/image.ios.ts

@@ -4,9 +4,7 @@ import proxy = require("ui/core/proxy");
 import definition = require("ui/image");
 import enums = require("ui/enums");
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(imageCommon, exports);
-declare var exports;
-require("utils/module-merge").merge(imageCommon, exports);
 
 function onStretchPropertyChanged(data: dependencyObservable.PropertyChangeData) {
     var image = <Image>data.object;

ui/label/label.android.ts

@@ -21,9 +21,7 @@ function onTextWrapPropertyChanged(data: dependencyObservable.PropertyChangeData
 // register the setNativeValue callback
 (<proxy.PropertyMetadata>common.Label.textWrapProperty.metadata).onSetNativeValue = onTextWrapPropertyChanged;
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 export class Label extends common.Label {
     private _android: android.widget.TextView;

ui/label/label.ios.ts

@@ -22,9 +22,7 @@ function onTextWrapPropertyChanged(data: dependencyObservable.PropertyChangeData
 // register the setNativeValue callback
 (<proxy.PropertyMetadata>common.Label.textWrapProperty.metadata).onSetNativeValue = onTextWrapPropertyChanged;
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 export class Label extends common.Label {
     private _ios: UILabel;

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

@@ -2,9 +2,7 @@
 import dependencyObservable = require("ui/core/dependency-observable");
 import types = require("utils/types");
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 export class ListPicker extends common.ListPicker {
     private _android: android.widget.NumberPicker;

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

@@ -2,9 +2,7 @@
 import dependencyObservable = require("ui/core/dependency-observable");
 import types = require("utils/types");
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 export class ListPicker extends common.ListPicker {
     private _ios: UIPickerView;

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

@@ -13,9 +13,7 @@ var LOADMOREITEMS = common.ListView.loadMoreItemsEvent;
 var ITEMTAP = common.ListView.itemTapEvent;
 var REALIZED_INDEX = "realizedIndex";
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 function onSeparatorColorPropertyChanged(data: dependencyObservable.PropertyChangeData) {
     var bar = <ListView>data.object;

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

@@ -13,9 +13,7 @@ var LOADMOREITEMS = common.ListView.loadMoreItemsEvent;
 var ITEMTAP = common.ListView.itemTapEvent;
 var DEFAULT_HEIGHT = 80;
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 var infinity = utils.layout.makeMeasureSpec(0, utils.layout.UNSPECIFIED);
 

ui/page/page.android.ts

@@ -3,8 +3,7 @@ import definition = require("ui/page");
 import trace = require("trace");
 import color = require("color");
 
-declare var exports;
+global.moduleMerge(pageCommon, exports);
-require("utils/module-merge").merge(pageCommon, exports);
 
 class DialogFragmentClass extends android.app.DialogFragment {
     private _owner: Page;

ui/page/page.ios.ts

@@ -5,8 +5,7 @@ import trace = require("trace");
 import utils = require("utils/utils");
 import types = require("utils/types");
 
-declare var exports;
+global.moduleMerge(pageCommon, exports);
-require("utils/module-merge").merge(pageCommon, exports);
 
 class UIViewControllerImpl extends UIViewController {
     static new(): UIViewControllerImpl {

ui/placeholder/placeholder.android.ts

@@ -1,9 +1,7 @@
 import definition = require("ui/placeholder");
 import common = require("ui/placeholder/placeholder-common");
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 export class Placeholder extends common.Placeholder {
     private _android: android.view.View;

ui/placeholder/placeholder.ios.ts

@@ -1,9 +1,7 @@
 import definition = require("ui/placeholder");
 import common = require("ui/placeholder/placeholder-common");
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 export class Placeholder extends common.Placeholder {
     private _ios: UIView;

ui/progress/progress.android.ts

@@ -24,9 +24,7 @@ function onMaxValuePropertyChanged(data: dependencyObservable.PropertyChangeData
 (<proxy.PropertyMetadata>common.Progress.valueProperty.metadata).onSetNativeValue = onValuePropertyChanged;
 (<proxy.PropertyMetadata>common.Progress.maxValueProperty.metadata).onSetNativeValue = onMaxValuePropertyChanged;
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 export class Progress extends common.Progress {
     private _android: android.widget.ProgressBar;

ui/progress/progress.ios.ts

@@ -16,9 +16,7 @@ function onMaxValuePropertyChanged(data: dependencyObservable.PropertyChangeData
 (<proxy.PropertyMetadata>common.Progress.valueProperty.metadata).onSetNativeValue = onValuePropertyChanged;
 (<proxy.PropertyMetadata>common.Progress.maxValueProperty.metadata).onSetNativeValue = onMaxValuePropertyChanged;
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 export class Progress extends common.Progress {
     private _ios: UIProgressView;

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

@@ -6,9 +6,7 @@ import common = require("ui/scroll-view/scroll-view-common");
 import utils = require("utils/utils");
 import enums = require("ui/enums");
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 var OWNER = "_owner";
 var STATE = "_scrollViewState";

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

@@ -5,9 +5,7 @@ import common = require("ui/scroll-view/scroll-view-common");
 import enums = require("ui/enums");
 import utils = require("utils/utils");
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 export class ScrollView extends contentView.ContentView implements definition.ScrollView {
     private _scroll: UIScrollView;

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

@@ -90,9 +90,7 @@ function _changeSearchViewHintColor(bar: android.widget.SearchView, color: numbe
     }
 }
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 export class SearchBar extends common.SearchBar {
     private _android: android.widget.SearchView;

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

@@ -60,9 +60,7 @@ function getUITextField(bar: UISearchBar): UITextField {
     return undefined;
 }
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 class UISearchBarDelegateImpl extends NSObject implements UISearchBarDelegate {
     public static ObjCProtocols = [UISearchBarDelegate];

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

@@ -4,9 +4,7 @@ import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
 import types = require("utils/types");
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 function onSelectedIndexPropertyChanged(data: dependencyObservable.PropertyChangeData) {
     var view = <SegmentedBar>data.object;

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

@@ -5,9 +5,7 @@ import proxy = require("ui/core/proxy");
 import types = require("utils/types");
 import color = require("color");
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 function onSelectedIndexPropertyChanged(data: dependencyObservable.PropertyChangeData) {
     var view = <SegmentedBar>data.object;

ui/slider/slider.android.ts

@@ -35,9 +35,7 @@ function onMaxValuePropertyChanged(data: dependencyObservable.PropertyChangeData
 (<proxy.PropertyMetadata>common.Slider.minValueProperty.metadata).onSetNativeValue = onMinValuePropertyChanged;
 (<proxy.PropertyMetadata>common.Slider.maxValueProperty.metadata).onSetNativeValue = onMaxValuePropertyChanged;
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 export class Slider extends common.Slider {
     private _supressNativeValue: boolean;

ui/slider/slider.ios.ts

@@ -22,9 +22,7 @@ function onMaxValuePropertyChanged(data: dependencyObservable.PropertyChangeData
 (<proxy.PropertyMetadata>common.Slider.minValueProperty.metadata).onSetNativeValue = onMinValuePropertyChanged;
 (<proxy.PropertyMetadata>common.Slider.maxValueProperty.metadata).onSetNativeValue = onMaxValuePropertyChanged;
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 class SliderChangeHandlerImpl extends NSObject {
     static new(): SliderChangeHandlerImpl {

ui/styling/background.android.ts

@@ -2,8 +2,7 @@ import utils = require("utils/utils");
 import common = require("ui/styling/background-common");
 import dts = require("ui/styling/background");
 
-declare var exports;
+global.moduleMerge(common, exports);
-require("utils/module-merge").merge(common, exports);
 
 // We are using "ad" here to avoid namespace collision with the global android object
 export module ad {

ui/styling/background.ios.ts

@@ -2,8 +2,7 @@ import viewModule = require("ui/core/view");
 import style = require("ui/styling/style");
 import common = require("ui/styling/background-common");
 
-declare var exports;
+global.moduleMerge(common, exports);
-require("utils/module-merge").merge(common, exports);
 
 export module ios {
     export function createBackgroundUIColor(view: viewModule.View): UIColor {

ui/styling/stylers.android.ts

@@ -10,9 +10,7 @@ import styleModule = require("ui/styling/style");
 import font = require("ui/styling/font");
 import background = require("ui/styling/background");
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(stylersCommon, exports);
-declare var exports;
-require("utils/module-merge").merge(stylersCommon, exports);
 
 var _defaultBackgrounds = new Map<string, android.graphics.drawable.Drawable>();
 function onBackgroundOrBorderPropertyChanged(v: view.View) {

ui/styling/stylers.ios.ts

@@ -6,9 +6,7 @@ import enums = require("ui/enums");
 import font = require("ui/styling/font");
 import background = require("ui/styling/background");
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(stylersCommon, exports);
-declare var exports;
-require("utils/module-merge").merge(stylersCommon, exports);
 
 interface TextUIView {
     font: UIFont;

ui/switch/switch.android.ts

@@ -14,9 +14,7 @@ function onCheckedPropertyChanged(data: dependencyObservable.PropertyChangeData)
 // register the setNativeValue callbacks
 (<proxy.PropertyMetadata>common.Switch.checkedProperty.metadata).onSetNativeValue = onCheckedPropertyChanged;
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 export class Switch extends common.Switch {
     private _android: android.widget.Switch;

ui/switch/switch.ios.ts

@@ -10,9 +10,7 @@ function onCheckedPropertyChanged(data: dependencyObservable.PropertyChangeData)
 // register the setNativeValue callbacks
 (<proxy.PropertyMetadata>common.Switch.checkedProperty.metadata).onSetNativeValue = onCheckedPropertyChanged;
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 class SwitchChangeHandlerImpl extends NSObject {
     static new(): SwitchChangeHandlerImpl {

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

@@ -11,9 +11,7 @@ import page = require("ui/page");
 var VIEWS_STATES = "_viewStates";
 var RESOURCE_PREFIX = "res://";
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 class ViewPagerClass extends android.support.v4.view.ViewPager {
     private owner: TabView;

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

@@ -8,9 +8,7 @@ import view = require("ui/core/view");
 import imageSource = require("image-source");
 import types = require("utils/types");
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 class UITabBarControllerImpl extends UITabBarController {
     static new(): UITabBarControllerImpl {

ui/text-field/text-field-common.ts

@@ -10,9 +10,7 @@ export var secureProperty = new dependencyObservable.Property(
     new proxy.PropertyMetadata(false)
     );
 
-// merge the exports of the textBase file with the exports of this file
+global.moduleMerge(textBase, exports);
-declare var exports;
-require("utils/module-merge").merge(textBase, exports);
 
 export class TextField extends editableTextBase.EditableTextBase implements definition.TextField {
     constructor(options?: definition.Options) {

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

@@ -40,9 +40,7 @@ function onSecurePropertyChanged(data: dependencyObservable.PropertyChangeData)
 // register the setNativeValue callbacks
 (<proxy.PropertyMetadata>common.secureProperty.metadata).onSetNativeValue = onSecurePropertyChanged;
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 export class TextField extends common.TextField {
     public _configureEditText() {

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

@@ -11,9 +11,7 @@ function onSecurePropertyChanged(data: dependencyObservable.PropertyChangeData)
 
 (<proxy.PropertyMetadata>common.secureProperty.metadata).onSetNativeValue = onSecurePropertyChanged;
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 class UITextFieldDelegateImpl extends NSObject implements UITextFieldDelegate {
     public static ObjCProtocols = [UITextFieldDelegate];

ui/text-view/text-view-common.ts

@@ -2,9 +2,7 @@
 import textBase = require("ui/text-base");
 import editableTextBase = require("ui/editable-text-base");
 
-// merge the exports of the textBase file with the exports of this file
+global.moduleMerge(textBase, exports);
-declare var exports;
-require("utils/module-merge").merge(textBase, exports);
 
 export class TextView extends editableTextBase.EditableTextBase implements definition.TextView {
     constructor(options?: editableTextBase.Options) {

ui/text-view/text-view.android.ts

@@ -1,8 +1,6 @@
 import common = require("ui/text-view/text-view-common");
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 export class TextView extends common.TextView {
     public _configureEditText() {

ui/time-picker/time-picker.android.ts

@@ -16,9 +16,7 @@ function onMinutePropertyChanged(data: dependencyObservable.PropertyChangeData)
 
 (<proxy.PropertyMetadata>common.TimePicker.minuteProperty.metadata).onSetNativeValue = onMinutePropertyChanged;
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 export class TimePicker extends common.TimePicker {
     private _android: android.widget.TimePicker;

ui/time-picker/time-picker.ios.ts

@@ -26,9 +26,7 @@ function onMinutePropertyChanged(data: dependencyObservable.PropertyChangeData)
 
 (<proxy.PropertyMetadata>common.TimePicker.minuteProperty.metadata).onSetNativeValue = onMinutePropertyChanged;
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 export class TimePicker extends common.TimePicker {
     private _ios: UIDatePicker;

ui/web-view/web-view.android.ts

@@ -3,8 +3,7 @@ import trace = require("trace");
 import utils = require("utils/utils");
 import fs = require("file-system");
 
-declare var exports;
+global.moduleMerge(common, exports);
-require("utils/module-merge").merge(common, exports);
 
 class WebViewClientClass extends android.webkit.WebViewClient {
     private _view: common.WebView;

ui/web-view/web-view.ios.ts

@@ -3,8 +3,7 @@ import trace = require("trace");
 import utils = require("utils/utils");
 import fs = require("file-system");
 
-declare var exports;
+global.moduleMerge(common, exports);
-require("utils/module-merge").merge(common, exports);
 
 class UIWebViewDelegateImpl extends NSObject implements UIWebViewDelegate {
     public static ObjCProtocols = [UIWebViewDelegate];

utils/utils.android.ts

@@ -1,8 +1,6 @@
 import common = require("utils/utils-common");
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 export module layout {
     var density = -1;

utils/utils.ios.ts

@@ -1,11 +1,8 @@
 import common = require("utils/utils-common");
 import colorModule = require("color");
 import view = require("ui/core/view");
-//import trace = require("trace");
 
-// merge the exports of the common file with the exports of this file
+global.moduleMerge(common, exports);
-declare var exports;
-require("utils/module-merge").merge(common, exports);
 
 function isOrientationLandscape(orientation: number) {
     return orientation === UIDeviceOrientation.UIDeviceOrientationLandscapeLeft || orientation === UIDeviceOrientation.UIDeviceOrientationLandscapeRight;