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 2017/08/07 21:54:22 UTC
git commit: [flex-asjs] [refs/heads/develop] - Revert "Only layout if
visible"
Repository: flex-asjs
Updated Branches:
refs/heads/develop 42db76613 -> c874c8e1e
Revert "Only layout if visible"
This reverts commit a9e7458c505fdd1731068b3888a649035934c171.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c874c8e1
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c874c8e1
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c874c8e1
Branch: refs/heads/develop
Commit: c874c8e1ed1e6a3786e04b9629b387f84d4ba250
Parents: 42db766
Author: Harbs <ha...@in-tools.com>
Authored: Tue Aug 8 00:09:45 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Tue Aug 8 00:09:45 2017 +0300
----------------------------------------------------------------------
.../src/main/flex/org/apache/flex/core/LayoutBase.as | 2 --
.../flex/org/apache/flex/html/beads/ScrollBarView.as | 3 +--
.../apache/flex/html/beads/layouts/DataGridLayout.as | 10 +---------
.../flex/html/beads/layouts/DataGridPercentageLayout.as | 12 ++----------
.../src/main/flex/org/apache/flex/express/Container.as | 9 ++++-----
5 files changed, 8 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c874c8e1/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/LayoutBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/LayoutBase.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/LayoutBase.as
index 6c4f2f2..7bc5ab0 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/LayoutBase.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/LayoutBase.as
@@ -316,8 +316,6 @@ package org.apache.flex.core
*/
public function performLayout():void
{
- if(!host.visible)
- return;
// avoid running this layout instance recursively.
if (isLayoutRunning) return;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c874c8e1/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/ScrollBarView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/ScrollBarView.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/ScrollBarView.as
index e290ba7..41ef624 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/ScrollBarView.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/ScrollBarView.as
@@ -116,8 +116,7 @@ package org.apache.flex.html.beads
sbModel.addEventListener("stepSizeChange", changeHandler);
sbModel.addEventListener("pageSizeChange", changeHandler);
sbModel.addEventListener("valueChange", changeHandler);
- (value as IEventDispatcher).addEventListener("show", changeHandler);
-
+
if( _strand.getBeadByType(IBeadLayout) == null ) {
layout = new (ValuesManager.valuesImpl.getValue(_strand, "iBeadLayout")) as IBeadLayout;
_strand.addBead(layout);
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c874c8e1/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/DataGridLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/DataGridLayout.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/DataGridLayout.as
index e3c4624..fe4ccab 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/DataGridLayout.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/DataGridLayout.as
@@ -67,7 +67,6 @@ package org.apache.flex.html.beads.layouts
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
- * @flexjsignorecoercion org.apache.flex.core.UIBase
*/
public function set strand(value:IStrand):void
{
@@ -106,12 +105,9 @@ package org.apache.flex.html.beads.layouts
{
return _header;
}
- /**
- * @flexjsignorecoercion org.apache.flex.core.UIBase
- */
public function set header(value:IUIBase):void
{
- _header = (value as UIBase);
+ _header = UIBase(value);
}
private var _columns:Array;
@@ -146,7 +142,6 @@ package org.apache.flex.html.beads.layouts
/**
* @copy org.apache.flex.core.IBeadLayout#layout
- * @flexjsignorecoercion org.apache.flex.core.UIBase
*/
public function layout():Boolean
{
@@ -207,12 +202,9 @@ package org.apache.flex.html.beads.layouts
/**
* @private
- * @flexjsignorecoercion org.apache.flex.core.UIBase
*/
private function handleSizeChanges(event:Event):void
{
- if(!(_strand as UIBase).visible)
- return;
var view:DataGridView = UIBase(_strand).view as DataGridView;
if (view == null) return;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c874c8e1/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/DataGridPercentageLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/DataGridPercentageLayout.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/DataGridPercentageLayout.as
index a8195d5..7459a24 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/DataGridPercentageLayout.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/DataGridPercentageLayout.as
@@ -66,7 +66,6 @@ package org.apache.flex.html.beads.layouts
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
- * @flexjsignorecoercion org.apache.flex.core.UIBase
*/
public function set strand(value:IStrand):void
{
@@ -105,12 +104,9 @@ package org.apache.flex.html.beads.layouts
{
return _header;
}
- /**
- * @flexjsignorecoercion org.apache.flex.core.UIBase
- */
public function set header(value:IUIBase):void
{
- _header = value as UIBase;
+ _header = UIBase(value);
}
private var _columns:Array;
@@ -145,7 +141,6 @@ package org.apache.flex.html.beads.layouts
/**
* @copy org.apache.flex.core.IBeadLayout#layout
- * @flexjsignorecoercion org.apache.flex.core.UIBase
*/
public function layout():Boolean
{
@@ -215,13 +210,10 @@ package org.apache.flex.html.beads.layouts
/**
* @private
- * @flexjsignorecoercion org.apache.flex.core.UIBase
*/
private function handleSizeChanges(event:Event):void
{
- if(!(_strand as UIBase).visible)
- return;
- var view:DataGridView = (_strand as UIBase).view as DataGridView;
+ var view:DataGridView = UIBase(_strand).view as DataGridView;
if (view == null) return;
columns = view.columnLists;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c874c8e1/frameworks/projects/Express/src/main/flex/org/apache/flex/express/Container.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Express/src/main/flex/org/apache/flex/express/Container.as b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/Container.as
index 5316c8c..27e2b08 100644
--- a/frameworks/projects/Express/src/main/flex/org/apache/flex/express/Container.as
+++ b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/Container.as
@@ -19,15 +19,15 @@
package org.apache.flex.express
{
import org.apache.flex.binding.ContainerDataBinding;
- import org.apache.flex.core.BindableCSSStyles;
- import org.apache.flex.core.StyleChangeNotifier;
import org.apache.flex.html.Container;
- import org.apache.flex.html.beads.layouts.LayoutOnShow;
import org.apache.flex.html.supportClasses.ScrollingViewport;
+ import org.apache.flex.core.BindableCSSStyles;
+ import org.apache.flex.core.StyleChangeNotifier;
+
COMPILE::SWF {
- import org.apache.flex.html.beads.SingleLineBorderWithChangeListenerBead;
import org.apache.flex.html.beads.SolidBackgroundWithChangeListenerBead;
+ import org.apache.flex.html.beads.SingleLineBorderWithChangeListenerBead;
}
/**
@@ -48,7 +48,6 @@ package org.apache.flex.express
addBead(new ContainerDataBinding());
addBead(new ScrollingViewport());
addBead(new StyleChangeNotifier());
- addBead(new LayoutOnShow());
COMPILE::SWF {
addBead(new SolidBackgroundWithChangeListenerBead());