github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-22 07:05:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

forum: uncomment discussion list pane methods

Browse Source
This commit is contained in:
David Sevilla Martin 2020-05-03 16:41:38 -04:00
parent 1d83b740d2
commit 4a5a5a9ef0
No known key found for this signature in database
GPG Key ID: F764F1417E16B15F
5 changed files with 133 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
js/dist/admin.js vendored
View File

@ -14467,7 +14467,7 @@ var MailPage = /*#__PURE__*/function (_Page) {
"use strict";
__webpack_require__.r(__webpack_exports__);
/* harmony import */ var _common_components_Page__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../common/components/Page */ "./src/common/components/Page.ts");
/* harmony import */ var _common_components_Page__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../common/components/Page */ "./src/common/components/Page.tsx");
/* harmony default export */ __webpack_exports__["default"] = (_common_components_Page__WEBPACK_IMPORTED_MODULE_0__["default"]);
@ -18328,14 +18328,68 @@ var Navigation = /*#__PURE__*/function (_Component) {
/***/ }),
/***/ "./src/common/components/Page.ts":
/*!***************************************!*\
!*** ./src/common/components/Page.ts ***!
\***************************************/
/***/ "./src/common/components/Page.tsx":
/*!****************************************!*\
!*** ./src/common/components/Page.tsx ***!
\****************************************/
/*! exports provided: default */
/***/ (function(module, exports) {
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
__webpack_require__.r(__webpack_exports__);
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return Page; });
/* harmony import */ var _babel_runtime_helpers_esm_inheritsLoose__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @babel/runtime/helpers/esm/inheritsLoose */ "./node_modules/@babel/runtime/helpers/esm/inheritsLoose.js");
/* harmony import */ var _common_Component__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../common/Component */ "./src/common/Component.ts");
/**
* The `Page` component
*/
var Page = /*#__PURE__*/function (_Component) {
Object(_babel_runtime_helpers_esm_inheritsLoose__WEBPACK_IMPORTED_MODULE_0__["default"])(Page, _Component);
function Page() {
var _this;
for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
args[_key] = arguments[_key];
}
_this = _Component.call.apply(_Component, [this].concat(args)) || this;
_this.bodyClass = '';
return _this;
}
var _proto = Page.prototype;
_proto.oninit = function oninit(vnode) {
_Component.prototype.oninit.call(this, vnode);
app.previous = app.current;
app.current = this;
if (this.bodyClass) {
$('#app').addClass(this.bodyClass);
}
};
_proto.oncreate = function oncreate(vnode) {
_Component.prototype.oncreate.call(this, vnode);
app.modal.close();
};
_proto.onremove = function onremove(vnode) {
_Component.prototype.onremove.call(this, vnode);
$('#app').removeClass(this.bodyClass);
};
return Page;
}(_common_Component__WEBPACK_IMPORTED_MODULE_1__["default"]);
throw new Error("Module build failed (from ./node_modules/babel-loader/lib/index.js):\nError: ENOENT: no such file or directory, open 'E:\\sites\\flarum-new\\packages\\flarum-core\\js\\src\\common\\components\\Page.ts'");
/***/ }),

2
js/dist/admin.js.map vendored
View File

File diff suppressed because one or more lines are too long

129
js/dist/forum.js vendored
View File

@ -19591,16 +19591,18 @@ var DiscussionListItem = /*#__PURE__*/function (_Component) {
__webpack_require__.r(__webpack_exports__);
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return DiscussionPage; });
/* harmony import */ var _babel_runtime_helpers_esm_inheritsLoose__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @babel/runtime/helpers/esm/inheritsLoose */ "./node_modules/@babel/runtime/helpers/esm/inheritsLoose.js");
/* harmony import */ var _Page__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./Page */ "./src/forum/components/Page.tsx");
/* harmony import */ var _common_utils_ItemList__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../common/utils/ItemList */ "./src/common/utils/ItemList.ts");
/* harmony import */ var _DiscussionHero__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./DiscussionHero */ "./src/forum/components/DiscussionHero.tsx");
/* harmony import */ var _PostStream__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./PostStream */ "./src/forum/components/PostStream.tsx");
/* harmony import */ var _PostStreamScrubber__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./PostStreamScrubber */ "./src/forum/components/PostStreamScrubber.tsx");
/* harmony import */ var _common_components_LoadingIndicator__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../common/components/LoadingIndicator */ "./src/common/components/LoadingIndicator.tsx");
/* harmony import */ var _common_components_SplitDropdown__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../common/components/SplitDropdown */ "./src/common/components/SplitDropdown.tsx");
/* harmony import */ var _common_helpers_listItems__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../common/helpers/listItems */ "./src/common/helpers/listItems.tsx");
/* harmony import */ var _utils_DiscussionControls__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../utils/DiscussionControls */ "./src/forum/utils/DiscussionControls.tsx");
/* harmony import */ var _DiscussionList__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./DiscussionList */ "./src/forum/components/DiscussionList.tsx");
/* harmony import */ var _app__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../app */ "./src/forum/app.ts");
/* harmony import */ var _Page__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./Page */ "./src/forum/components/Page.tsx");
/* harmony import */ var _common_utils_ItemList__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../common/utils/ItemList */ "./src/common/utils/ItemList.ts");
/* harmony import */ var _DiscussionHero__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./DiscussionHero */ "./src/forum/components/DiscussionHero.tsx");
/* harmony import */ var _PostStream__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./PostStream */ "./src/forum/components/PostStream.tsx");
/* harmony import */ var _PostStreamScrubber__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./PostStreamScrubber */ "./src/forum/components/PostStreamScrubber.tsx");
/* harmony import */ var _common_components_LoadingIndicator__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../common/components/LoadingIndicator */ "./src/common/components/LoadingIndicator.tsx");
/* harmony import */ var _common_components_SplitDropdown__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../common/components/SplitDropdown */ "./src/common/components/SplitDropdown.tsx");
/* harmony import */ var _common_helpers_listItems__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../../common/helpers/listItems */ "./src/common/helpers/listItems.tsx");
/* harmony import */ var _utils_DiscussionControls__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../utils/DiscussionControls */ "./src/forum/utils/DiscussionControls.tsx");
/* harmony import */ var _DiscussionList__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./DiscussionList */ "./src/forum/components/DiscussionList.tsx");
@ -19647,12 +19649,12 @@ var DiscussionPage = /*#__PURE__*/function (_Page) {
// then the pane would which would be slow and would cause problems with
// event handlers.
if (app.cache.discussionList) {// TODO app pane
// app.pane.enable();
// app.pane.hide();
if (_app__WEBPACK_IMPORTED_MODULE_1__["default"].cache.discussionList) {
_app__WEBPACK_IMPORTED_MODULE_1__["default"].pane.enable();
_app__WEBPACK_IMPORTED_MODULE_1__["default"].pane.hide();
}
app.history.push('discussion');
_app__WEBPACK_IMPORTED_MODULE_1__["default"].history.push('discussion');
this.bodyClass = 'App--discussion';
};
@ -19679,14 +19681,13 @@ var DiscussionPage = /*#__PURE__*/function (_Page) {
// discussion list pane. Also, if we're composing a reply to this
// discussion, minimize the composer – unless it's empty, in which case
// we'll just close it.
// TODO pane & composer
// app.pane.disable();
// if (app.composingReplyTo(this.discussion) && !app.composer.component.content()) {
_app__WEBPACK_IMPORTED_MODULE_1__["default"].pane.disable(); // if (app.composingReplyTo(this.discussion) && !app.composer.component.content()) {
// app.composer.hide();
// } else {
// app.composer.minimize();
// }
};
_proto.view = function view() {
@ -19696,7 +19697,7 @@ var DiscussionPage = /*#__PURE__*/function (_Page) {
// posts we want to display. Tell the stream to scroll down and highlight
// the specific post that was routed to.
var postStream = m(_PostStream__WEBPACK_IMPORTED_MODULE_4__["default"], {
var postStream = m(_PostStream__WEBPACK_IMPORTED_MODULE_5__["default"], {
discussion: discussion,
includedPosts: this.includedPosts,
oninit: function oninit(vnode) {
@ -19710,25 +19711,25 @@ var DiscussionPage = /*#__PURE__*/function (_Page) {
});
return m("div", {
className: "DiscussionPage"
}, app.cache.discussionList ? m("div", {
}, _app__WEBPACK_IMPORTED_MODULE_1__["default"].cache.discussionList ? m("div", {
className: "DiscussionPage-list",
oncreate: this.oncreatePane.bind(this),
onbeforeupdate: function onbeforeupdate() {
return false;
}
}, !$('.App-navigation').is(':visible') && m(_DiscussionList__WEBPACK_IMPORTED_MODULE_10__["default"], {
state: app.cache.discussionList
}, !$('.App-navigation').is(':visible') && m(_DiscussionList__WEBPACK_IMPORTED_MODULE_11__["default"], {
state: _app__WEBPACK_IMPORTED_MODULE_1__["default"].cache.discussionList
})) : '', m("div", {
className: "DiscussionPage-discussion"
}, discussion ? [_DiscussionHero__WEBPACK_IMPORTED_MODULE_3__["default"].component({
}, discussion ? [_DiscussionHero__WEBPACK_IMPORTED_MODULE_4__["default"].component({
discussion: discussion
}), m("div", {
className: "container"
}, m("nav", {
className: "DiscussionPage-nav"
}, m("ul", null, Object(_common_helpers_listItems__WEBPACK_IMPORTED_MODULE_8__["default"])(this.sidebarItems().toArray()))), m("div", {
}, m("ul", null, Object(_common_helpers_listItems__WEBPACK_IMPORTED_MODULE_9__["default"])(this.sidebarItems().toArray()))), m("div", {
className: "DiscussionPage-stream"
}, postStream))] : _common_components_LoadingIndicator__WEBPACK_IMPORTED_MODULE_6__["default"].component({
}, postStream))] : _common_components_LoadingIndicator__WEBPACK_IMPORTED_MODULE_7__["default"].component({
className: 'LoadingIndicator--block'
})));
};
@ -19737,7 +19738,7 @@ var DiscussionPage = /*#__PURE__*/function (_Page) {
_Page.prototype.oncreate.call(this, vnode);
if (this.discussion) {
app.setTitle(this.discussion.title());
_app__WEBPACK_IMPORTED_MODULE_1__["default"].setTitle(this.discussion.title());
}
}
/**
@ -19748,7 +19749,7 @@ var DiscussionPage = /*#__PURE__*/function (_Page) {
_proto.refresh = function refresh() {
this.near = Number(m.route.param('near') || 0);
this.discussion = null;
var preloadedDiscussion = app.preloadedApiDocument();
var preloadedDiscussion = _app__WEBPACK_IMPORTED_MODULE_1__["default"].preloadedApiDocument();
if (preloadedDiscussion) {
// We must wrap this in a setTimeout because if we are mounting this
@ -19758,7 +19759,7 @@ var DiscussionPage = /*#__PURE__*/function (_Page) {
setTimeout(this.show.bind(this, preloadedDiscussion), 0);
} else {
var params = this.requestParams();
app.store.find('discussions', m.route.param('id').split('-')[0], params).then(this.show.bind(this));
_app__WEBPACK_IMPORTED_MODULE_1__["default"].store.find('discussions', m.route.param('id').split('-')[0], params).then(this.show.bind(this));
}
m.redraw();
@ -19783,8 +19784,8 @@ var DiscussionPage = /*#__PURE__*/function (_Page) {
_proto.show = function show(discussion) {
this.discussion = discussion;
app.history.push('discussion', discussion.title());
app.setTitleCount(0); // When the API responds with a discussion, it will also include a number of
_app__WEBPACK_IMPORTED_MODULE_1__["default"].history.push('discussion', discussion.title());
_app__WEBPACK_IMPORTED_MODULE_1__["default"].setTitleCount(0); // When the API responds with a discussion, it will also include a number of
// posts. Some of these posts are included because they are on the first
// page of posts we want to display (determined by the `near` parameter) –
// others may be included because due to other relationships introduced by
@ -19797,7 +19798,7 @@ var DiscussionPage = /*#__PURE__*/function (_Page) {
this.includedPosts = discussion.payload.included.filter(function (record) {
return record.type === 'posts' && record.relationships && record.relationships.discussion && record.relationships.discussion.data.id === discussionId;
}).map(function (record) {
return app.store.getById('posts', record.id);
return _app__WEBPACK_IMPORTED_MODULE_1__["default"].store.getById('posts', record.id);
}).sort(function (a, b) {
return a.id() - b.id();
}).slice(0, 20);
@ -19848,14 +19849,14 @@ var DiscussionPage = /*#__PURE__*/function (_Page) {
_proto.sidebarItems = function sidebarItems() {
var _this3 = this;
var items = new _common_utils_ItemList__WEBPACK_IMPORTED_MODULE_2__["default"]();
items.add('controls', _common_components_SplitDropdown__WEBPACK_IMPORTED_MODULE_7__["default"].component({
children: _utils_DiscussionControls__WEBPACK_IMPORTED_MODULE_9__["default"].controls(this.discussion, this).toArray(),
var items = new _common_utils_ItemList__WEBPACK_IMPORTED_MODULE_3__["default"]();
items.add('controls', _common_components_SplitDropdown__WEBPACK_IMPORTED_MODULE_8__["default"].component({
children: _utils_DiscussionControls__WEBPACK_IMPORTED_MODULE_10__["default"].controls(this.discussion, this).toArray(),
icon: 'fas fa-ellipsis-v',
className: 'App-primaryControl',
buttonClassName: 'Button--primary'
}));
items.add('scrubber', m(_PostStreamScrubber__WEBPACK_IMPORTED_MODULE_5__["default"], {
items.add('scrubber', m(_PostStreamScrubber__WEBPACK_IMPORTED_MODULE_6__["default"], {
oninit: function oninit(vnode) {
return _this3.scrubber = vnode.state;
},
@ -19874,14 +19875,14 @@ var DiscussionPage = /*#__PURE__*/function (_Page) {
if (!discussion) return; // Construct a URL to this discussion with the updated position, then
// replace it into the window's history and our own history stack.
var url = app.route.discussion(discussion, this.near = startNumber);
var url = _app__WEBPACK_IMPORTED_MODULE_1__["default"].route.discussion(discussion, this.near = startNumber);
m.route.set(url, true, {
replace: true
});
app.history.push('discussion', discussion.title()); // If the user hasn't read past here before, then we'll update their read
_app__WEBPACK_IMPORTED_MODULE_1__["default"].history.push('discussion', discussion.title()); // If the user hasn't read past here before, then we'll update their read
// state and redraw.
if (app.session.user && endNumber > (discussion.lastReadPostNumber() || 0)) {
if (_app__WEBPACK_IMPORTED_MODULE_1__["default"].session.user && endNumber > (discussion.lastReadPostNumber() || 0)) {
discussion.save({
lastReadPostNumber: endNumber
});
@ -19890,7 +19891,7 @@ var DiscussionPage = /*#__PURE__*/function (_Page) {
};
return DiscussionPage;
}(_Page__WEBPACK_IMPORTED_MODULE_1__["default"]);
}(_Page__WEBPACK_IMPORTED_MODULE_2__["default"]);
@ -20065,9 +20066,9 @@ __webpack_require__.r(__webpack_exports__);
/**
* The `DiscussionsUserPage` component shows a discussion list inside of a user
* page.
/**
* The `DiscussionsUserPage` component shows a discussion list inside of a user
* page.
*/
var DiscussionsUserPage = /*#__PURE__*/function (_UserPage) {
@ -23504,9 +23505,9 @@ __webpack_require__.r(__webpack_exports__);
/**
* The `PostsUserPage` component shows a user's activity feed inside of their
* profile.
/**
* The `PostsUserPage` component shows a user's activity feed inside of their
* profile.
*/
var PostsUserPage = /*#__PURE__*/function (_UserPage) {
Object(_babel_runtime_helpers_esm_inheritsLoose__WEBPACK_IMPORTED_MODULE_0__["default"])(PostsUserPage, _UserPage);
@ -23581,9 +23582,9 @@ var PostsUserPage = /*#__PURE__*/function (_UserPage) {
className: "PostsUserPage-loadMore"
}, footer));
}
/**
* Initialize the component with a user, and trigger the loading of their
* activity feed.
/**
* Initialize the component with a user, and trigger the loading of their
* activity feed.
*/
;
@ -23592,8 +23593,8 @@ var PostsUserPage = /*#__PURE__*/function (_UserPage) {
this.refresh();
}
/**
* Clear and reload the user's activity feed.
/**
* Clear and reload the user's activity feed.
*/
;
@ -23603,10 +23604,10 @@ var PostsUserPage = /*#__PURE__*/function (_UserPage) {
m.redraw();
this.loadResults().then(this.parseResults.bind(this));
}
/**
* Load a new page of the user's activity feed.
*
* @param offset The position to start getting results from.
/**
* Load a new page of the user's activity feed.
*
* @param offset The position to start getting results from.
*/
;
@ -23623,8 +23624,8 @@ var PostsUserPage = /*#__PURE__*/function (_UserPage) {
sort: '-createdAt'
});
}
/**
* Load the next page of results.
/**
* Load the next page of results.
*/
;
@ -23632,8 +23633,8 @@ var PostsUserPage = /*#__PURE__*/function (_UserPage) {
this.loading = true;
this.loadResults(this.posts.length).then(this.parseResults.bind(this));
}
/**
* Parse results and append them to the activity feed.
/**
* Parse results and append them to the activity feed.
*/
;
@ -25232,8 +25233,8 @@ __webpack_require__.r(__webpack_exports__);
component: _components_IndexPage__WEBPACK_IMPORTED_MODULE_0__["default"]
}
};
/**
* Generate a URL to a discussion.
/**
* Generate a URL to a discussion.
*/
app.route.discussion = function (discussion, near) {
@ -25244,16 +25245,16 @@ __webpack_require__.r(__webpack_exports__);
near: hasNear && near
});
};
/**
* Generate a URL to a post.
/**
* Generate a URL to a post.
*/
app.route.post = function (post) {
return app.route.discussion(post.discussion(), post.number());
};
/**
* Generate a URL to a user.
/**
* Generate a URL to a user.
*/

2
js/dist/forum.js.map vendored
View File

File diff suppressed because one or more lines are too long

10
js/src/forum/components/DiscussionPage.tsx
View File

@ -1,3 +1,5 @@
import app from '../app';
import Page from './Page';
import ItemList from '../../common/utils/ItemList';
import DiscussionHero from './DiscussionHero';
@ -42,9 +44,8 @@ export default class DiscussionPage extends Page {
// then the pane would which would be slow and would cause problems with
// event handlers.
if (app.cache.discussionList) {
// TODO app pane
// app.pane.enable();
// app.pane.hide();
app.pane.enable();
app.pane.hide();
}
app.history.push('discussion');
@ -78,8 +79,7 @@ export default class DiscussionPage extends Page {
// discussion list pane. Also, if we're composing a reply to this
// discussion, minimize the composer – unless it's empty, in which case
// we'll just close it.
// TODO pane & composer
// app.pane.disable();
app.pane.disable();
// if (app.composingReplyTo(this.discussion) && !app.composer.component.content()) {
// app.composer.hide();