Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Tom Morris 2012-11-20 13:12:54 -05:00
commit 14c04698e3

View File

@ -146,13 +146,12 @@ ExtendDataPreviewDialog.prototype._show = function(properties) {
} }
this._elmts.addPropertyInput.suggestP(suggestConfig).bind("fb-select", function(evt, data) { this._elmts.addPropertyInput.suggestP(suggestConfig).bind("fb-select", function(evt, data) {
var expected = data.expected_type;
self._addProperty({ self._addProperty({
id : data.id, id : data.id,
name: data.name, name: data.name,
expected: { expected: {
id: expected.id, id: "/type/object",
name: expected.name name: "Object"
} }
}); });
}); });