Fixing merge
Этот коммит содержится в:
=Corey Hulen
@@ -145,7 +145,7 @@ export default {
|
||||
PRESENTATION_TYPES: ['ppt', 'pptx'],
|
||||
SPREADSHEET_TYPES: ['xlsx', 'csv'],
|
||||
WORD_TYPES: ['doc', 'docx'],
|
||||
CODE_TYPES: ['css', 'html', 'js', 'php', 'rb'],
|
||||
CODE_TYPES: ['as', 'applescript', 'osascript', 'scpt', 'bash', 'sh', 'zsh', 'clj', 'boot', 'cl2', 'cljc', 'cljs', 'cljs.hl', 'cljscm', 'cljx', 'hic', 'coffee', '_coffee', 'cake', 'cjsx', 'cson', 'iced', 'cpp', 'c', 'cc', 'h', 'c++', 'h++', 'hpp', 'cs', 'csharp', 'css', 'd', 'di', 'dart', 'delphi', 'dpr', 'dfm', 'pas', 'pascal', 'freepascal', 'lazarus', 'lpr', 'lfm', 'diff', 'django', 'jinja', 'dockerfile', 'docker', 'erl', 'f90', 'f95', 'fsharp', 'fs', 'gcode', 'nc', 'go', 'groovy', 'handlebars', 'hbs', 'html.hbs', 'html.handlebars', 'hs', 'hx', 'java', 'jsp', 'js', 'jsx', 'json', 'jl', 'kt', 'ktm', 'kts', 'less', 'lisp', 'lua', 'mk', 'mak', 'md', 'mkdown', 'mkd', 'matlab', 'm', 'mm', 'objc', 'obj-c', 'ml', 'perl', 'pl', 'php', 'php3', 'php4', 'php5', 'php6', 'ps', 'ps1', 'pp', 'py', 'gyp', 'r', 'ruby', 'rb', 'gemspec', 'podspec', 'thor', 'irb', 'rs', 'scala', 'scm', 'sld', 'scss', 'st', 'sql', 'swift', 'tex', 'vbnet', 'vb', 'bas', 'vbs', 'v', 'veo', 'xml', 'html', 'xhtml', 'rss', 'atom', 'xsl', 'plist', 'yaml'],
|
||||
PDF_TYPES: ['pdf'],
|
||||
PATCH_TYPES: ['patch'],
|
||||
ICON_FROM_TYPE: {
|
||||
@@ -515,30 +515,64 @@ export default {
|
||||
SPACE: 32,
|
||||
TAB: 9
|
||||
},
|
||||
CODE_PREVIEW_MAX_FILE_SIZE: 500000, // 500 KB
|
||||
HighlightedLanguages: {
|
||||
diff: 'Diff',
|
||||
apache: 'Apache',
|
||||
makefile: 'Makefile',
|
||||
http: 'HTTP',
|
||||
json: 'JSON',
|
||||
markdown: 'Markdown',
|
||||
javascript: 'JavaScript',
|
||||
css: 'CSS',
|
||||
nginx: 'nginx',
|
||||
objectivec: 'Objective-C',
|
||||
python: 'Python',
|
||||
xml: 'XML',
|
||||
perl: 'Perl',
|
||||
bash: 'Bash',
|
||||
php: 'PHP',
|
||||
coffeescript: 'CoffeeScript',
|
||||
cs: 'C#',
|
||||
cpp: 'C++',
|
||||
sql: 'SQL',
|
||||
go: 'Go',
|
||||
ruby: 'Ruby',
|
||||
java: 'Java',
|
||||
ini: 'ini'
|
||||
actionscript: {name: 'ActionScript', extensions: ['as']},
|
||||
applescript: {name: 'AppleScript', extensions: ['applescript', 'osascript', 'scpt']},
|
||||
bash: {name: 'Bash', extensions: ['bash', 'sh', 'zsh']},
|
||||
clojure: {name: 'Clojure', extensions: ['clj', 'boot', 'cl2', 'cljc', 'cljs', 'cljs.hl', 'cljscm', 'cljx', 'hic']},
|
||||
coffeescript: {name: 'CoffeeScript', extensions: ['coffee', '_coffee', 'cake', 'cjsx', 'cson', 'iced']},
|
||||
cpp: {name: 'C/C++', extensions: ['cpp', 'c', 'cc', 'h', 'c++', 'h++', 'hpp']},
|
||||
cs: {name: 'C#', extensions: ['cs', 'csharp']},
|
||||
css: {name: 'CSS', extensions: ['css']},
|
||||
d: {name: 'D', extensions: ['d', 'di']},
|
||||
dart: {name: 'Dart', extensions: ['dart']},
|
||||
delphi: {name: 'Delphi', extensions: ['delphi', 'dpr', 'dfm', 'pas', 'pascal', 'freepascal', 'lazarus', 'lpr', 'lfm']},
|
||||
diff: {name: 'Diff', extensions: ['diff', 'patch']},
|
||||
django: {name: 'Django', extensions: ['django', 'jinja']},
|
||||
dockerfile: {name: 'Dockerfile', extensions: ['dockerfile', 'docker']},
|
||||
erlang: {name: 'Erlang', extensions: ['erl']},
|
||||
fortran: {name: 'Fortran', extensions: ['f90', 'f95']},
|
||||
fsharp: {name: 'F#', extensions: ['fsharp', 'fs']},
|
||||
gcode: {name: 'G-Code', extensions: ['gcode', 'nc']},
|
||||
go: {name: 'Go', extensions: ['go']},
|
||||
groovy: {name: 'Groovy', extensions: ['groovy']},
|
||||
handlebars: {name: 'Handlebars', extensions: ['handlebars', 'hbs', 'html.hbs', 'html.handlebars']},
|
||||
haskell: {name: 'Haskell', extensions: ['hs']},
|
||||
haxe: {name: 'Haxe', extensions: ['hx']},
|
||||
java: {name: 'Java', extensions: ['java', 'jsp']},
|
||||
javascript: {name: 'JavaScript', extensions: ['js', 'jsx']},
|
||||
json: {name: 'JSON', extensions: ['json']},
|
||||
julia: {name: 'Julia', extensions: ['jl']},
|
||||
kotlin: {name: 'Kotlin', extensions: ['kt', 'ktm', 'kts']},
|
||||
less: {name: 'Less', extensions: ['less']},
|
||||
lisp: {name: 'Lisp', extensions: ['lisp']},
|
||||
lua: {name: 'Lua', extensions: ['lua']},
|
||||
makefile: {name: 'Makefile', extensions: ['mk', 'mak']},
|
||||
markdown: {name: 'Markdown', extensions: ['md', 'mkdown', 'mkd']},
|
||||
matlab: {name: 'Matlab', extensions: ['matlab', 'm']},
|
||||
objectivec: {name: 'Objective C', extensions: ['mm', 'objc', 'obj-c']},
|
||||
ocaml: {name: 'OCaml', extensions: ['ml']},
|
||||
perl: {name: 'Perl', extensions: ['perl', 'pl']},
|
||||
php: {name: 'PHP', extensions: ['php', 'php3', 'php4', 'php5', 'php6']},
|
||||
powershell: {name: 'PowerShell', extensions: ['ps', 'ps1']},
|
||||
puppet: {name: 'Puppet', extensions: ['pp']},
|
||||
python: {name: 'Python', extensions: ['py', 'gyp']},
|
||||
r: {name: 'R', extensions: ['r']},
|
||||
ruby: {name: 'Ruby', extensions: ['ruby', 'rb', 'gemspec', 'podspec', 'thor', 'irb']},
|
||||
rust: {name: 'Rust', extensions: ['rs']},
|
||||
scala: {name: 'Scala', extensions: ['scala']},
|
||||
scheme: {name: 'Scheme', extensions: ['scm', 'sld']},
|
||||
scss: {name: 'SCSS', extensions: ['scss']},
|
||||
smalltalk: {name: 'Smalltalk', extensions: ['st']},
|
||||
sql: {name: 'SQL', extensions: ['sql']},
|
||||
swift: {name: 'Swift', extensions: ['swift']},
|
||||
tex: {name: 'TeX', extensions: ['tex']},
|
||||
vbnet: {name: 'VB.Net', extensions: ['vbnet', 'vb', 'bas']},
|
||||
vbscript: {name: 'VBScript', extensions: ['vbs']},
|
||||
verilog: {name: 'Verilog', extensions: ['v', 'veo']},
|
||||
xml: {name: 'HTML, XML', extensions: ['xml', 'html', 'xhtml', 'rss', 'atom', 'xsl', 'plist']},
|
||||
yaml: {name: 'YAML', extensions: ['yaml']}
|
||||
},
|
||||
PostsViewJumpTypes: {
|
||||
BOTTOM: 1,
|
||||
@@ -561,6 +595,10 @@ export default {
|
||||
EMBED_TOGGLE: {
|
||||
label: 'embed_toggle',
|
||||
description: 'Show toggle for all embed previews'
|
||||
},
|
||||
SLASHCMD_AUTOCMP: {
|
||||
label: 'slashCmd_autocmp',
|
||||
description: 'Enable external application to offer slash command autocomplete'
|
||||
}
|
||||
},
|
||||
OVERLAY_TIME_DELAY: 400,
|
||||
|
||||
Ссылка в новой задаче
Block a user