From 926bb90600f15a61df1f0940a2497625dd6d3716 Mon Sep 17 00:00:00 2001
From: Stephen Lautier <stephen.lautier@outlook.com>
Date: Sun, 20 Mar 2016 18:47:18 +0100
Subject: [PATCH] Changed placeholder to support IdTextPair

---
 select2/select2-tests.ts | 3 +++
 select2/select2.d.ts     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/select2/select2-tests.ts b/select2/select2-tests.ts
index 2ab6e94af..e294193a0 100644
--- a/select2/select2-tests.ts
+++ b/select2/select2-tests.ts
@@ -9,6 +9,9 @@ $("#e2").select2({
 $("#e2_2").select2({
     placeholder: "Select a State"
 });
+$("#e2_3").select2({
+    placeholder: { id: "1", text: "Select options" }
+});
 $("#e3").select2({
     minimumInputLength: 2
 });
diff --git a/select2/select2.d.ts b/select2/select2.d.ts
index aea144f00..66cfb2626 100644
--- a/select2/select2.d.ts
+++ b/select2/select2.d.ts
@@ -42,7 +42,7 @@ interface Select2Options {
     minimumInputLength?: number;
     minimumResultsForSearch?: number;
     maximumSelectionSize?: number;
-    placeholder?: string;
+    placeholder?: string | IdTextPair;
     separator?: string;
     allowClear?: boolean;
     multiple?: boolean;