You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ha...@apache.org on 2016/07/27 18:29:44 UTC
git commit: [flex-asjs] [refs/heads/refactor-sprite] - refactor batch
3
Repository: flex-asjs
Updated Branches:
refs/heads/refactor-sprite 7031769ef -> e976b1fa3
refactor batch 3
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e976b1fa
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e976b1fa
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e976b1fa
Branch: refs/heads/refactor-sprite
Commit: e976b1fa369d20b476879d19a6f00606a8f1ae71
Parents: 7031769
Author: Harbs <ha...@in-tools.com>
Authored: Wed Jul 27 21:29:37 2016 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Wed Jul 27 21:29:37 2016 +0300
----------------------------------------------------------------------
.../flex/html/accessories/NumericOnlyTextInputBead.as | 7 ++++---
.../flex/html/beads/CSSImageAndTextButtonView.as | 9 +++++----
.../org/apache/flex/html/beads/CSSTextButtonView.as | 7 ++++---
.../flex/org/apache/flex/html/beads/ComboBoxView.as | 1 +
.../beads/controllers/HScrollBarMouseController.as | 14 +++++++-------
.../beads/controllers/VScrollBarMouseController.as | 14 +++++++-------
6 files changed, 28 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e976b1fa/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/NumericOnlyTextInputBead.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/NumericOnlyTextInputBead.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/NumericOnlyTextInputBead.as
index 3b23f5b..93efa84 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/NumericOnlyTextInputBead.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/NumericOnlyTextInputBead.as
@@ -25,6 +25,7 @@ package org.apache.flex.html.accessories
COMPILE::SWF
{
import flash.events.TextEvent;
+ import flash.text.TextField;
import org.apache.flex.core.CSSTextField;
}
@@ -141,7 +142,7 @@ package org.apache.flex.html.accessories
textField.maxChars = maxChars;
// listen for changes to this textField and prevent non-numeric values, such
// as 34.09.94
- textField.addEventListener(TextEvent.TEXT_INPUT, handleTextInput);
+ textField.textField.addEventListener(TextEvent.TEXT_INPUT, handleTextInput);
}
else {
throw new Error("NumericOnlyTextInputBead requires strand to have an ITextFieldView bead");
@@ -155,8 +156,8 @@ package org.apache.flex.html.accessories
private function handleTextInput(event:TextEvent):void
{
var insert:String = event.text;
- var caretIndex:int = (event.target as CSSTextField).caretIndex;
- var current:String = (event.target as CSSTextField).text;
+ var caretIndex:int = (event.target as TextField).caretIndex;
+ var current:String = (event.target as TextField).text;
var value:String = current.substring(0,caretIndex) + insert + current.substr(caretIndex);
var n:Number = Number(value);
if (isNaN(n)) event.preventDefault();
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e976b1fa/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/CSSImageAndTextButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/CSSImageAndTextButtonView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/CSSImageAndTextButtonView.as
index 2f7507c..e0104c7 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/CSSImageAndTextButtonView.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/CSSImageAndTextButtonView.as
@@ -32,6 +32,7 @@ package org.apache.flex.html.beads
import org.apache.flex.core.CSSTextField;
import org.apache.flex.core.IBeadView;
import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.IUIBase;
import org.apache.flex.core.ValuesManager;
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
@@ -147,10 +148,10 @@ package org.apache.flex.html.beads
var sw:uint = IUIBase(_strand).width;
var sh:uint = IUIBase(_strand).height;
- textField.defaultTextFormat.leftMargin = 0;
- textField.defaultTextFormat.rightMargin = 0;
+ textField.textField.defaultTextFormat.leftMargin = 0;
+ textField.textField.defaultTextFormat.rightMargin = 0;
// set it again so it gets noticed
- textField.defaultTextFormat = textField.defaultTextFormat;
+ textField.textField.defaultTextFormat = textField.textField.defaultTextFormat;
var borderColor:uint;
var borderThickness:uint;
@@ -242,7 +243,7 @@ package org.apache.flex.html.beads
{
var loader:Loader = new Loader();
sprite.addChildAt(loader, 0);
- sprite.addChild(textField);
+ sprite.addChild(textField.textField);
var url:String = backgroundImage as String;
loader.load(new URLRequest(url));
loader.contentLoaderInfo.addEventListener(flash.events.Event.COMPLETE, function (e:flash.events.Event):void {
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e976b1fa/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/CSSTextButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/CSSTextButtonView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/CSSTextButtonView.as
index 9309f3a..0d188ed 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/CSSTextButtonView.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/CSSTextButtonView.as
@@ -33,6 +33,7 @@ package org.apache.flex.html.beads
import org.apache.flex.core.IBeadView;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.ITextModel;
+ import org.apache.flex.core.IUIBase;
import org.apache.flex.core.ValuesManager;
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
@@ -146,10 +147,10 @@ package org.apache.flex.html.beads
var sw:uint = IUIBase(_strand).width;
var sh:uint = IUIBase(_strand).height;
- textField.defaultTextFormat.leftMargin = 0;
- textField.defaultTextFormat.rightMargin = 0;
+ textField.textField.defaultTextFormat.leftMargin = 0;
+ textField.textField.defaultTextFormat.rightMargin = 0;
// set it again so it gets noticed
- textField.defaultTextFormat = textField.defaultTextFormat;
+ textField.textField.defaultTextFormat = textField.textField.defaultTextFormat;
var borderColor:uint;
var borderThickness:uint;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e976b1fa/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ComboBoxView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ComboBoxView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ComboBoxView.as
index 82dd046..64f7ecd 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ComboBoxView.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ComboBoxView.as
@@ -23,6 +23,7 @@ package org.apache.flex.html.beads
import flash.display.Sprite;
import org.apache.flex.core.BeadViewBase;
+ import org.apache.flex.core.HTMLElementWrapper;
import org.apache.flex.core.IBeadView;
import org.apache.flex.core.IComboBoxModel;
import org.apache.flex.core.IPopUpHost;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e976b1fa/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/HScrollBarMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/HScrollBarMouseController.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/HScrollBarMouseController.as
index 4abaffe..da93493 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/HScrollBarMouseController.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/HScrollBarMouseController.as
@@ -18,11 +18,11 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.html.beads.controllers
{
- import flash.display.DisplayObject;
import org.apache.flex.events.Event;
import org.apache.flex.events.MouseEvent;
import org.apache.flex.events.IEventDispatcher;
+ import org.apache.flex.html.Button;
/**
* The HScrollBarMouseController class is the controller for
@@ -76,16 +76,16 @@ package org.apache.flex.html.beads.controllers
*/
override protected function thumbMouseDownHandler(event:MouseEvent):void
{
- sbView.thumb.stage.addEventListener(MouseEvent.MOUSE_MOVE, thumbMouseMoveHandler);
- sbView.thumb.stage.addEventListener(MouseEvent.MOUSE_UP, thumbMouseUpHandler);
+ sbView.thumb.button.stage.addEventListener(MouseEvent.MOUSE_MOVE, thumbMouseMoveHandler);
+ sbView.thumb.button.stage.addEventListener(MouseEvent.MOUSE_UP, thumbMouseUpHandler);
thumbDownX = event.screenX;
lastThumbX = sbView.thumb.x;
}
private function thumbMouseMoveHandler(event:MouseEvent):void
{
- var thumb:DisplayObject = sbView.thumb;
- var track:DisplayObject = sbView.track;
+ var thumb:Button = sbView.thumb;
+ var track:Button = sbView.track;
thumb.x = Math.max(track.x, Math.min(lastThumbX + (event.screenX - thumbDownX), track.x + track.width - thumb.width));
var newValue:Number = snap((thumb.x - track.x) / (track.width - thumb.width) * (sbModel.maximum - sbModel.minimum - sbModel.pageSize));
sbModel.value = newValue;
@@ -94,8 +94,8 @@ package org.apache.flex.html.beads.controllers
private function thumbMouseUpHandler(event:MouseEvent):void
{
- sbView.thumb.stage.removeEventListener(MouseEvent.MOUSE_MOVE, thumbMouseMoveHandler);
- sbView.thumb.stage.removeEventListener(MouseEvent.MOUSE_UP, thumbMouseUpHandler);
+ sbView.thumb.button.stage.removeEventListener(MouseEvent.MOUSE_MOVE, thumbMouseMoveHandler);
+ sbView.thumb.button.stage.removeEventListener(MouseEvent.MOUSE_UP, thumbMouseUpHandler);
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e976b1fa/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/VScrollBarMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/VScrollBarMouseController.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/VScrollBarMouseController.as
index 611f6dd..f8b2142 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/VScrollBarMouseController.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/VScrollBarMouseController.as
@@ -18,11 +18,11 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.html.beads.controllers
{
- import flash.display.DisplayObject;
import org.apache.flex.events.Event;
import org.apache.flex.events.MouseEvent;
import org.apache.flex.events.IEventDispatcher;
+ import org.apache.flex.html.Button;
/**
* The VScrollBarMouseController class is the controller for
@@ -76,16 +76,16 @@ package org.apache.flex.html.beads.controllers
*/
override protected function thumbMouseDownHandler(event:MouseEvent):void
{
- sbView.thumb.stage.addEventListener(MouseEvent.MOUSE_MOVE, thumbMouseMoveHandler);
- sbView.thumb.stage.addEventListener(MouseEvent.MOUSE_UP, thumbMouseUpHandler);
+ sbView.thumb.button.stage.addEventListener(MouseEvent.MOUSE_MOVE, thumbMouseMoveHandler);
+ sbView.thumb.button.stage.addEventListener(MouseEvent.MOUSE_UP, thumbMouseUpHandler);
thumbDownY = event.screenY;
lastThumbY = sbView.thumb.y;
}
private function thumbMouseMoveHandler(event:MouseEvent):void
{
- var thumb:DisplayObject = sbView.thumb;
- var track:DisplayObject = sbView.track;
+ var thumb:Button = sbView.thumb;
+ var track:Button = sbView.track;
thumb.y = Math.max(track.y, Math.min(lastThumbY + (event.screenY - thumbDownY), track.y + track.height - thumb.height));
var newValue:Number = snap((thumb.y - track.y) / (track.height - thumb.height) * (sbModel.maximum - sbModel.minimum - sbModel.pageSize));
sbModel.value = newValue;
@@ -94,8 +94,8 @@ package org.apache.flex.html.beads.controllers
private function thumbMouseUpHandler(event:MouseEvent):void
{
- sbView.thumb.stage.removeEventListener(MouseEvent.MOUSE_MOVE, thumbMouseMoveHandler);
- sbView.thumb.stage.removeEventListener(MouseEvent.MOUSE_UP, thumbMouseUpHandler);
+ sbView.thumb.button.stage.removeEventListener(MouseEvent.MOUSE_MOVE, thumbMouseMoveHandler);
+ sbView.thumb.button.stage.removeEventListener(MouseEvent.MOUSE_UP, thumbMouseUpHandler);
}
}
}