Skip to content

- added optional arg addCommandNameAsArg to addSlashCommand method #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CrazyFlasher wants to merge 1 commit into
base: master
Choose a base branch
from
Open

- added optional arg addCommandNameAsArg to addSlashCommand method #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified bin/Console.swc
View file
Open in desktop
Binary file not shown.
Binary file modified bin/SampleBasic.swf
View file
Open in desktop
Binary file not shown.
Binary file modified bin/consoleRemote.swf
View file
Open in desktop
Binary file not shown.
Binary file modified bin/sampleAdvanced.swf
View file
Open in desktop
Binary file not shown.
Binary file modified bin/sampleStyle.swf
View file
Open in desktop
Binary file not shown.
5 changes: 3 additions & 2 deletions build/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#Tue, 11 Oct 2016 22:50:56 +0300
#Wed Feb 22 00:11:41 GMT 2012
build.number=611
build.date=2012/02/22 00\:11
build.number=614
build.date=2016/10/11 22\:50
build.version=2.6
build.stage=
5 changes: 3 additions & 2 deletions src/com/junkbyte/console/Cc.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,9 +473,10 @@ package com.junkbyte.console {
* @param alwaysAvailable If set to false this command will NOT be avaviable when Cc.config.commandLineAllowed is false; default = true
* @param endOfArgsMarker Marker string used to determine end of command argument so that remaining string can be parsed as next line.
* null = whole string always passed as argument. default = ";"
* @param addCommandNameAsArg If true, name will be passed to call back as the first argument
*/
public static function addSlashCommand(name:String, callback:Function, description:String = "", alwaysAvailable:Boolean = true, endOfArgsMarker:String = ";"):void{
if(_console ) _console.addSlashCommand(name, callback, description, alwaysAvailable, endOfArgsMarker);
public static function addSlashCommand(name:String, callback:Function, description:String = "", alwaysAvailable:Boolean = true, endOfArgsMarker:String = ";", addCommandNameAsArg:Boolean = false):void{
if(_console ) _console.addSlashCommand(name, callback, description, alwaysAvailable, endOfArgsMarker, addCommandNameAsArg);
}
//
// Memory management tools
Expand Down
8 changes: 4 additions & 4 deletions src/com/junkbyte/console/Console.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ package com.junkbyte.console

public static const VERSION:Number = 2.6;
public static const VERSION_STAGE:String = "";
public static const BUILD:int = 611;
public static const BUILD_DATE:String = "2012/02/22 00:11";
public static const BUILD:int = 614;
public static const BUILD_DATE:String = "2016/10/11 22:50";
//
public static const LOG:uint = 1;
public static const INFO:uint = 3;
Expand Down Expand Up @@ -501,8 +501,8 @@ package com.junkbyte.console
/**
* @copy com.junkbyte.console.Cc#addSlashCommand()
*/
public function addSlashCommand(name:String, callback:Function, desc:String = "", alwaysAvailable:Boolean = true, endOfArgsMarker:String = ";"):void{
_cl.addSlashCommand(name, callback, desc, alwaysAvailable, endOfArgsMarker);
public function addSlashCommand(name:String, callback:Function, desc:String = "", alwaysAvailable:Boolean = true, endOfArgsMarker:String = ";", addCommandNameAsArg:Boolean = false):void{
_cl.addSlashCommand(name, callback, desc, alwaysAvailable, endOfArgsMarker, addCommandNameAsArg);
}
//
// LOGGING
Expand Down
16 changes: 9 additions & 7 deletions src/com/junkbyte/console/core/CommandLine.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,15 +167,15 @@ package com.junkbyte.console.core
public function get scopeString():String{
return config.commandLineAllowed?_scopeStr:"";
}
public function addCLCmd(n:String, callback:Function, desc:String, allow:Boolean = false, endOfArgsMarker:String = ";"):void{
public function addCLCmd(n:String, callback:Function, desc:String, allow:Boolean = false, endOfArgsMarker:String = ";", addCommandNameAsArg:Boolean = false):void{
var split:Array = n.split("|");
for(var i:int = 0; i<split.length; i++){
n = split[i];
_slashCmds[n] = new SlashCommand(n, callback, desc, false, allow, endOfArgsMarker);
_slashCmds[n] = new SlashCommand(n, callback, desc, false, allow, endOfArgsMarker, addCommandNameAsArg);
if(i>0) _slashCmds.setPropertyIsEnumerable(n, false);
}
}
public function addSlashCommand(n:String, callback:Function, desc:String = "", alwaysAvailable:Boolean = true, endOfArgsMarker:String = ";"):void{
public function addSlashCommand(n:String, callback:Function, desc:String = "", alwaysAvailable:Boolean = true, endOfArgsMarker:String = ";", addCommandNameAsArg:Boolean = false):void{
n = n.replace(/[^\w]*/g, "");
if(_slashCmds[n] != null){
var prev:SlashCommand = _slashCmds[n];
Expand All @@ -184,7 +184,7 @@ package com.junkbyte.console.core
}
}
if(callback == null) delete _slashCmds[n];
else _slashCmds[n] = new SlashCommand(n, callback, LogReferences.EscHTML(desc), true, alwaysAvailable, endOfArgsMarker);
else _slashCmds[n] = new SlashCommand(n, callback, LogReferences.EscHTML(desc), true, alwaysAvailable, endOfArgsMarker, addCommandNameAsArg);
}
public function run(str:String, saves:Object = null):* {
if(!str) return;
Expand Down Expand Up @@ -266,9 +266,9 @@ package com.junkbyte.console.core
}
}
if(param.length == 0){
slashcmd.f();
slashcmd.nameArg ? slashcmd.f(slashcmd.n) : slashcmd.f();
} else {
slashcmd.f(param);
slashcmd.nameArg ? slashcmd.f(slashcmd.n, param) : slashcmd.f(param);
}
if(restStr){
run(restStr);
Expand Down Expand Up @@ -433,12 +433,14 @@ internal class SlashCommand{
public var user:Boolean;
public var allow:Boolean;
public var endMarker:String;
public function SlashCommand(nn:String, ff:Function, dd:String, cus:Boolean, permit:Boolean, argsMarker:String){
public var nameArg:Boolean;
public function SlashCommand(nn:String, ff:Function, dd:String, cus:Boolean, permit:Boolean, argsMarker:String, nameAsArg:Boolean){
n = nn;
f = ff;
d = dd?dd:"";
user = cus;
allow = permit;
endMarker = argsMarker;
nameArg = nameAsArg;
}
}