github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-16 09:35:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ns-fix-editor-auto-height

Browse Source 
# Conflicts:
#	src/text-editor.coffee
This commit is contained in:
Antonio Scandurra
2016-08-19 13:27:26 +02:00
parent a264eaa18a 473406f6b7
commit 1f4cd6e00d
8 changed files with 98 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/workspace.coffee
View File

@@ -550,7 +550,7 @@ class Workspace extends Model
fileSize = fs.getSizeSync(filePath)
largeFileMode = fileSize >= 2 * 1048576 # 2MB
if fileSize >= 20 * 1048576 # 20MB
if fileSize >= @config.get('core.warnOnLargeFileLimit') * 1048576 # 20MB by default
choice = @applicationDelegate.confirm
message: 'Atom will be unresponsive during the loading of very large files.'
detailedMessage: "Do you still want to load this file?"