github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-01 06:23:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Recompile JS

Browse Source
This commit is contained in:
Toby Zerner 2017-07-22 12:08:17 +09:30
parent e3e4786391
commit d16f4dbefa
2 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/admin/dist/app.js vendored
View File

@ -18097,20 +18097,18 @@ System.register('flarum/components/BasicsPage', ['flarum/components/Page', 'flar
app.translator.trans('core.admin.basics.forum_description_text') app.translator.trans('core.admin.basics.forum_description_text')
), m('textarea', { className: 'FormControl', value: this.values.forum_description(), oninput: m.withAttr('value', this.values.forum_description) })] ), m('textarea', { className: 'FormControl', value: this.values.forum_description(), oninput: m.withAttr('value', this.values.forum_description) })]
}), }),
Object.keys(this.localeOptions).length > 1 ? FieldSet.component({ Object.keys(this.localeOptions).length > 0 ? FieldSet.component({
label: app.translator.trans('core.admin.basics.default_language_heading'), label: app.translator.trans('core.admin.basics.default_language_heading'),
children: [Select.component({ children: [Select.component({
options: this.localeOptions, options: this.localeOptions,
value: this.values.default_locale(), value: this.values.default_locale(),
onchange: this.values.default_locale onchange: this.values.default_locale
})] }), Switch.component({
}) : '',
Switch.component({
state: this.values.show_language_selector(), state: this.values.show_language_selector(),
onchange: this.values.show_language_selector, onchange: this.values.show_language_selector,
children: app.translator.trans('core.admin.basics.show_language_selector_label') children: app.translator.trans('core.admin.basics.show_language_selector_label')
}), })]
m('br', null), }) : '',
FieldSet.component({ FieldSet.component({
label: app.translator.trans('core.admin.basics.home_page_heading'), label: app.translator.trans('core.admin.basics.home_page_heading'),
className: 'BasicsPage-homePage', className: 'BasicsPage-homePage',
@ -19850,11 +19848,10 @@ System.register('flarum/components/Navigation', ['flarum/Component', 'flarum/com
var previous = history.getPrevious() || {}; var previous = history.getPrevious() || {};
return LinkButton.component({ return LinkButton.component({
className: 'Button Navigation-back ' + (previous.title ? '' : 'Button--icon'), className: 'Button Navigation-back Button--icon',
href: history.backUrl(), href: history.backUrl(),
icon: 'chevron-left', icon: 'chevron-left',
children: previous.title, title: previous.title,
config: function config() {},
onclick: function onclick(e) { onclick: function onclick(e) {
if (e.shiftKey || e.ctrlKey || e.metaKey || e.which === 2) return; if (e.shiftKey || e.ctrlKey || e.metaKey || e.which === 2) return;
e.preventDefault(); e.preventDefault();
@ -21496,7 +21493,7 @@ System.register('flarum/helpers/icon', [], function (_export, _context) {
function icon(name) { function icon(name) {
var attrs = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}; var attrs = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
attrs.className = 'icon fa fa-fw fa-' + name + ' ' + (attrs.className || ''); attrs.className = 'icon fa fa-' + name + ' ' + (attrs.className || '');
return m('i', attrs); return m('i', attrs);
} }

23
js/forum/dist/app.js vendored
View File

@ -23357,7 +23357,7 @@ System.register('flarum/components/IndexPage', ['flarum/extend', 'flarum/compone
app.cache.discussionList = new DiscussionList({ params: params }); app.cache.discussionList = new DiscussionList({ params: params });
} }
app.history.push('index', icon('bars')); app.history.push('index', app.translator.trans('core.forum.header.back_to_index_tooltip'));
this.bodyClass = 'App--index'; this.bodyClass = 'App--index';
} }
@ -23515,11 +23515,10 @@ System.register('flarum/components/IndexPage', ['flarum/extend', 'flarum/compone
} }
items.add('sort', Dropdown.component({ items.add('sort', Dropdown.component({
buttonClassName: "Select-input FormControl", buttonClassName: 'Button',
label: sortOptions[this.params().sort] || Object.keys(sortMap).map(function (key) { label: sortOptions[this.params().sort] || Object.keys(sortMap).map(function (key) {
return sortOptions[key]; return sortOptions[key];
})[0], })[0],
caretIcon: "sort",
children: Object.keys(sortOptions).map(function (value) { children: Object.keys(sortOptions).map(function (value) {
var label = sortOptions[value]; var label = sortOptions[value];
var active = (_this2.params().sort || Object.keys(sortMap)[0]) === value; var active = (_this2.params().sort || Object.keys(sortMap)[0]) === value;
@ -24373,10 +24372,10 @@ System.register('flarum/components/Navigation', ['flarum/Component', 'flarum/com
var previous = history.getPrevious() || {}; var previous = history.getPrevious() || {};
return LinkButton.component({ return LinkButton.component({
className: 'Button Navigation-back ' + (previous.title ? '' : 'Button--icon'), className: 'Button Navigation-back Button--icon',
href: history.backUrl(), href: history.backUrl(),
icon: 'chevron-left', icon: 'chevron-left',
children: previous.title, title: previous.title,
config: function config() {}, config: function config() {},
onclick: function onclick(e) { onclick: function onclick(e) {
if (e.shiftKey || e.ctrlKey || e.metaKey || e.which === 2) return; if (e.shiftKey || e.ctrlKey || e.metaKey || e.which === 2) return;
@ -26873,17 +26872,17 @@ System.register('flarum/components/RenameDiscussionModal', ['flarum/components/M
{ className: 'Modal-body' }, { className: 'Modal-body' },
m( m(
'div', 'div',
{ className: 'Form' }, { className: 'Form Form--centered' },
m( m(
'div', 'div',
{ className: 'Form-group' }, { className: 'Form-group' },
m('input', { className: 'FormControl title', placeholder: this.currentTitle, bidi: this.newTitle }) m('input', { className: 'FormControl', bidi: this.newTitle, type: 'text' })
), ),
m( m(
'div', 'div',
{ className: 'Form-group' }, { className: 'Form-group' },
Button.component({ Button.component({
className: 'Button Button--primary', className: 'Button Button--primary Button--block',
type: 'submit', type: 'submit',
loading: this.loading, loading: this.loading,
children: app.translator.trans('core.forum.rename_discussion.submit_button') children: app.translator.trans('core.forum.rename_discussion.submit_button')
@ -26914,6 +26913,9 @@ System.register('flarum/components/RenameDiscussionModal', ['flarum/components/M
} }
m.redraw(); m.redraw();
_this2.hide(); _this2.hide();
}).catch(function () {
_this2.loading = false;
m.redraw();
}); });
} else { } else {
this.hide(); this.hide();
@ -28788,8 +28790,6 @@ System.register('flarum/components/UserPage', ['flarum/components/Page', 'flarum
*/ */
this.user = null; this.user = null;
app.history.push('user');
this.bodyClass = 'App--user'; this.bodyClass = 'App--user';
} }
}, { }, {
@ -28831,7 +28831,6 @@ System.register('flarum/components/UserPage', ['flarum/components/Page', 'flarum
value: function show(user) { value: function show(user) {
this.user = user; this.user = user;
app.history.push('user', user.username());
app.setTitle(user.username()); app.setTitle(user.username());
m.redraw(); m.redraw();
@ -29418,7 +29417,7 @@ System.register('flarum/helpers/icon', [], function (_export, _context) {
function icon(name) { function icon(name) {
var attrs = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}; var attrs = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
attrs.className = 'icon fa fa-fw fa-' + name + ' ' + (attrs.className || ''); attrs.className = 'icon fa fa-' + name + ' ' + (attrs.className || '');
return m('i', attrs); return m('i', attrs);
} }