This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new e818ee4 fix slider input event not updating continuously
e818ee4 is described below
commit e818ee40c20a5459868c2f4299ba960b682d3afc
Author: Carlos Rovira <[email protected]>
AuthorDate: Wed Apr 11 17:06:59 2018 +0200
fix slider input event not updating continuously
---
examples/royale/JewelExample/pom.xml | 8 +-
.../src/main/royale/SliderPlayGround.mxml | 4 +-
.../projects/Jewel/src/main/resources/defaults.css | 7 +-
.../Jewel/src/main/resources/jewel-manifest.xml | 2 -
.../projects/Jewel/src/main/royale/JewelClasses.as | 9 +-
.../main/royale/org/apache/royale/jewel/Slider.as | 21 +--
.../beads/controllers/SliderMouseController.as | 49 ++++---
.../jewel/beads/layouts/HorizontalSliderLayout.as | 144 ---------------------
.../royale/jewel/beads/models/SliderRangeModel.as | 16 +--
.../jewel/beads/{ => views}/SliderThumbView.as | 12 +-
.../jewel/beads/{ => views}/SliderTrackView.as | 12 +-
.../royale/jewel/beads/{ => views}/SliderView.as | 16 +--
.../jewel/beads/{ => views}/TextFieldView.as | 7 +-
.../Jewel/src/main/sass/components/_slider.sass | 8 +-
14 files changed, 80 insertions(+), 235 deletions(-)
diff --git a/examples/royale/JewelExample/pom.xml
b/examples/royale/JewelExample/pom.xml
index 78a2723..2cef798 100644
--- a/examples/royale/JewelExample/pom.xml
+++ b/examples/royale/JewelExample/pom.xml
@@ -32,12 +32,6 @@
<name>Apache Royale: Examples: Royale: JewelExample</name>
- <properties>
- <!-- Customize Jewel colors -->
- <primary>red</primary>
- <secondary>grey</secondary>
- </properties>
-
<build>
<sourceDirectory>src/main/royale</sourceDirectory>
<plugins>
@@ -48,7 +42,7 @@
<configuration>
<mainClass>App.mxml</mainClass>
<targets>JSRoyale,SWF</targets>
- <debug>false</debug>
+ <!-- <debug>false</debug> -->
<htmlTemplate>${basedir}/target/javascript/bin/js-debug/jewel-example-index-template.html</htmlTemplate>
</configuration>
</plugin>
diff --git a/examples/royale/JewelExample/src/main/royale/SliderPlayGround.mxml
b/examples/royale/JewelExample/src/main/royale/SliderPlayGround.mxml
index 4b2d87e..d580c38 100644
--- a/examples/royale/JewelExample/src/main/royale/SliderPlayGround.mxml
+++ b/examples/royale/JewelExample/src/main/royale/SliderPlayGround.mxml
@@ -40,9 +40,9 @@ limitations under the License.
<html:H3 text="Jewel Slider"/>
<j:Slider id="slider" width="250" value="120" minimum="100"
maximum="500"
- change="onChange(event)"/>
+ change="onChange(event)"
input="onChange(event)"/>
<j:Slider id="slider_v" width="250" value="40" minimum="40"
maximum="300"
- change="onChange(event)"/>
+ change="onChange(event)"
input="onChange(event)"/>
<j:TextButton id="button" text="Button" width="120" height="40"
primary="true"/>
</js:Group>
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index cf4bf36..24ca12d 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -144,8 +144,7 @@ j|Label {
j|Slider {
IBeadModel:
ClassReference("org.apache.royale.jewel.beads.models.SliderRangeModel");
- IBeadView: ClassReference("org.apache.royale.jewel.beads.SliderView");
- IBeadLayout:
ClassReference("org.apache.royale.jewel.beads.layouts.HorizontalSliderLayout");
+ IBeadView: ClassReference("org.apache.royale.jewel.beads.views.SliderView");
IBeadController:
ClassReference("org.apache.royale.jewel.beads.controllers.SliderMouseController");
}
@@ -160,8 +159,8 @@ j|Slider {
@media -royale-swf {
j|Slider {
- iThumbView:
ClassReference("org.apache.royale.jewel.beads.SliderThumbView");
- iTrackView:
ClassReference("org.apache.royale.jewel.beads.SliderTrackView");
+ iThumbView:
ClassReference("org.apache.royale.jewel.beads.views.SliderThumbView");
+ iTrackView:
ClassReference("org.apache.royale.jewel.beads.views.SliderTrackView");
}
}
j|TextField {
diff --git a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
index 8e73799..194f79a 100644
--- a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
+++ b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
@@ -40,8 +40,6 @@
<component id="HorizontalLayoutWithPaddingAndGap"
class="org.apache.royale.jewel.beads.layouts.HorizontalLayoutWithPaddingAndGap"/>
<component id="VerticalLayoutWithPaddingAndGap"
class="org.apache.royale.jewel.beads.layouts.VerticalLayoutWithPaddingAndGap"/>
<component id="HorizontalLayoutSpaceBetween"
class="org.apache.royale.jewel.beads.layouts.HorizontalLayoutSpaceBetween"/>
-
- <component id="HorizontalSliderLayout"
class="org.apache.royale.jewel.beads.layouts.HorizontalSliderLayout" />
<!-- <component id="JewelLabelViewBead"
class="org.apache.royale.jewel.beads.views.JewelLabelViewBead"/> -->
diff --git a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
index d2be88b..adf14e4 100644
--- a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
+++ b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
@@ -27,10 +27,9 @@ package
*/
internal class JewelClasses
{
- import org.apache.royale.jewel.beads.SliderView; SliderView;
+ import org.apache.royale.jewel.beads.views.SliderView; SliderView;
import org.apache.royale.jewel.beads.models.SliderRangeModel;
SliderRangeModel;
import
org.apache.royale.jewel.beads.controllers.SliderMouseController;
SliderMouseController;
- import
org.apache.royale.jewel.beads.layouts.HorizontalSliderLayout;
HorizontalSliderLayout;
import org.apache.royale.jewel.beads.controllers.AlertController;
AlertController;
import org.apache.royale.jewel.beads.views.AlertView; AlertView;
@@ -39,10 +38,10 @@ package
COMPILE::SWF
{
- import org.apache.royale.html.beads.TextFieldView; TextFieldView;
+ import org.apache.royale.jewel.beads.views.TextFieldView;
TextFieldView;
- import org.apache.royale.jewel.beads.SliderThumbView;
SliderThumbView;
- import org.apache.royale.jewel.beads.SliderTrackView;
SliderTrackView;
+ import org.apache.royale.jewel.beads.views.SliderThumbView;
SliderThumbView;
+ import org.apache.royale.jewel.beads.views.SliderTrackView;
SliderTrackView;
import org.apache.royale.jewel.beads.views.RadioButtonView;
RadioButtonView;
import org.apache.royale.jewel.beads.views.CheckBoxView;
CheckBoxView;
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Slider.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Slider.as
index 8b45a79..9286d50 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Slider.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Slider.as
@@ -41,7 +41,7 @@ package org.apache.royale.jewel
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.8
+ * @productversion Royale 0.9.3
*/
[Event(name="change", type="org.apache.royale.events.Event")]
@@ -51,7 +51,7 @@ package org.apache.royale.jewel
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.8
+ * @productversion Royale 0.9
*/
[Event(name="input", type="org.apache.royale.events.Event")]
@@ -69,7 +69,7 @@ package org.apache.royale.jewel
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.2
+ * @productversion Royale 0.9.3
*/
public class Slider extends UIBase
{
@@ -79,7 +79,7 @@ package org.apache.royale.jewel
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.2
+ * @productversion Royale 0.9.3
*/
public function Slider()
{
@@ -100,9 +100,9 @@ package org.apache.royale.jewel
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.8
+ * @productversion Royale 0.9.3
*/
- [Bindable("valueChange")]
+ [Bindable("input")]
public function get value():Number
{
return IRangeModel(model).value;
@@ -118,7 +118,7 @@ package org.apache.royale.jewel
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.8
+ * @productversion Royale 0.9.3
*/
public function get minimum():Number
{
@@ -135,7 +135,7 @@ package org.apache.royale.jewel
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.8
+ * @productversion Royale 0.9.3
*/
public function get maximum():Number
{
@@ -171,7 +171,7 @@ package org.apache.royale.jewel
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.8
+ * @productversion Royale 0.9.3
*/
public function get stepSize():Number
{
@@ -198,9 +198,10 @@ package org.apache.royale.jewel
_positioner = value;
}
-
/**
* @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement
+ * @royaleignorecoercion HTMLInputElement
+ * @royaleignorecoercion HTMLElement
*/
COMPILE::JS
override protected function createElement():WrappedHTMLElement
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/SliderMouseController.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/SliderMouseController.as
index eba83f9..d917514 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/SliderMouseController.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/SliderMouseController.as
@@ -18,7 +18,6 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.jewel.beads.controllers
{
- import org.apache.royale.collections.parsers.JSONInputParser;
import org.apache.royale.core.IBead;
import org.apache.royale.core.IBeadController;
import org.apache.royale.core.IRangeModel;
@@ -36,12 +35,12 @@ package org.apache.royale.jewel.beads.controllers
import goog.events;
import goog.events.EventType;
import org.apache.royale.events.BrowserEvent;
- import org.apache.royale.html.Slider;
+ import org.apache.royale.jewel.Slider;
}
/**
* The SliderMouseController class bead handles mouse events on the
- * org.apache.royale.html.Slider's component parts (thumb and track)
and
+ * org.apache.royale.jewel.Slider's component parts (thumb and track)
and
* dispatches change events on behalf of the Slider (as well as
co-ordinating visual
* changes (such as moving the thumb when the track has been tapped or
clicked). Use
* this controller for horizontally oriented Sliders.
@@ -49,7 +48,7 @@ package org.apache.royale.jewel.beads.controllers
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.0
+ * @productversion Royale 0.9.3
*/
public class SliderMouseController implements IBead, IBeadController
{
@@ -59,12 +58,20 @@ package org.apache.royale.jewel.beads.controllers
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.0
+ * @productversion Royale 0.9.3
*/
public function SliderMouseController()
{
}
+ /**
+ * Range model
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.3
+ */
private var rangeModel:IRangeModel;
private var _strand:IStrand;
@@ -77,7 +84,7 @@ package org.apache.royale.jewel.beads.controllers
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.0
+ * @productversion Royale 0.9.3
*/
public function set strand(value:IStrand):void
{
@@ -97,11 +104,7 @@ package org.apache.royale.jewel.beads.controllers
COMPILE::JS
{
var sliderView:ISliderView =
value.getBeadByType(ISliderView) as ISliderView;
- //track = sliderView.track as UIBase;
- //thumb = sliderView.thumb as UIBase;
- //goog.events.listen(track.element,
goog.events.EventType.CLICK, handleTrackClick, false, this);
- //goog.events.listen(thumb.element,
goog.events.EventType.MOUSEDOWN, handleThumbDown, false, this);
-
+
goog.events.listen(UIBase(_strand).element,
goog.events.EventType.CHANGE, handleChange, false, this);
goog.events.listen(UIBase(_strand).element,
goog.events.EventType.INPUT, handleInput, false, this);
}
@@ -113,7 +116,7 @@ package org.apache.royale.jewel.beads.controllers
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.8
+ * @productversion Royale 0.9.3
*/
COMPILE::JS
private function handleChange(event:BrowserEvent):void
@@ -131,7 +134,7 @@ package org.apache.royale.jewel.beads.controllers
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.8
+ * @productversion Royale 0.9.3
*/
COMPILE::JS
private function handleInput(event:BrowserEvent):void
@@ -140,15 +143,16 @@ package org.apache.royale.jewel.beads.controllers
rangeModel.value = Number((UIBase(_strand).element as
HTMLInputElement).value);
- //host.dispatchEvent(new org.apache.royale.events.Event('input'));
+ host.dispatchEvent(new org.apache.royale.events.Event('input'));
}
- /*COMPILE::JS
- private var track:UIBase;
-
- COMPILE::JS
- private var thumb:UIBase;
- */
+
+
+ COMPILE::SWF
+ private var origin:Point;
+ COMPILE::SWF
+ private var thumb:Point;
+
/**
* @private
*/
@@ -178,11 +182,6 @@ package org.apache.royale.jewel.beads.controllers
IEventDispatcher(_strand).dispatchEvent(vce);
}
- COMPILE::SWF
- private var origin:Point;
- COMPILE::SWF
- private var thumb:Point;
-
/**
* @private
*/
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalSliderLayout.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalSliderLayout.as
deleted file mode 100644
index 320a81b..0000000
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalSliderLayout.as
+++ /dev/null
@@ -1,144 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// 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.royale.jewel.beads.layouts
-{
- import org.apache.royale.core.IBeadLayout;
- 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.IEventDispatcher;
- import org.apache.royale.html.beads.ISliderView;
-
- /**
- * Use the HorizontalSliderLayout with a Slider to orient the Slider
- * horizontally.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9
- */
- public class HorizontalSliderLayout implements IBeadLayout
- {
- /**
- * Constructor
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9
- */
- public function HorizontalSliderLayout()
- {
- }
-
- private var _strand:IStrand;
-
- /**
- * @see org.apache.royale.core.IStrand
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9
- */
- public function set strand(value:IStrand):void
- {
- _strand = value;
-
- host.addEventListener("layoutNeeded", performLayout);
-
- host.addEventListener("widthChanged",performLayout);
- host.addEventListener("heightChanged",performLayout);
- }
-
- /**
- * @private
- */
- private function performLayout(event:Event):void
- {
- layout();
- }
-
- /**
- * @private
- */
- public function get host():UIBase
- {
- return _strand as UIBase;
- }
-
- /**
- * Performs the layout (size and positioning) of the elements
of the slider.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9
- */
- public function layout():Boolean
- {
- var viewBead:ISliderView = host.view as ISliderView;
- if (viewBead == null) {
- return false;
- }
-
- var useWidth:Number = host.width;
- if (isNaN(useWidth)) {
- useWidth = 100;
- }
- var useHeight:Number = host.height;
- if (isNaN(useHeight)) {
- useHeight = 25;
- }
- var square:Number = Math.min(useWidth, useHeight);
- var trackHeight:Number = useHeight / 3;
-
- // determine the thumb position from the model information
- var model:IRangeModel = host.model as IRangeModel;
- var value:Number = model.value;
- if (value < model.minimum) value = model.minimum;
- if (value > model.maximum) value = model.maximum;
- var p:Number =
(value-model.minimum)/(model.maximum-model.minimum);
- var xloc:Number = p * (useWidth - square);
-
- var thumb:IUIBase = viewBead.thumb as IUIBase;
- if(thumb != null) {
- thumb.width = square;
- thumb.height = square;
-
- thumb.x = xloc;
- thumb.y = 0;
- }
-
- var track:IUIBase = viewBead.track as IUIBase;
- if(track != null)
- {
- track.x = square/2;
- track.y = trackHeight; // 1/3 of the totalHeight
- track.width = useWidth - square;
- track.height = trackHeight;
- }
-
- return true;
- }
- }
-}
\ No newline at end of file
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/SliderRangeModel.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/SliderRangeModel.as
index bf52755..c7055a7 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/SliderRangeModel.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/SliderRangeModel.as
@@ -31,7 +31,7 @@ package org.apache.royale.jewel.beads.models
* It do not calculate any values for slider - just holds it.
*
* @langversion 3.0
- * @productversion Royale 0.8
+ * @productversion Royale 0.9.3
*/
public class SliderRangeModel extends EventDispatcher implements IBead,
IRangeModel
{
@@ -41,7 +41,7 @@ package org.apache.royale.jewel.beads.models
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.0
+ * @productversion Royale 0.9.3
*/
public function SliderRangeModel()
{
@@ -56,7 +56,7 @@ package org.apache.royale.jewel.beads.models
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.0
+ * @productversion Royale 0.9.3
*/
public function set strand(value:IStrand):void
{
@@ -73,7 +73,7 @@ package org.apache.royale.jewel.beads.models
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.0
+ * @productversion Royale 0.9.3
*/
public function get maximum():Number
{
@@ -99,7 +99,7 @@ package org.apache.royale.jewel.beads.models
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.0
+ * @productversion Royale 0.9.3
*/
public function get minimum():Number
{
@@ -125,7 +125,7 @@ package org.apache.royale.jewel.beads.models
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.0
+ * @productversion Royale 0.9.3
*/
public function get snapInterval():Number
{
@@ -151,7 +151,7 @@ package org.apache.royale.jewel.beads.models
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.0
+ * @productversion Royale 0.9.3
*/
public function get stepSize():Number
{
@@ -179,7 +179,7 @@ package org.apache.royale.jewel.beads.models
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.0
+ * @productversion Royale 0.9.3
*/
public function get value():Number
{
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/SliderThumbView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SliderThumbView.as
similarity index 94%
rename from
frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/SliderThumbView.as
rename to
frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SliderThumbView.as
index 4df51c8..829a5b4 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/SliderThumbView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SliderThumbView.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.jewel.beads
+package org.apache.royale.jewel.beads.views
{
import flash.display.Graphics;
import flash.display.Shape;
@@ -25,20 +25,20 @@ package org.apache.royale.jewel.beads
import org.apache.royale.core.BeadViewBase;
import org.apache.royale.core.IBeadView;
import org.apache.royale.core.IStrand;
- import org.apache.royale.html.Button;
+ import org.apache.royale.jewel.Button;
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.core.IChild;
/**
* The SliderThumbView class creates the draggable input element for
the
- * org.apache.royale.html.Slider component.
+ * org.apache.royale.jewel.Slider component.
*
* @viewbead
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.0
+ * @productversion Royale 0.9.3
*/
public class SliderThumbView extends BeadViewBase implements IBeadView
{
@@ -48,7 +48,7 @@ package org.apache.royale.jewel.beads
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.0
+ * @productversion Royale 0.9.3
*/
public function SliderThumbView()
{
@@ -80,7 +80,7 @@ package org.apache.royale.jewel.beads
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.0
+ * @productversion Royale 0.9.3
* @royaleignoreimport org.apache.royale.core.WrappedHTMLElement
* @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement
*/
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/SliderTrackView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SliderTrackView.as
similarity index 94%
rename from
frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/SliderTrackView.as
rename to
frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SliderTrackView.as
index a5e0410..c71f468 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/SliderTrackView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SliderTrackView.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.jewel.beads
+package org.apache.royale.jewel.beads.views
{
import flash.display.Graphics;
import flash.display.Shape;
@@ -26,20 +26,20 @@ package org.apache.royale.jewel.beads
import org.apache.royale.core.IBeadView;
import org.apache.royale.core.IStrand;
import org.apache.royale.core.UIBase;
- import org.apache.royale.html.Button;
+ import org.apache.royale.jewel.Button;
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.core.IChild;
/**
- * The SliderTrackView class creates the track area for the
org.apache.royale.html.Slider
+ * The SliderTrackView class creates the track area for the
org.apache.royale.jewel.Slider
* component.
*
* @viewbead
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.0
+ * @productversion Royale 0.9.3
*/
public class SliderTrackView extends BeadViewBase implements IBeadView
{
@@ -49,7 +49,7 @@ package org.apache.royale.jewel.beads
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.0
+ * @productversion Royale 0.9.3
*/
public function SliderTrackView()
{
@@ -81,7 +81,7 @@ package org.apache.royale.jewel.beads
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.0
+ * @productversion Royale 0.9.3
* @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement
*/
override public function set strand(value:IStrand):void
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/SliderView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SliderView.as
similarity index 93%
rename from
frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/SliderView.as
rename to
frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SliderView.as
index f61d500..963546b 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/SliderView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SliderView.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.jewel.beads
+package org.apache.royale.jewel.beads.views
{
COMPILE::SWF {
import flash.display.DisplayObject;
@@ -26,7 +26,6 @@ package org.apache.royale.jewel.beads
import org.apache.royale.html.beads.ISliderView;
import org.apache.royale.core.BeadViewBase;
import org.apache.royale.core.IBead;
- import org.apache.royale.core.IBeadLayout;
import org.apache.royale.core.IBeadModel;
import org.apache.royale.core.IBeadView;
import org.apache.royale.core.IRangeModel;
@@ -36,8 +35,7 @@ package org.apache.royale.jewel.beads
import org.apache.royale.core.ValuesManager;
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
- import org.apache.royale.html.Button;
- import org.apache.royale.html.TextButton;
+ import org.apache.royale.jewel.Button;
/**
* The SliderView class creates the visual elements of the
org.apache.royale.jewel.Slider
@@ -47,7 +45,7 @@ package org.apache.royale.jewel.beads
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.0
+ * @productversion Royale 0.9.3
*/
public class SliderView extends BeadViewBase implements ISliderView,
IBeadView
{
@@ -75,7 +73,7 @@ package org.apache.royale.jewel.beads
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.8
+ * @productversion Royale 0.9.3
*/
public function get track():IUIBase
{
@@ -88,7 +86,7 @@ package org.apache.royale.jewel.beads
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.8
+ * @productversion Royale 0.9.3
*/
public function get thumb():IUIBase
{
@@ -101,7 +99,7 @@ package org.apache.royale.jewel.beads
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.8
+ * @productversion Royale 0.9.3
*/
override public function set strand(value:IStrand):void
{
@@ -144,7 +142,7 @@ package org.apache.royale.jewel.beads
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.8
+ * @productversion Royale 0.9.3
*/
private function modelChangeHandler( event:Event ) : void
{
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/TextFieldView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/TextFieldView.as
similarity index 90%
rename from
frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/TextFieldView.as
rename to
frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/TextFieldView.as
index 884d8d6..4c8df5e 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/TextFieldView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/TextFieldView.as
@@ -16,8 +16,9 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.jewel.beads
+package org.apache.royale.jewel.beads.views
{
+ import org.apache.royale.html.beads.TextFieldViewBase
import flash.text.TextFieldType;
/**
@@ -29,7 +30,7 @@ package org.apache.royale.jewel.beads
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.0
+ * @productversion Royale 0.9.3
*/
public class TextFieldView extends TextFieldViewBase
{
@@ -39,7 +40,7 @@ package org.apache.royale.jewel.beads
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.0
+ * @productversion Royale 0.9.3
*/
public function TextFieldView()
{
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_slider.sass
b/frameworks/projects/Jewel/src/main/sass/components/_slider.sass
index a7440ab..cd89aa4 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_slider.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_slider.sass
@@ -24,8 +24,8 @@
j|Slider
IBeadModel:
ClassReference("org.apache.royale.jewel.beads.models.SliderRangeModel")
- IBeadView: ClassReference("org.apache.royale.jewel.beads.SliderView")
- IBeadLayout:
ClassReference("org.apache.royale.jewel.beads.layouts.HorizontalSliderLayout")
+ IBeadView:
ClassReference("org.apache.royale.jewel.beads.views.SliderView")
+ //IBeadLayout:
ClassReference("org.apache.royale.html.beads.layouts.HorizontalSliderLayout")
IBeadController:
ClassReference("org.apache.royale.jewel.beads.controllers.SliderMouseController")
.SliderTrack
@@ -37,6 +37,6 @@ j|Slider
@media -royale-swf
j|Slider
- iThumbView:
ClassReference("org.apache.royale.jewel.beads.SliderThumbView")
- iTrackView:
ClassReference("org.apache.royale.jewel.beads.SliderTrackView")
+ iThumbView:
ClassReference("org.apache.royale.jewel.beads.views.SliderThumbView")
+ iTrackView:
ClassReference("org.apache.royale.jewel.beads.views.SliderTrackView")
--
To stop receiving notification emails like this one, please contact
[email protected].
