fix jewel textinput and numericstepper positioner
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/IconTextInput.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/IconTextInput.as
index 8584f38..84f8172 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/IconTextInput.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/IconTextInput.as
@@ -75,10 +75,10 @@
// insert the icon before the text
if(rightPosition)
{
- div.element.insertBefore(_icon.positioner, null);
+ positioner.insertBefore(_icon.positioner, null);
} else
{
- div.element.insertBefore(_icon.positioner, element);
+ positioner.insertBefore(_icon.positioner, element);
}
(_icon as IUIBase).addedToParent();
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/NumericStepper.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/NumericStepper.as
index 954a335..3c40963 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/NumericStepper.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/NumericStepper.as
@@ -18,16 +18,17 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.jewel
{
- import org.apache.royale.core.IRangeModel;
- import org.apache.royale.core.StyledUIBase;
COMPILE::JS
{
- import goog.events;
- import org.apache.royale.core.IBead;
- import org.apache.royale.core.WrappedHTMLElement;
- import org.apache.royale.events.IEventDispatcher;
- import org.apache.royale.html.util.addElementToWrapper;
+ import goog.events;
+
+ import org.apache.royale.core.IBead;
+ import org.apache.royale.core.WrappedHTMLElement;
+ import org.apache.royale.events.IEventDispatcher;
+ import org.apache.royale.html.util.addElementToWrapper;
}
+ import org.apache.royale.core.IRangeModel;
+ import org.apache.royale.core.StyledUIBase;
[Event(name="valueChange", type="org.apache.royale.events.Event")]
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Spinner.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Spinner.as
index 0c40525..8a19208 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Spinner.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Spinner.as
@@ -18,14 +18,13 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.jewel
{
- import org.apache.royale.core.IRangeModel;
- import org.apache.royale.core.StyledUIBase;
-
COMPILE::JS
{
- import org.apache.royale.core.WrappedHTMLElement;
- import org.apache.royale.html.util.addElementToWrapper;
+ import org.apache.royale.core.WrappedHTMLElement;
+ import org.apache.royale.html.util.addElementToWrapper;
}
+ import org.apache.royale.core.IRangeModel;
+ import org.apache.royale.core.StyledUIBase;
[Event(name="valueChange", type="org.apache.royale.events.Event")]
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TextArea.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TextArea.as
index 97a1569..4ffc3bb 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TextArea.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TextArea.as
@@ -19,10 +19,10 @@
{
COMPILE::JS
{
- import goog.events;
+ import goog.events;
- import org.apache.royale.core.WrappedHTMLElement;
- import org.apache.royale.html.util.addElementToWrapper;
+ import org.apache.royale.core.WrappedHTMLElement;
+ import org.apache.royale.html.util.addElementToWrapper;
}
import org.apache.royale.jewel.supportClasses.textinput.TextInputBase;
@@ -121,7 +121,7 @@
//goog.events.listen(element, 'change', killChangeHandler);
goog.events.listen(input, 'input', textChangeHandler);
- div.element.appendChild(input);
+ positioner = document.createElement('div') as WrappedHTMLElement;
return element;
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TextInput.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TextInput.as
index 5a3bbb5..171306b 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TextInput.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TextInput.as
@@ -17,14 +17,14 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.jewel
{
- import org.apache.royale.jewel.supportClasses.textinput.TextInputBase;
-
COMPILE::JS
{
- import goog.events;
- import org.apache.royale.core.WrappedHTMLElement;
- import org.apache.royale.html.util.addElementToWrapper;
+ import goog.events;
+
+ import org.apache.royale.core.WrappedHTMLElement;
+ import org.apache.royale.html.util.addElementToWrapper;
}
+ import org.apache.royale.jewel.supportClasses.textinput.TextInputBase;
/**
* The TextInput class implements the basic control for
@@ -67,7 +67,7 @@
//goog.events.listen(element, 'change', killChangeHandler);
goog.events.listen(input, 'input', textChangeHandler);
- div.element.appendChild(input);
+ positioner = document.createElement('div') as WrappedHTMLElement;
return element;
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/NumericStepperView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/NumericStepperView.as
index a2ab34f..f6fa396 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/NumericStepperView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/NumericStepperView.as
@@ -19,21 +19,21 @@
package org.apache.royale.jewel.beads.views
{
import org.apache.royale.core.BeadViewBase;
- import org.apache.royale.core.IBead;
- import org.apache.royale.core.IBeadView;
- import org.apache.royale.core.ILayoutChild;
+ import org.apache.royale.core.IBead;
+ import org.apache.royale.core.IBeadView;
+ import org.apache.royale.core.ILayoutChild;
import org.apache.royale.core.IParent;
- import org.apache.royale.core.IParentIUIBase;
- import org.apache.royale.core.IRangeModel;
- import org.apache.royale.core.IStrand;
+ import org.apache.royale.core.IParentIUIBase;
+ import org.apache.royale.core.IRangeModel;
+ import org.apache.royale.core.IStrand;
import org.apache.royale.core.IUIBase;
import org.apache.royale.core.UIBase;
- import org.apache.royale.events.Event;
- import org.apache.royale.events.ValueChangeEvent
- import org.apache.royale.events.IEventDispatcher;
+ import org.apache.royale.events.Event;
+ import org.apache.royale.events.IEventDispatcher;
+ import org.apache.royale.events.ValueChangeEvent;
import org.apache.royale.jewel.Label;
- import org.apache.royale.jewel.Spinner;
- import org.apache.royale.jewel.TextInput;
+ import org.apache.royale.jewel.Spinner;
+ import org.apache.royale.jewel.TextInput;
/**
* The NumericStepperView class creates the visual elements of the
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/textinput/TextInputBase.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/textinput/TextInputBase.as
index 1b990ef..5d53a1d 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/textinput/TextInputBase.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/textinput/TextInputBase.as
@@ -19,16 +19,15 @@
{
COMPILE::JS
{
- import goog.events;
+ import goog.events;
- import org.apache.royale.core.WrappedHTMLElement;
+ import org.apache.royale.core.WrappedHTMLElement;
}
import org.apache.royale.core.ITextModel;
import org.apache.royale.core.StyledUIBase;
+ import org.apache.royale.core.UIBase;
import org.apache.royale.events.Event;
import org.apache.royale.jewel.supportClasses.textinput.ITextInput;
- import org.apache.royale.jewel.Group;
- import org.apache.royale.core.UIBase;
/**
* Dispatched when the user changes the text.
@@ -237,25 +236,21 @@
_label = value;
}
- /**
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- private var _div:UIBase;
-
- public function get div():UIBase
- {
- if(!_div)
- _div = new UIBase();
- return _div;
- }
-
COMPILE::JS
+ private var _positioner:WrappedHTMLElement;
+
+ COMPILE::JS
override public function get positioner():WrappedHTMLElement
{
- return div.element;
+ return _positioner;
+ }
+
+ COMPILE::JS
+ override public function set positioner(value:WrappedHTMLElement):void
+ {
+ _positioner = value;
+ _positioner.royale_wrapper = this;
+ _positioner.appendChild(element);
}
}
}
