Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision

Target

Select target project
  • omadrid/front
  • minds/front
  • joe59/front
  • markharding/front
  • eiennohi/front
  • edgebal/front
  • msantang78/front
  • bhayward93/front
  • xorgy/front
  • duyquoc/front
  • benhayward.ben/front
  • mnurzia/front
  • priestd09/front
  • dknunn/front
  • Yersinia/front
  • literalpie/front
  • maruthi-adithya/front
  • javanick/front
  • juanmsolaro/front
  • ascenderking/front
  • fabiolalombardim/front
  • jim-toth/front
  • Shivathanu/front
  • pestixaba/front
  • project_connection/front
  • mul53/front
  • iamonuwa/front
  • manishoo/front
  • namesty/front
  • AaronTheBruce/front
  • bedriguler/front
  • th2tran/front
  • jun784/front
  • mdstevens044/front
  • CodingNagger/front
  • heenachauhan201/front
  • diazairic/front
  • m994/front
  • webprodev/minds_front
  • chaoukiammar/front
  • benn7/front
  • ung1807/front
  • vinliao/front-patch-1
  • suhailkakar/front
  • theokeist/minds-blog
45 results
Select Git revision
Show changes
Commits on Source (7)
Showing
with 32 additions and 18 deletions
...@@ -247,7 +247,9 @@ export class EmbedImage { ...@@ -247,7 +247,9 @@ export class EmbedImage {
if ($image.tagName === 'SPAN') { if ($image.tagName === 'SPAN') {
$image = $image.parentNode.querySelector('img'); $image = $image.parentNode.querySelector('img');
} else if ($image.tagName !== 'IMG') { }
if (!$image || $image.tagName !== 'IMG') {
return; return;
} }
......
...@@ -184,7 +184,10 @@ ...@@ -184,7 +184,10 @@
[src]="[ [src]="[
{ {
res: '360', res: '360',
uri: 'api/v1/media/' + comment.custom_data.guid + '/play', uri:
'api/v1/media/' +
comment.custom_data.guid +
'/play?s=comment',
type: 'video/mp4' type: 'video/mp4'
} }
]" ]"
......
...@@ -296,7 +296,7 @@ ...@@ -296,7 +296,7 @@
height="300px" height="300px"
[muted]="false" [muted]="false"
[poster]="activity.custom_data.thumbnail_src" [poster]="activity.custom_data.thumbnail_src"
[src]="[{ 'res': '360', 'uri': 'api/v1/media/' + activity.custom_data.guid + '/play', 'type': 'video/mp4' }]" [src]="[{ 'res': '360', 'uri': 'api/v1/media/' + activity.custom_data.guid + '/play?s=activity', 'type': 'video/mp4' }]"
[guid]="activity.custom_data.guid" [guid]="activity.custom_data.guid"
[playCount]="activity['play:count']" [playCount]="activity['play:count']"
[torrent]="[{ res: '360', key: activity.custom_data.guid + '/360.mp4' }]" [torrent]="[{ res: '360', key: activity.custom_data.guid + '/360.mp4' }]"
......
...@@ -115,11 +115,11 @@ export class MindsVideoDirectHttpPlayer ...@@ -115,11 +115,11 @@ export class MindsVideoDirectHttpPlayer
return this.player.nativeElement; return this.player.nativeElement;
} }
play() { async play() {
const player = this.getPlayer(); const player = this.getPlayer();
try { try {
player.play(); await player.play();
} catch (e) { } catch (e) {
console.log(e); console.log(e);
} }
...@@ -135,11 +135,11 @@ export class MindsVideoDirectHttpPlayer ...@@ -135,11 +135,11 @@ export class MindsVideoDirectHttpPlayer
} }
} }
toggle() { async toggle() {
const player = this.getPlayer(); const player = this.getPlayer();
if (player.paused) { if (player.paused) {
this.play(); await this.play();
} else { } else {
this.pause(); this.pause();
} }
......
<ng-container *ngIf="current"> <ng-container *ngIf="current">
<m-video--direct-http-player <m-video--direct-http-player
*ngIf="current.type === 'direct-http'" *ngIf="current.type === 'direct-http' || true"
class="m-video--player" class="m-video--player"
[src]="current.src" [src]="current.src"
[poster]="poster" [poster]="poster"
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
></m-video--direct-http-player> ></m-video--direct-http-player>
<m-video--torrent-player <m-video--torrent-player
*ngIf="current.type === 'torrent'" *ngIf="current.type === 'torrent' && false"
class="m-video--player" class="m-video--player"
[src]="current.src" [src]="current.src"
[poster]="poster" [poster]="poster"
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<i <i
*ngIf=" *ngIf="
(!playerRef.isPlaying() && !playerRef.isLoading()) || (!playerRef.isPlaying() && !playerRef.isLoading()) ||
(isActivity && metadataLoaded && !playerRef.isPlaying()) (shouldPlayInModal && !playerRef.isPlaying())
" "
class="material-icons minds-video-play-icon" class="material-icons minds-video-play-icon"
(click)="clickedVideo()" (click)="clickedVideo()"
......
...@@ -435,9 +435,9 @@ export class MindsVideoComponent implements OnDestroy { ...@@ -435,9 +435,9 @@ export class MindsVideoComponent implements OnDestroy {
} }
clickedVideo() { clickedVideo() {
if (!this.metadataLoaded) { // if (!this.metadataLoaded) {
return; // return;
} // }
const isNotTablet = Math.min(screen.width, screen.height) < 768; const isNotTablet = Math.min(screen.width, screen.height) < 768;
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
[src]="[ [src]="[
{ {
res: '360', res: '360',
uri: 'api/v1/media/' + entity.entity_guid + '/play', uri: 'api/v1/media/' + entity.entity_guid + '/play?s=modal',
type: 'video/mp4' type: 'video/mp4'
} }
]" ]"
......
...@@ -170,6 +170,11 @@ m-overlay-modal { ...@@ -170,6 +170,11 @@ m-overlay-modal {
m-video { m-video {
position: static; position: static;
video {
width: 100%;
height: 100%;
}
.minds-video-bar-full { .minds-video-bar-full {
.m-video--progress-bar { .m-video--progress-bar {
padding-right: 0; padding-right: 0;
......
...@@ -151,8 +151,12 @@ export class MediaModalComponent implements OnInit, OnDestroy { ...@@ -151,8 +151,12 @@ export class MediaModalComponent implements OnInit, OnDestroy {
switch (this.entity.custom_type) { switch (this.entity.custom_type) {
case 'video': case 'video':
this.contentType = 'video'; this.contentType = 'video';
this.entity.width = this.entity.custom_data.dimensions.width; this.entity.width = this.entity.custom_data.dimensions
this.entity.height = this.entity.custom_data.dimensions.height; ? this.entity.custom_data.dimensions.width
: 1280;
this.entity.height = this.entity.custom_data.dimensions
? this.entity.custom_data.dimensions.height
: 720;
this.entity.thumbnail_src = this.entity.custom_data.thumbnail_src; this.entity.thumbnail_src = this.entity.custom_data.thumbnail_src;
break; break;
case 'batch': case 'batch':
......
...@@ -13,7 +13,7 @@ export class MessengerSounds { ...@@ -13,7 +13,7 @@ export class MessengerSounds {
}; };
play(sound: string) { play(sound: string) {
if (this.canPlay()) this.sounds[sound].play(); // if (this.canPlay()) this.sounds[sound].play();
} }
canPlay() { canPlay() {
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
[src]="[ [src]="[
{ {
res: '360', res: '360',
uri: 'api/v1/media/' + entity.guid + '/play', uri: 'api/v1/media/' + entity.guid + '/play?s=tile',
type: 'video/mp4' type: 'video/mp4'
} }
]" ]"
......