mirror of
https://github.com/mediacms-io/mediacms.git
synced 2026-03-11 15:37:22 -04:00
all
This commit is contained in:
@@ -1 +1 @@
|
|||||||
VERSION = "7.7"
|
VERSION = "7.9"
|
||||||
|
|||||||
@@ -680,6 +680,17 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Disable sticky navigation when in select_media mode (for LTI iframe)
|
||||||
|
&.fixed-nav[data-action="select_media"] {
|
||||||
|
.profile-nav {
|
||||||
|
position: relative;
|
||||||
|
top: auto;
|
||||||
|
left: auto;
|
||||||
|
right: auto;
|
||||||
|
z-index: 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.page-main {
|
.page-main {
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { LinksContext, MemberContext, SiteContext } from '../../utils/contexts/'
|
|||||||
import { PageStore, ProfilePageStore } from '../../utils/stores/';
|
import { PageStore, ProfilePageStore } from '../../utils/stores/';
|
||||||
import { PageActions, ProfilePageActions } from '../../utils/actions/';
|
import { PageActions, ProfilePageActions } from '../../utils/actions/';
|
||||||
import { CircleIconButton, PopupMain } from '../_shared';
|
import { CircleIconButton, PopupMain } from '../_shared';
|
||||||
import { translateString, inEmbeddedApp, inSelectMediaEmbedMode } from '../../utils/helpers/';
|
import { translateString, inEmbeddedApp, inSelectMediaEmbedMode, isSelectMediaMode } from '../../utils/helpers/';
|
||||||
|
|
||||||
class ProfileSearchBar extends React.PureComponent {
|
class ProfileSearchBar extends React.PureComponent {
|
||||||
constructor(props) {
|
constructor(props) {
|
||||||
@@ -721,7 +721,11 @@ export default function ProfilePagesHeader(props) {
|
|||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div ref={profilePageHeaderRef} className={'profile-page-header' + (fixedNav ? ' fixed-nav' : '')}>
|
<div
|
||||||
|
ref={profilePageHeaderRef}
|
||||||
|
className={'profile-page-header' + (fixedNav ? ' fixed-nav' : '')}
|
||||||
|
{...(isSelectMediaMode() ? { 'data-action': 'select_media' } : {})}
|
||||||
|
>
|
||||||
{!props.hideChannelBanner && (
|
{!props.hideChannelBanner && (
|
||||||
<span className="profile-banner-wrap">
|
<span className="profile-banner-wrap">
|
||||||
{props.author.banner_thumbnail_url ? (
|
{props.author.banner_thumbnail_url ? (
|
||||||
|
|||||||
@@ -14,4 +14,4 @@ export * from './quickSort';
|
|||||||
export * from './requests';
|
export * from './requests';
|
||||||
export { translateString } from './translate';
|
export { translateString } from './translate';
|
||||||
export { replaceString } from './replacementStrings';
|
export { replaceString } from './replacementStrings';
|
||||||
export * from './embeddedApp';
|
export { inEmbeddedApp, inSelectMediaEmbedMode, isSelectMediaMode } from './embeddedApp';
|
||||||
|
|||||||
@@ -195,13 +195,18 @@ class MediaPageStore extends EventEmitter {
|
|||||||
this.emit('loaded_media_data');
|
this.emit('loaded_media_data');
|
||||||
}
|
}
|
||||||
|
|
||||||
this.loadPlaylists();
|
// Skip loading playlists and comments when in embed mode (to reduce API calls)
|
||||||
if (MediaCMS.features.media.actions.comment_mention === true) {
|
const isEmbedMode = window.location.pathname.startsWith('/embed');
|
||||||
this.loadUsers();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.mediacms_config.member.can.readComment) {
|
if (!isEmbedMode) {
|
||||||
this.loadComments();
|
this.loadPlaylists();
|
||||||
|
if (MediaCMS.features.media.actions.comment_mention === true) {
|
||||||
|
this.loadUsers();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.mediacms_config.member.can.readComment) {
|
||||||
|
this.loadComments();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user