From 685471303a020ff3f9e62bc4044e9cfef202395a Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Thu, 17 Sep 2015 00:38:05 +0800
Subject: [PATCH 1/3] FIX: Don't dismiss headers on modifier keys.

---
 app/assets/javascripts/discourse/components/menu-panel.js.es6 | 2 +-
 app/assets/javascripts/discourse/lib/click-event.js.es6       | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/javascripts/discourse/lib/click-event.js.es6

diff --git a/app/assets/javascripts/discourse/components/menu-panel.js.es6 b/app/assets/javascripts/discourse/components/menu-panel.js.es6
index 02304afee7..e240335615 100644
--- a/app/assets/javascripts/discourse/components/menu-panel.js.es6
+++ b/app/assets/javascripts/discourse/components/menu-panel.js.es6
@@ -155,7 +155,7 @@ export default Ember.Component.extend({
   @on('didInsertElement')
   _bindEvents() {
     this.$().on('click.discourse-menu-panel', 'a', e => {
-      if (e.metaKey) { return; }
+      if (e.metaKey || e.ctrlKey || e.shiftKey) { return; }
       if ($(e.target).data('ember-action')) { return; }
       this.hide();
     });
diff --git a/app/assets/javascripts/discourse/lib/click-event.js.es6 b/app/assets/javascripts/discourse/lib/click-event.js.es6
new file mode 100644
index 0000000000..2ca000d20d
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/click-event.js.es6
@@ -0,0 +1,3 @@
+export function isModifierOrMetaKey(event) {
+  return e.metaKey || e.ctrlKey || e.shiftKey;
+}

From 2958b4b0a1c300d9c03ae2f7bcec3d52098ae7ff Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Thu, 17 Sep 2015 01:21:00 +0800
Subject: [PATCH 2/3] FIX: Don't dismiss dropdown when searching within posts
 context.

---
 .../discourse/components/menu-panel.js.es6    |  3 ++-
 .../discourse/lib/click-event.js.es6          |  3 ---
 .../components/search-result-post.hbs         | 20 ++++++++++---------
 3 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 app/assets/javascripts/discourse/lib/click-event.js.es6

diff --git a/app/assets/javascripts/discourse/components/menu-panel.js.es6 b/app/assets/javascripts/discourse/components/menu-panel.js.es6
index e240335615..604ec69d39 100644
--- a/app/assets/javascripts/discourse/components/menu-panel.js.es6
+++ b/app/assets/javascripts/discourse/components/menu-panel.js.es6
@@ -156,7 +156,8 @@ export default Ember.Component.extend({
   _bindEvents() {
     this.$().on('click.discourse-menu-panel', 'a', e => {
       if (e.metaKey || e.ctrlKey || e.shiftKey) { return; }
-      if ($(e.target).data('ember-action')) { return; }
+      const $target = $(e.target);
+      if ($target.data('ember-action') || $target.closest('.search-link').length > 0) { return; }
       this.hide();
     });
 
diff --git a/app/assets/javascripts/discourse/lib/click-event.js.es6 b/app/assets/javascripts/discourse/lib/click-event.js.es6
deleted file mode 100644
index 2ca000d20d..0000000000
--- a/app/assets/javascripts/discourse/lib/click-event.js.es6
+++ /dev/null
@@ -1,3 +0,0 @@
-export function isModifierOrMetaKey(event) {
-  return e.metaKey || e.ctrlKey || e.shiftKey;
-}
diff --git a/app/assets/javascripts/discourse/templates/components/search-result-post.hbs b/app/assets/javascripts/discourse/templates/components/search-result-post.hbs
index 71b188ddf1..f89090ac24 100644
--- a/app/assets/javascripts/discourse/templates/components/search-result-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/search-result-post.hbs
@@ -1,12 +1,14 @@
 {{#each results as |result|}}
-  <a class='search-link' href='{{unbound result.urlWithNumber}}'>
-    <span class='topic'>
-      {{i18n 'search.post_format' post_number=result.post_number username=result.username}}
-    </span>
-    {{#unless site.mobileView}}
-      <span class='blurb'>
-      {{{unbound result.blurb}}}
+  <li>
+    <a class='search-link' href='{{unbound result.urlWithNumber}}'>
+      <span class='topic'>
+        {{i18n 'search.post_format' post_number=result.post_number username=result.username}}
       </span>
-    {{/unless}}
-  </a>
+      {{#unless site.mobileView}}
+        <span class='blurb'>
+        {{{unbound result.blurb}}}
+        </span>
+      {{/unless}}
+    </a>
+  </li>
 {{/each}}

From a845e0c4983af0eb07a0d59fd0e400abce48a811 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Thu, 17 Sep 2015 01:37:48 +0800
Subject: [PATCH 3/3] FIX: Highlight posts was broken.

---
 app/assets/javascripts/discourse/templates/post.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/templates/post.hbs b/app/assets/javascripts/discourse/templates/post.hbs
index abdde5fbc4..70f4c910c3 100644
--- a/app/assets/javascripts/discourse/templates/post.hbs
+++ b/app/assets/javascripts/discourse/templates/post.hbs
@@ -8,7 +8,7 @@
   {{view 'reply-history' content=replyHistory}}
 </div>
 
-<article class="boxed {{if via_email 'via-email'}}" id={{postElementId}} data-post-id={{id}} data-user-id={{user_id}}>
+<article class="boxed {{if via_email 'via-email'}}" id={{view.postElementId}} data-post-id={{id}} data-user-id={{user_id}}>
   <div class='row'>
 
     <div class='topic-avatar'>