From 7b8e313dac551c240b1448ab3ea56b98950a37bf Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 18 Feb 2016 12:33:23 -0500
Subject: [PATCH] Remove unncessary CP
---
.../controllers/user-private-messages.js.es6 | 5 -----
.../discourse/templates/user/messages.hbs | 16 ++++++++--------
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6 b/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
index 94a8db7c1..06a1be30d 100644
--- a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
@@ -2,7 +2,6 @@ import computed from 'ember-addons/ember-computed-decorators';
import Topic from 'discourse/models/topic';
export default Ember.Controller.extend({
-
needs: ["application", "user-topics-list", "user"],
pmView: false,
viewingSelf: Em.computed.alias('controllers.user.viewingSelf'),
@@ -11,10 +10,6 @@ export default Ember.Controller.extend({
selected: Em.computed.alias('controllers.user-topics-list.selected'),
bulkSelectEnabled: Em.computed.alias('controllers.user-topics-list.bulkSelectEnabled'),
- mobileView: function() {
- return this.site.mobileView;
- }.property(),
-
showNewPM: function(){
return this.get('controllers.user.viewingSelf') &&
Discourse.User.currentProp('can_send_private_messages');
diff --git a/app/assets/javascripts/discourse/templates/user/messages.hbs b/app/assets/javascripts/discourse/templates/user/messages.hbs
index afc7d0f42..9f4c6b62f 100644
--- a/app/assets/javascripts/discourse/templates/user/messages.hbs
+++ b/app/assets/javascripts/discourse/templates/user/messages.hbs
@@ -1,8 +1,8 @@
<section class='user-navigation'>
- {{#unless mobileView}}
- {{#if showNewPM}}
- {{d-button class="btn-primary new-private-message" action="composePrivateMessage" icon="envelope" label="user.new_private_message"}}
- {{/if}}
+ {{#unless site.mobileView}}
+ {{#if showNewPM}}
+ {{d-button class="btn-primary new-private-message" action="composePrivateMessage" icon="envelope" label="user.new_private_message"}}
+ {{/if}}
{{/unless}}
{{#mobile-nav class='messages-nav' desktopClass='nav-stacked action-list' currentPath=currentPath}}
@@ -47,10 +47,10 @@
<i class="fa fa-list"></i>
</button>
- {{#if mobileView}}
- {{#if showNewPM}}
- {{d-button class="btn-primary new-private-message" action="composePrivateMessage" icon="envelope" label="user.new_private_message"}}
- {{/if}}
+ {{#if site.mobileView}}
+ {{#if showNewPM}}
+ {{d-button class="btn-primary new-private-message" action="composePrivateMessage" icon="envelope" label="user.new_private_message"}}
+ {{/if}}
{{/if}}
{{#if canArchive}}