You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by bi...@apache.org on 2014/10/14 02:15:17 UTC
git commit: [flex-asjs] [refs/heads/develop] - Fixed a few compile
errors that Flash Builder caught in FlexJSJX and FlexJSUI
Repository: flex-asjs
Updated Branches:
refs/heads/develop e25bb2223 -> 9b58dece2
Fixed a few compile errors that Flash Builder caught in FlexJSJX and FlexJSUI
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9b58dece
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9b58dece
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9b58dece
Branch: refs/heads/develop
Commit: 9b58dece2429f70e4ccec023c9d5dba67d58076c
Parents: e25bb22
Author: OmPrakash Muppirala <bi...@gmail.com>
Authored: Mon Oct 13 17:14:37 2014 -0700
Committer: OmPrakash Muppirala <bi...@gmail.com>
Committed: Mon Oct 13 17:14:37 2014 -0700
----------------------------------------------------------------------
.../charts/beads/ChartItemRendererFactory.as | 2 +-
.../apache/flex/html/beads/TitleBarView.mxml | 28 ++++++++++----------
.../apache/flex/html/beads/TextFieldViewBase.as | 5 ++++
.../beads/controllers/DragMouseController.as | 5 ++++
.../beads/controllers/DropMouseController.as | 7 ++++-
5 files changed, 31 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9b58dece/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartItemRendererFactory.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartItemRendererFactory.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartItemRendererFactory.as
index f62fb13..2909b03 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartItemRendererFactory.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartItemRendererFactory.as
@@ -116,7 +116,7 @@ package org.apache.flex.charts.beads
k.yField = s.yField;
//k.fillColor = s.fillColor;
k.data = dp[j];
- k.index = j;
+ //k.index = j;
renderers.push(k);
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9b58dece/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/TitleBarView.mxml
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/TitleBarView.mxml b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/TitleBarView.mxml
index d3abd05..60cae26 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/TitleBarView.mxml
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/TitleBarView.mxml
@@ -17,9 +17,9 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-<basic:MXMLBeadViewBase xmlns:fx="http://ns.adobe.com/mxml/2009"
+<core:MXMLBeadViewBase xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:basic="library://ns.apache.org/flexjs/basic"
- xmlns:mx="library://ns.adobe.com/flex/mx"
+ xmlns:mx="library://ns.adobe.com/flex/mx" xmlns:core="org.apache.flex.core.*" xmlns:html="org.apache.flex.html.*" xmlns:layouts="org.apache.flex.html.beads.layouts.*"
>
<fx:Script>
<![CDATA[
@@ -35,18 +35,18 @@ limitations under the License.
}
]]>
</fx:Script>
- <basic:beads>
- <basic:MXMLBeadViewBaseDataBinding />
- <basic:LayoutChangeNotifier watchedProperty="{ITitleBarModel(model).title}" />
- </basic:beads>
+ <core:beads>
+ <core:MXMLBeadViewBaseDataBinding />
+ <layouts:LayoutChangeNotifier watchedProperty="{ITitleBarModel(model).title}" />
+ </core:beads>
- <basic:Label id="titleLabel" text="{ITitleBarModel(model).title}" >
- <basic:style>
- <basic:SimpleCSSStyles fontWeight="inherit" />
- </basic:style>
- </basic:Label>
- <basic:CloseButton id="closeButton" click="clickHandler()"
- visible="{ITitleBarModel(model).showCloseButton}";
+ <html:Label id="titleLabel" text="{ITitleBarModel(model).title}" >
+ <html:style>
+ <core:SimpleCSSStyles fontWeight="inherit" />
+ </html:style>
+ </html:Label>
+ <html:CloseButton id="closeButton" click="clickHandler()"
+ visible="{ITitleBarModel(model).showCloseButton}"
/>
-</basic:MXMLBeadViewBase>
+</core:MXMLBeadViewBase>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9b58dece/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldViewBase.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldViewBase.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldViewBase.as
index bf361ef..7e40a44 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldViewBase.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldViewBase.as
@@ -97,6 +97,11 @@ package org.apache.flex.html.beads
if (_textModel.html !== null)
html = _textModel.html;
}
+
+ public function get strand():IStrand
+ {
+ return _strand;
+ }
/**
* @private
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9b58dece/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/DragMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/DragMouseController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/DragMouseController.as
index 3fcdfc5..f9e4b7e 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/DragMouseController.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/DragMouseController.as
@@ -156,6 +156,11 @@ package org.apache.flex.html.beads.controllers
IEventDispatcher(_strand).addEventListener(MouseEvent.MOUSE_DOWN, dragMouseDownHandler);
}
+
+ public function get strand():IStrand
+ {
+ return _strand;
+ }
private var mouseDownX:Number;
private var mouseDownY:Number;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9b58dece/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/DropMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/DropMouseController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/DropMouseController.as
index 6ddc3f0..9793e83 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/DropMouseController.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/DropMouseController.as
@@ -26,7 +26,7 @@ package org.apache.flex.html.beads.controllers
import org.apache.flex.core.IStrand;
import org.apache.flex.core.UIBase;
import org.apache.flex.events.DragEvent;
- import org.apache.flex.events.EventDispatcher;
+ import org.apache.flex.events.EventDispatcher;
import org.apache.flex.events.IEventDispatcher;
/**
@@ -100,6 +100,11 @@ package org.apache.flex.html.beads.controllers
IEventDispatcher(_strand).addEventListener(DragEvent.DRAG_MOVE, dragMoveHandler);
}
+
+ public function get strand():IStrand
+ {
+ return _strand;
+ }
private var inside:Boolean;
Re: git commit: [flex-asjs] [refs/heads/develop] - Fixed a few
compile errors that Flash Builder caught in FlexJSJX and FlexJSUI
Posted by OmPrakash Muppirala <bi...@gmail.com>.
Sorry, I don't remember the exact errors. It might have occurred when I was
switching between the FlexJS installation vs. flex-asjs compilations.
Please revert the changes you think were unnecessary. I will see if I can
reproduce the errors.
Thanks,
Om
On Thu, Oct 16, 2014 at 11:27 PM, Alex Harui <ah...@adobe.com> wrote:
> Om, what errors were coming from TitleBarView? It shouldn’t have been
> necessary to make those changes.
>
> -Alex
>
> On 10/13/14, 5:15 PM, "bigosmallm@apache.org" <bi...@apache.org>
> wrote:
>
> >Repository: flex-asjs
> >Updated Branches:
> > refs/heads/develop e25bb2223 -> 9b58dece2
> >
> >
> >Fixed a few compile errors that Flash Builder caught in FlexJSJX and
> >FlexJSUI
> >
> >
> >Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
> >Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9b58dece
> >Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9b58dece
> >Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9b58dece
> >
> >Branch: refs/heads/develop
> >Commit: 9b58dece2429f70e4ccec023c9d5dba67d58076c
> >Parents: e25bb22
> >Author: OmPrakash Muppirala <bi...@gmail.com>
> >Authored: Mon Oct 13 17:14:37 2014 -0700
> >Committer: OmPrakash Muppirala <bi...@gmail.com>
> >Committed: Mon Oct 13 17:14:37 2014 -0700
> >
> >----------------------------------------------------------------------
> > .../charts/beads/ChartItemRendererFactory.as | 2 +-
> > .../apache/flex/html/beads/TitleBarView.mxml | 28 ++++++++++----------
> > .../apache/flex/html/beads/TextFieldViewBase.as | 5 ++++
> > .../beads/controllers/DragMouseController.as | 5 ++++
> > .../beads/controllers/DropMouseController.as | 7 ++++-
> > 5 files changed, 31 insertions(+), 16 deletions(-)
> >----------------------------------------------------------------------
> >
> >
> >
> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9b58dece/frameworks/
> >as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartItemRendererFac
> >tory.as
> >----------------------------------------------------------------------
> >diff --git
> >a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartIt
> >emRendererFactory.as
> >b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartIt
> >emRendererFactory.as
> >index f62fb13..2909b03 100644
> >---
> >a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartIt
> >emRendererFactory.as
> >+++
> >b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartIt
> >emRendererFactory.as
> >@@ -116,7 +116,7 @@ package org.apache.flex.charts.beads
> > k.yField = s.yField;
> > //k.fillColor = s.fillColor;
> > k.data = dp[j];
> >- k.index = j;
> >+ //k.index = j;
> >
> > renderers.push(k);
> >
> >
> >
> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9b58dece/frameworks/
> >as/projects/FlexJSJX/src/org/apache/flex/html/beads/TitleBarView.mxml
> >----------------------------------------------------------------------
> >diff --git
> >a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/TitleBarV
> >iew.mxml
> >b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/TitleBarV
> >iew.mxml
> >index d3abd05..60cae26 100644
> >---
> >a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/TitleBarV
> >iew.mxml
> >+++
> >b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/TitleBarV
> >iew.mxml
> >@@ -17,9 +17,9 @@ See the License for the specific language governing
> >permissions and
> > limitations under the License.
> >
> > -->
> >-<basic:MXMLBeadViewBase xmlns:fx="http://ns.adobe.com/mxml/2009"
> >+<core:MXMLBeadViewBase xmlns:fx="http://ns.adobe.com/mxml/2009"
> > xmlns:basic="library://ns.apache.org/flexjs/basic"
> >- xmlns:mx="library://ns.adobe.com/flex/mx"
> >+ xmlns:mx="library://ns.adobe.com/flex/mx"
> >xmlns:core="org.apache.flex.core.*" xmlns:html="org.apache.flex.html.*"
> >xmlns:layouts="org.apache.flex.html.beads.layouts.*"
> > >
> > <fx:Script>
> > <![CDATA[
> >@@ -35,18 +35,18 @@ limitations under the License.
> > }
> > ]]>
> > </fx:Script>
> >- <basic:beads>
> >- <basic:MXMLBeadViewBaseDataBinding />
> >- <basic:LayoutChangeNotifier
> >watchedProperty="{ITitleBarModel(model).title}" />
> >- </basic:beads>
> >+ <core:beads>
> >+ <core:MXMLBeadViewBaseDataBinding />
> >+ <layouts:LayoutChangeNotifier
> >watchedProperty="{ITitleBarModel(model).title}" />
> >+ </core:beads>
> >
> >- <basic:Label id="titleLabel" text="{ITitleBarModel(model).title}" >
> >- <basic:style>
> >- <basic:SimpleCSSStyles fontWeight="inherit" />
> >- </basic:style>
> >- </basic:Label>
> >- <basic:CloseButton id="closeButton" click="clickHandler()"
> >- visible="{ITitleBarModel(model).showCloseButton}";
> >+ <html:Label id="titleLabel" text="{ITitleBarModel(model).title}" >
> >+ <html:style>
> >+ <core:SimpleCSSStyles fontWeight="inherit" />
> >+ </html:style>
> >+ </html:Label>
> >+ <html:CloseButton id="closeButton" click="clickHandler()"
> >+ visible="{ITitleBarModel(model).showCloseButton}"
> > />
> >
> >-</basic:MXMLBeadViewBase>
> >+</core:MXMLBeadViewBase>
> >
> >
> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9b58dece/frameworks/
> >as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldViewBase.as
> >----------------------------------------------------------------------
> >diff --git
> >a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextField
> >ViewBase.as
> >b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextField
> >ViewBase.as
> >index bf361ef..7e40a44 100644
> >---
> >a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextField
> >ViewBase.as
> >+++
> >b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextField
> >ViewBase.as
> >@@ -97,6 +97,11 @@ package org.apache.flex.html.beads
> > if (_textModel.html !== null)
> > html = _textModel.html;
> > }
> >+
> >+ public function get strand():IStrand
> >+ {
> >+ return _strand;
> >+ }
> >
> > /**
> > * @private
> >
> >
> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9b58dece/frameworks/
> >as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/DragMouseC
> >ontroller.as
> >----------------------------------------------------------------------
> >diff --git
> >a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controlle
> >rs/DragMouseController.as
> >b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controlle
> >rs/DragMouseController.as
> >index 3fcdfc5..f9e4b7e 100644
> >---
> >a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controlle
> >rs/DragMouseController.as
> >+++
> >b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controlle
> >rs/DragMouseController.as
> >@@ -156,6 +156,11 @@ package org.apache.flex.html.beads.controllers
> >
> >
> >IEventDispatcher(_strand).addEventListener(MouseEvent.MOUSE_DOWN,
> >dragMouseDownHandler);
> > }
> >+
> >+ public function get strand():IStrand
> >+ {
> >+ return _strand;
> >+ }
> >
> > private var mouseDownX:Number;
> > private var mouseDownY:Number;
> >
> >
> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9b58dece/frameworks/
> >as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/DropMouseC
> >ontroller.as
> >----------------------------------------------------------------------
> >diff --git
> >a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controlle
> >rs/DropMouseController.as
> >b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controlle
> >rs/DropMouseController.as
> >index 6ddc3f0..9793e83 100644
> >---
> >a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controlle
> >rs/DropMouseController.as
> >+++
> >b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controlle
> >rs/DropMouseController.as
> >@@ -26,7 +26,7 @@ package org.apache.flex.html.beads.controllers
> > import org.apache.flex.core.IStrand;
> > import org.apache.flex.core.UIBase;
> > import org.apache.flex.events.DragEvent;
> >- import org.apache.flex.events.EventDispatcher;
> >+ import org.apache.flex.events.EventDispatcher;
> > import org.apache.flex.events.IEventDispatcher;
> >
> > /**
> >@@ -100,6 +100,11 @@ package org.apache.flex.html.beads.controllers
> >
> >
> >IEventDispatcher(_strand).addEventListener(DragEvent.DRAG_MOVE,
> >dragMoveHandler);
> > }
> >+
> >+ public function get strand():IStrand
> >+ {
> >+ return _strand;
> >+ }
> >
> > private var inside:Boolean;
> >
> >
>
>
Re: git commit: [flex-asjs] [refs/heads/develop] - Fixed a few
compile errors that Flash Builder caught in FlexJSJX and FlexJSUI
Posted by Alex Harui <ah...@adobe.com>.
Om, what errors were coming from TitleBarView? It shouldn’t have been
necessary to make those changes.
-Alex
On 10/13/14, 5:15 PM, "bigosmallm@apache.org" <bi...@apache.org>
wrote:
>Repository: flex-asjs
>Updated Branches:
> refs/heads/develop e25bb2223 -> 9b58dece2
>
>
>Fixed a few compile errors that Flash Builder caught in FlexJSJX and
>FlexJSUI
>
>
>Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
>Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9b58dece
>Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9b58dece
>Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9b58dece
>
>Branch: refs/heads/develop
>Commit: 9b58dece2429f70e4ccec023c9d5dba67d58076c
>Parents: e25bb22
>Author: OmPrakash Muppirala <bi...@gmail.com>
>Authored: Mon Oct 13 17:14:37 2014 -0700
>Committer: OmPrakash Muppirala <bi...@gmail.com>
>Committed: Mon Oct 13 17:14:37 2014 -0700
>
>----------------------------------------------------------------------
> .../charts/beads/ChartItemRendererFactory.as | 2 +-
> .../apache/flex/html/beads/TitleBarView.mxml | 28 ++++++++++----------
> .../apache/flex/html/beads/TextFieldViewBase.as | 5 ++++
> .../beads/controllers/DragMouseController.as | 5 ++++
> .../beads/controllers/DropMouseController.as | 7 ++++-
> 5 files changed, 31 insertions(+), 16 deletions(-)
>----------------------------------------------------------------------
>
>
>http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9b58dece/frameworks/
>as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartItemRendererFac
>tory.as
>----------------------------------------------------------------------
>diff --git
>a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartIt
>emRendererFactory.as
>b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartIt
>emRendererFactory.as
>index f62fb13..2909b03 100644
>---
>a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartIt
>emRendererFactory.as
>+++
>b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartIt
>emRendererFactory.as
>@@ -116,7 +116,7 @@ package org.apache.flex.charts.beads
> k.yField = s.yField;
> //k.fillColor = s.fillColor;
> k.data = dp[j];
>- k.index = j;
>+ //k.index = j;
>
> renderers.push(k);
>
>
>http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9b58dece/frameworks/
>as/projects/FlexJSJX/src/org/apache/flex/html/beads/TitleBarView.mxml
>----------------------------------------------------------------------
>diff --git
>a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/TitleBarV
>iew.mxml
>b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/TitleBarV
>iew.mxml
>index d3abd05..60cae26 100644
>---
>a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/TitleBarV
>iew.mxml
>+++
>b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/TitleBarV
>iew.mxml
>@@ -17,9 +17,9 @@ See the License for the specific language governing
>permissions and
> limitations under the License.
>
> -->
>-<basic:MXMLBeadViewBase xmlns:fx="http://ns.adobe.com/mxml/2009"
>+<core:MXMLBeadViewBase xmlns:fx="http://ns.adobe.com/mxml/2009"
> xmlns:basic="library://ns.apache.org/flexjs/basic"
>- xmlns:mx="library://ns.adobe.com/flex/mx"
>+ xmlns:mx="library://ns.adobe.com/flex/mx"
>xmlns:core="org.apache.flex.core.*" xmlns:html="org.apache.flex.html.*"
>xmlns:layouts="org.apache.flex.html.beads.layouts.*"
> >
> <fx:Script>
> <![CDATA[
>@@ -35,18 +35,18 @@ limitations under the License.
> }
> ]]>
> </fx:Script>
>- <basic:beads>
>- <basic:MXMLBeadViewBaseDataBinding />
>- <basic:LayoutChangeNotifier
>watchedProperty="{ITitleBarModel(model).title}" />
>- </basic:beads>
>+ <core:beads>
>+ <core:MXMLBeadViewBaseDataBinding />
>+ <layouts:LayoutChangeNotifier
>watchedProperty="{ITitleBarModel(model).title}" />
>+ </core:beads>
>
>- <basic:Label id="titleLabel" text="{ITitleBarModel(model).title}" >
>- <basic:style>
>- <basic:SimpleCSSStyles fontWeight="inherit" />
>- </basic:style>
>- </basic:Label>
>- <basic:CloseButton id="closeButton" click="clickHandler()"
>- visible="{ITitleBarModel(model).showCloseButton}";
>+ <html:Label id="titleLabel" text="{ITitleBarModel(model).title}" >
>+ <html:style>
>+ <core:SimpleCSSStyles fontWeight="inherit" />
>+ </html:style>
>+ </html:Label>
>+ <html:CloseButton id="closeButton" click="clickHandler()"
>+ visible="{ITitleBarModel(model).showCloseButton}"
> />
>
>-</basic:MXMLBeadViewBase>
>+</core:MXMLBeadViewBase>
>
>http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9b58dece/frameworks/
>as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldViewBase.as
>----------------------------------------------------------------------
>diff --git
>a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextField
>ViewBase.as
>b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextField
>ViewBase.as
>index bf361ef..7e40a44 100644
>---
>a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextField
>ViewBase.as
>+++
>b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextField
>ViewBase.as
>@@ -97,6 +97,11 @@ package org.apache.flex.html.beads
> if (_textModel.html !== null)
> html = _textModel.html;
> }
>+
>+ public function get strand():IStrand
>+ {
>+ return _strand;
>+ }
>
> /**
> * @private
>
>http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9b58dece/frameworks/
>as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/DragMouseC
>ontroller.as
>----------------------------------------------------------------------
>diff --git
>a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controlle
>rs/DragMouseController.as
>b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controlle
>rs/DragMouseController.as
>index 3fcdfc5..f9e4b7e 100644
>---
>a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controlle
>rs/DragMouseController.as
>+++
>b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controlle
>rs/DragMouseController.as
>@@ -156,6 +156,11 @@ package org.apache.flex.html.beads.controllers
>
>
>IEventDispatcher(_strand).addEventListener(MouseEvent.MOUSE_DOWN,
>dragMouseDownHandler);
> }
>+
>+ public function get strand():IStrand
>+ {
>+ return _strand;
>+ }
>
> private var mouseDownX:Number;
> private var mouseDownY:Number;
>
>http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9b58dece/frameworks/
>as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/DropMouseC
>ontroller.as
>----------------------------------------------------------------------
>diff --git
>a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controlle
>rs/DropMouseController.as
>b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controlle
>rs/DropMouseController.as
>index 6ddc3f0..9793e83 100644
>---
>a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controlle
>rs/DropMouseController.as
>+++
>b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controlle
>rs/DropMouseController.as
>@@ -26,7 +26,7 @@ package org.apache.flex.html.beads.controllers
> import org.apache.flex.core.IStrand;
> import org.apache.flex.core.UIBase;
> import org.apache.flex.events.DragEvent;
>- import org.apache.flex.events.EventDispatcher;
>+ import org.apache.flex.events.EventDispatcher;
> import org.apache.flex.events.IEventDispatcher;
>
> /**
>@@ -100,6 +100,11 @@ package org.apache.flex.html.beads.controllers
>
>
>IEventDispatcher(_strand).addEventListener(DragEvent.DRAG_MOVE,
>dragMoveHandler);
> }
>+
>+ public function get strand():IStrand
>+ {
>+ return _strand;
>+ }
>
> private var inside:Boolean;
>
>
Re: git commit: [flex-asjs] [refs/heads/develop] - Fixed a few
compile errors that Flash Builder caught in FlexJSJX and FlexJSUI
Posted by Alex Harui <ah...@adobe.com>.
Om, what errors were coming from TitleBarView? It shouldn’t have been
necessary to make those changes.
-Alex
On 10/13/14, 5:15 PM, "bigosmallm@apache.org" <bi...@apache.org>
wrote:
>Repository: flex-asjs
>Updated Branches:
> refs/heads/develop e25bb2223 -> 9b58dece2
>
>
>Fixed a few compile errors that Flash Builder caught in FlexJSJX and
>FlexJSUI
>
>
>Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
>Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9b58dece
>Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9b58dece
>Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9b58dece
>
>Branch: refs/heads/develop
>Commit: 9b58dece2429f70e4ccec023c9d5dba67d58076c
>Parents: e25bb22
>Author: OmPrakash Muppirala <bi...@gmail.com>
>Authored: Mon Oct 13 17:14:37 2014 -0700
>Committer: OmPrakash Muppirala <bi...@gmail.com>
>Committed: Mon Oct 13 17:14:37 2014 -0700
>
>----------------------------------------------------------------------
> .../charts/beads/ChartItemRendererFactory.as | 2 +-
> .../apache/flex/html/beads/TitleBarView.mxml | 28 ++++++++++----------
> .../apache/flex/html/beads/TextFieldViewBase.as | 5 ++++
> .../beads/controllers/DragMouseController.as | 5 ++++
> .../beads/controllers/DropMouseController.as | 7 ++++-
> 5 files changed, 31 insertions(+), 16 deletions(-)
>----------------------------------------------------------------------
>
>
>http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9b58dece/frameworks/
>as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartItemRendererFac
>tory.as
>----------------------------------------------------------------------
>diff --git
>a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartIt
>emRendererFactory.as
>b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartIt
>emRendererFactory.as
>index f62fb13..2909b03 100644
>---
>a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartIt
>emRendererFactory.as
>+++
>b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartIt
>emRendererFactory.as
>@@ -116,7 +116,7 @@ package org.apache.flex.charts.beads
> k.yField = s.yField;
> //k.fillColor = s.fillColor;
> k.data = dp[j];
>- k.index = j;
>+ //k.index = j;
>
> renderers.push(k);
>
>
>http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9b58dece/frameworks/
>as/projects/FlexJSJX/src/org/apache/flex/html/beads/TitleBarView.mxml
>----------------------------------------------------------------------
>diff --git
>a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/TitleBarV
>iew.mxml
>b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/TitleBarV
>iew.mxml
>index d3abd05..60cae26 100644
>---
>a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/TitleBarV
>iew.mxml
>+++
>b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/TitleBarV
>iew.mxml
>@@ -17,9 +17,9 @@ See the License for the specific language governing
>permissions and
> limitations under the License.
>
> -->
>-<basic:MXMLBeadViewBase xmlns:fx="http://ns.adobe.com/mxml/2009"
>+<core:MXMLBeadViewBase xmlns:fx="http://ns.adobe.com/mxml/2009"
> xmlns:basic="library://ns.apache.org/flexjs/basic"
>- xmlns:mx="library://ns.adobe.com/flex/mx"
>+ xmlns:mx="library://ns.adobe.com/flex/mx"
>xmlns:core="org.apache.flex.core.*" xmlns:html="org.apache.flex.html.*"
>xmlns:layouts="org.apache.flex.html.beads.layouts.*"
> >
> <fx:Script>
> <![CDATA[
>@@ -35,18 +35,18 @@ limitations under the License.
> }
> ]]>
> </fx:Script>
>- <basic:beads>
>- <basic:MXMLBeadViewBaseDataBinding />
>- <basic:LayoutChangeNotifier
>watchedProperty="{ITitleBarModel(model).title}" />
>- </basic:beads>
>+ <core:beads>
>+ <core:MXMLBeadViewBaseDataBinding />
>+ <layouts:LayoutChangeNotifier
>watchedProperty="{ITitleBarModel(model).title}" />
>+ </core:beads>
>
>- <basic:Label id="titleLabel" text="{ITitleBarModel(model).title}" >
>- <basic:style>
>- <basic:SimpleCSSStyles fontWeight="inherit" />
>- </basic:style>
>- </basic:Label>
>- <basic:CloseButton id="closeButton" click="clickHandler()"
>- visible="{ITitleBarModel(model).showCloseButton}";
>+ <html:Label id="titleLabel" text="{ITitleBarModel(model).title}" >
>+ <html:style>
>+ <core:SimpleCSSStyles fontWeight="inherit" />
>+ </html:style>
>+ </html:Label>
>+ <html:CloseButton id="closeButton" click="clickHandler()"
>+ visible="{ITitleBarModel(model).showCloseButton}"
> />
>
>-</basic:MXMLBeadViewBase>
>+</core:MXMLBeadViewBase>
>
>http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9b58dece/frameworks/
>as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldViewBase.as
>----------------------------------------------------------------------
>diff --git
>a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextField
>ViewBase.as
>b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextField
>ViewBase.as
>index bf361ef..7e40a44 100644
>---
>a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextField
>ViewBase.as
>+++
>b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextField
>ViewBase.as
>@@ -97,6 +97,11 @@ package org.apache.flex.html.beads
> if (_textModel.html !== null)
> html = _textModel.html;
> }
>+
>+ public function get strand():IStrand
>+ {
>+ return _strand;
>+ }
>
> /**
> * @private
>
>http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9b58dece/frameworks/
>as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/DragMouseC
>ontroller.as
>----------------------------------------------------------------------
>diff --git
>a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controlle
>rs/DragMouseController.as
>b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controlle
>rs/DragMouseController.as
>index 3fcdfc5..f9e4b7e 100644
>---
>a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controlle
>rs/DragMouseController.as
>+++
>b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controlle
>rs/DragMouseController.as
>@@ -156,6 +156,11 @@ package org.apache.flex.html.beads.controllers
>
>
>IEventDispatcher(_strand).addEventListener(MouseEvent.MOUSE_DOWN,
>dragMouseDownHandler);
> }
>+
>+ public function get strand():IStrand
>+ {
>+ return _strand;
>+ }
>
> private var mouseDownX:Number;
> private var mouseDownY:Number;
>
>http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9b58dece/frameworks/
>as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/DropMouseC
>ontroller.as
>----------------------------------------------------------------------
>diff --git
>a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controlle
>rs/DropMouseController.as
>b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controlle
>rs/DropMouseController.as
>index 6ddc3f0..9793e83 100644
>---
>a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controlle
>rs/DropMouseController.as
>+++
>b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controlle
>rs/DropMouseController.as
>@@ -26,7 +26,7 @@ package org.apache.flex.html.beads.controllers
> import org.apache.flex.core.IStrand;
> import org.apache.flex.core.UIBase;
> import org.apache.flex.events.DragEvent;
>- import org.apache.flex.events.EventDispatcher;
>+ import org.apache.flex.events.EventDispatcher;
> import org.apache.flex.events.IEventDispatcher;
>
> /**
>@@ -100,6 +100,11 @@ package org.apache.flex.html.beads.controllers
>
>
>IEventDispatcher(_strand).addEventListener(DragEvent.DRAG_MOVE,
>dragMoveHandler);
> }
>+
>+ public function get strand():IStrand
>+ {
>+ return _strand;
>+ }
>
> private var inside:Boolean;
>
>