github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-02 23:23:52 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Use dropdown for discussion list order input (#1191)

Browse Source 
* Use dropdown menu for index select input

* Fix space before `:`
This commit is contained in:
David Sevilla Martín 2017-07-17 00:10:35 -04:00 committed by Toby Zerner
parent 9dde8529eb
commit 204dedb59b
2 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
framework/core/js/forum/dist/app.js vendored
View File

@ -23275,10 +23275,10 @@ System.register('flarum/components/HeaderSecondary', ['flarum/Component', 'flaru
});; });;
'use strict'; 'use strict';
System.register('flarum/components/IndexPage', ['flarum/extend', 'flarum/components/Page', 'flarum/utils/ItemList', 'flarum/helpers/listItems', 'flarum/helpers/icon', 'flarum/components/DiscussionList', 'flarum/components/WelcomeHero', 'flarum/components/DiscussionComposer', 'flarum/components/LogInModal', 'flarum/components/DiscussionPage', 'flarum/components/Select', 'flarum/components/Button', 'flarum/components/LinkButton', 'flarum/components/SelectDropdown'], function (_export, _context) { System.register('flarum/components/IndexPage', ['flarum/extend', 'flarum/components/Page', 'flarum/utils/ItemList', 'flarum/helpers/listItems', 'flarum/helpers/icon', 'flarum/components/DiscussionList', 'flarum/components/WelcomeHero', 'flarum/components/DiscussionComposer', 'flarum/components/LogInModal', 'flarum/components/DiscussionPage', 'flarum/components/Dropdown', 'flarum/components/Button', 'flarum/components/LinkButton', 'flarum/components/SelectDropdown'], function (_export, _context) {
"use strict"; "use strict";
var extend, Page, ItemList, listItems, icon, DiscussionList, WelcomeHero, DiscussionComposer, LogInModal, DiscussionPage, Select, Button, LinkButton, SelectDropdown, IndexPage; var extend, Page, ItemList, listItems, icon, DiscussionList, WelcomeHero, DiscussionComposer, LogInModal, DiscussionPage, Dropdown, Button, LinkButton, SelectDropdown, IndexPage;
return { return {
setters: [function (_flarumExtend) { setters: [function (_flarumExtend) {
extend = _flarumExtend.extend; extend = _flarumExtend.extend;
@ -23300,8 +23300,8 @@ System.register('flarum/components/IndexPage', ['flarum/extend', 'flarum/compone
LogInModal = _flarumComponentsLogInModal.default; LogInModal = _flarumComponentsLogInModal.default;
}, function (_flarumComponentsDiscussionPage) { }, function (_flarumComponentsDiscussionPage) {
DiscussionPage = _flarumComponentsDiscussionPage.default; DiscussionPage = _flarumComponentsDiscussionPage.default;
}, function (_flarumComponentsSelect) { }, function (_flarumComponentsDropdown) {
Select = _flarumComponentsSelect.default; Dropdown = _flarumComponentsDropdown.default;
}, function (_flarumComponentsButton) { }, function (_flarumComponentsButton) {
Button = _flarumComponentsButton.default; Button = _flarumComponentsButton.default;
}, function (_flarumComponentsLinkButton) { }, function (_flarumComponentsLinkButton) {
@ -23504,6 +23504,8 @@ System.register('flarum/components/IndexPage', ['flarum/extend', 'flarum/compone
}, { }, {
key: 'viewItems', key: 'viewItems',
value: function viewItems() { value: function viewItems() {
var _this2 = this;
var items = new ItemList(); var items = new ItemList();
var sortMap = app.cache.discussionList.sortMap(); var sortMap = app.cache.discussionList.sortMap();
@ -23512,10 +23514,23 @@ System.register('flarum/components/IndexPage', ['flarum/extend', 'flarum/compone
sortOptions[i] = app.translator.trans('core.forum.index_sort.' + i + '_button'); sortOptions[i] = app.translator.trans('core.forum.index_sort.' + i + '_button');
} }
items.add('sort', Select.component({ items.add('sort', Dropdown.component({
options: sortOptions, buttonClassName: "Select-input FormControl",
value: this.params().sort || Object.keys(sortMap)[0], label: sortOptions[this.params().sort] || Object.keys(sortMap).map(function (key) {
onchange: this.changeSort.bind(this) return sortOptions[key];
})[0],
caretIcon: "sort",
children: Object.keys(sortOptions).map(function (value) {
var label = sortOptions[value];
var active = (_this2.params().sort || Object.keys(sortMap)[0]) === value;
return Button.component({
children: label,
icon: active ? 'check' : true,
onclick: _this2.changeSort.bind(_this2, value),
active: active
});
})
})); }));
return items; return items;

21
framework/core/js/forum/src/components/IndexPage.js
View File

@ -8,7 +8,7 @@ import WelcomeHero from 'flarum/components/WelcomeHero';
import DiscussionComposer from 'flarum/components/DiscussionComposer'; import DiscussionComposer from 'flarum/components/DiscussionComposer';
import LogInModal from 'flarum/components/LogInModal'; import LogInModal from 'flarum/components/LogInModal';
import DiscussionPage from 'flarum/components/DiscussionPage'; import DiscussionPage from 'flarum/components/DiscussionPage';
import Select from 'flarum/components/Select'; import Dropdown from 'flarum/components/Dropdown';
import Button from 'flarum/components/Button'; import Button from 'flarum/components/Button';
import LinkButton from 'flarum/components/LinkButton'; import LinkButton from 'flarum/components/LinkButton';
import SelectDropdown from 'flarum/components/SelectDropdown'; import SelectDropdown from 'flarum/components/SelectDropdown';
@ -212,10 +212,21 @@ export default class IndexPage extends Page {
} }
items.add('sort', items.add('sort',
Select.component({ Dropdown.component({
options: sortOptions, buttonClassName: "Select-input FormControl",
value: this.params().sort || Object.keys(sortMap)[0], label: sortOptions[this.params().sort] || Object.keys(sortMap).map(key => sortOptions[key])[0],
onchange: this.changeSort.bind(this) caretIcon: "sort",
children: Object.keys(sortOptions).map(value => {
const label = sortOptions[value];
const active = (this.params().sort || Object.keys(sortMap)[0]) === value;
return Button.component({
children: label,
icon: active ? 'check' : true,
onclick: this.changeSort.bind(this, value),
active: active,
})
}),
}) })
); );