Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
scratch-www
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
scratch-www
Commits
43060345
Unverified
Commit
43060345
authored
Nov 19, 2018
by
Paul Kaplan
Committed by
GitHub
Nov 19, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2332 from paulkaplan/not-available-editor
Show projectNotAvailable view in editor mode also
parents
4f4a5987
7cfc3ed8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
12 deletions
+11
-12
src/views/preview/presentation.jsx
src/views/preview/presentation.jsx
+0
-11
src/views/preview/preview.jsx
src/views/preview/preview.jsx
+11
-1
No files found.
src/views/preview/presentation.jsx
View file @
43060345
...
...
@@ -25,7 +25,6 @@ const InplaceInput = require('../../components/forms/inplace-input.jsx');
const
TopLevelComment
=
require
(
'
./comment/top-level-comment.jsx
'
);
const
ComposeComment
=
require
(
'
./comment/compose-comment.jsx
'
);
const
ExtensionChip
=
require
(
'
./extension-chip.jsx
'
);
const
NotAvailable
=
require
(
'
../../components/not-available/not-available.jsx
'
);
const
projectShape
=
require
(
'
./projectshape.jsx
'
).
projectShape
;
require
(
'
./preview.scss
'
);
...
...
@@ -90,7 +89,6 @@ const PreviewPresentation = ({
projectHost
,
projectId
,
projectInfo
,
projectNotAvailable
,
projectStudios
,
remixes
,
replies
,
...
...
@@ -100,14 +98,6 @@ const PreviewPresentation = ({
})
=>
{
const
shareDate
=
((
projectInfo
.
history
&&
projectInfo
.
history
.
shared
))
?
projectInfo
.
history
.
shared
:
''
;
if
(
projectNotAvailable
)
{
return
(
<
div
className=
"preview"
>
<
NotAvailable
/>
</
div
>
);
}
return
(
<
div
className=
"preview"
>
{
canShare
&&
!
isShared
&&
(
...
...
@@ -498,7 +488,6 @@ PreviewPresentation.propTypes = {
projectHost
:
PropTypes
.
string
,
projectId
:
PropTypes
.
string
,
projectInfo
:
projectShape
,
projectNotAvailable
:
PropTypes
.
bool
,
projectStudios
:
PropTypes
.
arrayOf
(
PropTypes
.
object
),
remixes
:
PropTypes
.
arrayOf
(
PropTypes
.
object
),
replies
:
PropTypes
.
objectOf
(
PropTypes
.
array
),
...
...
src/views/preview/preview.jsx
View file @
43060345
...
...
@@ -20,6 +20,7 @@ const projectShape = require('./projectshape.jsx').projectShape;
const
Registration
=
require
(
'
../../components/registration/registration.jsx
'
);
const
ConnectedLogin
=
require
(
'
../../components/login/connected-login.jsx
'
);
const
CanceledDeletionModal
=
require
(
'
../../components/login/canceled-deletion-modal.jsx
'
);
const
NotAvailable
=
require
(
'
../../components/not-available/not-available.jsx
'
);
const
sessionActions
=
require
(
'
../../redux/session.js
'
);
const
navigationActions
=
require
(
'
../../redux/navigation.js
'
);
...
...
@@ -400,6 +401,16 @@ class Preview extends React.Component {
);
}
render
()
{
if
(
this
.
props
.
projectNotAvailable
)
{
return
(
<
Page
>
<
div
className=
"preview"
>
<
NotAvailable
/>
</
div
>
</
Page
>
);
}
return
(
this
.
props
.
playerMode
?
<
Page
>
...
...
@@ -431,7 +442,6 @@ class Preview extends React.Component {
projectHost=
{
this
.
props
.
projectHost
}
projectId=
{
this
.
state
.
projectId
}
projectInfo=
{
this
.
props
.
projectInfo
}
projectNotAvailable=
{
this
.
props
.
projectNotAvailable
}
projectStudios=
{
this
.
props
.
projectStudios
}
remixes=
{
this
.
props
.
remixes
}
replies=
{
this
.
props
.
replies
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment