From ceb059b2abcef0ea59486185f4cee366df07aaf8 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Mon, 17 Aug 2015 14:06:50 -0700
Subject: [PATCH] Removed union types from definition files.

---
 jquery.uniform/jquery.uniform.d.ts | 11 ++++++++---
 jqueryui/jqueryui.d.ts             |  2 +-
 log4js/log4js.d.ts                 |  6 +++++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/jquery.uniform/jquery.uniform.d.ts b/jquery.uniform/jquery.uniform.d.ts
index e91a41c93b..d5eee3e478 100644
--- a/jquery.uniform/jquery.uniform.d.ts
+++ b/jquery.uniform/jquery.uniform.d.ts
@@ -5,7 +5,7 @@
 
 /// <reference path="../jquery/jquery.d.ts" />
 
-interface UniformOptions {
+interface UniformCoreOptions {
     activeClass?: string;
     autoHide?: boolean;
     buttonClass?: string;
@@ -34,12 +34,17 @@ interface UniformOptions {
     useID?: boolean;
     wrapperClass?: string;
 }
+
+interface UniformOptions extends UniformCoreOptions {
+    [option: string]: any;
+}
+
 interface Uniform {
-    (options?: UniformOptions & {[option: string]: any;}): JQuery;
+    (options?: UniformOptions): JQuery;
     update(elemOrSelector?: any): void;
     restore(elemOrSelector?: any): void;
     elements: JQuery[];
-	defaults: UniformOptions;
+    defaults: UniformOptions;
 }
 interface JQueryStatic {
     uniform: Uniform;
diff --git a/jqueryui/jqueryui.d.ts b/jqueryui/jqueryui.d.ts
index 80cda8976a..e658d0d109 100644
--- a/jqueryui/jqueryui.d.ts
+++ b/jqueryui/jqueryui.d.ts
@@ -1670,7 +1670,7 @@ interface JQuery {
     sortable(methodName: string): JQuery;
     sortable(options: JQueryUI.SortableOptions): JQuery;
     sortable(optionLiteral: string, optionName: string): any;
-    sortable(methodName: 'serialize', options: { key?: string; attribute?: string; expression?: RegExp });
+    sortable(methodName: 'serialize', options: { key?: string; attribute?: string; expression?: RegExp }): string;
     sortable(optionLiteral: string, options: JQueryUI.SortableOptions): any;
     sortable(optionLiteral: string, optionName: string, optionValue: any): JQuery;
 
diff --git a/log4js/log4js.d.ts b/log4js/log4js.d.ts
index 70059142c5..5ecec0db10 100644
--- a/log4js/log4js.d.ts
+++ b/log4js/log4js.d.ts
@@ -232,6 +232,10 @@ declare module "log4js" {
                           | GelfAppenderConfig
                           | MultiprocessAppenderConfig
 
-  type AppenderConfig = CoreAppenderConfig | (AppenderConfigBase & { [prop: string]: any; });
+  interface CustomAppenderConfig extends AppenderConfigBase {
+    [prop: string]: any;
+  }
+
+  type AppenderConfig = CoreAppenderConfig | CustomAppenderConfig;
 }