IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: more conservative refactoring to avoid regressions in customisations

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2018-04-03 10:35:22 +02:00 committed by GitHub
parent f1ef46d7b7
commit 61812b52e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse/controllers/user.js.es6
View File

@ -91,8 +91,12 @@ export default Ember.Controller.extend(CanCheckEmails, {
}, },
actions: { actions: {
toggleExtendedProfile() { collapseProfile() {
this.toggleProperty('forceExpand'); this.set('forceExpand', false);
},
expandProfile() {
this.set('forceExpand', true);
}, },
showSuspensions() { showSuspensions() {

12
app/assets/javascripts/discourse/templates/user.hbs
View File

@ -69,13 +69,15 @@
{{#if viewingSelf}} {{#if viewingSelf}}
<li> <li>
<a {{action "toggleExtendedProfile"}} href class="btn"> {{#if collapsedInfo}}
{{#if collapsedInfo}} <a {{action "expandProfile"}} href class="btn">
{{d-icon "angle-double-down"}} {{i18n 'user.expand_profile'}} {{d-icon "angle-double-down"}} {{i18n 'user.expand_profile'}}
{{else}} </a>
{{else}}
<a {{action "collapseProfile"}} href class="btn">
{{d-icon "angle-double-up"}} {{i18n 'user.collapse_profile'}} {{d-icon "angle-double-up"}} {{i18n 'user.collapse_profile'}}
{{/if}} </a>
</a> {{/if}}
</li> </li>
{{/if}} {{/if}}
</ul> </ul>