Skip to content

Commit f9c8716

Browse files
committed
fix inconsistent line endings
1 parent 9be24b1 commit f9c8716

17 files changed

+494
-470
lines changed

.eslintrc

+47-1
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
alert: true,
2626
prompt: true,
2727
XMLHttpRequest: true,
28+
localStorage: true,
2829
},
2930
"rules": {
3031
curly: 0,
3132
eqeqeq: 0,
32-
no-underscore-dangle: 0,
3333
comma-dangle: 2,
3434
no-dupe-args: 2,
3535
no-dupe-keys: 2,
@@ -101,5 +101,51 @@
101101
// no-else-return: 2,
102102
// no-unused-expressions: 2,
103103
// no-use-before-define : [2, "nofunc"],
104+
105+
106+
// array-bracket-spacing: 2, // enforce spacing inside array brackets (fixable)
107+
// block-spacing: 2, // disallow or enforce spaces inside of single line blocks (fixable)
108+
// brace-style: 2, // enforce one true brace style
109+
// camelcase: 2, // require camel case names
110+
// comma-spacing: 2, // enforce spacing before and after comma (fixable)
111+
// comma-style: 2, // enforce one true comma style
112+
computed-property-spacing: 2, // require or disallow padding inside computed properties (fixable)
113+
// consistent-this: 2, // enforce consistent naming when capturing the current execution context
114+
linebreak-style: 2, // disallow mixed 'LF' and 'CRLF' as linebreaks
115+
// indent: 2, // specify tab or space width for your code (fixable)
116+
// key-spacing: 2, // enforce spacing between keys and values in object literal properties
117+
// new-cap: 2, // require a capital letter for constructors
118+
// new-parens: 2, // disallow the omission of parentheses when invoking a constructor with no arguments
119+
// newline-after-var: 2, // require or disallow an empty newline after variable declarations
120+
no-array-constructor: 2, // disallow use of the Array constructor
121+
// no-lonely-if: 2, // disallow if as the only statement in an else block
122+
no-mixed-spaces-and-tabs: 2, // disallow mixed spaces and tabs for indentation (recommended)
123+
// no-multiple-empty-lines: 2, // disallow multiple empty lines
124+
// no-negated-condition: 2, // disallow negated conditions
125+
// no-nested-ternary: 2, // disallow nested ternary expressions
126+
no-new-object: 2, // disallow the use of the Object constructor
127+
no-restricted-syntax: 2, // disallow use of certain syntax in code
128+
no-spaced-func: 2, // disallow space between function identifier and application (fixable)
129+
// no-trailing-spaces: 2, // disallow trailing whitespace at the end of lines (fixable)
130+
// no-underscore-dangle: 2, // disallow dangling underscores in identifiers
131+
// no-unneeded-ternary: 2, // disallow the use of ternary operators when a simpler alternative exists
132+
// object-curly-spacing: 2, // require or disallow padding inside curly braces (fixable)
133+
// one-var: 2, // require or disallow one variable declaration per function
134+
// operator-assignment: 2, // require assignment operator shorthand where possible or prohibit it entirely
135+
// operator-linebreak: 2, // enforce operators to be placed before or after line breaks
136+
// quotes: [2, "double", "avoid-escape"], // specify whether backticks, double or single quotes should be used (fixable)
137+
// require-jsdoc: 2, // Require JSDoc comment
138+
// semi-spacing: 2, // enforce spacing before and after semicolons
139+
// semi: 2, // require or disallow use of semicolons instead of ASI (fixable)
140+
// space-after-keywords: 2, // require a space after certain keywords (fixable)
141+
// space-before-blocks: 2, // require or disallow a space before blocks (fixable)
142+
// space-before-function-paren: 2, // require or disallow a space before function opening parenthesis (fixable)
143+
// space-before-keywords: 2, // require a space before certain keywords (fixable)
144+
// space-in-parens: [2, "never"], // require or disallow spaces inside parentheses
145+
// space-infix-ops: 2, // require spaces around operators (fixable)
146+
space-return-throw-case: 2, // require a space after return, throw, and case (fixable)
147+
// space-unary-ops: 2, // require or disallow spaces before/after unary operators (fixable)
148+
// spaced-comment: [2, "always", { markers: ["-", "*", "/", "{", "}", "#"], exceptions: ["}"] }]
149+
104150
}
105151
}

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ script:
1010
- npm test
1111

1212
matrix:
13-
fast_finish: true
13+
fast_finish: false
1414

1515
sudo: false

demo/kitchen-sink/demo.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ function updateUIEditorOptions() {
374374
themelist.themes.forEach(function(x){ x.value = x.theme });
375375
fillDropdown(themeEl, {
376376
Bright: themelist.themes.filter(function(x){return !x.isDark}),
377-
Dark: themelist.themes.filter(function(x){return x.isDark}),
377+
Dark: themelist.themes.filter(function(x){return x.isDark})
378378
});
379379

380380
event.addListener(themeEl, "mouseover", function(e){

demo/kitchen-sink/doclist.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ module.exports = {
206206
hugeDocs: prepareDocList(hugeDocs),
207207
initDoc: initDoc,
208208
loadDoc: loadDoc,
209-
saveDoc: saveDoc,
209+
saveDoc: saveDoc
210210
};
211211
module.exports.all = {
212212
"Mode Examples": module.exports.docs,

lib/ace/ace.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ exports.require = require;
7272
*
7373
**/
7474
exports.edit = function(el) {
75-
if (typeof(el) == "string") {
75+
if (typeof el == "string") {
7676
var _id = el;
7777
el = document.getElementById(_id);
7878
if (!el)
@@ -90,7 +90,7 @@ exports.edit = function(el) {
9090
oldNode.parentNode.replaceChild(el, oldNode);
9191
} else if (el) {
9292
value = dom.getInnerText(el);
93-
el.innerHTML = '';
93+
el.innerHTML = "";
9494
}
9595

9696
var doc = exports.createEditSession(value);

0 commit comments

Comments
 (0)