Browse Source

Merge pull request #1963 from gigaherz/nits

Fix some minor issues/nits detected by JetBrains' WebStorm inspector.
Yury Delendik 13 years ago
parent
commit
fb46e4d5da
  1. 14
      web/debugger.js
  2. 31
      web/viewer.js

14
web/debugger.js

@ -44,7 +44,7 @@ var FontInspector = (function FontInspectorClosure() {
} }
} }
return { return {
// Poperties/functions needed by PDFBug. // Properties/functions needed by PDFBug.
id: 'FontInspector', id: 'FontInspector',
name: 'Font Inspector', name: 'Font Inspector',
panel: null, panel: null,
@ -140,7 +140,7 @@ var StepperManager = (function StepperManagerClosure() {
var stepperChooser = null; var stepperChooser = null;
var breakPoints = {}; var breakPoints = {};
return { return {
// Poperties/functions needed by PDFBug. // Properties/functions needed by PDFBug.
id: 'Stepper', id: 'Stepper',
name: 'Stepper', name: 'Stepper',
panel: null, panel: null,
@ -207,7 +207,7 @@ var StepperManager = (function StepperManagerClosure() {
var Stepper = (function StepperClosure() { var Stepper = (function StepperClosure() {
function Stepper(panel, pageIndex, initialBreakPoints) { function Stepper(panel, pageIndex, initialBreakPoints) {
this.panel = panel; this.panel = panel;
this.len; this.len = 0;
this.breakPoint = 0; this.breakPoint = 0;
this.nextBreakPoint = null; this.nextBreakPoint = null;
this.pageIndex = pageIndex; this.pageIndex = pageIndex;
@ -236,6 +236,7 @@ var Stepper = (function StepperClosure() {
headerRow.appendChild(c('th', 'fn')); headerRow.appendChild(c('th', 'fn'));
headerRow.appendChild(c('th', 'args')); headerRow.appendChild(c('th', 'args'));
var self = this;
for (var i = 0; i < IRQueue.fnArray.length; i++) { for (var i = 0; i < IRQueue.fnArray.length; i++) {
var line = c('tr'); var line = c('tr');
line.className = 'line'; line.className = 'line';
@ -249,7 +250,6 @@ var Stepper = (function StepperClosure() {
cbox.type = 'checkbox'; cbox.type = 'checkbox';
cbox.className = 'points'; cbox.className = 'points';
cbox.checked = checked; cbox.checked = checked;
var self = this;
cbox.onclick = (function(x) { cbox.onclick = (function(x) {
return function() { return function() {
if (this.checked) if (this.checked)
@ -298,7 +298,7 @@ var Stepper = (function StepperClosure() {
callback(); callback();
break; break;
} }
} };
dom.addEventListener('keydown', listener, false); dom.addEventListener('keydown', listener, false);
self.goTo(idx); self.goTo(idx);
}, },
@ -331,7 +331,7 @@ var Stats = (function Stats() {
return false; return false;
} }
return { return {
// Poperties/functions needed by PDFBug. // Properties/functions needed by PDFBug.
id: 'Stats', id: 'Stats',
name: 'Stats', name: 'Stats',
panel: null, panel: null,
@ -429,12 +429,12 @@ var PDFBug = (function PDFBugClosure() {
// Initialize all the debugging tools. // Initialize all the debugging tools.
var tools = this.tools; var tools = this.tools;
var self = this;
for (var i = 0; i < tools.length; ++i) { for (var i = 0; i < tools.length; ++i) {
var tool = tools[i]; var tool = tools[i];
var panel = document.createElement('div'); var panel = document.createElement('div');
var panelButton = document.createElement('button'); var panelButton = document.createElement('button');
panelButton.textContent = tool.name; panelButton.textContent = tool.name;
var self = this;
panelButton.addEventListener('click', (function(selected) { panelButton.addEventListener('click', (function(selected) {
return function(event) { return function(event) {
event.preventDefault(); event.preventDefault();

31
web/viewer.js

@ -117,7 +117,7 @@ var Settings = (function SettingsClosure() {
if (isLocalStorageEnabled) if (isLocalStorageEnabled)
database = localStorage.getItem('database') || '{}'; database = localStorage.getItem('database') || '{}';
else else
return false; return;
//#else //#else
// database = FirefoxCom.requestSync('getDatabase', null) || '{}'; // database = FirefoxCom.requestSync('getDatabase', null) || '{}';
//#endif //#endif
@ -296,9 +296,10 @@ var PDFView = {
set page(val) { set page(val) {
var pages = this.pages; var pages = this.pages;
var input = document.getElementById('pageNumber'); var input = document.getElementById('pageNumber');
var event = document.createEvent('UIEvents');
event.initUIEvent('pagechange', false, false, window, 0);
if (!(0 < val && val <= pages.length)) { if (!(0 < val && val <= pages.length)) {
var event = document.createEvent('UIEvents');
event.initUIEvent('pagechange', false, false, window, 0);
event.pageNumber = this.page; event.pageNumber = this.page;
window.dispatchEvent(event); window.dispatchEvent(event);
return; return;
@ -306,8 +307,6 @@ var PDFView = {
pages[val - 1].updateStats(); pages[val - 1].updateStats();
currentPageNumber = val; currentPageNumber = val;
var event = document.createEvent('UIEvents');
event.initUIEvent('pagechange', false, false, window, 0);
event.pageNumber = val; event.pageNumber = val;
window.dispatchEvent(event); window.dispatchEvent(event);
@ -406,7 +405,7 @@ var PDFView = {
var url = this.url.split('#')[0]; var url = this.url.split('#')[0];
//#if !(FIREFOX || MOZCENTRAL) //#if !(FIREFOX || MOZCENTRAL)
url += '#pdfjs.action=download', '_parent'; url += '#pdfjs.action=download';
window.open(url, '_parent'); window.open(url, '_parent');
//#else //#else
// // Document isn't ready just try to download with the url. // // Document isn't ready just try to download with the url.
@ -432,14 +431,14 @@ var PDFView = {
// } // }
// ); // );
// }, // },
// noData // Error ocurred try downloading with just the url. // noData // Error occurred try downloading with just the url.
// ); // );
//#endif //#endif
}, },
fallback: function pdfViewFallback() { fallback: function pdfViewFallback() {
//#if !(FIREFOX || MOZCENTRAL) //#if !(FIREFOX || MOZCENTRAL)
return; // return;
//#else //#else
// // Only trigger the fallback once so we don't spam the user with messages // // Only trigger the fallback once so we don't spam the user with messages
// // for one PDF. // // for one PDF.
@ -746,7 +745,6 @@ var PDFView = {
var numVisible = visibleViews.length; var numVisible = visibleViews.length;
if (numVisible === 0) { if (numVisible === 0) {
info('No visible views.');
return false; return false;
} }
for (var i = 0; i < numVisible; ++i) { for (var i = 0; i < numVisible; ++i) {
@ -800,14 +798,14 @@ var PDFView = {
search: function pdfViewStartSearch() { search: function pdfViewStartSearch() {
// Limit this function to run every <SEARCH_TIMEOUT>ms. // Limit this function to run every <SEARCH_TIMEOUT>ms.
var SEARCH_TIMEOUT = 250; var SEARCH_TIMEOUT = 250;
var lastSeach = this.lastSearch; var lastSearch = this.lastSearch;
var now = Date.now(); var now = Date.now();
if (lastSeach && (now - lastSeach) < SEARCH_TIMEOUT) { if (lastSearch && (now - lastSearch) < SEARCH_TIMEOUT) {
if (!this.searchTimer) { if (!this.searchTimer) {
this.searchTimer = setTimeout(function resumeSearch() { this.searchTimer = setTimeout(function resumeSearch() {
PDFView.search(); PDFView.search();
}, },
SEARCH_TIMEOUT - (now - lastSeach) SEARCH_TIMEOUT - (now - lastSearch)
); );
} }
return; return;
@ -894,7 +892,6 @@ var PDFView = {
} else { } else {
this.page = pageNumber; // simple page this.page = pageNumber; // simple page
} }
return;
} }
} else if (/^\d+$/.test(hash)) // page number } else if (/^\d+$/.test(hash)) // page number
this.page = hash; this.page = hash;
@ -965,7 +962,7 @@ var PDFView = {
extractPageText(pageIndex + 1); extractPageText(pageIndex + 1);
} }
); );
}; }
extractPageText(0); extractPageText(0);
}, },
@ -1671,13 +1668,13 @@ var CustomStyle = (function CustomStyleClosure() {
//if all fails then set to undefined //if all fails then set to undefined
return (_cache[propName] = 'undefined'); return (_cache[propName] = 'undefined');
} };
CustomStyle.setProp = function set(propName, element, str) { CustomStyle.setProp = function set(propName, element, str) {
var prop = this.getProp(propName); var prop = this.getProp(propName);
if (prop != 'undefined') if (prop != 'undefined')
element.style[prop] = str; element.style[prop] = str;
} };
return CustomStyle; return CustomStyle;
})(); })();
@ -1746,7 +1743,7 @@ var TextLayerBuilder = function textLayerBuilder(textLayerDiv) {
// Resume rendering // Resume rendering
renderTimer = setInterval(renderTextLayer, renderInterval); renderTimer = setInterval(renderTextLayer, renderInterval);
}, resumeInterval); }, resumeInterval);
}; // textLayerOnScroll } // textLayerOnScroll
window.addEventListener('scroll', textLayerOnScroll, false); window.addEventListener('scroll', textLayerOnScroll, false);
}; // endLayout }; // endLayout

Loading…
Cancel
Save