From 56196c03a355beb7a32ea006de1b6ebbca789c06 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard.stearns@gmail.com>
Date: Thu, 27 Apr 2017 12:56:32 -0700
Subject: [PATCH] pr review

---
 interface/resources/qml/hifi/Card.qml                    | 2 +-
 interface/resources/qml/hifi/Feed.qml                    | 5 +++--
 .../resources/qml/hifi/tablet/TabletAddressDialog.qml    | 9 ++++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/interface/resources/qml/hifi/Card.qml b/interface/resources/qml/hifi/Card.qml
index 1a3ae43692..59fa66af0b 100644
--- a/interface/resources/qml/hifi/Card.qml
+++ b/interface/resources/qml/hifi/Card.qml
@@ -130,7 +130,7 @@ Rectangle {
     property int dropSamples: 9;
     property int dropSpread: 0;
     DropShadow {
-        visible: showPlace && desktop.gradientsSupported;
+        visible: showPlace; // Do we have to check for whatever the modern equivalent is for desktop.gradientsSupported?
         source: place;
         anchors.fill: place;
         horizontalOffset: dropHorizontalOffset;
diff --git a/interface/resources/qml/hifi/Feed.qml b/interface/resources/qml/hifi/Feed.qml
index c02cd1dd36..d95518b891 100644
--- a/interface/resources/qml/hifi/Feed.qml
+++ b/interface/resources/qml/hifi/Feed.qml
@@ -31,6 +31,7 @@ Column {
     property string labelText: actions;
     property string filter: '';
     onFilterChanged: filterChoicesByText();
+    property var goFunction: null;
 
     HifiConstants { id: hifi }
     ListModel { id: suggestions; }
@@ -57,7 +58,7 @@ Column {
             created_at: data.created_at || "",
             action: data.action || "",
             thumbnail_url: resolveUrl(thumbnail_url),
-            image_url: resolveUrl(data.details.image_url),
+            image_url: resolveUrl(data.details && data.details.image_url),
 
             metaverseId: (data.id || "").toString(), // Some are strings from server while others are numbers. Model objects require uniformity.
 
@@ -181,7 +182,7 @@ Column {
         delegate: Card {
             width: cardWidth;
             height: cardHeight;
-            goFunction: goCard; // fixme global
+            goFunction: root.goFunction;
             userName: model.username;
             placeName: model.place_name;
             hifiUrl: model.place_name + model.path;
diff --git a/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml b/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml
index ef120b9c4f..6695ac08f6 100644
--- a/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml
+++ b/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml
@@ -242,7 +242,7 @@ StackView {
                     height: stack.height;
                     color: "transparent";
                     anchors {
-                        left: bgMain.left;
+                        left: parent.left;
                         leftMargin: column.pad;
                         topMargin: column.pad;
                     }
@@ -258,9 +258,10 @@ StackView {
                             cardHeight: places.cardHeight * happeningNow.cardScale;
                             metaverseServerUrl: addressBarDialog.metaverseServerUrl;
                             labelText: 'Happening Now';
-                            //actions: 'concurrency,snapshot'; // uncomment this line instead of next to produce fake announcement data for testing.
-                            actions: 'announcement';
+                            actions: 'concurrency,snapshot'; // uncomment this line instead of next to produce fake announcement data for testing.
+                            //actions: 'announcement';
                             filter: addressLine.text;
+                            goFunction: goCard;
                         }
                         Feed {
                             id: places;
@@ -269,6 +270,7 @@ StackView {
                             labelText: 'Places';
                             actions: 'concurrency';
                             filter: addressLine.text;
+                            goFunction: goCard;
                         }
                         Feed {
                             id: snapshots;
@@ -277,6 +279,7 @@ StackView {
                             labelText: 'Recent Activity';
                             actions: 'snapshot';
                             filter: addressLine.text;
+                            goFunction: goCard;
                         }
                     }
                 }