From 1cb7121401662c7cac22b4248eedc8b140aef162 Mon Sep 17 00:00:00 2001 From: Harvey Kandola Date: Mon, 4 Jul 2016 14:11:19 -0700 Subject: [PATCH] misc. --- .jsbeautifyrc | 34 +++++++----- .../components/section/code/type-editor.js | 6 +-- app/app/index.html | 54 +++++++++---------- documize/api/endpoint/router.go | 2 +- 4 files changed, 52 insertions(+), 44 deletions(-) diff --git a/.jsbeautifyrc b/.jsbeautifyrc index 93e2e835..7e285dd5 100644 --- a/.jsbeautifyrc +++ b/.jsbeautifyrc @@ -1,30 +1,37 @@ { "css": { - "indent_size": 4, + "indent_size": 4, + "indent_level": 0, + "indent_with_tabs": true "allowed_file_extensions": ["css", "scss", "sass", "less"] + "max_preserve_newlines": 2, }, "html": { - "indent_size": 4, - "indent_char": " ", + "indent_size": 4, + "indent_level": 0, + "indent_with_tabs": true "preserve_newlines": true, + "max_preserve_newlines": 2, "wrap_line_length": 0, "indent_handlebars": true, "indent_inner_html": false, "indent_scripts": "keep" }, "hbs": { - "indent_size": 4, - "indent_char": " ", + "indent_size": 4, + "indent_level": 0, + "indent_with_tabs": true + "max_preserve_newlines": 2, "preserve_newlines": true, "wrap_line_length": 0 }, "js": { - "indent_size": 4, - "indent_char": " ", + "indent_size": 4, + "indent_level": 0, + "indent_with_tabs": true "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", @@ -34,14 +41,15 @@ }, "sql": { "indent_size": 4, - "indent_char": " ", "indent_level": 0, - "indent_with_tabs": false + "indent_with_tabs": true }, "_default": { - "indent_size": 4, - "indent_char": " ", + "indent_size": 4, + "indent_level": 0, + "indent_with_tabs": true "preserve_newlines": true, + "max_preserve_newlines": 2, "wrap_line_length": 0 } -} \ No newline at end of file +} diff --git a/app/app/components/section/code/type-editor.js b/app/app/components/section/code/type-editor.js index 599ed147..f54d66f0 100644 --- a/app/app/components/section/code/type-editor.js +++ b/app/app/components/section/code/type-editor.js @@ -1,11 +1,11 @@ // Copyright 2016 Documize Inc. . All rights reserved. // -// This software (Documize Community Edition) is licensed under +// This software (Documize Community Edition) is licensed under // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html // // You can operate outside the AGPL restrictions by purchasing // Documize Enterprise Edition and obtaining a commercial license -// by contacting . +// by contacting . // // https://documize.com @@ -129,4 +129,4 @@ export default Ember.Component.extend(TooltipMixin, { this.attrs.onAction(page, meta); } } -}); \ No newline at end of file +}); diff --git a/app/app/index.html b/app/app/index.html index 9a6174b3..1fc7fc56 100644 --- a/app/app/index.html +++ b/app/app/index.html @@ -1,32 +1,32 @@ - - {{content-for 'head'}} - - - Documize - - - - - - - - - {{content-for 'head-footer'}} - + + {{content-for 'head'}} + + + Documize + + + + + + + + + {{content-for 'head-footer'}} + - - {{content-for 'body'}} - - - - - - - - {{content-for 'body-footer'}} - + + {{content-for 'body'}} + + + + + + + + {{content-for 'body-footer'}} + - \ No newline at end of file + diff --git a/documize/api/endpoint/router.go b/documize/api/endpoint/router.go index eeff52fb..d0bb88c9 100644 --- a/documize/api/endpoint/router.go +++ b/documize/api/endpoint/router.go @@ -30,7 +30,7 @@ const ( // AppVersion does what it says // Versioning scheme major.minor where "minor" is optional // e.g. 1, 2, 3, 4.1, 4.2, 5, 6, 7, 7.1, 8, 9, 10, ..... 127, 127.1, 128 - AppVersion = "12.9" + AppVersion = "13.1" ) var port, certFile, keyFile, forcePort2SSL string