InfernalGames/haxework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
shmyga
2014-10-06 12:29:35 +04:00
parent 5012060170
commit a4cda92dc9
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
haxework/format/Formatter.hx
View File

@@ -19,6 +19,8 @@ class Formatter implements IFormatter {
case "yyyy": date.getFullYear() + ""; case "yyyy": date.getFullYear() + "";
case "month": locale.getArray("month")[date.getMonth()]; case "month": locale.getArray("month")[date.getMonth()];
case "Month": firstLetterUp(locale.getArray("month")[date.getMonth()]); case "Month": firstLetterUp(locale.getArray("month")[date.getMonth()]);
case "month_r": locale.getArray("month_r")[date.getMonth()];
case "Month_r": firstLetterUp(locale.getArray("month_r")[date.getMonth()]);
default: r.matched(0); default: r.matched(0);
} }
}); });

12
haxework/gui/InputView.hx
View File

@@ -16,6 +16,7 @@ class InputView extends TextView implements IDisposable {
public var hint(default, set):String; public var hint(default, set):String;
public var dispatcher(default, null):IDispatcher<InputViewListener>; public var dispatcher(default, null):IDispatcher<InputViewListener>;
public var onKeyUp(null, set):InputViewListener;
private var hintTextField:TextField; private var hintTextField:TextField;
@@ -23,7 +24,7 @@ class InputView extends TextView implements IDisposable {
super(); super();
dispatcher = new Dispatcher<InputViewListener>(); dispatcher = new Dispatcher<InputViewListener>();
textField.addEventListener(Event.CHANGE, onTextChange); textField.addEventListener(Event.CHANGE, onTextChange);
textField.addEventListener(KeyboardEvent.KEY_UP, onKeyUp); textField.addEventListener(KeyboardEvent.KEY_UP, _onKeyUp);
textField.addEventListener(KeyboardEvent.KEY_DOWN, onKeyDown); textField.addEventListener(KeyboardEvent.KEY_DOWN, onKeyDown);
hintTextField = buildHintTextField(); hintTextField = buildHintTextField();
@@ -56,7 +57,7 @@ class InputView extends TextView implements IDisposable {
hintTextField.visible = (textField.text == ""); hintTextField.visible = (textField.text == "");
} }
private function onKeyUp(event:KeyboardEvent):Void { private function _onKeyUp(event:KeyboardEvent):Void {
event.stopImmediatePropagation(); event.stopImmediatePropagation();
dispatcher.dispatch(function(listener) listener.onKeyUp(textField.text)); dispatcher.dispatch(function(listener) listener.onKeyUp(textField.text));
} }
@@ -77,9 +78,14 @@ class InputView extends TextView implements IDisposable {
public function dispose():Void { public function dispose():Void {
textField.removeEventListener(Event.CHANGE, onTextChange); textField.removeEventListener(Event.CHANGE, onTextChange);
textField.removeEventListener(KeyboardEvent.KEY_UP, onKeyUp); textField.removeEventListener(KeyboardEvent.KEY_UP, _onKeyUp);
textField.removeEventListener(KeyboardEvent.KEY_DOWN, onKeyDown); textField.removeEventListener(KeyboardEvent.KEY_DOWN, onKeyDown);
} }
private function set_onKeyUp(value:InputViewListener):InputViewListener {
dispatcher.addListener(value);
return value;
}
} }
typedef InputViewListener = { typedef InputViewListener = {

4
haxework/log/SocketLogger.hx
View File

@@ -19,10 +19,10 @@ class SocketLogger extends BaseLogger {
socket = new Socket(); socket = new Socket();
#if flash #if flash
socket.addEventListener(IOErrorEvent.IO_ERROR, function(error):Void { socket.addEventListener(IOErrorEvent.IO_ERROR, function(error):Void {
L.e("SocketLogger", "", error); //L.e("SocketLogger", "", error);
}); });
socket.addEventListener(SecurityErrorEvent.SECURITY_ERROR, function(error):Void { socket.addEventListener(SecurityErrorEvent.SECURITY_ERROR, function(error):Void {
L.e("SocketLogger", "", error); //L.e("SocketLogger", "", error);
}); });
socket.connect(CompilationOption.get("debug.address"), Std.parseInt(CompilationOption.get("debug.port"))); socket.connect(CompilationOption.get("debug.address"), Std.parseInt(CompilationOption.get("debug.port")));
#else #else

5
haxework/provider/Provider.hx
View File

@@ -1,7 +1,6 @@
package haxework.provider; package haxework.provider;
import haxe.ds.ObjectMap; import haxe.ds.ObjectMap;
import flash.errors.Error;
class Provider { class Provider {
@@ -27,7 +26,7 @@ class Provider {
instances.set(key, instance); instances.set(key, instance);
return instance; return instance;
} else { } else {
throw new Error("Factory for\"" + i + "\" not found"); throw "Factory for\"" + i + "\" not found";
} }
} }
@@ -37,7 +36,7 @@ class Provider {
var instance:T = Type.createInstance(factories.get(key), args.exists(key) ? args.get(key) : []); var instance:T = Type.createInstance(factories.get(key), args.exists(key) ? args.get(key) : []);
return instance; return instance;
} else { } else {
throw new Error("Factory for\"" + i + "\" not found"); throw "Factory for\"" + i + "\" not found";
} }
} }