Merge branch 'master' into feature/2.0.0

# Conflicts: # CHANGELOG.md # README.md # build/lib/pdfjs-dist/bower.json # build/lib/pdfjs-dist/build/pdf.combined.js # build/lib/pdfjs-dist/build/pdf.combined.js.map # build/lib/pdfjs-dist/build/pdf.js # build/lib/pdfjs-dist/build/pdf.js.map # build/lib/pdfjs-dist/build/pdf.min.js # build/lib/pdfjs-dist/build/pdf.worker.js # build/lib/pdfjs-dist/build/pdf.worker.js.map # build/lib/pdfjs-dist/build/pdf.worker.min.js # build/lib/pdfjs-dist/lib/core/annotation.js # build/lib/pdfjs-dist/lib/core/cff_parser.js # build/lib/pdfjs-dist/lib/core/chunked_stream.js # build/lib/pdfjs-dist/lib/core/cmap.js # build/lib/pdfjs-dist/lib/core/colorspace.js # build/lib/pdfjs-dist/lib/core/crypto.js # build/lib/pdfjs-dist/lib/core/document.js # build/lib/pdfjs-dist/lib/core/evaluator.js # build/lib/pdfjs-dist/lib/core/fonts.js # build/lib/pdfjs-dist/lib/core/function.js # build/lib/pdfjs-dist/lib/core/image.js # build/lib/pdfjs-dist/lib/core/jbig2.js # build/lib/pdfjs-dist/lib/core/jpg.js # build/lib/pdfjs-dist/lib/core/jpx.js # build/lib/pdfjs-dist/lib/core/obj.js # build/lib/pdfjs-dist/lib/core/parser.js # build/lib/pdfjs-dist/lib/core/primitives.js # build/lib/pdfjs-dist/lib/core/stream.js # build/lib/pdfjs-dist/lib/core/type1_parser.js # build/lib/pdfjs-dist/lib/core/worker.js # build/lib/pdfjs-dist/lib/display/annotation_layer.js # build/lib/pdfjs-dist/lib/display/api.js # build/lib/pdfjs-dist/lib/display/canvas.js # build/lib/pdfjs-dist/lib/display/dom_utils.js # build/lib/pdfjs-dist/lib/display/global.js # build/lib/pdfjs-dist/lib/display/metadata.js # build/lib/pdfjs-dist/lib/display/network.js # build/lib/pdfjs-dist/lib/display/pattern_helper.js # build/lib/pdfjs-dist/lib/display/svg.js # build/lib/pdfjs-dist/lib/examples/node/domstubs.js # build/lib/pdfjs-dist/lib/pdf.js # build/lib/pdfjs-dist/lib/pdf.worker.js # build/lib/pdfjs-dist/lib/shared/compatibility.js # build/lib/pdfjs-dist/lib/shared/util.js # build/lib/pdfjs-dist/lib/test/unit/annotation_spec.js # build/lib/pdfjs-dist/lib/test/unit/api_spec.js # build/lib/pdfjs-dist/lib/test/unit/display_svg_spec.js # build/lib/pdfjs-dist/lib/test/unit/dom_utils_spec.js # build/lib/pdfjs-dist/lib/test/unit/fonts_spec.js # build/lib/pdfjs-dist/lib/test/unit/function_spec.js # build/lib/pdfjs-dist/lib/test/unit/jasmine-boot.js # build/lib/pdfjs-dist/lib/test/unit/metadata_spec.js # build/lib/pdfjs-dist/lib/test/unit/ui_utils_spec.js # build/lib/pdfjs-dist/lib/web/app.js # build/lib/pdfjs-dist/lib/web/download_manager.js # build/lib/pdfjs-dist/lib/web/firefoxcom.js # build/lib/pdfjs-dist/lib/web/interfaces.js # build/lib/pdfjs-dist/lib/web/pdf_attachment_viewer.js # build/lib/pdfjs-dist/lib/web/pdf_history.js # build/lib/pdfjs-dist/lib/web/pdf_link_service.js # build/lib/pdfjs-dist/lib/web/pdf_outline_viewer.js # build/lib/pdfjs-dist/lib/web/pdf_page_view.js # build/lib/pdfjs-dist/lib/web/pdf_sidebar.js # build/lib/pdfjs-dist/lib/web/pdf_thumbnail_viewer.js # build/lib/pdfjs-dist/lib/web/pdf_viewer.component.js # build/lib/pdfjs-dist/lib/web/pdf_viewer.js # build/lib/pdfjs-dist/lib/web/preferences.js # build/lib/pdfjs-dist/lib/web/ui_utils.js # build/lib/pdfjs-dist/lib/web/view_history.js # build/lib/pdfjs-dist/package.json # build/lib/pdfjs-dist/web/compatibility.js # build/lib/pdfjs-dist/web/compatibility.js.map # build/lib/pdfjs-dist/web/pdf_viewer.css # build/lib/pdfjs-dist/web/pdf_viewer.js # build/lib/pdfjs-dist/web/pdf_viewer.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 # build/system.config.js # build/system.config.js.map # package.json # src/pdf-viewer/pdf-viewer.component.ts # src/system.config.ts
VadimDez · Sep 29, 2017 · d81f75b · d81f75b
2 parents 00902a8 + 7001bc4
commit d81f75b
Show file tree

Hide file tree

Showing 95 changed files with 168,538 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,22 @@
 
 * `[show-all]` is removed - use `[stick-to-page]` in combination with `[page]`
 
+## 1.2.7
+Updated dependencies
+
+## 1.2.6
+* [[#140](https://github.com/VadimDez/ng2-pdf-viewer/issues/140)] - Incorrect Font and Font Size Rendering
+* [[#151](https://github.com/VadimDez/ng2-pdf-viewer/pull/151)] - force inline style to prevent css override font-family and font-size
+
+## 1.2.5
+* Update dist
+
+## 1.2.4
+* [[#150](https://github.com/VadimDez/ng2-pdf-viewer/issues/150)] - Used not minified version of pdfjs
+
+## 1.2.3
+* [[#146](https://github.com/VadimDez/ng2-pdf-viewer/issues/146)] - Load web worker separately, use minified version of pdfjs
+
 ## 1.2.2
 * [[#94](https://github.com/VadimDez/ng2-pdf-viewer/issues/94)] - Add load progress callback
 

diff --git a/README.md b/README.md
@@ -79,17 +79,18 @@ export class AppComponent {
 
 ## Options
 
-* [src](#src)
-* [page](#page)
-* [stick-to-page](#stick-to-page)
-* [render-text](#render-text)
-* [external-link-target](#external-link-target)
-* [rotation](#rotation)
-* [zoom](#zoom)
-* [original-size](#original-size)
-* [after-load-complete](#after-load-complete)
-* [error](#error)
-* [on-progress](#on-progress)
+* [[src]](#src)
+* [[(page)]](#page)
+* [[stick-to-page]](#stick-to-page)
+* [[external-link-target]](#external-link-target)
+* [[render-text]](#render-text)
+* [[rotation]](#rotation)
+* [[zoom]](#zoom)
+* [[original-size]](#original-size)
+* [[show-all]](#show-all)
+* [(after-load-complete)](#after-load-complete)
+* [(error)](#error)
+* [(on-progress)](#on-progress)
 
 #### [src]
 *accepts: string, object, UInt8Array*

diff --git a/build/app/app.component.html b/build/app/app.component.html
@@ -7,7 +7,7 @@
     <main class="mdl-layout__content">
         <div class="page-content">
             <div>
-                <h2>Angular 2 PDF Viewer</h2>
+                <h2>Angular 2+ PDF Viewer</h2>
             </div>
 
             <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
@@ -30,7 +30,8 @@ <h2>Angular 2 PDF Viewer</h2>
                 <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="original-size">
                     <input type="checkbox" id="original-size" class="mdl-switch__input"
                            [checked]="originalSize"
-                           [(ngModel)]="originalSize">
+                           [(ngModel)]="originalSize"
+                    >
                     <span class="mdl-switch__label">Original size</span>
                 </label>
             </div>

diff --git a/build/lib/pdfjs-dist/bower.json b/build/lib/pdfjs-dist/bower.json
@@ -0,0 +1,14 @@
+{
+  "name": "pdfjs-dist",
+  "version": "1.9.602",
+  "main": [
+    "build/pdf.js",
+    "build/pdf.worker.js"
+  ],
+  "ignore": [],
+  "keywords": [
+    "Mozilla",
+    "pdf",
+    "pdf.js"
+  ]
+}