iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: replace VSCode-specific settings.json with broadly recommended .editorconfig 

closes #1022
This commit is contained in:
Ward Bell 2016-04-04 11:19:26 -07:00
parent c1f2c397ff
commit 7fdb40caa3
6 changed files with 54 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.editorconfig Normal file
View File

@ -0,0 +1,24 @@
# http://editorconfig.org
root = true
[*]
charset = utf-8
indent_style = space
indent_size = 2
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
[*.md]
max_line_length = 0
trim_trailing_whitespace = false
[*.jade]
max_line_length = 0
trim_trailing_whitespace = false
# Indentation override
#[lib/**.js]
#[{package.json,.travis.yml}]
#[**/**.js]

11
.vscode/settings.json vendored
View File

@ -1,11 +0,0 @@
// Place your settings in this file to overwrite default and user settings.
{
// Controls the rendering size of tabs in characters. Accepted values: "auto", 2, 4, 6, etc. If set to "auto", the value will be guessed when a file is opened.
"editor.tabSize": 2,
// Controls if the editor will insert spaces for tabs. Accepted values: "auto", true, false. If set to "auto", the value will be guessed when a file is opened.
"editor.insertSpaces": true,
// When enabled, will trim trailing whitespace when you save a file.
"files.trimTrailingWhitespace": false,
// Specifies the folder path containing the tsserver and lib*.d.ts files to use.
"typescript.tsdk": "public/docs/_examples/node_modules/typescript/lib"
}

1
gulpfile.js
View File

@ -69,6 +69,7 @@ var _excludeMatchers = _excludePatterns.map(function(excludePattern){
}); });
var _exampleBoilerplateFiles = [ var _exampleBoilerplateFiles = [
'.editorconfig',
'karma.conf.js', 'karma.conf.js',
'karma-test-shim.js', 'karma-test-shim.js',
'package.json', 'package.json',

20
public/docs/_examples/.editorconfig Normal file
View File

@ -0,0 +1,20 @@
# http://editorconfig.org
root = true
[*]
charset = utf-8
indent_style = space
indent_size = 2
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
[*.md]
max_line_length = 0
trim_trailing_whitespace = false
# Indentation override
#[lib/**.js]
#[{package.json,.travis.yml}]
#[**/**.js]

1
public/docs/_examples/.gitignore vendored
View File

@ -1,3 +1,4 @@
.editorconfig
styles.css styles.css
typings typings
typings.json typings.json

14
tools/plunker-builder/plunkerBuilder.js
View File

@ -107,14 +107,16 @@ function initConfigAndCollectFileNames(configFileName) {
} }
}); });
// var defaultExcludes = [ '!**/node_modules/**','!**/typings/**','!**/tsconfig.json', '!**/*plnkr.json', '!**/*plnkr.html', '!**/*plnkr.no-link.html' ]; // var defaultExcludes = [ '!**/node_modules/**','!**/typings/**','!**/tsconfig.json', '!**/*plnkr.json', '!**/*plnkr.html', '!**/*plnkr.no-link.html' ];
var defaultExcludes = [ var defaultExcludes = [
'!**/typings/**', '!**/typings/**',
'!**/typings.json', '!**/typings.json',
'!**/tsconfig.json', '!**/tsconfig.json',
'!**/*plnkr.*', '!**/*plnkr.*',
'!**/package.json', '!**/package.json',
'!**/example-config.json', '!**/example-config.json',
'!**/*.spec.*' '!**/*.spec.*',
'!**/tslint.json',
'!**/.editorconfig'
]; ];
Array.prototype.push.apply(gpaths, defaultExcludes); Array.prototype.push.apply(gpaths, defaultExcludes);
@ -263,4 +265,4 @@ function escapeHtml(unsafe) {
// fs.writeFileSync(outputFn, html, 'utf-8' ); // fs.writeFileSync(outputFn, html, 'utf-8' );
// } // }
// }); // });
//} //}