Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unwrap getFileName from the object, avoid issues with / in query/anchor strings, simplify the code to calculate 'end'.

Browse Source
This commit is contained in:
gigaherz 2012-03-27 09:27:54 +02:00
parent ab46530ff8
commit 3280a2bece
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
web/viewer.js
View File

@ -15,16 +15,14 @@ var kMaxScale = 4.0;
var kImageDirectory = './images/'; var kImageDirectory = './images/';
var kSettingsMemory = 20; var kSettingsMemory = 20;
var Util = { function getFileName(url) {
getFileName: function Util_getFileName(url) { var anchor = url.indexOf('#');
var anchor = url.indexOf('#'); var query = url.indexOf('?');
var query = url.indexOf('?'); var end = Math.min(
var end = url.length; anchor > 0 ? anchor : url.length,
if (anchor > 0) end = Math.min(anchor, end); query > 0 ? query : url.length);
if (query > 0) end = Math.min(query, end); return url.substring(url.lastIndexOf('/', end) + 1, end);
return url.substring(url.lastIndexOf('/') + 1, end); }
}
};
var Cache = function cacheCache(size) { var Cache = function cacheCache(size) {
var data = []; var data = [];
@ -271,7 +269,7 @@ var PDFView = {
open: function pdfViewOpen(url, scale) { open: function pdfViewOpen(url, scale) {
this.url = url; this.url = url;
document.title = Util.getFileName(url) || url; document.title = getFileName(url) || url;
var self = this; var self = this;
PDFJS.getPdf( PDFJS.getPdf(