Merge pull request #1642 from kkujala/master

Correct style for class methods and closure.

src/api.js

@@ -45,7 +45,7 @@ PDFJS.getDocument = function getDocument(source) {
  * Proxy to a PDFDocument in the worker thread. Also, contains commonly used
  * properties that can be read synchronously.
  */
-var PDFDocumentProxy = (function() {
+var PDFDocumentProxy = (function PDFDocumentProxyClosure() {
   function PDFDocumentProxy(pdfInfo, transport) {
     this.pdfInfo = pdfInfo;
     this.transport = transport;
@@ -69,14 +69,14 @@ var PDFDocumentProxy = (function() {
      * @return {Promise} A promise that is resolved with a {PDFPageProxy}
      * object.
      */
-    getPage: function(number) {
+    getPage: function PDFDocumentProxy_getPage(number) {
       return this.transport.getPage(number);
     },
     /**
      * @return {Promise} A promise that is resolved with a lookup table for
      * mapping named destinations to reference numbers.
      */
-    getDestinations: function() {
+    getDestinations: function PDFDocumentProxy_getDestinations() {
       var promise = new PDFJS.Promise();
       var destinations = this.pdfInfo.destinations;
       promise.resolve(destinations);
@@ -97,7 +97,7 @@ var PDFDocumentProxy = (function() {
      *  ...
      * ].
      */
-    getOutline: function() {
+    getOutline: function PDFDocumentProxy_getOutline() {
       var promise = new PDFJS.Promise();
       var outline = this.pdfInfo.outline;
       promise.resolve(outline);
@@ -109,7 +109,7 @@ var PDFDocumentProxy = (function() {
      * available in the information dictionary and similarly metadata is a
      * {Metadata} object with information from the metadata section of the PDF.
      */
-    getMetadata: function() {
+    getMetadata: function PDFDocumentProxy_getMetadata() {
       var promise = new PDFJS.Promise();
       var info = this.pdfInfo.info;
       var metadata = this.pdfInfo.metadata;
@@ -119,7 +119,7 @@ var PDFDocumentProxy = (function() {
       });
       return promise;
     },
-    destroy: function() {
+    destroy: function PDFDocumentProxy_destroy() {
       this.transport.destroy();
     }
   };
@@ -169,7 +169,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
      * @return {PageViewport} Contains 'width' and 'height' properties along
      * with transforms required for rendering.
      */
-    getViewport: function(scale, rotate) {
+    getViewport: function PDFPageProxy_getViewport(scale, rotate) {
       if (arguments.length < 2)
         rotate = this.rotate;
       return new PDFJS.PageViewport(this.view, scale, rotate, 0, 0);
@@ -178,7 +178,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
      * @return {Promise} A promise that is resolved with an {array} of the
      * annotation objects.
      */
-    getAnnotations: function() {
+    getAnnotations: function PDFPageProxy_getAnnotations() {
       if (this.annotationsPromise)
         return this.annotationsPromise;
 
@@ -198,7 +198,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
      * @return {Promise} A promise that is resolved when the page finishes
      * rendering.
      */
-    render: function(params) {
+    render: function PDFPageProxy_render(params) {
       this.renderInProgress = true;
 
       var promise = new Promise();
@@ -257,7 +257,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
      * For internal use only.
      */
     startRenderingFromOperatorList:
-      function PDFPageWrapper_startRenderingFromOperatorList(operatorList,
+      function PDFPageProxy_startRenderingFromOperatorList(operatorList,
                                                            fonts) {
       var self = this;
       this.operatorList = operatorList;
@@ -279,7 +279,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
     /**
      * For internal use only.
      */
-    ensureFonts: function PDFPageWrapper_ensureFonts(fonts, callback) {
+    ensureFonts: function PDFPageProxy_ensureFonts(fonts, callback) {
       this.stats.time('Font Loading');
       // Convert the font names to the corresponding font obj.
       for (var i = 0, ii = fonts.length; i < ii; i++) {
@@ -299,7 +299,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
     /**
      * For internal use only.
      */
-    display: function PDFPageWrapper_display(gfx, viewport, callback) {
+    display: function PDFPageProxy_display(gfx, viewport, callback) {
       var stats = this.stats;
       stats.time('Rendering');
 
@@ -331,7 +331,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
     /**
      * Stub for future feature.
      */
-    getTextContent: function() {
+    getTextContent: function PDFPageProxy_getTextContent() {
       var promise = new PDFJS.Promise();
       var textContent = 'page text'; // not implemented
       promise.resolve(textContent);
@@ -340,7 +340,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
     /**
      * Stub for future feature.
      */
-    getOperationList: function() {
+    getOperationList: function PDFPageProxy_getOperationList() {
       var promise = new PDFJS.Promise();
       var operationList = { // not implemented
         dependencyFontsID: null,
@@ -352,7 +352,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
     /**
      * Destroys resources allocated by the page.
      */
-    destroy: function() {
+    destroy: function PDFPageProxy_destroy() {
       this.destroyed = true;
 
       if (!this.renderInProgress) {

src/obj.js

@@ -39,7 +39,7 @@ var Dict = (function DictClosure() {
     // Map should only be used internally, use functions below to access.
     var map = Object.create(null);
 
-    this.assignXref = function Dict_assingXref(newXref) {
+    this.assignXref = function Dict_assignXref(newXref) {
       xref = newXref;
     };
 

src/pattern.js

@@ -110,7 +110,7 @@ Shadings.RadialAxial = (function RadialAxialClosure() {
     var r1 = raw[6];
     return {
       type: 'Pattern',
-      getPattern: function(ctx) {
+      getPattern: function RadialAxial_getPattern(ctx) {
         var curMatrix = ctx.mozCurrentTransform;
         if (curMatrix) {
           var userMatrix = ctx.mozCurrentTransformInverse;

src/util.js

@@ -97,7 +97,7 @@ var Util = PDFJS.Util = (function UtilClosure() {
     return [xt, yt];
   };
 
-  Util.applyInverseTransform = function Util_applyTransform(p, m) {
+  Util.applyInverseTransform = function Util_applyInverseTransform(p, m) {
     var d = m[0] * m[3] - m[1] * m[2];
     var xt = (p[0] * m[3] - p[1] * m[2] + m[2] * m[5] - m[4] * m[3]) / d;
     var yt = (-p[0] * m[1] + p[1] * m[0] + m[4] * m[1] - m[5] * m[0]) / d;