From d13aa38c9c12b5b067a0fcd55a36fb91095e43f6 Mon Sep 17 00:00:00 2001
From: Yury Delendik <ydelendik@mozilla.com>
Date: Sat, 2 Feb 2013 17:00:13 -0600
Subject: [PATCH] Enforces quotmark=single for jshint
---
.jshintrc | 1 +
src/evaluator.js | 2 +-
src/fonts.js | 2 +-
src/parser.js | 4 ++--
test/reporter.js | 35 ++++++++++++++++++++++++++---------
5 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/.jshintrc b/.jshintrc
index f9eb06a1a..3edabba55 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -7,6 +7,7 @@
// Enforcing
"maxlen": 80,
+ "quotmark": "single",
// Relaxing
"boss": true,
diff --git a/src/evaluator.js b/src/evaluator.js
index c21925d9c..54b6089b0 100644
--- a/src/evaluator.js
+++ b/src/evaluator.js
@@ -734,7 +734,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
case 'Tj':
chunk += fontCharsToUnicode(args[0], font);
break;
- case "'":
+ case '\'':
// For search, adding a extra white space for line breaks would be
// better here, but that causes too much spaces in the
// text-selection divs.
diff --git a/src/fonts.js b/src/fonts.js
index 8b845595d..80c43b0f5 100644
--- a/src/fonts.js
+++ b/src/fonts.js
@@ -4312,7 +4312,7 @@ var Font = (function FontClosure() {
// Add the font-face rule to the document
var url = ('url(data:' + this.mimetype + ';base64,' +
window.btoa(data) + ');');
- var rule = "@font-face { font-family:'" + fontName + "';src:" + url + '}';
+ var rule = '@font-face { font-family:"' + fontName + '";src:' + url + '}';
var styleElement = document.getElementById('PDFJS_FONT_STYLE_TAG');
if (!styleElement) {
diff --git a/src/parser.js b/src/parser.js
index 3f8baa38b..35954b4c3 100644
--- a/src/parser.js
+++ b/src/parser.js
@@ -481,13 +481,13 @@ var Lexer = (function LexerClosure() {
if (isFirstHex) {
firstDigit = toHexDigit(ch);
if (firstDigit === -1) {
- warn("Ignoring invalid character '" + ch + "' in hex string");
+ warn('Ignoring invalid character "' + ch + '" in hex string');
continue;
}
} else {
secondDigit = toHexDigit(ch);
if (secondDigit === -1) {
- warn("Ignoring invalid character '" + ch + "' in hex string");
+ warn('Ignoring invalid character "' + ch + '" in hex string');
continue;
}
str += String.fromCharCode((firstDigit << 4) | secondDigit);
diff --git a/test/reporter.js b/test/reporter.js
index c8993e3a9..6c5c5a9fb 100644
--- a/test/reporter.js
+++ b/test/reporter.js
@@ -1,28 +1,45 @@
-"use strict";
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+/* Copyright 2012 Mozilla Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+'use strict';
module.exports = {
- reporter: function (res) {
+ reporter: function reporter(res) {
var len = 0;
- var str = "";
+ var str = '';
- res.forEach(function (r) {
+ res.forEach(function(r) {
var file = r.file;
var err = r.error;
- switch(err.code) {
+ switch (err.code) {
case 'W004': // variable is already defined
case 'W018': // confusing use of !
break;
default:
len++;
- str += file + ": line " + err.line + ", col " +
- err.character + ", " + err.reason + "\n";
+ str += file + ': line ' + err.line + ', col ' +
+ err.character + ', ' + err.reason + '\n';
}
});
if (str) {
- process.stdout.write(str + "\n" + len + " error" +
- ((len === 1) ? "" : "s") + "\n");
+ process.stdout.write(str + '\n' + len + ' error' +
+ ((len === 1) ? '' : 's') + '\n');
process.exit(2);
} else {
process.exit(0);