Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(594)

Side by Side Diff: chrome/browser/resources/pdf/open_pdf_params_parser.js

Issue 830433002: Navigation to relative fragments does not work correctly for OOP pdf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Indentation fix. Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/pdf/pdf.js » ('j') | chrome/browser/resources/pdf/pdf.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 'use strict'; 5 'use strict';
6 6
7 /** 7 /**
8 * Creates a new OpenPDFParamsParser. This parses the open pdf parameters 8 * Creates a new OpenPDFParamsParser. This parses the open pdf parameters
9 * passed in the url to set initial viewport settings for opening the pdf. 9 * passed in the url to set initial viewport settings for opening the pdf.
10 * @param {string} url to be parsed. 10 * @param {string} url to be parsed.
11 */ 11 */
12 function OpenPDFParamsParser(url) { 12 function OpenPDFParamsParser(url) {
13 this.url_ = url;
14 this.urlParams = {}; 13 this.urlParams = {};
15 this.parseOpenPDFParams_(); 14 // A dictionary of all the named destinations in the PDF.
15 this.namedDestinations = {};
16 } 16 }
17 17
18 OpenPDFParamsParser.prototype = { 18 OpenPDFParamsParser.prototype = {
19 /** 19 /**
20 * @private 20 * @private
21 * Parse zoom parameter of open PDF parameters. If this 21 * Parse zoom parameter of open PDF parameters. If this
22 * parameter is passed while opening PDF then PDF should be opened 22 * parameter is passed while opening PDF then PDF should be opened
23 * at the specified zoom level. 23 * at the specified zoom level.
24 * @param {number} zoom value. 24 * @param {number} zoom value.
25 */ 25 */
(...skipping 15 matching lines...) Expand all
41 41
42 // Handle #zoom=scale,left,top. 42 // Handle #zoom=scale,left,top.
43 var position = {x: parseFloat(paramValueSplit[1]), 43 var position = {x: parseFloat(paramValueSplit[1]),
44 y: parseFloat(paramValueSplit[2])}; 44 y: parseFloat(paramValueSplit[2])};
45 this.urlParams['position'] = position; 45 this.urlParams['position'] = position;
46 this.urlParams['zoom'] = zoomFactor; 46 this.urlParams['zoom'] = zoomFactor;
47 }, 47 },
48 48
49 /** 49 /**
50 * @private 50 * @private
51 * Parse open PDF parameters. These parameters are mentioned in the url 51 * Parse PDF url parameters. These parameters are mentioned in the url
52 * and specify actions to be performed when opening pdf files. 52 * and specify actions to be performed when opening pdf files.
53 * See http://www.adobe.com/content/dam/Adobe/en/devnet/acrobat/ 53 * See http://www.adobe.com/content/dam/Adobe/en/devnet/acrobat/
54 * pdfs/pdf_open_parameters.pdf for details. 54 * pdfs/pdf_open_parameters.pdf for details.
55 * @param {string} inputUrl that need to be parsed.
56 * @return {Object} urlParams data that have the PDF url parameter info.
55 */ 57 */
56 parseOpenPDFParams_: function() { 58 getURLPDFParams: function(inputUrl) {
raymes 2015/01/15 04:51:11 nit: let's change the name because I think it is d
Deepak 2015/01/15 06:30:05 Done.
57 var originalUrl = this.url_; 59 var originalUrl = inputUrl;
58 var paramIndex = originalUrl.search('#'); 60 var paramIndex = originalUrl.search('#');
59 if (paramIndex == -1) 61 if (paramIndex == -1)
60 return; 62 return;
63 var paramTokens = originalUrl.substring(paramIndex + 1).split('&');
61 64
62 var paramTokens = originalUrl.substring(paramIndex + 1).split('&'); 65 if ((paramTokens.length == 1) && (paramTokens[0].search('=') == -1)) {
66 this.urlParams['page'] = this.namedDestinations[paramTokens[0]];
67 return this.urlParams;
68 }
raymes 2015/01/15 04:51:11 I don't think we need this whole if-block
Deepak 2015/01/15 06:30:05 Then how we will handle http://XXX.pdf#Chapter5 c
69
63 var paramsDictionary = {}; 70 var paramsDictionary = {};
64 for (var i = 0; i < paramTokens.length; ++i) { 71 for (var i = 0; i < paramTokens.length; ++i) {
65 var keyValueSplit = paramTokens[i].split('='); 72 var keyValueSplit = paramTokens[i].split('=');
66 if (keyValueSplit.length != 2) 73 if (keyValueSplit.length != 2)
67 continue; 74 continue;
68 paramsDictionary[keyValueSplit[0]] = keyValueSplit[1]; 75 paramsDictionary[keyValueSplit[0]] = keyValueSplit[1];
69 } 76 }
70 77
78 if ('nameddest' in paramsDictionary) {
79 var pageNumber = parseInt(paramsDictionary['nameddest']);
80 if (!isNaN(pageNumber) && pageNumber >= 0)
81 this.urlParams['nameddest'] = pageNumber;
raymes 2015/01/15 04:51:11 Can we just store this in the 'page' param as well
Deepak 2015/01/15 06:30:05 Done.
82 }
83
71 if ('page' in paramsDictionary) { 84 if ('page' in paramsDictionary) {
72 // |pageNumber| is 1-based, but goToPage() take a zero-based page number. 85 // |pageNumber| is 1-based, but goToPage() take a zero-based page number.
73 var pageNumber = parseInt(paramsDictionary['page']); 86 var pageNumber = parseInt(paramsDictionary['page']);
74 if (!isNaN(pageNumber)) 87 if (!isNaN(pageNumber) && pageNumber > 0)
raymes 2015/01/15 04:51:11 good catch! thanks :)
Deepak 2015/01/15 06:30:05 Acknowledged.
75 this.urlParams['page'] = pageNumber - 1; 88 this.urlParams['page'] = pageNumber - 1;
76 } 89 }
77 90
78 if ('zoom' in paramsDictionary) 91 if ('zoom' in paramsDictionary)
79 this.parseZoomParam_(paramsDictionary['zoom']); 92 this.parseZoomParam_(paramsDictionary['zoom']);
93
94 return this.urlParams;
80 } 95 }
81 }; 96 };
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/pdf/pdf.js » ('j') | chrome/browser/resources/pdf/pdf.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698