From 128875c022a87573439f0c426d24bc682fab61a4 Mon Sep 17 00:00:00 2001
From: Lucas Dixon <ldixon@google.com>
Date: Fri, 22 Jan 2016 22:48:09 -0500
Subject: [PATCH] Allow polymer properties to be objects

---
 polymer/polymer-tests.ts | 6 +++++-
 polymer/polymer.d.ts     | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/polymer/polymer-tests.ts b/polymer/polymer-tests.ts
index 8a44ed285..e1a5ae650 100644
--- a/polymer/polymer-tests.ts
+++ b/polymer/polymer-tests.ts
@@ -12,7 +12,11 @@ Polymer({
       reflectToAttribute: true,
       notify: true,
       computed: "__prop2()"
-    }
+    },
+    prop3: {
+        type: Object,
+        value: { "foo": "bar" },
+    },
   },
 
   hostAttributes: {
diff --git a/polymer/polymer.d.ts b/polymer/polymer.d.ts
index c346de8b3..2c548e34d 100644
--- a/polymer/polymer.d.ts
+++ b/polymer/polymer.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for polymer v1.1.5
+// Type definitions for polymer v1.1.6
 // Project: https://github.com/Polymer/polymer
 // Definitions by: Louis Grignon <https://github.com/lgrignon>, Suguru Inatomi <https://github.com/laco0416>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -11,7 +11,7 @@ declare module polymer {
 
   interface PropObjectType {
     type: PropConstructorType;
-    value?: boolean | number | string | Function;
+    value?: boolean | number | string | Function | Object;
     reflectToAttribute?: boolean;
     readOnly?: boolean;
     notify?: boolean;