Skip to content

Commit

Permalink
Merge branch 'features/1.1.5'
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
#	README.md
#	build/app.module.js
#	build/app.module.js.map
#	build/app/app.component.css
#	build/app/app.component.js
#	build/app/app.component.js.map
#	build/app/app.component.metadata.json
#	build/app/mdl.js
#	build/app/mdl.js.map
#	build/lib/pdfjs-dist/bower.json
#	build/lib/pdfjs-dist/build/pdf.combined.js
#	build/lib/pdfjs-dist/build/pdf.js
#	build/lib/pdfjs-dist/build/pdf.min.js
#	build/lib/pdfjs-dist/build/pdf.worker.js
#	build/lib/pdfjs-dist/build/pdf.worker.min.js
#	build/lib/pdfjs-dist/package.json
#	build/lib/pdfjs-dist/web/compatibility.js
#	build/lib/pdfjs-dist/web/pdf_viewer.js
#	build/lib/reflect-metadata/Reflect.js
#	build/lib/rxjs/Observable.js.map
#	build/lib/rxjs/Rx.js.map
#	build/lib/rxjs/Subject.js.map
#	build/lib/rxjs/Subscription.d.ts
#	build/lib/rxjs/Subscription.js
#	build/lib/rxjs/Subscription.js.map
#	build/lib/rxjs/bundles/Rx.js
#	build/lib/rxjs/bundles/Rx.min.js
#	build/lib/rxjs/bundles/Rx.min.js.map
#	build/lib/rxjs/observable/BoundCallbackObservable.d.ts
#	build/lib/rxjs/observable/BoundCallbackObservable.js.map
#	build/lib/rxjs/observable/BoundNodeCallbackObservable.d.ts
#	build/lib/rxjs/observable/BoundNodeCallbackObservable.js.map
#	build/lib/rxjs/observable/ConnectableObservable.js.map
#	build/lib/rxjs/observable/ErrorObservable.d.ts
#	build/lib/rxjs/observable/ErrorObservable.js.map
#	build/lib/rxjs/observable/ForkJoinObservable.js.map
#	build/lib/rxjs/observable/FromObservable.js.map
#	build/lib/rxjs/observable/IteratorObservable.js.map
#	build/lib/rxjs/observable/combineLatest.js
#	build/lib/rxjs/observable/combineLatest.js.map
#	build/lib/rxjs/observable/dom/AjaxObservable.js.map
#	build/lib/rxjs/observable/dom/WebSocketSubject.d.ts
#	build/lib/rxjs/observable/dom/WebSocketSubject.js
#	build/lib/rxjs/observable/dom/WebSocketSubject.js.map
#	build/lib/rxjs/operator/bufferCount.js
#	build/lib/rxjs/operator/bufferCount.js.map
#	build/lib/rxjs/operator/bufferTime.js
#	build/lib/rxjs/operator/bufferTime.js.map
#	build/lib/rxjs/operator/catch.js
#	build/lib/rxjs/operator/catch.js.map
#	build/lib/rxjs/operator/combineLatest.js
#	build/lib/rxjs/operator/combineLatest.js.map
#	build/lib/rxjs/operator/concat.js
#	build/lib/rxjs/operator/concat.js.map
#	build/lib/rxjs/operator/concatAll.js
#	build/lib/rxjs/operator/concatAll.js.map
#	build/lib/rxjs/operator/concatMap.js
#	build/lib/rxjs/operator/concatMap.js.map
#	build/lib/rxjs/operator/concatMapTo.js
#	build/lib/rxjs/operator/concatMapTo.js.map
#	build/lib/rxjs/operator/defaultIfEmpty.js
#	build/lib/rxjs/operator/defaultIfEmpty.js.map
#	build/lib/rxjs/operator/delay.js.map
#	build/lib/rxjs/operator/distinct.d.ts
#	build/lib/rxjs/operator/distinct.js
#	build/lib/rxjs/operator/distinctUntilChanged.js
#	build/lib/rxjs/operator/distinctUntilChanged.js.map
#	build/lib/rxjs/operator/distinctUntilKeyChanged.js
#	build/lib/rxjs/operator/distinctUntilKeyChanged.js.map
#	build/lib/rxjs/operator/do.js
#	build/lib/rxjs/operator/do.js.map
#	build/lib/rxjs/operator/every.d.ts
#	build/lib/rxjs/operator/every.js
#	build/lib/rxjs/operator/exhaust.js.map
#	build/lib/rxjs/operator/exhaustMap.js
#	build/lib/rxjs/operator/exhaustMap.js.map
#	build/lib/rxjs/operator/expand.js
#	build/lib/rxjs/operator/expand.js.map
#	build/lib/rxjs/operator/filter.js
#	build/lib/rxjs/operator/filter.js.map
#	build/lib/rxjs/operator/find.js
#	build/lib/rxjs/operator/find.js.map
#	build/lib/rxjs/operator/first.js
#	build/lib/rxjs/operator/groupBy.js
#	build/lib/rxjs/operator/groupBy.js.map
#	build/lib/rxjs/operator/last.js
#	build/lib/rxjs/operator/last.js.map
#	build/lib/rxjs/operator/max.d.ts
#	build/lib/rxjs/operator/max.js
#	build/lib/rxjs/operator/merge.js
#	build/lib/rxjs/operator/merge.js.map
#	build/lib/rxjs/operator/mergeAll.js.map
#	build/lib/rxjs/operator/mergeMap.js
#	build/lib/rxjs/operator/mergeMap.js.map
#	build/lib/rxjs/operator/mergeMapTo.js
#	build/lib/rxjs/operator/mergeMapTo.js.map
#	build/lib/rxjs/operator/min.d.ts
#	build/lib/rxjs/operator/min.js
#	build/lib/rxjs/operator/min.js.map
#	build/lib/rxjs/operator/multicast.js
#	build/lib/rxjs/operator/multicast.js.map
#	build/lib/rxjs/operator/observeOn.d.ts
#	build/lib/rxjs/operator/observeOn.js
#	build/lib/rxjs/operator/observeOn.js.map
#	build/lib/rxjs/operator/onErrorResumeNext.js.map
#	build/lib/rxjs/operator/publish.js
#	build/lib/rxjs/operator/publish.js.map
#	build/lib/rxjs/operator/race.js
#	build/lib/rxjs/operator/race.js.map
#	build/lib/rxjs/operator/reduce.d.ts
#	build/lib/rxjs/operator/reduce.js
#	build/lib/rxjs/operator/reduce.js.map
#	build/lib/rxjs/operator/repeat.d.ts
#	build/lib/rxjs/operator/repeat.js
#	build/lib/rxjs/operator/repeat.js.map
#	build/lib/rxjs/operator/repeatWhen.d.ts
#	build/lib/rxjs/operator/repeatWhen.js
#	build/lib/rxjs/operator/repeatWhen.js.map
#	build/lib/rxjs/operator/retry.js.map
#	build/lib/rxjs/operator/retryWhen.d.ts
#	build/lib/rxjs/operator/retryWhen.js
#	build/lib/rxjs/operator/retryWhen.js.map
#	build/lib/rxjs/operator/scan.js
#	build/lib/rxjs/operator/scan.js.map
#	build/lib/rxjs/operator/single.js.map
#	build/lib/rxjs/operator/startWith.js
#	build/lib/rxjs/operator/startWith.js.map
#	build/lib/rxjs/operator/subscribeOn.d.ts
#	build/lib/rxjs/operator/subscribeOn.js
#	build/lib/rxjs/operator/switchMap.js
#	build/lib/rxjs/operator/switchMap.js.map
#	build/lib/rxjs/operator/switchMapTo.js
#	build/lib/rxjs/operator/switchMapTo.js.map
#	build/lib/rxjs/operator/timeout.js
#	build/lib/rxjs/operator/timeout.js.map
#	build/lib/rxjs/operator/timeoutWith.js
#	build/lib/rxjs/operator/timeoutWith.js.map
#	build/lib/rxjs/operator/toPromise.js
#	build/lib/rxjs/operator/toPromise.js.map
#	build/lib/rxjs/operator/windowTime.d.ts
#	build/lib/rxjs/operator/windowTime.js
#	build/lib/rxjs/operator/windowTime.js.map
#	build/lib/rxjs/operator/withLatestFrom.js
#	build/lib/rxjs/operator/withLatestFrom.js.map
#	build/lib/rxjs/operator/zip.js
#	build/lib/rxjs/operator/zip.js.map
#	build/lib/rxjs/package.json
#	build/lib/rxjs/scheduler/VirtualTimeScheduler.d.ts
#	build/lib/rxjs/scheduler/VirtualTimeScheduler.js
#	build/lib/rxjs/scheduler/VirtualTimeScheduler.js.map
#	build/lib/rxjs/src/Subscription.ts
#	build/lib/rxjs/src/observable/BoundCallbackObservable.ts
#	build/lib/rxjs/src/observable/BoundNodeCallbackObservable.ts
#	build/lib/rxjs/src/observable/ErrorObservable.ts
#	build/lib/rxjs/src/observable/FromObservable.ts
#	build/lib/rxjs/src/observable/combineLatest.ts
#	build/lib/rxjs/src/observable/dom/WebSocketSubject.ts
#	build/lib/rxjs/src/operator/bufferCount.ts
#	build/lib/rxjs/src/operator/bufferTime.ts
#	build/lib/rxjs/src/operator/catch.ts
#	build/lib/rxjs/src/operator/combineLatest.ts
#	build/lib/rxjs/src/operator/concat.ts
#	build/lib/rxjs/src/operator/concatAll.ts
#	build/lib/rxjs/src/operator/concatMap.ts
#	build/lib/rxjs/src/operator/concatMapTo.ts
#	build/lib/rxjs/src/operator/defaultIfEmpty.ts
#	build/lib/rxjs/src/operator/distinct.ts
#	build/lib/rxjs/src/operator/distinctUntilChanged.ts
#	build/lib/rxjs/src/operator/distinctUntilKeyChanged.ts
#	build/lib/rxjs/src/operator/do.ts
#	build/lib/rxjs/src/operator/every.ts
#	build/lib/rxjs/src/operator/exhaustMap.ts
#	build/lib/rxjs/src/operator/expand.ts
#	build/lib/rxjs/src/operator/filter.ts
#	build/lib/rxjs/src/operator/find.ts
#	build/lib/rxjs/src/operator/groupBy.ts
#	build/lib/rxjs/src/operator/last.ts
#	build/lib/rxjs/src/operator/materialize.ts
#	build/lib/rxjs/src/operator/max.ts
#	build/lib/rxjs/src/operator/merge.ts
#	build/lib/rxjs/src/operator/mergeMap.ts
#	build/lib/rxjs/src/operator/mergeMapTo.ts
#	build/lib/rxjs/src/operator/min.ts
#	build/lib/rxjs/src/operator/multicast.ts
#	build/lib/rxjs/src/operator/observeOn.ts
#	build/lib/rxjs/src/operator/publish.ts
#	build/lib/rxjs/src/operator/race.ts
#	build/lib/rxjs/src/operator/reduce.ts
#	build/lib/rxjs/src/operator/repeat.ts
#	build/lib/rxjs/src/operator/repeatWhen.ts
#	build/lib/rxjs/src/operator/retryWhen.ts
#	build/lib/rxjs/src/operator/scan.ts
#	build/lib/rxjs/src/operator/startWith.ts
#	build/lib/rxjs/src/operator/subscribeOn.ts
#	build/lib/rxjs/src/operator/switchMap.ts
#	build/lib/rxjs/src/operator/switchMapTo.ts
#	build/lib/rxjs/src/operator/timeout.ts
#	build/lib/rxjs/src/operator/timeoutWith.ts
#	build/lib/rxjs/src/operator/toPromise.ts
#	build/lib/rxjs/src/operator/windowTime.ts
#	build/lib/rxjs/src/operator/withLatestFrom.ts
#	build/lib/rxjs/src/operator/zip.ts
#	build/lib/rxjs/src/scheduler/VirtualTimeScheduler.ts
#	build/lib/rxjs/src/symbol/iterator.ts
#	build/lib/rxjs/src/util/subscribeToResult.ts
#	build/lib/rxjs/symbol/iterator.d.ts
#	build/lib/rxjs/symbol/iterator.js
#	build/lib/rxjs/symbol/iterator.js.map
#	build/lib/rxjs/util/subscribeToResult.js
#	build/lib/rxjs/util/subscribeToResult.js.map
#	build/lib/systemjs/dist/system.src.js
#	build/lib/zone.js/dist/long-stack-trace-zone.js
#	build/lib/zone.js/dist/mocha-patch.js
#	build/lib/zone.js/dist/webapis-media-query.js
#	build/lib/zone.js/dist/webapis-notification.js
#	build/lib/zone.js/dist/zone-node.js
#	build/lib/zone.js/dist/zone.js
#	build/lib/zone.js/dist/zone.min.js
#	build/main.js
#	build/main.js.map
#	build/pdf-viewer/index.js
#	build/pdf-viewer/index.js.map
#	build/pdf-viewer/pdf-viewer.component.d.ts
#	build/pdf-viewer/pdf-viewer.component.js
#	build/pdf-viewer/pdf-viewer.component.js.map
#	build/pdf-viewer/pdf-viewer.component.metadata.json
#	dist/pdf-viewer.component.d.ts
#	dist/pdf-viewer.component.js
#	dist/pdf-viewer.component.metadata.json
#	package.json
#	src/app/app.component.css
#	src/app/app.component.ts
#	src/pdf-viewer/pdf-viewer.component.ts
#	tslint.json
  • Loading branch information
VadimDez committed Aug 7, 2017
2 parents 81f34f3 + 3b59e48 commit 905bf90
Show file tree
Hide file tree
Showing 2,367 changed files with 407,544 additions and 217,905 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
# Changelog

## 1.1.5
* [[#124](https://github.com/VadimDez/ng2-pdf-viewer/issues/124)] - PDF background disappeared after update to 1.1.4

## 1.1.4
* Switched canvas to SVG rendering.
* Changed text layer rendering.
* [[#89](https://github.com/VadimDez/ng2-pdf-viewer/issues/89)] - Added `data-page-number` attribute

## 1.1.3
* [[#46](https://github.com/VadimDez/ng2-pdf-viewer/issues/46)] - Retina display support

## 1.1.2
* [[#112](https://github.com/VadimDez/ng2-pdf-viewer/issues/112)] - Error handling
* Updated documentation

## 1.1.1
* [[#111](https://github.com/VadimDez/ng2-pdf-viewer/issues/111)] - out of order

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ Then add it to `pdf-component` in component's template

## Contribute

Clone project and switch to latest version branch (right now `features/1.1.4`, for the 2.0.0 switch to `feature/2.0.0`)
Clone the project

```
npm start
Expand Down
22 changes: 9 additions & 13 deletions build/app.module.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/app.module.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions build/app/app.component.css
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,7 @@
pdf-viewer {
display: block;
}

.error {
color: #ff4146;
}
4 changes: 2 additions & 2 deletions build/app/app.component.d.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
/// <reference types="pdf" />
import { PdfViewerComponent } from "../pdf-viewer/pdf-viewer.component";
export declare class AppComponent {
pdfViewer: PdfViewerComponent;
pdfSrc: string;
error: any;
page: number;
rotation: number;
zoom: number;
Expand All @@ -15,4 +14,5 @@ export declare class AppComponent {
rotate(angle: number): void;
onFileSelected(): void;
afterLoadComplete(pdf: PDFDocumentProxy): void;
onError(error: any): void;
}
52 changes: 27 additions & 25 deletions build/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ <h2>Angular 2 PDF Viewer</h2>
<input (change)="onFileSelected()" type="file" id="file">
</div>

<div *ngIf="error" class="error mb">
{{ error.message | json }}
</div>

<div class="mb">
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="original-size">
<input type="checkbox" id="original-size" class="mdl-switch__input"
Expand All @@ -31,6 +35,26 @@ <h2>Angular 2 PDF Viewer</h2>
</label>
</div>

<div class="mb">
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="render-text">
<input type="checkbox" id="render-text" class="mdl-switch__input"
[checked]="renderText"
[(ngModel)]="renderText"
>
<span class="mdl-switch__label">Render text layer</span>
</label>
</div>

<div class="mb">
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="show-all">
<input type="checkbox" id="show-all" class="mdl-switch__input"
[checked]="showAll"
[(ngModel)]="showAll"
>
<span class="mdl-switch__label">Show all pages</span>
</label>
</div>

<div mdl>
<button (click)="incrementZoom(-0.1)" class="mdl-button mdl-js-button">
-
Expand All @@ -51,18 +75,7 @@ <h2>Angular 2 PDF Viewer</h2>
</button>
</div>


<div>
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="stick-to-page">
<input type="checkbox" id="stick-to-page" class="mdl-switch__input"
[checked]="stickToPage"
[(ngModel)]="stickToPage"
>
<span class="mdl-switch__label">Stick to page</span>
</label>
</div>

<div mdl *ngIf="!showAll || stickToPage">
<div mdl *ngIf="!showAll">
<button (click)="incrementPage(-1)" class="mdl-button mdl-js-button">
Previous
</button>
Expand Down Expand Up @@ -96,26 +109,15 @@ <h2>Angular 2 PDF Viewer</h2>
<button (click)="rotate(90)" class="mdl-button mdl-js-button">Rotate right</button>
</div>

<div>
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="render-text">
<input type="checkbox" id="render-text" class="mdl-switch__input"
[checked]="renderText"
[(ngModel)]="renderText"
>
<span class="mdl-switch__label">Render text layer</span>
</label>
</div>

<pdf-viewer #myPdfViewer
[src]="pdfSrc"
<pdf-viewer [src]="pdfSrc"
[(page)]="page"
[rotation]="rotation"
[original-size]="originalSize"
[show-all]="showAll"
(after-load-complete)="afterLoadComplete($event)"
[zoom]="zoom"
[stick-to-page]="stickToPage"
[render-text]="renderText"
(error)="onError($event)"
></pdf-viewer>

</div>
Expand Down
36 changes: 14 additions & 22 deletions build/app/app.component.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/app/app.component.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 905bf90

Please sign in to comment.