From 0fab38e0229db90317219afabfca898f70846e70 Mon Sep 17 00:00:00 2001
From: Bob Trahan <btrahan@phacility.com>
Date: Tue, 9 Jun 2015 13:48:47 -0700
Subject: [PATCH] Conpherence - fix default widget on main Conpherence view.

Summary: Fixes T8489. Regression in D13058. Re-write this so a) works and b) works as well cross browser as possible. (big guess on b)

Test Plan: visited /Z1 vs /Z1?settings and saw people widget vs settings widget as respective defaults.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: epriestley, Korvin

Maniphest Tasks: T8489

Differential Revision: https://secure.phabricator.com/D13228
---
 resources/celerity/map.php                    | 32 +++++++++----------
 .../application/conpherence/behavior-menu.js  |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 31d889e7d6..c13dd2c0c5 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -338,7 +338,7 @@ return array(
     'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '01774ab2',
     'rsrc/js/application/conpherence/behavior-drag-and-drop-photo.js' => 'cf86d16a',
     'rsrc/js/application/conpherence/behavior-durable-column.js' => 'c72aa091',
-    'rsrc/js/application/conpherence/behavior-menu.js' => '43b24a10',
+    'rsrc/js/application/conpherence/behavior-menu.js' => 'd3782c93',
     'rsrc/js/application/conpherence/behavior-pontificate.js' => '21ba5861',
     'rsrc/js/application/conpherence/behavior-quicksand-blacklist.js' => '7927a7d3',
     'rsrc/js/application/conpherence/behavior-widget-pane.js' => '93568464',
@@ -546,7 +546,7 @@ return array(
     'javelin-behavior-choose-control' => '6153c708',
     'javelin-behavior-config-reorder-fields' => 'b6993408',
     'javelin-behavior-conpherence-drag-and-drop-photo' => 'cf86d16a',
-    'javelin-behavior-conpherence-menu' => '43b24a10',
+    'javelin-behavior-conpherence-menu' => 'd3782c93',
     'javelin-behavior-conpherence-pontificate' => '21ba5861',
     'javelin-behavior-conpherence-widget-pane' => '93568464',
     'javelin-behavior-countdown-timer' => 'e4cc26b3',
@@ -1098,20 +1098,6 @@ return array(
       'javelin-dom',
       'javelin-request',
     ),
-    '43b24a10' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-util',
-      'javelin-stratcom',
-      'javelin-workflow',
-      'javelin-behavior-device',
-      'javelin-history',
-      'javelin-vector',
-      'javelin-scrollbar',
-      'phabricator-title',
-      'phabricator-shaped-request',
-      'conpherence-thread-manager',
-    ),
     '44168bad' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1838,6 +1824,20 @@ return array(
     'd254d646' => array(
       'javelin-util',
     ),
+    'd3782c93' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-util',
+      'javelin-stratcom',
+      'javelin-workflow',
+      'javelin-behavior-device',
+      'javelin-history',
+      'javelin-vector',
+      'javelin-scrollbar',
+      'phabricator-title',
+      'phabricator-shaped-request',
+      'conpherence-thread-manager',
+    ),
     'd4505101' => array(
       'javelin-stratcom',
       'javelin-install',
diff --git a/webroot/rsrc/js/application/conpherence/behavior-menu.js b/webroot/rsrc/js/application/conpherence/behavior-menu.js
index cc20d5a4e0..4d18c44b51 100644
--- a/webroot/rsrc/js/application/conpherence/behavior-menu.js
+++ b/webroot/rsrc/js/application/conpherence/behavior-menu.js
@@ -299,7 +299,7 @@ JX.behavior('conpherence-menu', function(config) {
       widget = 'widgets-people';
       var uri = JX.$U(location.href);
       var params = uri.getQueryParams();
-      if (params['settings'] !== null) {
+      if ('settings' in params) {
         widget = 'widgets-settings';
       }
     }