You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pe...@apache.org on 2017/01/10 19:47:15 UTC
git commit: [flex-asjs] [refs/heads/develop] - Updated Express
framework. Added TextButton. Added enabled property to TextInput.
Repository: flex-asjs
Updated Branches:
refs/heads/develop ffcc9a3dc -> e802c11f4
Updated Express framework. Added TextButton. Added enabled property to TextInput.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e802c11f
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e802c11f
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e802c11f
Branch: refs/heads/develop
Commit: e802c11f4dd619b3fdac61570761452863168b43
Parents: ffcc9a3
Author: Peter Ent <pe...@apache.org>
Authored: Tue Jan 10 14:47:12 2017 -0500
Committer: Peter Ent <pe...@apache.org>
Committed: Tue Jan 10 14:47:12 2017 -0500
----------------------------------------------------------------------
.../Express/src/main/flex/ExpressClasses.as | 1 +
.../flex/org/apache/flex/express/TextButton.as | 61 ++++++++++++++++++++
.../flex/org/apache/flex/express/TextInput.as | 35 +++++++++++
.../src/main/resources/express-manifest.xml | 2 +-
.../flex/html/accessories/TextPromptBead.as | 11 +++-
5 files changed, 106 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e802c11f/frameworks/projects/Express/src/main/flex/ExpressClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Express/src/main/flex/ExpressClasses.as b/frameworks/projects/Express/src/main/flex/ExpressClasses.as
index 70c74de..8776086 100644
--- a/frameworks/projects/Express/src/main/flex/ExpressClasses.as
+++ b/frameworks/projects/Express/src/main/flex/ExpressClasses.as
@@ -34,6 +34,7 @@ internal class ExpressClasses
import org.apache.flex.express.HView; HView;
import org.apache.flex.express.List; List;
import org.apache.flex.express.MXMLItemRenderer; MXMLItemRenderer;
+ import org.apache.flex.express.TextButton; TextButton;
import org.apache.flex.express.TextInput; TextInput;
import org.apache.flex.express.VContainer; VContainer;
import org.apache.flex.express.View; View;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e802c11f/frameworks/projects/Express/src/main/flex/org/apache/flex/express/TextButton.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Express/src/main/flex/org/apache/flex/express/TextButton.as b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/TextButton.as
new file mode 100644
index 0000000..3ccdd52
--- /dev/null
+++ b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/TextButton.as
@@ -0,0 +1,61 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.flex.express
+{
+ import org.apache.flex.events.Event;
+ import org.apache.flex.html.TextButton;
+ import org.apache.flex.html.beads.DisableBead;
+
+ /**
+ * This class extends Container and adds the HorizontalLayout
+ * bead for convenience.
+ */
+ public class TextButton extends org.apache.flex.html.TextButton
+ {
+ public function TextButton()
+ {
+ super();
+ }
+
+ private var _disableBead:DisableBead;
+ private var _enabled:Boolean = true;
+
+ [Bindable("enabledChanged")]
+ /**
+ * Can enable or disable interaction with the control.
+ */
+ public function get enabled():Boolean
+ {
+ return _enabled;
+ }
+ public function set enabled(value:Boolean):void
+ {
+ _enabled = value;
+
+ if (_disableBead == null) {
+ _disableBead = new DisableBead();
+ addBead(_disableBead);
+ }
+
+ _disableBead.disabled = !value;
+
+ dispatchEvent(new Event("enabledChanged"));
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e802c11f/frameworks/projects/Express/src/main/flex/org/apache/flex/express/TextInput.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Express/src/main/flex/org/apache/flex/express/TextInput.as b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/TextInput.as
index f79c2fe..e48dba4 100644
--- a/frameworks/projects/Express/src/main/flex/org/apache/flex/express/TextInput.as
+++ b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/TextInput.as
@@ -23,6 +23,11 @@ package org.apache.flex.express
import org.apache.flex.html.accessories.NumericOnlyTextInputBead;
import org.apache.flex.html.accessories.PasswordInputBead;
import org.apache.flex.html.accessories.TextPromptBead;
+ import org.apache.flex.html.beads.DisableBead;
+
+ COMPILE::SWF {
+ import org.apache.flex.html.beads.TextInputView;
+ }
/**
* This class extends the standard TextInput class and adds in
@@ -113,5 +118,35 @@ package org.apache.flex.express
dispatchEvent(new Event("numericChanged"));
}
+
+ private var _disableBead:DisableBead;
+ private var _enabled:Boolean = true;
+
+ [Bindable("enabledChanged")]
+ /**
+ * Can enable or disable interaction with the control.
+ */
+ public function get enabled():Boolean
+ {
+ return _enabled;
+ }
+ public function set enabled(value:Boolean):void
+ {
+ _enabled = value;
+
+ if (_disableBead == null) {
+ _disableBead = new DisableBead();
+ addBead(_disableBead);
+ }
+
+ _disableBead.disabled = !value;
+
+ COMPILE::SWF {
+ var textView:TextInputView = view as TextInputView;
+ textView.textField.mouseEnabled = _enabled;
+ }
+
+ dispatchEvent(new Event("enabledChanged"));
+ }
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e802c11f/frameworks/projects/Express/src/main/resources/express-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Express/src/main/resources/express-manifest.xml b/frameworks/projects/Express/src/main/resources/express-manifest.xml
index 19b0d09..19496d9 100644
--- a/frameworks/projects/Express/src/main/resources/express-manifest.xml
+++ b/frameworks/projects/Express/src/main/resources/express-manifest.xml
@@ -28,6 +28,7 @@
<component id="HView" class="org.apache.flex.express.HView"/>
<component id="List" class="org.apache.flex.express.List"/>
<component id="MXMLItemRenderer" class="org.apache.flex.express.MXMLItemRenderer"/>
+ <component id="TextButton" class="org.apache.flex.express.TextButton"/>
<component id="TextInput" class="org.apache.flex.express.TextInput"/>
<component id="VContainer" class="org.apache.flex.express.VContainer"/>
<component id="View" class="org.apache.flex.express.View"/>
@@ -42,7 +43,6 @@
<component id="Label" class="org.apache.flex.html.Label" lookupOnly="true" />
<component id="MultilineLabel" class="org.apache.flex.html.MultilineLabel" lookupOnly="true" />
<component id="ImageAndTextButton" class="org.apache.flex.html.ImageAndTextButton" lookupOnly="true" />
- <component id="TextButton" class="org.apache.flex.html.TextButton" lookupOnly="true" />
<component id="ToggleTextButton" class="org.apache.flex.html.ToggleTextButton" lookupOnly="true" />
<component id="TextArea" class="org.apache.flex.html.TextArea" lookupOnly="true" />
<component id="SimpleList" class="org.apache.flex.html.SimpleList" lookupOnly="true" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e802c11f/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/TextPromptBead.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/TextPromptBead.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/TextPromptBead.as
index 65a5a24..d22cc9a 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/TextPromptBead.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/accessories/TextPromptBead.as
@@ -20,7 +20,8 @@ package org.apache.flex.html.accessories
{
COMPILE::SWF
{
- import flash.text.TextFieldType;
+ import flash.text.TextFieldType;
+ import flash.text.TextField;
import org.apache.flex.core.CSSTextField;
}
@@ -101,7 +102,7 @@ package org.apache.flex.html.accessories
// create a TextField that displays the prompt - it shows
// and hides based on the model's content
- promptField = new CSSTextField();
+ promptField = new TextField();
promptField.selectable = false;
promptField.type = TextFieldType.DYNAMIC;
promptField.mouseEnabled = false;
@@ -121,7 +122,7 @@ package org.apache.flex.html.accessories
}
COMPILE::SWF
- private var promptField:CSSTextField;
+ private var promptField:TextField;
private var promptAdded:Boolean;
/**
@@ -142,6 +143,10 @@ package org.apache.flex.html.accessories
if (!promptAdded) UIBase(_strand).$displayObjectContainer.addChild(promptField);
promptField.text = prompt;
promptAdded = true;
+ promptField.x = 2;
+ promptField.y = 2;
+ promptField.width = UIBase(_strand).width-5;
+ promptField.height = UIBase(_strand).height-4;
}
}
}