Skip to content

Commit

Permalink
Merge pull request #102 from dicdiksha/fix/117369/video-player-issue
Browse files Browse the repository at this point in the history
Fixes for video-player-issue , removed all old changes for videojs
  • Loading branch information
yashveertrigyn authored Dec 8, 2023
2 parents 0377362 + 75cd576 commit e4e672f
Show file tree
Hide file tree
Showing 6 changed files with 1,746 additions and 13 deletions.
9 changes: 5 additions & 4 deletions src/app/client/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
},
{
"glob": "**/*",
"input": "node_modules/dictrigyn-video-player/lib/assets/",
"input": "node_modules/@dicdikshaorg/video-player-v9/lib/assets/",
"output": "/assets/"
},
{
Expand Down Expand Up @@ -70,13 +70,13 @@
"./node_modules/@project-sunbird/sb-styles/assets/styles.scss",
"./node_modules/leaflet/dist/leaflet.css",
"src/assets/styles/styles.scss",
"node_modules/video.js/dist/video-js.min.css",
"src/assets/video-js.css",
"node_modules/katex/dist/katex.min.css",
"./node_modules/@project-sunbird/sb-themes/themes/themes-material_UI.scss",
"./node_modules/@project-sunbird/sb-themes/themes/themes-df.scss",
"./node_modules/@project-sunbird/sb-themes/themes/themes-portal.scss",
"./node_modules/@project-sunbird/discussions-ui-v8/assets/styles/global.scss",
"node_modules/dictrigyn-video-player/lib/assets/videojs.markers.min.css",
"node_modules/@dicdikshaorg/video-player-v9/lib/assets/videojs.markers.min.css",
"node_modules/videojs-http-source-selector/dist/videojs-http-source-selector.css"
],
"stylePreprocessorOptions": {
Expand All @@ -97,7 +97,8 @@
"node_modules/jquery.fancytree/dist/jquery.fancytree-all-deps.min.js",
"src/assets/libs/semantic-ui/modal.min.js",
"node_modules/video.js/dist/video.js",
"node_modules/dictrigyn-video-player/lib/assets/videojs-markers.js",
"node_modules/videojs-contrib-quality-levels/dist/videojs-contrib-quality-levels.min.js",
"node_modules/@dicdikshaorg/video-player-v9/lib/assets/videojs-markers.js",
"node_modules/videojs-http-source-selector/dist/videojs-http-source-selector.min.js",
{
"inject": false,
Expand Down
7 changes: 3 additions & 4 deletions src/app/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
"@angular/platform-browser": "^11.2.14",
"@angular/platform-browser-dynamic": "^11.2.14",
"@angular/router": "^11.2.14",
"@dicdikshaorg/video-player-v9": "^5.1.7",
"@dictrigyn/common-form-elements": "^5.1.3",
"@project-sunbird/common-form-elements": "5.1.1",
"@dictrigyn/pdf-player": "^0.0.6",
"@ngx-translate/core": "12.0.0",
"@ngx-translate/http-loader": "^5.0.0",
Expand All @@ -62,6 +62,7 @@
"@project-sunbird/ckeditor-build-font": "^1.0.8",
"@project-sunbird/client-services": "4.8.13",
"@project-sunbird/common-consumption": "4.12.1",
"@project-sunbird/common-form-elements": "5.1.1",
"@project-sunbird/discussions-ui-v8": "2.6.0-beta.2",
"@project-sunbird/sb-dashlet-v9": "^1.0.4",
"@project-sunbird/sb-notification": "5.0.7",
Expand All @@ -73,7 +74,6 @@
"@project-sunbird/sunbird-question-editor": "0.0.9",
"@project-sunbird/sunbird-quml-player-v9": "5.1.5",
"@project-sunbird/sunbird-resource-library": "0.0.19",
"@project-sunbird/sunbird-video-player-v9": "5.1.3",
"@project-sunbird/telemetry-sdk": "0.0.29",
"@project-sunbird/web-extensions": "^0.0.2",
"@samagra-x/uci-console": "1.3.7",
Expand All @@ -95,7 +95,6 @@
"datatables.net-dt": "^1.10.20",
"dayjs": "^1.8.26",
"dictrigyn-collection-editor-v9": "^5.0.14",
"dictrigyn-video-player": "^5.1.4",
"dom-to-image": "^2.6.0",
"epubjs": "0.3.88",
"export-to-csv": "0.2.1",
Expand All @@ -121,9 +120,9 @@
"jszip": "^3.7.1",
"katex": "^0.12.0",
"leaflet": "^1.7.1",
"library-filters-common-consumption": "^4.12.26",
"lodash-es": "^4.17.15",
"marked": "1.1.1",
"library-filters-common-consumption": "^4.12.26",
"md5": "2.2.1",
"moment": "^2.24.0",
"moment-duration-format": "2.3.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export class PlayerComponent implements OnInit, AfterViewInit, OnChanges, OnDest
contentId: string;
collectionId:string;

currentPage: any;
currentPage: any=1;
totalPage: any;
currentPageType: any

Expand Down Expand Up @@ -377,7 +377,7 @@ export class PlayerComponent implements OnInit, AfterViewInit, OnChanges, OnDest
}

eventHandler(event) {
this.currentPage = event.edata.currentPage;
this.currentPage = event.edata.currentPage ?? 1;
this.totalPage = event.edata.totalPages;
this.currentPageType = event.edata.type;

Expand Down Expand Up @@ -427,7 +427,9 @@ export class PlayerComponent implements OnInit, AfterViewInit, OnChanges, OnDest
const contentId = _.get(eventCopy, 'detail.telemetryData.object.id');
// this.contentId = contentId;
if (eid && (eid === 'START' || eid === 'END') && contentId === _.get(this.playerConfig, 'metadata.identifier')) {
this.showRatingPopup(eventCopy);
setTimeout(() => {
this.showRatingPopup(eventCopy);
}, 1400);
if (this.contentProgressEvents$) {
this.contentProgressEvents$.next(eventCopy);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { FormsModule } from '@angular/forms';
import { CommonConsumptionModule } from '@project-sunbird/common-consumption';
// import {SunbirdPdfPlayerModule} from '@project-sunbird/sunbird-pdf-player-v9';
import { SunbirdPdfPlayerModule} from '@dictrigyn/pdf-player';
import { SunbirdVideoPlayerModule } from 'dictrigyn-video-player';
import { SunbirdVideoPlayerModule } from '@dicdikshaorg/video-player-v9';
// import { SunbirdVideoPlayerModule } from '@project-sunbird/sunbird-video-player-v9';
import { SunbirdEpubPlayerModule } from '@project-sunbird/sunbird-epub-player-v9';
import { QumlPlayerService } from './service/quml-player/quml-player.service';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { CommonConsumptionModule } from '@project-sunbird/common-consumption';
import { FaqReportComponent } from './components/faq-report/faq-report.component';
import { CommonFormElementsModule } from '@dictrigyn/common-form-elements';
import { SuiModalModule } from 'ng2-semantic-ui-v9';
import { SunbirdVideoPlayerModule } from 'dictrigyn-video-player';
import { SunbirdVideoPlayerModule } from '@dicdikshaorg/video-player-v9';
// import { SunbirdVideoPlayerModule } from '@project-sunbird/sunbird-video-player-v9';

@NgModule({
Expand Down
Loading

0 comments on commit e4e672f

Please sign in to comment.