OOP PDF - Add OpenPDFParamsParser class

chrome/browser/resources/pdf/pdf.js

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 'use strict';
 
 <include src="../../../../ui/webui/resources/js/util.js">
+<include src="open_pdf_params_parser.js">
 <include src="pdf_scripting_api.js">
 <include src="viewport.js">
 
 /**
  * @return {number} Width of a scrollbar in pixels
  */
 function getScrollbarWidth() {
   var div = document.createElement('div');
   div.style.visibility = 'hidden';
   div.style.overflow = 'scroll';
@@ skipping 125 matching lines @@
       // If the zoom level is close enough to the current zoom level, don't
       // change it. This avoids us getting into an infinite loop of zoom changes
       // due to floating point error.
       var MIN_ZOOM_DELTA = 0.01;
       var zoomDelta = Math.abs(this.viewport_.zoom -
                                zoomChangeInfo.newZoomFactor);
       if (zoomDelta > MIN_ZOOM_DELTA)
         this.viewport_.setZoom(zoomChangeInfo.newZoomFactor);
     }.bind(this));
   }
+
+  // Parse open pdf parameters.
+  var paramsParser = new OpenPDFParamsParser(this.streamDetails.originalUrl);
+  this.openParams_ = paramsParser.viewportSettings;

[raymes, 2014/08/28 01:50:32]

maybe we can call this this.urlParams_ (a bit more descriptive than openParams)

[Nikhil, 2014/08/28 05:07:37]

Done.

 }
 
 PDFViewer.prototype = {
   /**
    * @private
    * Handle key events. These may come from the user directly or via the
    * scripting API.
    * @param {KeyboardEvent} e the event to handle.
    */
   handleKeyEvent_: function(e) {
@@ skipping 95 matching lines @@
    * Notify the plugin to print.
    */
   print_: function() {
     this.plugin_.postMessage({
       type: 'print',
     });
   },
 
   /**
    * @private
-   * Handle open PDF parameters. These parameters are mentioned in the URL
-   * and specify actions to be performed when opening PDF files.
-   * See http://crbug.com/64309 for details.
-   */
-  handleOpenPDFParams_: function() {
-    var originalUrl = this.streamDetails.originalUrl;
-    var paramIndex = originalUrl.search('#');
-    if (paramIndex == -1)
-      return;
-
-    var paramTokens = originalUrl.substring(paramIndex + 1).split('&');
-    var paramsDictionary = {};
-    for (var i = 0; i < paramTokens.length; ++i) {
-      var keyValueSplit = paramTokens[i].split('=');
-      if (keyValueSplit.length != 2)
-        continue;
-      paramsDictionary[keyValueSplit[0]] = keyValueSplit[1];
-    }
-
-    // Order is important as later actions can override the effects
-    // of previous actions.
-    if ('page' in paramsDictionary) {
-      // |pageNumber| is 1-based, but goToPage() take a zero-based page number.
-      var pageNumber = parseInt(paramsDictionary['page']);
-      if (!isNaN(pageNumber))
-        this.viewport_.goToPage(pageNumber - 1);
-    }
-  },
-
-  /**
-   * @private
    * Update the loading progress of the document in response to a progress
    * message being received from the plugin.
    * @param {number} progress the progress as a percentage.
    */
   updateProgress_: function(progress) {
     this.progressBar_.progress = progress;
     if (progress == -1) {
       // Document load failed.
       this.errorScreen_.style.visibility = 'visible';
       this.sizer_.style.display = 'none';
       this.toolbar_.style.visibility = 'hidden';
       if (this.passwordScreen_.active) {
         this.passwordScreen_.deny();
         this.passwordScreen_.active = false;
       }
     } else if (progress == 100) {
       // Document load complete.
-      this.handleOpenPDFParams_();
       this.loaded = true;
       var loadEvent = new Event('pdfload');
       window.dispatchEvent(loadEvent);
       this.sendScriptingMessage_({
         type: 'documentLoaded'
       });
       if (this.lastViewportPosition_)
         this.viewport_.position = this.lastViewportPosition_;
+
+      // Handle open pdf params. Order is important as later actions can
+      // override the effects of previous actions.
+      if (this.openParams_.page)
+        this.viewport_.goToPage(this.openParams_.page);
     }
   },
 
   /**
    * @private
    * An event handler for handling password-submitted events. These are fired
    * when an event is entered into the password screen.
    * @param {Object} event a password-submitted event.
    */
   onPasswordSubmitted_: function(event) {
@@ skipping 236 matching lines @@
 
   /**
    * @type {Viewport} the viewport of the PDF viewer.
    */
   get viewport() {
     return this.viewport_;
   }
 };
 
 var viewer = new PDFViewer();