From d3f92eeab650bc015243fce1774eb6404901cc1c Mon Sep 17 00:00:00 2001
From: Zev Benjamin <zev@humbughq.com>
Date: Tue, 12 Feb 2013 17:43:37 -0500
Subject: [PATCH] Remove narrow.from_popover()

(imported from commit 5214955658cdbd652777dda1c4351d89b5f220af)
---
 zephyr/jstemplates/actions_popover_content.html | 6 +++---
 zephyr/static/js/narrow.js                      | 6 ------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/zephyr/jstemplates/actions_popover_content.html b/zephyr/jstemplates/actions_popover_content.html
index 64333d4c8a..5b1e383089 100644
--- a/zephyr/jstemplates/actions_popover_content.html
+++ b/zephyr/jstemplates/actions_popover_content.html
@@ -12,7 +12,7 @@
 
   {{#if narrowed}}
   <li>
-    <a onclick="narrow.from_popover(); narrow.activate([], {target_id: {{message.id}} });">
+    <a onclick="ui.hide_actions_popover(); narrow.activate([], {target_id: {{message.id}} });">
       <i class="icon-time"></i> Narrow to messages around this time
     </a>
   </li>
@@ -20,14 +20,14 @@
 
   {{#if message.is_stream}}
     <li>
-      <a onclick="narrow.from_popover(); narrow.by_subject({{message.id}});">
+      <a onclick="ui.hide_actions_popover(); narrow.by_subject({{message.id}});">
         <i class="icon-bullhorn"></i>
         Narrow to this subject on stream <b>{{message.display_recipient}}</b>
       </a>
     </li>
   {{else}}
     <li>
-      <a onclick="narrow.from_popover(); narrow.by_recipient({{message.id}});">
+      <a onclick="ui.hide_actions_popover(); narrow.by_recipient({{message.id}});">
         <i class="icon-user"></i>
         Narrow to this private message conversation
       </a>
diff --git a/zephyr/static/js/narrow.js b/zephyr/static/js/narrow.js
index 7f8103451f..6eb656e359 100644
--- a/zephyr/static/js/narrow.js
+++ b/zephyr/static/js/narrow.js
@@ -271,12 +271,6 @@ exports.by = function (operator, operand, opts) {
     exports.activate([[operator, operand]], opts);
 };
 
-// Helper function for the actions popover
-exports.from_popover = function (message_id) {
-    ui.hide_actions_popover();
-    exports.target(message_id);
-};
-
 exports.by_subject = function (target_id) {
     var original = message_dict[target_id];
     if (original.type !== 'stream') {