Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9688277

Browse files
committed
refactor atom editor actions
1 parent2bd94bf commit9688277

File tree

25 files changed

+268
-248
lines changed

25 files changed

+268
-248
lines changed

‎lib/atom/actions.js

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎lib/atom/actions/console.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
"use strict";
2+
varconsoleHasOpened=false;
3+
functiontoggleDevTools(){
4+
if(!consoleHasOpened){
5+
consoleHasOpened=true;
6+
console.log('Atom-CodeRoad: runs on save');
7+
}
8+
atom.toggleDevTools();
9+
}
10+
exports.toggleDevTools=toggleDevTools;
11+
functionopenDevTools(){
12+
atom.openDevTools();
13+
consoleHasOpened=true;
14+
}
15+
exports.openDevTools=openDevTools;

‎lib/atom/actions/editor.js

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
"use strict";
2+
functiongetEditor(){
3+
returnnewPromise(function(resolve,reject){
4+
vargetEditorCount=0;
5+
vareditor=atom.workspace.getActiveTextEditor();
6+
while(!editor){
7+
getEditorCount+=1;
8+
setTimeout(function(){
9+
editor=atom.workspace.getActiveTextEditor();
10+
});
11+
if(getEditorCount>999){
12+
console.log('Failed to find active editor');
13+
reject(null);
14+
}
15+
}
16+
resolve(editor);
17+
});
18+
}
19+
exports.getEditor=getEditor;

‎lib/atom/actions/file.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
"use strict";
2+
varfs_1=require('fs');
3+
varexists_1=require('../../services/exists');
4+
vareditor_1=require('./editor');
5+
functionopenFolder(){
6+
atom.open();
7+
}
8+
exports.openFolder=openFolder;
9+
functionsave(){
10+
editor_1.getEditor().then(function(editor){returneditor.save();});
11+
}
12+
exports.save=save;
13+
functionopen(filePath,options){
14+
if(options===void0){options={};}
15+
returnnewPromise(function(resolve,reject){
16+
if(exists_1.fileExists(filePath)){
17+
fs_1.unlink(filePath);
18+
}
19+
resolve(atom.workspace.open(filePath,options));
20+
});
21+
}
22+
exports.open=open;

‎lib/atom/actions/quit.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
"use strict";
2+
functionquit(){
3+
}
4+
exports.quit=quit;

‎lib/atom/actions/tabs.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
"use strict";
2+
functioncloseAllPanels(){
3+
vareditors=atom.workspace.getTextEditors();
4+
editors.forEach(function(editor){
5+
editor.destroy();
6+
});
7+
}
8+
exports.closeAllPanels=closeAllPanels;

‎lib/atom/actions/terminal.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
"use strict";
2+
functionopenTerminal(){
3+
if(atom.packages.isPackageActive('terminal-plus')){
4+
if(!document.getElementsByClassName('xterm')[0]){
5+
atom.commands.dispatch(document.getElementsByTagName('atom-workspace')[0],'terminal-plus:toggle');
6+
}
7+
returntrue;
8+
}
9+
returnfalse;
10+
}
11+
exports.openTerminal=openTerminal;

‎lib/atom/actions/write.js

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
"use strict";
2+
vareditor_1=require('./editor');
3+
functionwrite(action,text,options){
4+
if(options===void0){options={};}
5+
returneditor_1.getEditor().then(function(editor){
6+
editor.moveToBottom();
7+
editor[(action+"Text")](text,options);
8+
editor.insertNewline();
9+
editor.moveToBottom();
10+
setCursorPosition(editor);
11+
editor.save();
12+
});
13+
}
14+
functionset(text){
15+
returnwrite('set',text);
16+
}
17+
exports.set=set;
18+
functioninsert(text,options){
19+
if(options===void0){options={};}
20+
options=Object.assign(options,{
21+
autoIndent:true,
22+
});
23+
returnwrite('insert',text,options);
24+
}
25+
exports.insert=insert;
26+
varcursor=/::>/g;
27+
functionsetCursorPosition(editor){
28+
returneditor.scan(cursor,function(scanned){
29+
editor.setCursorScreenPosition(scanned.range.start);
30+
scanned.replace('');
31+
scanned.stop();
32+
});
33+
}

‎lib/atom/editor.js

Lines changed: 16 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,17 @@
11
"use strict";
2-
varfs_1=require('fs');
3-
varexists_1=require('../services/exists');
4-
vargetEditorCount=0;
5-
functionsave(){
6-
vareditor=findEditor();
7-
editor.save();
8-
}
9-
exports.save=save;
10-
functionfindEditor(){
11-
vareditor=atom.workspace.getActiveTextEditor();
12-
varmax=1000;
13-
if(!editor){
14-
getEditorCount+=1;
15-
setTimeout(function(){
16-
returnfindEditor();
17-
},10);
18-
}
19-
elseif(getEditorCount>max){
20-
console.log('Failed to find active editor');
21-
returnnull;
22-
}
23-
else{
24-
getEditorCount=0;
25-
returneditor;
26-
}
27-
}
28-
exports.findEditor=findEditor;
29-
functiongetEditor(){
30-
returnnewPromise(function(resolve,reject){
31-
resolve(findEditor());
32-
});
33-
}
34-
exports.getEditor=getEditor;
35-
functionopen(filePath,options){
36-
if(options===void0){options={};}
37-
if(exists_1.fileExists(filePath)){
38-
fs_1.unlink(filePath);
39-
}
40-
atom.workspace.open(filePath,options);
41-
}
42-
exports.open=open;
43-
functionset(text){
44-
returngetEditor().then(function(editor){
45-
editor.setText(text);
46-
editor.insertNewline();
47-
editor.moveToBottom();
48-
editor.save();
49-
setCursorPosition(editor);
50-
});
51-
}
52-
exports.set=set;
53-
functioninsert(text,options){
54-
if(options===void0){options={};}
55-
options=Object.assign(options,{
56-
autoIndent:true,
57-
});
58-
return(getEditor().then(functioninsertWithEditor(editor){
59-
editor.moveToBottom();
60-
editor.insertText(text,options);
61-
editor.insertNewline();
62-
editor.moveToBottom();
63-
editor.save();
64-
setCursorPosition(editor);
65-
}));
66-
}
67-
exports.insert=insert;
68-
varcursor=/::\s?>/g;
69-
functionsetCursorPosition(editor){
70-
editor.scan(cursor,function(scanned){
71-
editor.setCursorScreenPosition(scanned.range.start);
72-
scanned.replace('');
73-
scanned.stop();
74-
});
75-
}
2+
varfile_1=require('./actions/file');
3+
exports.save=file_1.save;
4+
exports.open=file_1.open;
5+
exports.openFolder=file_1.openFolder;
6+
varwrite_1=require('./actions/write');
7+
exports.set=write_1.set;
8+
exports.insert=write_1.insert;
9+
varconsole_1=require('./actions/console');
10+
exports.openDevTools=console_1.openDevTools;
11+
exports.toggleDevTools=console_1.toggleDevTools;
12+
varterminal_1=require('./actions/terminal');
13+
exports.openTerminal=terminal_1.openTerminal;
14+
vartabs_1=require('./actions/tabs');
15+
exports.closeAllPanels=tabs_1.closeAllPanels;
16+
varquit_1=require('./actions/quit');
17+
exports.quit=quit_1.quit;
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22
varReact=require('react');
33
varcode_1=require('material-ui/svg-icons/action/code');
4-
varactions_1=require('../../../../atom/actions');
4+
vareditor_1=require('../../../../atom/editor');
55
varFlatButton_1=require('material-ui/FlatButton');
6-
exports.ToggleLog=function(){return(React.createElement(FlatButton_1.default,{icon:React.createElement(code_1.default,null),onTouchTap:actions_1.toggleDevTools}));};
6+
exports.ToggleLog=function(){return(React.createElement(FlatButton_1.default,{icon:React.createElement(code_1.default,null),onTouchTap:editor_1.toggleDevTools}));};

‎lib/reducers/checks/action-setup.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
"use strict";
22
varpath_1=require('path');
33
vareditor_1=require('../../atom/editor');
4-
varactions_1=require('../../atom/actions');
4+
vareditor_2=require('../../atom/editor');
55
varstore_1=require('../../store');
6-
varactions_2=require('../../actions');
6+
varactions_1=require('../../actions');
77
varpackageData="{\n \"name\": \"demo\",\n \"dependencies\": {\n \"coderoad-functional-school\": \"^0.2.1\"\n }\n}";
88
functioncreatePackageJson(){
99
vardir=store_1.default.getState().dir;
@@ -15,11 +15,11 @@ function createPackageJson() {
1515
});
1616
}).then(function(){
1717
editor_1.set(packageData);
18-
store_1.default.dispatch(actions_2.setupVerify());
18+
store_1.default.dispatch(actions_1.setupVerify());
1919
});
2020
}
2121
exports.createPackageJson=createPackageJson;
2222
functionopenDirectory(){
23-
actions_1.openFolder();
23+
editor_2.openFolder();
2424
}
2525
exports.openDirectory=openDirectory;

‎lib/reducers/editor-actions/actions.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
"use strict";
22
vareditor_1=require('../../atom/editor');
3-
varactions_1=require('../../atom/actions');
43
varaction_helpers_1=require('./action-helpers');
54
varType={
65
OPEN:'open',
@@ -45,7 +44,7 @@ function editorActions(actionString) {
4544
caseType.OPEN_CONSOLE:
4645
if(params.length===0){
4746
setTimeout(function(){
48-
actions_1.openDevTools();
47+
editor_1.openDevTools();
4948
resolve(true);
5049
});
5150
}

‎src/atom/actions.ts

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎src/atom/actions/console.ts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
letconsoleHasOpened=false;
2+
exportfunctiontoggleDevTools():void{
3+
if(!consoleHasOpened){
4+
// clear console on first run
5+
// atom.executeJavaScriptInDevTools(console.clear());
6+
consoleHasOpened=true;
7+
console.log('Atom-CodeRoad: runs on save');
8+
}
9+
atom.toggleDevTools();
10+
}
11+
12+
exportfunctionopenDevTools():void{
13+
atom.openDevTools();
14+
consoleHasOpened=true;
15+
}

‎src/atom/actions/editor.ts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
exportfunctiongetEditor():Promise<AtomCore.IEditor>{
2+
returnnewPromise((resolve,reject)=>{
3+
letgetEditorCount=0;
4+
leteditor=atom.workspace.getActiveTextEditor();
5+
while(!editor){
6+
getEditorCount+=1;
7+
setTimeout(function(){
8+
editor=atom.workspace.getActiveTextEditor();
9+
});
10+
if(getEditorCount>999){
11+
console.log('Failed to find active editor');
12+
reject(null);
13+
}
14+
}
15+
resolve(editor);
16+
});
17+
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp