From 7e9a1d8ffe098a066577253a80089171e0137aec Mon Sep 17 00:00:00 2001 From: Daniel Hengeveld Date: Mon, 4 Nov 2013 16:47:12 -0800 Subject: [PATCH 1/5] copy docs into atom.io project, don't build guides as they are in the DB --- docs/template.jst | 3 +-- tasks/docs-task.coffee | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/docs/template.jst b/docs/template.jst index 50a1d4005..41a521d40 100644 --- a/docs/template.jst +++ b/docs/template.jst @@ -137,8 +137,7 @@
diff --git a/tasks/docs-task.coffee b/tasks/docs-task.coffee index be454ac61..0eb83b5c2 100644 --- a/tasks/docs-task.coffee +++ b/tasks/docs-task.coffee @@ -7,8 +7,6 @@ module.exports = (grunt) -> stdio: 'inherit' grunt.registerTask 'build-docs', 'Builds the API docs in src/app', -> - grunt.task.run('markdown:guides') - done = @async() args = [commonArgs..., '--title', 'Atom API Documentation', '-o', 'docs/output/api', 'src/', 'vendor/telepath/lib/range.coffee', 'vendor/telepath/lib/point.coffee'] grunt.util.spawn({cmd, args, opts}, done) @@ -33,11 +31,11 @@ module.exports = (grunt) -> if error? callback(error) else - callback(null, String(result).trim().split('.')[0..1].join('.')) + callback(null, String(result).trim()) copyDocs = (tag, callback) -> cmd = 'cp' - args = ['-r', 'docs/output/', "../atom-docs/public/#{tag}/"] + args = ['-r', 'docs/output/', "../atom.io/public/docs/api/#{tag}/"] grunt.util.spawn {cmd, args}, (error, result) -> if error? From 105f8d0bafe9ce96a51850a89db8465fdd3e4bc1 Mon Sep 17 00:00:00 2001 From: Daniel Hengeveld Date: Mon, 4 Nov 2013 17:03:29 -0800 Subject: [PATCH 2/5] check if atom.io directory exists in copy-docs --- tasks/docs-task.coffee | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tasks/docs-task.coffee b/tasks/docs-task.coffee index 0eb83b5c2..798024381 100644 --- a/tasks/docs-task.coffee +++ b/tasks/docs-task.coffee @@ -1,4 +1,5 @@ path = require 'path' +fs = require 'fs' module.exports = (grunt) -> cmd = path.join('node_modules', '.bin', 'coffee') @@ -37,11 +38,16 @@ module.exports = (grunt) -> cmd = 'cp' args = ['-r', 'docs/output/', "../atom.io/public/docs/api/#{tag}/"] - grunt.util.spawn {cmd, args}, (error, result) -> - if error? - callback(error) + fs.exists "../atom.io/public/docs/api/", (exists) -> + if exists + grunt.util.spawn {cmd, args}, (error, result) -> + if error? + callback(error) + else + callback(null, tag) else - callback(null, tag) + grunt.log.error "../atom.io/public/docs/api/ doesn't exist" + return false grunt.util.async.waterfall [fetchTag, copyDocs], done From 8cca42a6b89574dbb7f187e59dfda84f7a2435cc Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Tue, 5 Nov 2013 09:04:26 -0800 Subject: [PATCH 3/5] Remove references to atom-docs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 640488158..1542db41f 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ![atom](https://s3.amazonaws.com/speakeasy/apps/icons/27/medium/7db16e44-ba57-11e2-8c6f-981faf658e00.png) -Check out our [guides](https://atom-docs.githubapp.com/v26.0/index.html) and [API documentation](https://atom-docs.githubapp.com/v26.0/api/index.html). +Check out our [guides](https://www.atom.io/docs/latest/) and [API documentation](https://www.atom.io/docs/api/v34.0.0/api/) ## Installing From 151a4290d4e7dbc7e3af3d8682d34a44f62168ed Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Tue, 5 Nov 2013 09:39:10 -0800 Subject: [PATCH 4/5] Update biscotto arguments to latest telepath --- tasks/docs-task.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/docs-task.coffee b/tasks/docs-task.coffee index 798024381..ac034818f 100644 --- a/tasks/docs-task.coffee +++ b/tasks/docs-task.coffee @@ -9,7 +9,7 @@ module.exports = (grunt) -> grunt.registerTask 'build-docs', 'Builds the API docs in src/app', -> done = @async() - args = [commonArgs..., '--title', 'Atom API Documentation', '-o', 'docs/output/api', 'src/', 'vendor/telepath/lib/range.coffee', 'vendor/telepath/lib/point.coffee'] + args = [commonArgs..., '--title', 'Atom API Documentation', '-o', 'docs/output/api', 'src/', '../telepath/src/range.coffee', '../telepath/src/point.coffee', '../telepath/src/string-marker.coffee'] grunt.util.spawn({cmd, args, opts}, done) grunt.registerTask 'lint-docs', 'Generate stats about the doc coverage', -> From cd2e78f04f1f06c6acdcd2b98b2eb335044ab774 Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Tue, 5 Nov 2013 11:46:40 -0800 Subject: [PATCH 5/5] Fix indentation of comments Ref #1081 --- src/editor.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/editor.coffee b/src/editor.coffee index e657781dc..d5c6db21f 100644 --- a/src/editor.coffee +++ b/src/editor.coffee @@ -1694,12 +1694,12 @@ class Editor extends View getGrammar: -> @activeEditSession.getGrammar() - # {Delegates to: EditSession.setGrammar} + # {Delegates to: EditSession.setGrammar} setGrammar: (grammar) -> throw new Error("Only mini-editors can explicity set their grammar") unless @mini @activeEditSession.setGrammar(grammar) - # {Delegates to: EditSession.reloadGrammar} + # {Delegates to: EditSession.reloadGrammar} reloadGrammar: -> @activeEditSession.reloadGrammar()