github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-22 10:14:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update dependencies

Browse Source
This commit is contained in:
Toby Zerner 2017-07-08 21:50:54 +09:30
parent cbe49d6d07
commit 53aa4b94ba
2 changed files with 51 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
framework/core/js/admin/dist/app.js vendored
View File

@ -17101,13 +17101,11 @@ System.register('flarum/App', ['flarum/utils/ItemList', 'flarum/components/Alert
// and clients support, then we'll send it as a POST request with the // and clients support, then we'll send it as a POST request with the
// intended method specified in the X-HTTP-Method-Override header. // intended method specified in the X-HTTP-Method-Override header.
if (options.method !== 'GET' && options.method !== 'POST') { if (options.method !== 'GET' && options.method !== 'POST') {
(function () { var method = options.method;
var method = options.method; extend(options, 'config', function (result, xhr) {
extend(options, 'config', function (result, xhr) { return xhr.setRequestHeader('X-HTTP-Method-Override', method);
return xhr.setRequestHeader('X-HTTP-Method-Override', method); });
}); options.method = 'POST';
options.method = 'POST';
})();
} }
// When we deserialize JSON data, if for some reason the server has provided // When we deserialize JSON data, if for some reason the server has provided

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

@ -19279,13 +19279,11 @@ System.register('flarum/App', ['flarum/utils/ItemList', 'flarum/components/Alert
// and clients support, then we'll send it as a POST request with the // and clients support, then we'll send it as a POST request with the
// intended method specified in the X-HTTP-Method-Override header. // intended method specified in the X-HTTP-Method-Override header.
if (options.method !== 'GET' && options.method !== 'POST') { if (options.method !== 'GET' && options.method !== 'POST') {
(function () { var method = options.method;
var method = options.method; extend(options, 'config', function (result, xhr) {
extend(options, 'config', function (result, xhr) { return xhr.setRequestHeader('X-HTTP-Method-Override', method);
return xhr.setRequestHeader('X-HTTP-Method-Override', method); });
}); options.method = 'POST';
options.method = 'POST';
})();
} }
// When we deserialize JSON data, if for some reason the server has provided // When we deserialize JSON data, if for some reason the server has provided
@ -21696,21 +21694,17 @@ System.register('flarum/components/DiscussionListItem', ['flarum/Component', 'fl
}, { }, {
key: 'config', key: 'config',
value: function config(isInitialized) { value: function config(isInitialized) {
var _this4 = this;
if (isInitialized) return; if (isInitialized) return;
// If we're on a touch device, set up the discussion row to be slidable. // If we're on a touch device, set up the discussion row to be slidable.
// This allows the user to drag the row to either side of the screen to // This allows the user to drag the row to either side of the screen to
// reveal controls. // reveal controls.
if ('ontouchstart' in window) { if ('ontouchstart' in window) {
(function () { var slidableInstance = slidable(this.$().addClass('Slidable'));
var slidableInstance = slidable(_this4.$().addClass('Slidable'));
_this4.$('.DiscussionListItem-controls').on('hidden.bs.dropdown', function () { this.$('.DiscussionListItem-controls').on('hidden.bs.dropdown', function () {
return slidableInstance.reset(); return slidableInstance.reset();
}); });
})();
} }
} }
}, { }, {
@ -24756,33 +24750,31 @@ System.register('flarum/components/NotificationList', ['flarum/Component', 'flar
var groups = []; var groups = [];
if (app.cache.notifications) { if (app.cache.notifications) {
(function () { var discussions = {};
var discussions = {};
// Build an array of discussions which the notifications are related to, // Build an array of discussions which the notifications are related to,
// and add the notifications as children. // and add the notifications as children.
app.cache.notifications.forEach(function (notification) { app.cache.notifications.forEach(function (notification) {
var subject = notification.subject(); var subject = notification.subject();
if (typeof subject === 'undefined') return; if (typeof subject === 'undefined') return;
// Get the discussion that this notification is related to. If it's not // Get the discussion that this notification is related to. If it's not
// directly related to a discussion, it may be related to a post or // directly related to a discussion, it may be related to a post or
// other entity which is related to a discussion. // other entity which is related to a discussion.
var discussion = false; var discussion = false;
if (subject instanceof Discussion) discussion = subject;else if (subject && subject.discussion) discussion = subject.discussion(); if (subject instanceof Discussion) discussion = subject;else if (subject && subject.discussion) discussion = subject.discussion();
// If the notification is not related to a discussion directly or // If the notification is not related to a discussion directly or
// indirectly, then we will assign it to a neutral group. // indirectly, then we will assign it to a neutral group.
var key = discussion ? discussion.id() : 0; var key = discussion ? discussion.id() : 0;
discussions[key] = discussions[key] || { discussion: discussion, notifications: [] }; discussions[key] = discussions[key] || { discussion: discussion, notifications: [] };
discussions[key].notifications.push(notification); discussions[key].notifications.push(notification);
if (groups.indexOf(discussions[key]) === -1) { if (groups.indexOf(discussions[key]) === -1) {
groups.push(discussions[key]); groups.push(discussions[key]);
} }
}); });
})();
} }
return m( return m(
@ -27027,25 +27019,23 @@ System.register('flarum/components/ReplyComposer', ['flarum/components/ComposerB
if (app.viewingDiscussion(discussion)) { if (app.viewingDiscussion(discussion)) {
app.current.stream.update(); app.current.stream.update();
} else { } else {
(function () { // Otherwise, we'll create an alert message to inform the user that
// Otherwise, we'll create an alert message to inform the user that // their reply has been posted, containing a button which will
// their reply has been posted, containing a button which will // transition to their new post when clicked.
// transition to their new post when clicked. var alert = void 0;
var alert = void 0; var viewButton = Button.component({
var viewButton = Button.component({ className: 'Button Button--link',
className: 'Button Button--link', children: app.translator.trans('core.forum.composer_reply.view_button'),
children: app.translator.trans('core.forum.composer_reply.view_button'), onclick: function onclick() {
onclick: function onclick() { m.route(app.route.post(post));
m.route(app.route.post(post)); app.alerts.dismiss(alert);
app.alerts.dismiss(alert); }
} });
}); app.alerts.show(alert = new Alert({
app.alerts.show(alert = new Alert({ type: 'success',
type: 'success', message: app.translator.trans('core.forum.composer_reply.posted_message'),
message: app.translator.trans('core.forum.composer_reply.posted_message'), controls: [viewButton]
controls: [viewButton] }));
}));
})();
} }
app.composer.hide(); app.composer.hide();