From 3a8b11e389cb4dab12a2ca019d04ed073cbf89d5 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Fri, 18 Mar 2016 10:06:12 +1030
Subject: [PATCH] Extract sortMap variable

Also revert previous uncommitted change in dist file
---
 framework/core/js/forum/dist/app.js                 | 11 ++++++-----
 framework/core/js/forum/src/components/IndexPage.js |  5 +++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/framework/core/js/forum/dist/app.js b/framework/core/js/forum/dist/app.js
index ffaed50a4..1a94e62c9 100644
--- a/framework/core/js/forum/dist/app.js
+++ b/framework/core/js/forum/dist/app.js
@@ -22541,15 +22541,16 @@ System.register('flarum/components/IndexPage', ['flarum/extend', 'flarum/compone
           key: 'viewItems',
           value: function viewItems() {
             var items = new ItemList();
+            var sortMap = app.cache.discussionList.sortMap();
 
             var sortOptions = {};
-            for (var i in app.cache.discussionList.sortMap()) {
+            for (var i in sortMap) {
               sortOptions[i] = app.translator.trans('core.forum.index_sort.' + i + '_button');
             }
 
             items.add('sort', Select.component({
               options: sortOptions,
-              value: this.params().sort || Object.keys(app.cache.discussionList.sortMap())[0],
+              value: this.params().sort || Object.keys(sortMap)[0],
               onchange: this.changeSort.bind(this)
             }));
 
@@ -23351,10 +23352,10 @@ System.register('flarum/components/Navigation', ['flarum/Component', 'flarum/com
             var previous = history.getPrevious() || {};
 
             return LinkButton.component({
-              className: 'Button Navigation-back Button--icon',
+              className: 'Button Navigation-back ' + (previous.title ? '' : 'Button--icon'),
               href: history.backUrl(),
-              icon: 'list-ul',
-              //children: previous.title,
+              icon: 'chevron-left',
+              children: previous.title,
               config: function config() {},
               onclick: function onclick(e) {
                 if (e.shiftKey || e.ctrlKey || e.metaKey || e.which === 2) return;
diff --git a/framework/core/js/forum/src/components/IndexPage.js b/framework/core/js/forum/src/components/IndexPage.js
index e4e8b241e..4708f8a7d 100644
--- a/framework/core/js/forum/src/components/IndexPage.js
+++ b/framework/core/js/forum/src/components/IndexPage.js
@@ -204,16 +204,17 @@ export default class IndexPage extends Page {
    */
   viewItems() {
     const items = new ItemList();
+    const sortMap = app.cache.discussionList.sortMap();
 
     const sortOptions = {};
-    for (const i in app.cache.discussionList.sortMap()) {
+    for (const i in sortMap) {
       sortOptions[i] = app.translator.trans('core.forum.index_sort.' + i + '_button');
     }
 
     items.add('sort',
       Select.component({
         options: sortOptions,
-        value: this.params().sort || Object.keys(app.cache.discussionList.sortMap())[0],
+        value: this.params().sort || Object.keys(sortMap)[0],
         onchange: this.changeSort.bind(this)
       })
     );