Merge remote-tracking branch 'origin/dev' into dev

Author: hawkeye64

README.md

@@ -37,7 +37,7 @@ Can be found [here](https://quasarframework.github.io/app-extension-qpdfviewer)
 
 # Example Code
 Be sure to check out the Test Project for more examples.
-```
+```html
 <q-pdfviewer
   v-model="show"
   src="'https://www.ets.org/Media/Tests/GRE/pdf/gre_research_validity_data.pdf'"

src/component/QPdfviewer.js

@@ -11,14 +11,12 @@ export default Vue.extend({
     type: {
       type: String,
       default: 'html5',
-      validator: v => ['html5', 'pdfjs']
+      validator: v => ['html5', 'pdfjs'].indexOf(v) !== -1
     },
     errorString: {
       type: String,
       default: 'This browser does not support PDFs. Download the PDF to view it:'
     },
-    load: Function,
-    error: Function,
     contentStyle: [String, Object, Array],
     contentClass: [String, Object, Array],
     innerContentStyle: [String, Object, Array],
@@ -44,8 +42,8 @@ export default Vue.extend({
           height: '100%'
         },
         on: {
-          error: this.error ? this.error : '',
-          load: this.load ? this.load : ''
+          error: this.$listeners.error,
+          load: this.$listeners.load
         }
       }, [
         // browser object not supported, try iframe

src/component/QPdfviewer.json

@@ -27,20 +27,6 @@
       "default": "This browser does not support PDFs. Download the PDF to view it:",
       "examples": [ "error-string=\"Download the PDF to view it\"" ]
     },
-    "load": {
-      "type": "Function",
-      "desc": "The function to be called when the pdf document has been loaded",
-      "examples": [
-        "@load=\"onLoad\""
-      ]
-    },
-    "error": {
-      "type": "Function",
-      "desc": "The function to be called when the pdf document has an error",
-      "examples": [
-        "@error=\"onError\""
-      ]
-    },
     "content-class": {
       "type": [ "Array", "String", "Object" ],
       "desc": "Class definitions to be attributed to the PDF container",
@@ -73,5 +59,33 @@
         ":inner-content-style=\"{ backgroundColor: '#ff0000' }\""
       ]
     }
+  },
+  "events": {
+    "load": {
+      "desc": "The function to be called when the pdf document has been loaded",
+      "params": {
+        "evt": {
+          "type": "Object",
+          "desc": "JS event object",
+          "required": true
+        }
+      },
+      "examples": [
+        "@load=\"onLoad\""
+      ]
+    },
+    "error": {
+      "desc": "The function to be called when the pdf document has an error",
+      "params": {
+        "evt": {
+          "type": "Object",
+          "desc": "JS event object",
+          "required": true
+        }
+      },
+      "examples": [
+        "@error=\"onError\""
+      ]
+    }
   }
 }

src/component/pdfviewer.styl

@@ -4,12 +4,8 @@
   width 100%
 
   &__iframe
-    border none
-
-.q-pdfviewer iframe
-  border 0
-  height 100%
-  left 0
-  // position absolute
-  top 0
-  width 100%
+    border 0
+    height 100%
+    left 0
+    top 0
+    width 100%