Browse Source

Add braces to single line statements in src/shared/util.js

Jonas Jenwald 11 years ago
parent
commit
635466fcd2
  1. 48
      src/shared/util.js

48
src/shared/util.js

@ -195,8 +195,9 @@ function backtrace() {
} }
function assert(cond, msg) { function assert(cond, msg) {
if (!cond) if (!cond) {
error(msg); error(msg);
}
} }
var UNSUPPORTED_FEATURES = PDFJS.UNSUPPORTED_FEATURES = { var UNSUPPORTED_FEATURES = PDFJS.UNSUPPORTED_FEATURES = {
@ -227,10 +228,12 @@ var UnsupportedManager = PDFJS.UnsupportedManager =
// Combines two URLs. The baseUrl shall be absolute URL. If the url is an // Combines two URLs. The baseUrl shall be absolute URL. If the url is an
// absolute URL, it will be returned as is. // absolute URL, it will be returned as is.
function combineUrl(baseUrl, url) { function combineUrl(baseUrl, url) {
if (!url) if (!url) {
return baseUrl; return baseUrl;
if (/^[a-z][a-z0-9+\-.]*:/i.test(url)) }
if (/^[a-z][a-z0-9+\-.]*:/i.test(url)) {
return url; return url;
}
if (url.charAt(0) == '/') { if (url.charAt(0) == '/') {
// absolute path // absolute path
var i = baseUrl.indexOf('://'); var i = baseUrl.indexOf('://');
@ -279,8 +282,9 @@ PDFJS.isValidUrl = isValidUrl;
// In a well-formed PDF, |cond| holds. If it doesn't, subsequent // In a well-formed PDF, |cond| holds. If it doesn't, subsequent
// behavior is undefined. // behavior is undefined.
function assertWellFormed(cond, msg) { function assertWellFormed(cond, msg) {
if (!cond) if (!cond) {
error(msg); error(msg);
}
} }
function shadow(obj, prop, value) { function shadow(obj, prop, value) {
@ -397,8 +401,9 @@ function bytesToString(bytes) {
function stringToBytes(str) { function stringToBytes(str) {
var length = str.length; var length = str.length;
var bytes = new Uint8Array(length); var bytes = new Uint8Array(length);
for (var n = 0; n < length; ++n) for (var n = 0; n < length; ++n) {
bytes[n] = str.charCodeAt(n) & 0xFF; bytes[n] = str.charCodeAt(n) & 0xFF;
}
return bytes; return bytes;
} }
@ -802,14 +807,15 @@ function isRef(v) {
function isPDFFunction(v) { function isPDFFunction(v) {
var fnDict; var fnDict;
if (typeof v != 'object') if (typeof v != 'object') {
return false; return false;
else if (isDict(v)) } else if (isDict(v)) {
fnDict = v; fnDict = v;
else if (isStream(v)) } else if (isStream(v)) {
fnDict = v.dict; fnDict = v.dict;
else } else {
return false; return false;
}
return fnDict.has('FunctionType'); return fnDict.has('FunctionType');
} }
@ -1030,8 +1036,9 @@ var LegacyPromise = PDFJS.LegacyPromise = (function LegacyPromiseClosure() {
} }
results[i] = value; results[i] = value;
unresolved--; unresolved--;
if (unresolved === 0) if (unresolved === 0) {
resolveAll(results); resolveAll(results);
}
}; };
})(i); })(i);
if (Promise.isPromise(promise)) { if (Promise.isPromise(promise)) {
@ -1121,8 +1128,9 @@ var LegacyPromise = PDFJS.LegacyPromise = (function LegacyPromiseClosure() {
var StatTimer = (function StatTimerClosure() { var StatTimer = (function StatTimerClosure() {
function rpad(str, pad, length) { function rpad(str, pad, length) {
while (str.length < length) while (str.length < length) {
str += pad; str += pad;
}
return str; return str;
} }
function StatTimer() { function StatTimer() {
@ -1132,17 +1140,21 @@ var StatTimer = (function StatTimerClosure() {
} }
StatTimer.prototype = { StatTimer.prototype = {
time: function StatTimer_time(name) { time: function StatTimer_time(name) {
if (!this.enabled) if (!this.enabled) {
return; return;
if (name in this.started) }
if (name in this.started) {
warn('Timer is already running for ' + name); warn('Timer is already running for ' + name);
}
this.started[name] = Date.now(); this.started[name] = Date.now();
}, },
timeEnd: function StatTimer_timeEnd(name) { timeEnd: function StatTimer_timeEnd(name) {
if (!this.enabled) if (!this.enabled) {
return; return;
if (!(name in this.started)) }
if (!(name in this.started)) {
warn('Timer has not been started for ' + name); warn('Timer has not been started for ' + name);
}
this.times.push({ this.times.push({
'name': name, 'name': name,
'start': this.started[name], 'start': this.started[name],
@ -1158,8 +1170,9 @@ var StatTimer = (function StatTimerClosure() {
var longest = 0; var longest = 0;
for (var i = 0, ii = times.length; i < ii; ++i) { for (var i = 0, ii = times.length; i < ii; ++i) {
var name = times[i]['name']; var name = times[i]['name'];
if (name.length > longest) if (name.length > longest) {
longest = name.length; longest = name.length;
}
} }
for (var i = 0, ii = times.length; i < ii; ++i) { for (var i = 0, ii = times.length; i < ii; ++i) {
var span = times[i]; var span = times[i];
@ -1173,8 +1186,9 @@ var StatTimer = (function StatTimerClosure() {
})(); })();
PDFJS.createBlob = function createBlob(data, contentType) { PDFJS.createBlob = function createBlob(data, contentType) {
if (typeof Blob !== 'undefined') if (typeof Blob !== 'undefined') {
return new Blob([data], { type: contentType }); return new Blob([data], { type: contentType });
}
// Blob builder is deprecated in FF14 and removed in FF18. // Blob builder is deprecated in FF14 and removed in FF18.
var bb = new MozBlobBuilder(); var bb = new MozBlobBuilder();
bb.append(data); bb.append(data);

Loading…
Cancel
Save