From ef4726141df9006e623488b847a5aa25b6309d54 Mon Sep 17 00:00:00 2001 From: Harvey Kandola Date: Sun, 3 Jul 2016 16:43:03 -0700 Subject: [PATCH] misc. --- .jsbeautifyrc | 42 ++++++++++++++++++++++++++++++++++----- app/.editorconfig | 34 ------------------------------- app/app/utils/encoding.js | 8 ++++---- 3 files changed, 41 insertions(+), 43 deletions(-) delete mode 100644 app/.editorconfig diff --git a/.jsbeautifyrc b/.jsbeautifyrc index 9e2ba268..93e2e835 100644 --- a/.jsbeautifyrc +++ b/.jsbeautifyrc @@ -1,15 +1,47 @@ { - "indent_size": 4, - "indent_char": " ", - "preserve_newlines": true, "css": { "indent_size": 4, "allowed_file_extensions": ["css", "scss", "sass", "less"] }, "html": { - "allowed_file_extensions": ["htm", "html", "xhtml", "shtml", "xml", "svg", "hbs"] + "indent_size": 4, + "indent_char": " ", + "preserve_newlines": true, + "wrap_line_length": 0, + "indent_handlebars": true, + "indent_inner_html": false, + "indent_scripts": "keep" + }, + "hbs": { + "indent_size": 4, + "indent_char": " ", + "preserve_newlines": true, + "wrap_line_length": 0 }, "js": { - "break_chained_methods": false + "indent_size": 4, + "indent_char": " ", + "preserve_newlines": true, + "wrap_line_length": 0, + "break_chained_methods": false, + "indent_with_tabs": false, + "max_preserve_newlines": 2, + "jslint_happy": true, + "brace_style": "collapse-preserve-inline", + "space_after_anon_function": false, + "keep_function_indentation": false, + "space_before_conditional": true + }, + "sql": { + "indent_size": 4, + "indent_char": " ", + "indent_level": 0, + "indent_with_tabs": false + }, + "_default": { + "indent_size": 4, + "indent_char": " ", + "preserve_newlines": true, + "wrap_line_length": 0 } } \ No newline at end of file diff --git a/app/.editorconfig b/app/.editorconfig deleted file mode 100644 index 3ef6636e..00000000 --- a/app/.editorconfig +++ /dev/null @@ -1,34 +0,0 @@ -# EditorConfig helps developers define and maintain consistent -# coding styles between different editors and IDEs -# editorconfig.org - -root = true - - -[*] -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true -indent_style = space -indent_size = 4 - -[*.js] -indent_style = space -indent_size = 4 - -[*.hbs] -insert_final_newline = false -indent_style = space -indent_size = 4 - -[*.css] -indent_style = space -indent_size = 4 - -[*.html] -indent_style = space -indent_size = 4 - -[*.{diff,md}] -trim_trailing_whitespace = false diff --git a/app/app/utils/encoding.js b/app/app/utils/encoding.js index 60baf1b6..e7e6a87c 100644 --- a/app/app/utils/encoding.js +++ b/app/app/utils/encoding.js @@ -14,7 +14,7 @@ //************************************* var Base64 = { _keyStr: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=", - encode: function(e) { + encode: function (e) { var t = ""; var n, r, i, s, o, u, a; var f = 0; @@ -36,7 +36,7 @@ var Base64 = { } return t; }, - decode: function(e) { + decode: function (e) { var t = ""; var n, r, i; var s, o, u, a; @@ -61,7 +61,7 @@ var Base64 = { t = Base64._utf8_decode(t); return t; }, - _utf8_encode: function(e) { + _utf8_encode: function (e) { e = e.replace(/\r\n/g, "\n"); var t = ""; for (var n = 0; n < e.length; n++) { @@ -79,7 +79,7 @@ var Base64 = { } return t; }, - _utf8_decode: function(e) { + _utf8_decode: function (e) { var t = ""; var n = 0; let r = 0;