Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added MediaError handling #36

Open
wants to merge 48 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
5cca1b5
use manifesto-webpack
edsilv Dec 30, 2018
466fded
updated to manifold 2.0.0-pre.4 & manifesto 4.0.0-pre.5
edsilv Jan 20, 2019
325d1a2
Update C615_70.json
irv Feb 4, 2019
9f7ae22
updated manifesto and manifold
edsilv Mar 5, 2019
d015b5c
bumped to 0.0.88
edsilv Mar 5, 2019
089298a
removed simplified types
edsilv Mar 5, 2019
93e21cd
fixed globals compiler errors
edsilv Mar 6, 2019
43deb2b
Merge pull request #33 from stephenwf/feature/sf-bl
edsilv Mar 7, 2019
fe30815
updated globals
edsilv Mar 7, 2019
159ffea
pause if not autoplay
edsilv Mar 7, 2019
5d8d9ab
added beethoven sonata test
edsilv Mar 8, 2019
1c8774d
bumped version
edsilv Mar 8, 2019
55907af
use addEventListener
edsilv Mar 8, 2019
af6c7c7
use addEventListener
edsilv Mar 8, 2019
33fce68
added contributors
edsilv Mar 11, 2019
860a58f
Merge branch 'gh-pages' of https://github.com/IIIF-Commons/iiif-av-co…
edsilv Mar 11, 2019
7d3d38c
added contributors fixture
edsilv Mar 11, 2019
38c9bf8
Update AVComponent.ts
pietervanleeuwen May 27, 2019
e6aa779
Merge pull request #34 from Noterik/master
edsilv May 28, 2019
8cf9682
Adds posterImageExpanded as a property for AVComponent; Enables AVCom…
jrgriffiniii Jun 12, 2019
9c086fa
Merge pull request #35 from jrgriffiniii/jrgriffiniii-postercanvas-ex…
edsilv Jun 13, 2019
3d5b633
updated manifesto
edsilv Jul 1, 2019
48ea07a
Merge branch 'master' of https://github.com/IIIF-Commons/iiif-av-comp…
edsilv Jul 1, 2019
6bc4877
Added MediaError handling
pietervanleeuwen Aug 21, 2019
6604a48
bumped version
edsilv Sep 30, 2019
d7fd766
added webpack.config.js
edsilv Oct 29, 2019
f829a0a
updated manifesto, manifold, base-component
edsilv Oct 31, 2019
23a4136
merged webpack
edsilv Oct 31, 2019
8091a19
update manifesto, manifold
edsilv Mar 11, 2020
7d22116
update manifesto, manifold
edsilv Mar 11, 2020
e4c793a
Merge branch 'master' of https://github.com/IIIF-Commons/iiif-av-comp…
pietervanleeuwen Mar 12, 2020
d30d058
Merge branch 'IIIF-Commons-master'
pietervanleeuwen Mar 12, 2020
16d764d
updated new CanvasInstance.ts with changes earlier made in AVComponen…
pietervanleeuwen Mar 12, 2020
7931a0c
build
pietervanleeuwen Mar 12, 2020
389b371
throwing play/pause event on avcomponent
pietervanleeuwen Mar 19, 2020
54f154a
made setCurrentTime public and added getCurrentTime on CanvasInstance
pietervanleeuwen Apr 2, 2020
51cdcfa
Fire media error
pietervanleeuwen Apr 7, 2020
91e1edc
Merge pull request #2 from Noterik/build2
pietervanleeuwen May 12, 2020
1131fce
added canvas id as element identifier
pietervanleeuwen May 20, 2020
984acc6
changed canvas id to data-id as it contains invalid characters for an id
pietervanleeuwen May 20, 2020
e479394
on Media Error throw canvas that triggered this
pietervanleeuwen May 20, 2020
14cd0d8
swapped volume and fullscreenbutton
pietervanleeuwen May 22, 2020
c6f4b00
Updated to handle negative or missing durations of media items
pietervanleeuwen Jun 3, 2020
a7d5180
The iiif-av-component preloads all media itema
pietervanleeuwen Jun 9, 2020
9f9b5e8
fixed sync issue due to previous changes
pietervanleeuwen Jun 9, 2020
cf5fce8
fire media ready earlier
pietervanleeuwen Jun 9, 2020
97b42c8
Merge pull request #3 from Noterik/build2
pietervanleeuwen Jun 10, 2020
952333e
Synced with upstream
pietervanleeuwen Mar 10, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
.idea
.vscode
node_modules
coverage
npm-debug.log
Thumbs.db
node_modules
debug.log
typings
dist
Expand Down
15 changes: 15 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "build",
"group": {
"kind": "build",
"isDefault": true
}
}
]
}
119 changes: 119 additions & 0 deletions dist-commonjs/CanvasInstance.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
/// <reference types="jquery" />
/// <reference types="jqueryui" />
import { BaseComponent, IBaseComponentOptions } from "@iiif/base-component";
import { Canvas, Range } from "manifesto.js";
import { IAVComponentData } from ".";
import { VirtualCanvas } from "./VirtualCanvas";
export interface IMaxMin {
max: number;
min: number;
}
export interface IAVCanvasInstanceData extends IAVComponentData {
canvas?: Canvas | VirtualCanvas;
range?: Range;
visible?: boolean;
volume?: number;
}
export declare class CanvasInstance extends BaseComponent {
private _$canvasContainer;
private _$canvasDuration;
private _$canvasHoverHighlight;
private _$canvasHoverPreview;
private _$canvasTime;
private _$canvasTimelineContainer;
private _$controlsContainer;
private _$durationHighlight;
private _$hoverPreviewTemplate;
private _$nextButton;
private _$optionsContainer;
private _$playButton;
private _$prevButton;
private _$rangeHoverHighlight;
private _$rangeHoverPreview;
private _$rangeTimelineContainer;
private _$timeDisplay;
private _$timelineItemContainer;
private _canvasClockFrequency;
private _canvasClockInterval;
private _canvasClockStartDate;
private _canvasClockTime;
private _canvasHeight;
private _canvasWidth;
private _compositeWaveform;
private _contentAnnotations;
private _data;
private _highPriorityFrequency;
private _highPriorityInterval;
private _isPlaying;
private _isStalled;
private _lowPriorityFrequency;
private _lowPriorityInterval;
private _mediaSyncMarginSecs;
private _rangeSpanPadding;
private _readyMediaCount;
private _stallRequestedBy;
private _volume;
private _wasPlaying;
private _waveformCanvas;
private _waveformCtx;
ranges: Range[];
waveforms: string[];
private _$canvasLoadingProgress;
private _$fullscreenButton;
private _mediaDuration;
$playerElement: JQuery;
isOnlyCanvasInstance: boolean;
logMessage: (message: string) => void;
constructor(options: IBaseComponentOptions);
init(): void;
private _getBody;
private _getDuration;
data(): IAVCanvasInstanceData;
isVirtual(): boolean;
isVisible(): boolean;
includesVirtualSubCanvas(canvasId: string): boolean;
set(data: IAVCanvasInstanceData): void;
private _hasRangeChanged;
private _getRangeForCurrentTime;
private _rangeSpansCurrentTime;
private _rangeNavigable;
private _render;
getCanvasId(): string | undefined;
private _updateHoverPreview;
private _previous;
private _next;
destroy(): void;
private _convertToPercentage;
private _renderMediaElement;
private _getWaveformData;
private _renderWaveform;
private _drawWaveform;
private _scaleY;
private _getWaveformMaxAndMin;
private _updateCurrentTimeDisplay;
private _updateDurationDisplay;
private _renderSyncIndicator;
setCurrentTime(seconds: number): void;
getCurrentTime(): number;
private _rewind;
private _fastforward;
play(withoutUpdate?: boolean): void;
pause(withoutUpdate?: boolean): void;
private _isNavigationConstrainedToRange;
private _canvasClockUpdater;
private _highPriorityUpdater;
private _lowPriorityUpdater;
private _updateMediaActiveStates;
private _pauseMedia;
private _setMediaCurrentTime;
private _synchronizeMedia;
private _checkMediaSynchronization;
private _playbackStalled;
resize(): void;
}
export declare class CanvasInstanceEvents {
static NEXT_RANGE: string;
static PAUSECANVAS: string;
static PLAYCANVAS: string;
static PREVIOUS_RANGE: string;
}
Loading