Skip to content
Next
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
Minds Frontend
Project
Project
Details
Activity
Releases
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
898
Issues
898
List
Boards
Labels
Service Desk
Milestones
Merge Requests
47
Merge Requests
47
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Security & Compliance
Security & Compliance
Dependency List
Packages
Packages
List
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Minds
Minds Frontend
Compare Revisions
c7394e1abeb45303c1f93e2299923ee052797749...c46eb2a6a3416d96f54b14e0415811a18a771e1a
Source
c46eb2a6a3416d96f54b14e0415811a18a771e1a
Select Git revision
...
Target
c7394e1abeb45303c1f93e2299923ee052797749
Select Git revision
Compare
Commits (2)
Updated for conflicts
· c4a30fe3
Ben Hayward
authored
49 minutes ago
c4a30fe3
Accidental commit
· c46eb2a6
Ben Hayward
authored
43 minutes ago
c46eb2a6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
19 deletions
+25
-19
activity.html
...pp/modules/legacy/components/cards/activity/activity.html
+8
-4
activity.ts
src/app/modules/legacy/components/cards/activity/activity.ts
+17
-14
external_api.min.map
src/shims/external_api.min.map
+0
-1
No files found.
src/app/modules/legacy/components/cards/activity/activity.html
View file @
c46eb2a6
...
...
@@ -92,11 +92,15 @@
</div>
</div>
<div
class=
"mdl-card mdl-color--red-500 mdl-color-text--blue-grey-50 mdl-shadow--2dp"
style=
"min-height:0;"
*ngIf=
"errorString && editing"
>
<div
class=
"mdl-card__supporting-text mdl-color-text--blue-grey-50"
>
{{errorString}}
<div
class=
"mdl-card mdl-color--red-500 mdl-color-text--blue-grey-50 mdl-shadow--2dp"
style=
"min-height:0;"
*ngIf=
"errorString && editing"
>
<div
class=
"mdl-card__supporting-text mdl-color-text--blue-grey-50"
>
{{errorString}}
</div>
</div>
</div>
<m-wire--lock-screen
[(entity)]=
"activity"
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/legacy/components/cards/activity/activity.ts
View file @
c46eb2a6
...
...
@@ -20,13 +20,13 @@ import { MediaModalComponent } from '../../../../media/modal/modal.component';
import
{
BoostCreatorComponent
}
from
'
../../../../boost/creator/creator.component
'
;
import
{
WireCreatorComponent
}
from
'
../../../../wire/creator/creator.component
'
;
import
{
MindsVideoComponent
}
from
'
../../../../media/components/video/video.component
'
;
import
{
EntitiesService
}
from
"
../../../../../common/services/entities.service
"
;
import
{
Router
}
from
"
@angular/router
"
;
import
{
BlockListService
}
from
"
../../../../../common/services/block-list.service
"
;
import
{
ActivityAnalyticsOnViewService
}
from
"
./activity-analytics-on-view.service
"
;
import
{
NewsfeedService
}
from
"
../../../../newsfeed/services/newsfeed.service
"
;
import
{
ClientMetaService
}
from
"
../../../../../common/services/client-meta.service
"
;
import
{
TopbarHashtagsService
}
from
"
../../../../hashtags/service/topbar.service
"
;
import
{
EntitiesService
}
from
'
../../../../../common/services/entities.service
'
;
import
{
Router
}
from
'
@angular/router
'
;
import
{
BlockListService
}
from
'
../../../../../common/services/block-list.service
'
;
import
{
ActivityAnalyticsOnViewService
}
from
'
./activity-analytics-on-view.service
'
;
import
{
NewsfeedService
}
from
'
../../../../newsfeed/services/newsfeed.service
'
;
import
{
ClientMetaService
}
from
'
../../../../../common/services/client-meta.service
'
;
import
{
TopbarHashtagsService
}
from
'
../../../../hashtags/service/topbar.service
'
;
import
{
AutocompleteSuggestionsService
}
from
'
../../../../suggestions/services/autocomplete-suggestions.service
'
;
import
{
FeaturesService
}
from
'
../../../../../services/features.service
'
;
import
isMobile
from
'
../../../../../helpers/is-mobile
'
;
...
...
@@ -46,7 +46,11 @@ import isMobile from '../../../../../helpers/is-mobile';
'
showRatingToggle
'
,
],
outputs
:
[
'
_delete: delete
'
,
'
commentsOpened
'
,
'
onViewed
'
],
providers
:
[
ClientMetaService
,
ActivityAnalyticsOnViewService
,
TopbarHashtagsService
],
providers
:
[
ClientMetaService
,
ActivityAnalyticsOnViewService
,
TopbarHashtagsService
,
],
templateUrl
:
'
activity.html
'
,
changeDetection
:
ChangeDetectionStrategy
.
OnPush
,
})
...
...
@@ -66,21 +70,21 @@ export class Activity implements OnInit {
@
Input
()
showBoostMenuOptions
:
boolean
=
false
;
@
Input
()
slot
:
number
=
-
1
;
visibilityEvents
:
boolean
=
true
;
@
Input
(
'
visibilityEvents
'
)
set
_visibilityEvents
(
visibilityEvents
:
boolean
)
{
this
.
visibilityEvents
=
visibilityEvents
;
if
(
this
.
activityAnalyticsOnViewService
)
{
this
.
activityAnalyticsOnViewService
.
setEnabled
(
this
.
visibilityEvents
);
}
}
type
:
string
;
element
:
any
;
visible
:
boolean
=
false
;
errorString
:
string
=
''
;
errorString
:
string
=
''
;
editing
:
boolean
=
false
;
@
Input
()
hideTabs
:
boolean
;
...
...
@@ -244,7 +248,6 @@ export class Activity implements OnInit {
save
()
{
console
.
log
(
'
trying to save your changes to the server
'
,
this
.
activity
);
console
.
log
(
"
hello
"
);
if
(
this
.
hashtagsService
.
sliceHashTags
(
this
.
activity
.
message
).
length
>
5
)
{
this
.
editing
=
true
;
this
.
errorString
=
`You have exceeded the maximum 5 hashtags in a post`
;
...
...
This diff is collapsed.
Click to expand it.
src/shims/external_api.min.map
View file @
c46eb2a6
export const NOOP = 0;
\ No newline at end of file
This diff is collapsed.
Click to expand it.