mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-31 13:40:20 +02:00
Code Issues Releases Wiki Activity

Update for beta 6, fix some errors

Browse Source
This commit is contained in:
Toby Zerner
2016-06-05 09:54:25 +09:30
parent c1e593db0f
commit 856906d208
9 changed files with 131 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
extensions/embed/js/forum/dist/extension.js vendored
View File

@@ -10,15 +10,15 @@
//# sourceMappingURL=iframeResizer.contentWindow.map;
'use strict';
System.register('flarum/embed/components/DiscussionPage', ['flarum/components/DiscussionPage', 'flarum/components/PostStream', 'flarum/helpers/listItems'], function (_export, _context) {
System.register('flarum/embed/components/DiscussionPage', ['flarum/components/DiscussionPage', 'flarum/components/LoadingIndicator', 'flarum/helpers/listItems'], function (_export, _context) {
"use strict";
var BaseDiscussionPage, PostStream, listItems, DiscussionPage;
var BaseDiscussionPage, LoadingIndicator, listItems, DiscussionPage;
return {
setters: [function (_flarumComponentsDiscussionPage) {
BaseDiscussionPage = _flarumComponentsDiscussionPage.default;
}, function (_flarumComponentsPostStream) {
PostStream = _flarumComponentsPostStream.default;
}, function (_flarumComponentsLoadingIndicator) {
LoadingIndicator = _flarumComponentsLoadingIndicator.default;
}, function (_flarumHelpersListItems) {
listItems = _flarumHelpersListItems.default;
}],
@@ -50,7 +50,7 @@ System.register('flarum/embed/components/DiscussionPage', ['flarum/components/Di
m(
'div',
{ className: 'DiscussionPage-discussion' },
m(
this.discussion ? [m(
'nav',
{ className: 'DiscussionPage-nav--embed' },
m(
@@ -58,12 +58,11 @@ System.register('flarum/embed/components/DiscussionPage', ['flarum/components/Di
null,
listItems(this.sidebarItems().toArray())
)
),
m(
), m(
'div',
{ className: 'DiscussionPage-stream' },
this.stream ? this.stream.render() : ''
)
this.stream.render()
)] : m(LoadingIndicator, { className: 'LoadingIndicator--block' })
)
)
);
@@ -104,10 +103,10 @@ System.register('flarum/embed/components/DiscussionPage', ['flarum/components/Di
});;
'use strict';
System.register('flarum/embed/main', ['flarum/extend', 'flarum/app', 'flarum/components/Composer', 'flarum/components/PostStream', 'flarum/components/ModalManager', 'flarum/components/AlertManager', 'flarum/components/PostMeta', 'flarum/utils/mapRoutes', 'flarum/utils/Pane', 'flarum/utils/Drawer', 'flarum/embed/components/DiscussionPage'], function (_export, _context) {
System.register('flarum/embed/main', ['flarum/extend', 'flarum/app', 'flarum/components/Composer', 'flarum/components/PostStream', 'flarum/components/ModalManager', 'flarum/components/AlertManager', 'flarum/components/PostMeta', 'flarum/utils/mapRoutes', 'flarum/utils/Pane', 'flarum/utils/Drawer', 'flarum/utils/ScrollListener', 'flarum/embed/components/DiscussionPage'], function (_export, _context) {
"use strict";
var override, extend, app, Composer, PostStream, ModalManager, AlertManager, PostMeta, mapRoutes, Pane, Drawer, DiscussionPage;
var override, extend, app, Composer, PostStream, ModalManager, AlertManager, PostMeta, mapRoutes, Pane, Drawer, ScrollListener, DiscussionPage;
return {
setters: [function (_flarumExtend) {
override = _flarumExtend.override;
@@ -130,6 +129,8 @@ System.register('flarum/embed/main', ['flarum/extend', 'flarum/app', 'flarum/com
Pane = _flarumUtilsPane.default;
}, function (_flarumUtilsDrawer) {
Drawer = _flarumUtilsDrawer.default;
}, function (_flarumUtilsScrollListener) {
ScrollListener = _flarumUtilsScrollListener.default;
}, function (_flarumEmbedComponentsDiscussionPage) {
DiscussionPage = _flarumEmbedComponentsDiscussionPage.default;
}],
@@ -156,7 +157,7 @@ System.register('flarum/embed/main', ['flarum/extend', 'flarum/app', 'flarum/com
return original(post).replace('/embed', '/d');
});
app.pageInfo = m.prop();
app.pageInfo = m.prop({});
var reposition = function reposition() {
var info = app.pageInfo();
@@ -205,6 +206,15 @@ System.register('flarum/embed/main', ['flarum/extend', 'flarum/app', 'flarum/com
});
}
// Add a class to the body which indicates that the page has been scrolled
// down.
new ScrollListener(function (top) {
var $app = $('#app');
var offset = $app.offset().top;
$app.toggleClass('affix', top >= offset).toggleClass('scrolled', top > offset);
}).start();
// Initialize FastClick, which makes links and buttons much more responsive on
// touch devices.
$(function () {

18
extensions/embed/js/forum/src/components/DiscussionPage.js
View File

@@ -1,5 +1,5 @@
import BaseDiscussionPage from 'flarum/components/DiscussionPage';
import PostStream from 'flarum/components/PostStream';
import LoadingIndicator from 'flarum/components/LoadingIndicator';
import listItems from 'flarum/helpers/listItems';
export default class DiscussionPage extends BaseDiscussionPage {
@@ -14,12 +14,16 @@ export default class DiscussionPage extends BaseDiscussionPage {
<div className="DiscussionPage">
<div class="container">
<div className="DiscussionPage-discussion">
<nav className="DiscussionPage-nav--embed">
<ul>{listItems(this.sidebarItems().toArray())}</ul>
</nav>
<div className="DiscussionPage-stream">
{this.stream ? this.stream.render() : ''}
</div>
{this.discussion ? [
<nav className="DiscussionPage-nav--embed">
<ul>{listItems(this.sidebarItems().toArray())}</ul>
</nav>,
<div className="DiscussionPage-stream">
{this.stream.render()}
</div>
] : (
<LoadingIndicator className="LoadingIndicator--block"/>
)}
</div>
</div>
</div>

14
extensions/embed/js/forum/src/main.js
View File

@@ -8,6 +8,7 @@ import PostMeta from 'flarum/components/PostMeta';
import mapRoutes from 'flarum/utils/mapRoutes';
import Pane from 'flarum/utils/Pane';
import Drawer from 'flarum/utils/Drawer';
import ScrollListener from 'flarum/utils/ScrollListener';
import DiscussionPage from 'flarum/embed/components/DiscussionPage';
@@ -36,7 +37,7 @@ app.initializers.replace('boot', () => {
return original(post).replace('/embed', '/d');
});
app.pageInfo = m.prop();
app.pageInfo = m.prop({});
const reposition = function() {
const info = app.pageInfo();
@@ -89,6 +90,17 @@ app.initializers.replace('boot', () => {
});
}
// Add a class to the body which indicates that the page has been scrolled
// down.
new ScrollListener(top => {
const $app = $('#app');
const offset = $app.offset().top;
$app
.toggleClass('affix', top >= offset)
.toggleClass('scrolled', top > offset);
}).start();
// Initialize FastClick, which makes links and buttons much more responsive on
// touch devices.
$(() => {