penguin/AstroJS
1
0
Fork 0
forked from Botanical/BotanJS
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'vim/master' into Astro

Browse Source
This commit is contained in:
斟酌 鵬兄 2017-03-02 18:28:09 +08:00
commit 28a15f031e
5 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
botanjs/src/Components/Vim/Actions/DELETE.js
View File

@ -23,7 +23,7 @@
this.__startX = Cursor.aPos; this.__startX = Cursor.aPos;
this.__panY = this.__cursor.feeder.panY; this.__panY = this.__cursor.feeder.panY;
this.__cMode = e.kMap( "c" ); this.__cMode = e && e.kMap( "c" );
this.__cMode_c = false; this.__cMode_c = false;
this.__enterEvent = e; this.__enterEvent = e;

9
botanjs/src/Components/Vim/Actions/QUIT.js
View File

@ -35,7 +35,14 @@
var cur = this.__cursor; var cur = this.__cursor;
var Vim = cur.Vim; var Vim = cur.Vim;
if( cur.rec.changed ) var forceQuit = p.join( "" ).trim();
if( forceQuit && forceQuit[0] == "!" && 1 < forceQuit.length )
{
this.__msg = VimError( "E488" );
return false;
}
if( !forceQuit && cur.rec.changed )
{ {
var msg = VimError( "E37" ); var msg = VimError( "E37" );

5
botanjs/src/Components/Vim/Cursor.js
View File

@ -13,11 +13,12 @@
var LineOffset = function( buffs, l ) var LineOffset = function( buffs, l )
{ {
/** @type {Components.Vim.LineBuffer} */
var offset = 0; var offset = 0;
LineLoop: LineLoop:
for( var i = 0, line = buffs[0]; for( var i = 0,
/** @type {Components.Vim.LineBuffer} */
line = buffs[0];
line && i < l; i ++ ) line && i < l; i ++ )
{ {
while( line ) while( line )

1
botanjs/src/Components/Vim/VimArea.js
View File

@ -83,7 +83,6 @@
, new EventKey( "Blur", function() { _self.__active = false; } ) , new EventKey( "Blur", function() { _self.__active = false; } )
]; ];
if( detectScreenSize ) if( detectScreenSize )
{ {
var val = element.value; var val = element.value;

3
botanjs/src/Components/Vim/_this.js
View File

@ -1,4 +1,4 @@
var VIMRE_VERSION = "1.0.0"; var VIMRE_VERSION = "1.0.1";
(function(){ (function(){
var ns = __namespace( "Components.Vim" ); var ns = __namespace( "Components.Vim" );
@ -43,6 +43,7 @@ var VIMRE_VERSION = "1.0.0";
, "E481": "No range allowed" , "E481": "No range allowed"
, "E492": "Not an editor command: %1" , "E492": "Not an editor command: %1"
, "E486": "Pattern not found: %1" , "E486": "Pattern not found: %1"
, "E488": "Trailing characters"
// EXtended Errors // EXtended Errors
, "EX1": "Pattern Error( %1 )" , "EX1": "Pattern Error( %1 )"