You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2015/09/10 23:35:46 UTC
[1/9] git commit: [flex-asjs] [refs/heads/develop] - absorb errors
Repository: flex-asjs
Updated Branches:
refs/heads/develop 9e5abdf50 -> cc7f0d01b
absorb errors
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8592a204
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8592a204
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8592a204
Branch: refs/heads/develop
Commit: 8592a204b6aa85ff685b597931f83a76cd47b5c0
Parents: 2e43d44
Author: Alex Harui <ah...@apache.org>
Authored: Thu Sep 10 14:08:07 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Sep 10 14:14:16 2015 -0700
----------------------------------------------------------------------
.../Binding/js/src/org/apache/flex/binding/SimpleBinding.js | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8592a204/frameworks/projects/Binding/js/src/org/apache/flex/binding/SimpleBinding.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/js/src/org/apache/flex/binding/SimpleBinding.js b/frameworks/projects/Binding/js/src/org/apache/flex/binding/SimpleBinding.js
index cac627d..4846f06 100644
--- a/frameworks/projects/Binding/js/src/org/apache/flex/binding/SimpleBinding.js
+++ b/frameworks/projects/Binding/js/src/org/apache/flex/binding/SimpleBinding.js
@@ -51,8 +51,11 @@ org.apache.flex.binding.SimpleBinding.prototype.eventName = '';
* @export
*/
org.apache.flex.binding.SimpleBinding.prototype.changeHandler = function() {
- this.destination[this.destinationPropertyName] =
- this.source[this.sourcePropertyName];
+ try {
+ this.destination[this.destinationPropertyName] =
+ this.source[this.sourcePropertyName];
+ }
+ catch (e) {}
};
[8/9] git commit: [flex-asjs] [refs/heads/develop] - labelfield in
dropdownlist
Posted by ah...@apache.org.
labelfield in dropdownlist
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b5a5a4eb
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b5a5a4eb
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b5a5a4eb
Branch: refs/heads/develop
Commit: b5a5a4eb89e7de72c3c92fb03dcf634dca2ca1be
Parents: 00f22de
Author: Alex Harui <ah...@apache.org>
Authored: Thu Sep 10 14:11:54 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Sep 10 14:14:18 2015 -0700
----------------------------------------------------------------------
.../apache/flex/flat/beads/DropDownListView.as | 10 ++++--
.../js/src/org/apache/flex/flat/DropDownList.js | 32 ++++++++++++++++++--
.../as/src/org/apache/flex/html/DropDownList.as | 18 +++++++++++
.../apache/flex/html/beads/DropDownListView.as | 8 ++++-
.../TextItemRendererFactoryForArrayData.as | 5 ++-
.../beads/controllers/DropDownListController.as | 1 +
.../html/beads/models/ArraySelectionModel.as | 4 ++-
.../js/src/org/apache/flex/html/DropDownList.js | 22 ++++++++++++--
.../html/beads/models/ArraySelectionModel.js | 2 ++
9 files changed, 92 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b5a5a4eb/frameworks/projects/Flat/as/src/org/apache/flex/flat/beads/DropDownListView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/as/src/org/apache/flex/flat/beads/DropDownListView.as b/frameworks/projects/Flat/as/src/org/apache/flex/flat/beads/DropDownListView.as
index 3d7d838..f7357b9 100644
--- a/frameworks/projects/Flat/as/src/org/apache/flex/flat/beads/DropDownListView.as
+++ b/frameworks/projects/Flat/as/src/org/apache/flex/flat/beads/DropDownListView.as
@@ -126,6 +126,7 @@ package org.apache.flex.flat.beads
super.strand = value;;
selectionModel = value.getBeadByType(ISelectionModel) as ISelectionModel;
selectionModel.addEventListener("selectedIndexChanged", selectionChangeHandler);
+ selectionModel.addEventListener("dataProviderChanged", selectionChangeHandler);
shape = new Shape();
shape.graphics.beginFill(0xCCCCCC);
shape.graphics.drawRect(0, 0, 10, 10);
@@ -135,7 +136,7 @@ package org.apache.flex.flat.beads
SimpleButton(value).overState = overSprite;
SimpleButton(value).hitTestState = shape;
if (selectionModel.selectedIndex !== -1)
- text = selectionModel.selectedItem.toString();
+ selectionChangeHandler(null);
else
text = "^W_";
upTextField.height = upTextField.textHeight + 4;
@@ -151,7 +152,12 @@ package org.apache.flex.flat.beads
private function selectionChangeHandler(event:Event):void
{
- text = selectionModel.selectedItem.toString();
+ if (selectionModel.selectedItem == null)
+ text = "";
+ else if (selectionModel.labelField != null)
+ text = selectionModel.selectedItem[selectionModel.labelField].toString();
+ else
+ text = selectionModel.selectedItem.toString();
}
private function changeHandler(event:Event):void
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b5a5a4eb/frameworks/projects/Flat/js/src/org/apache/flex/flat/DropDownList.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/js/src/org/apache/flex/flat/DropDownList.js b/frameworks/projects/Flat/js/src/org/apache/flex/flat/DropDownList.js
index 9f7614c..ef6d3f5 100644
--- a/frameworks/projects/Flat/js/src/org/apache/flex/flat/DropDownList.js
+++ b/frameworks/projects/Flat/js/src/org/apache/flex/flat/DropDownList.js
@@ -152,13 +152,17 @@ org.apache.flex.flat.DropDownList.prototype.buttonClicked =
goog.events.listen(select, 'click', goog.bind(this.selectChanged, this));
select.className = 'dropdown-menu';
+ var lf = this.labelField;
dp = /** @type {Array.<string>} */ (this.dataProvider);
n = dp.length;
for (i = 0; i < n; i++) {
opt = document.createElement('li');
opt.style.backgroundColor = 'transparent';
var ir = document.createElement('a');
- ir.innerHTML = dp[i];
+ if (lf)
+ ir.innerHTML = dp[i][lf];
+ else
+ ir.innerHTML = dp[i];
ir.id = i.toString();
if (i == this.selectedIndex)
ir.className = 'dropdown-menu-item-renderer-selected';
@@ -186,6 +190,20 @@ Object.defineProperties(org.apache.flex.flat.DropDownList.prototype, {
}
},
/** @export */
+ labelField: {
+ // TODO: (aharui) copied from ListBase because you
+ // can't just override the setter in a defineProps
+ // structure.
+ /** @this {org.apache.flex.flat.DropDownList} */
+ get: function() {
+ return this.model.labelField;
+ },
+ /** @this {org.apache.flex.flat.DropDownList} */
+ set: function(value) {
+ this.model.labelField = value;
+ }
+ },
+ /** @export */
selectedIndex: {
// TODO: (aharui) copied from ListBase because you
// can't just override the setter in a defineProps
@@ -197,7 +215,11 @@ Object.defineProperties(org.apache.flex.flat.DropDownList.prototype, {
/** @this {org.apache.flex.flat.DropDownList} */
set: function(value) {
this.model.selectedIndex = value;
- this.button.innerHTML = this.selectedItem + '<span class="dropdown-caret"/>';
+ var lf = this.labelField;
+ if (lf)
+ this.button.innerHTML = this.selectedItem[lf] + '<span class="dropdown-caret"/>';
+ else
+ this.button.innerHTML = this.selectedItem + '<span class="dropdown-caret"/>';
}
},
/** @export */
@@ -212,7 +234,11 @@ Object.defineProperties(org.apache.flex.flat.DropDownList.prototype, {
/** @this {org.apache.flex.flat.DropDownList} */
set: function(value) {
this.model.selectedItem = value;
- this.button.innerHTML = this.selectedItem + '<span class="dropdown-caret"/>';
+ var lf = this.labelField;
+ if (lf)
+ this.button.innerHTML = this.selectedItem[lf] + '<span class="dropdown-caret"/>';
+ else
+ this.button.innerHTML = this.selectedItem + '<span class="dropdown-caret"/>';
}
}
});
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b5a5a4eb/frameworks/projects/HTML/as/src/org/apache/flex/html/DropDownList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/DropDownList.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/DropDownList.as
index 43b34ea..25dcfc7 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/DropDownList.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/DropDownList.as
@@ -135,5 +135,23 @@ package org.apache.flex.html
ISelectionModel(model).selectedItem = value;
}
+ /**
+ * The name of field within the data used for display. Each item of the
+ * data should have a property with this name.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get labelField():String
+ {
+ return ISelectionModel(model).labelField;
+ }
+ public function set labelField(value:String):void
+ {
+ ISelectionModel(model).labelField = value;
+ }
+
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b5a5a4eb/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/DropDownListView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/DropDownListView.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/DropDownListView.as
index e3f1a7e..1334227 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/DropDownListView.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/DropDownListView.as
@@ -114,6 +114,7 @@ package org.apache.flex.html.beads
super.strand = value;;
selectionModel = value.getBeadByType(ISelectionModel) as ISelectionModel;
selectionModel.addEventListener("selectedIndexChanged", selectionChangeHandler);
+ selectionModel.addEventListener("dataProviderChanged", selectionChangeHandler);
shape = new Shape();
shape.graphics.beginFill(0xCCCCCC);
shape.graphics.drawRect(0, 0, 10, 10);
@@ -139,7 +140,12 @@ package org.apache.flex.html.beads
private function selectionChangeHandler(event:Event):void
{
- text = selectionModel.selectedItem.toString();
+ if (selectionModel.selectedItem == null)
+ text = "";
+ else if (selectionModel.labelField != null)
+ text = selectionModel.selectedItem[selectionModel.labelField].toString();
+ else
+ text = selectionModel.selectedItem.toString();
}
private function changeHandler(event:Event):void
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b5a5a4eb/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.as
index 635b851..f500094 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.as
@@ -131,7 +131,10 @@ package org.apache.flex.html.beads
var tf:ITextItemRenderer = itemRendererFactory.createItemRenderer(dataGroup) as ITextItemRenderer;
tf.index = i;
dataGroup.addElement(tf);
- tf.text = dp[i];
+ if (selectionModel.labelField)
+ tf.text = dp[i][selectionModel.labelField];
+ else
+ tf.text = dp[i];
}
IEventDispatcher(_strand).dispatchEvent(new Event("itemsCreated"));
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b5a5a4eb/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/controllers/DropDownListController.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/controllers/DropDownListController.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/controllers/DropDownListController.as
index 848eda5..17a4b64 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/controllers/DropDownListController.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/controllers/DropDownListController.as
@@ -81,6 +81,7 @@ package org.apache.flex.html.beads.controllers
var popUpModel:ISelectionModel = UIBase(viewBead.popUp).model as ISelectionModel;
DisplayObject(viewBead.popUp).width = DisplayObject(_strand).width;
popUpModel.dataProvider = selectionModel.dataProvider;
+ popUpModel.labelField = selectionModel.labelField;
viewBead.popUpVisible = true; // adds to display list as well
popUpModel.selectedIndex = selectionModel.selectedIndex;
var pt:Point = new Point(DisplayObject(_strand).x, DisplayObject(_strand).y + DisplayObject(_strand).height);
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b5a5a4eb/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/models/ArraySelectionModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/models/ArraySelectionModel.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/models/ArraySelectionModel.as
index 2e655a4..a6c0a31 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/models/ArraySelectionModel.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/models/ArraySelectionModel.as
@@ -85,10 +85,12 @@ package org.apache.flex.html.beads.models
*/
public function set dataProvider(value:Object):void
{
+ if (value === _dataProvider) return;
+
_dataProvider = value;
if (_selectedIndex != -1)
_selectedItem = (_dataProvider == null || _selectedIndex >= _dataProvider.length) ? null :
- _dataProvider[value];
+ _dataProvider[_selectedIndex];
dispatchEvent(new Event("dataProviderChanged"));
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b5a5a4eb/frameworks/projects/HTML/js/src/org/apache/flex/html/DropDownList.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/DropDownList.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/DropDownList.js
index 1630d3a..2fb57a9 100644
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/DropDownList.js
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/DropDownList.js
@@ -74,15 +74,33 @@ Object.defineProperties(org.apache.flex.html.DropDownList.prototype, {
dp.remove(0);
}
+ var lf = this.labelField;
n = value.length;
for (i = 0; i < n; i++) {
opt = document.createElement('option');
- opt.text = value[i];
+ if (lf)
+ opt.text = value[i][lf];
+ else
+ opt.text = value[i];
dp.add(opt);
}
}
},
/** @export */
+ labelField: {
+ // TODO: (aharui) copied from ListBase because you
+ // can't just override the setter in a defineProps
+ // structure.
+ /** @this {org.apache.flex.html.DropDownList} */
+ get: function() {
+ return this.model.labelField;
+ },
+ /** @this {org.apache.flex.html.DropDownList} */
+ set: function(value) {
+ this.model.labelField = value;
+ }
+ },
+ /** @export */
selectedIndex: {
// TODO: (aharui) copied from ListBase because you
// can't just override the setter in a defineProps
@@ -109,7 +127,7 @@ Object.defineProperties(org.apache.flex.html.DropDownList.prototype, {
/** @this {org.apache.flex.html.DropDownList} */
set: function(value) {
this.model.selectedItem = value;
- this.element.selectedIndex = this.selectedIndex;
+ this.element.selectedIndex = this.model.selectedIndex;
}
}
});
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b5a5a4eb/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/models/ArraySelectionModel.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/models/ArraySelectionModel.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/models/ArraySelectionModel.js
index 1b211ce..b22cf27 100644
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/models/ArraySelectionModel.js
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/models/ArraySelectionModel.js
@@ -61,6 +61,7 @@ Object.defineProperties(org.apache.flex.html.beads.models.ArraySelectionModel.pr
},
/** @this {org.apache.flex.html.beads.models.ArraySelectionModel} */
set: function(value) {
+ if (value === this.dataProvider_) return;
this.dataProvider_ = value;
this.dispatchEvent('dataProviderChanged');
}
@@ -73,6 +74,7 @@ Object.defineProperties(org.apache.flex.html.beads.models.ArraySelectionModel.pr
},
/** @this {org.apache.flex.html.beads.models.ArraySelectionModel} */
set: function(value) {
+ if (value === this.selectedIndex_) return;
this.selectedIndex_ = value;
this.dispatchEvent('selectedIndexChanged');
}
[7/9] git commit: [flex-asjs] [refs/heads/develop] - use change in
label instead of change in data otherwise data change can happen before label
has new size
Posted by ah...@apache.org.
use change in label instead of change in data otherwise data change can happen before label has new size
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/00f22de6
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/00f22de6
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/00f22de6
Branch: refs/heads/develop
Commit: 00f22de68ea5aa53d843721220f3a795963ec48b
Parents: e7c0235
Author: Alex Harui <ah...@apache.org>
Authored: Thu Sep 10 14:11:29 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Sep 10 14:14:18 2015 -0700
----------------------------------------------------------------------
.../HTML/asjs/src/org/apache/flex/html/beads/TitleBarView.mxml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/00f22de6/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/TitleBarView.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/TitleBarView.mxml b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/TitleBarView.mxml
index 3cad1f6..cebd24b 100644
--- a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/TitleBarView.mxml
+++ b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/TitleBarView.mxml
@@ -44,7 +44,7 @@ limitations under the License.
</fx:Script>
<js:beads>
<js:MXMLBeadViewBaseDataBinding />
- <js:LayoutChangeNotifier watchedProperty="{ITitleBarModel(model).title}" />
+ <js:LayoutChangeNotifier watchedProperty="{titleLabel.text}" />
</js:beads>
<js:Label id="titleLabel" text="{ITitleBarModel(model).title}" >
[5/9] git commit: [flex-asjs] [refs/heads/develop] - quiet warnings
Posted by ah...@apache.org.
quiet warnings
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e16eeb4d
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e16eeb4d
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e16eeb4d
Branch: refs/heads/develop
Commit: e16eeb4dfe2fb86bcbb8ab037dc8d6a03370e9d9
Parents: 8592a20
Author: Alex Harui <ah...@apache.org>
Authored: Thu Sep 10 14:08:26 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Sep 10 14:14:17 2015 -0700
----------------------------------------------------------------------
.../projects/Core/as/src/org/apache/flex/core/Application.as | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e16eeb4d/frameworks/projects/Core/as/src/org/apache/flex/core/Application.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/Application.as b/frameworks/projects/Core/as/src/org/apache/flex/core/Application.as
index 54e45f0..0d933b6 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/Application.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/Application.as
@@ -231,8 +231,10 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
+ [Bindable("__NoChangeEvent__")]
public var initialView:ViewBase;
+ [Bindable("__NoChangeEvent__")]
/**
* The data model (for the initial view).
*
@@ -241,6 +243,7 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
+ [Bindable("__NoChangeEvent__")]
public var model:Object;
/**
[2/9] git commit: [flex-asjs] [refs/heads/develop] - don't dispatch
change event if nothing changed
Posted by ah...@apache.org.
don't dispatch change event if nothing changed
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/2e43d443
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2e43d443
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2e43d443
Branch: refs/heads/develop
Commit: 2e43d44398eb643d6de51020d0ea7949e3388f5d
Parents: c9bd62d
Author: Alex Harui <ah...@apache.org>
Authored: Tue Sep 8 23:20:25 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Sep 10 14:14:16 2015 -0700
----------------------------------------------------------------------
.../src/org/apache/flex/html/beads/models/ArraySelectionModel.as | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2e43d443/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/models/ArraySelectionModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/models/ArraySelectionModel.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/models/ArraySelectionModel.as
index cf692fc..2e655a4 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/models/ArraySelectionModel.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/models/ArraySelectionModel.as
@@ -138,6 +138,8 @@ package org.apache.flex.html.beads.models
*/
public function set selectedIndex(value:int):void
{
+ if (value === _selectedIndex) return;
+
_selectedIndex = value;
_selectedItem = (value == -1 || _dataProvider == null) ? null : (value < _dataProvider.length) ? _dataProvider[value] : null;
dispatchEvent(new Event("selectedIndexChanged"));
@@ -185,6 +187,8 @@ package org.apache.flex.html.beads.models
*/
public function set selectedItem(value:Object):void
{
+ if (value === _selectedItem) return;
+
_selectedItem = value;
var n:int = _dataProvider.length;
for (var i:int = 0; i < n; i++)
[6/9] git commit: [flex-asjs] [refs/heads/develop] - need binding
event
Posted by ah...@apache.org.
need binding event
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/019e958a
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/019e958a
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/019e958a
Branch: refs/heads/develop
Commit: 019e958af1c782669998a79d8070887d7d260263
Parents: e16eeb4
Author: Alex Harui <ah...@apache.org>
Authored: Thu Sep 10 14:08:54 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Sep 10 14:14:17 2015 -0700
----------------------------------------------------------------------
frameworks/projects/Core/as/src/org/apache/flex/core/UIBase.as | 1 +
.../projects/Core/as/src/org/apache/flex/core/UIButtonBase.as | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/019e958a/frameworks/projects/Core/as/src/org/apache/flex/core/UIBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/UIBase.as b/frameworks/projects/Core/as/src/org/apache/flex/core/UIBase.as
index f7ebd20..3f00b32 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/UIBase.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/UIBase.as
@@ -547,6 +547,7 @@ package org.apache.flex.core
/**
* @private
*/
+ [Bindable("visibleChanged")]
override public function set visible(value:Boolean):void
{
super.visible = value;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/019e958a/frameworks/projects/Core/as/src/org/apache/flex/core/UIButtonBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/UIButtonBase.as b/frameworks/projects/Core/as/src/org/apache/flex/core/UIButtonBase.as
index 5aa6de5..911176a 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/UIButtonBase.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/UIButtonBase.as
@@ -478,6 +478,7 @@ package org.apache.flex.core
/**
* @private
*/
+ [Bindable("visibleChanged")]
override public function set visible(value:Boolean):void
{
super.visible = value;
[9/9] git commit: [flex-asjs] [refs/heads/develop] - replace
support_map with public domain image
Posted by ah...@apache.org.
replace support_map with public domain image
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/cc7f0d01
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/cc7f0d01
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/cc7f0d01
Branch: refs/heads/develop
Commit: cc7f0d01b3155104e9303f9eabd3b9095bfc7ee5
Parents: b5a5a4e
Author: Alex Harui <ah...@apache.org>
Authored: Thu Sep 10 14:36:14 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Sep 10 14:36:14 2015 -0700
----------------------------------------------------------------------
LICENSE | 5 +++++
examples/flexjs/FlexJSStore/src/SupportView.mxml | 4 ++--
.../FlexJSStore/src/assets/427px-Bayarea_map.png | Bin 0 -> 122661 bytes
.../flexjs/FlexJSStore/src/assets/support_map.png | Bin 172293 -> 0 bytes
.../FlexJSStore_jquery/src/SupportView.mxml | 4 ++--
.../src/assets/427px-Bayarea_map.png | Bin 0 -> 122661 bytes
.../FlexJSStore_jquery/src/assets/support_map.png | Bin 172293 -> 0 bytes
7 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cc7f0d01/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 21f2725..439f630 100644
--- a/LICENSE
+++ b/LICENSE
@@ -213,3 +213,8 @@ conditions of the following licenses.
Portions of frameworks/projects/Flat/as/defaults.css is based on
designmodo’s (http://designmodo.com/flat-free/) Flat UI which is
available under an MIT license.
+
+The map image examples/flexjs/FlexJSStore/src/assets/427px-Bayarea_map.png
+was placed into the Public Domain by its author. See:
+https://commons.wikimedia.org/wiki/File:Bayarea_map.png
+
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cc7f0d01/examples/flexjs/FlexJSStore/src/SupportView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore/src/SupportView.mxml b/examples/flexjs/FlexJSStore/src/SupportView.mxml
index c0579e4..ab3eea7 100755
--- a/examples/flexjs/FlexJSStore/src/SupportView.mxml
+++ b/examples/flexjs/FlexJSStore/src/SupportView.mxml
@@ -137,9 +137,9 @@ The width and height are hard-coded in the root tag to help the Design view.
</js:VContainer>
<js:Container width="68%" height="100%">
- <js:Image source="assets/support_map.png">
+ <js:Image source="assets/427px-Bayarea_map.png">
<js:style>
- <js:SimpleCSSStyles left="2" right="2" top="2" bottom="2"/>
+ <js:SimpleCSSStyles left="12" top="12"/>
</js:style>
</js:Image>
</js:Container>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cc7f0d01/examples/flexjs/FlexJSStore/src/assets/427px-Bayarea_map.png
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore/src/assets/427px-Bayarea_map.png b/examples/flexjs/FlexJSStore/src/assets/427px-Bayarea_map.png
new file mode 100644
index 0000000..a183699
Binary files /dev/null and b/examples/flexjs/FlexJSStore/src/assets/427px-Bayarea_map.png differ
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cc7f0d01/examples/flexjs/FlexJSStore/src/assets/support_map.png
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore/src/assets/support_map.png b/examples/flexjs/FlexJSStore/src/assets/support_map.png
deleted file mode 100755
index c2f2394..0000000
Binary files a/examples/flexjs/FlexJSStore/src/assets/support_map.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cc7f0d01/examples/flexjs/FlexJSStore_jquery/src/SupportView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore_jquery/src/SupportView.mxml b/examples/flexjs/FlexJSStore_jquery/src/SupportView.mxml
index c0579e4..ab3eea7 100755
--- a/examples/flexjs/FlexJSStore_jquery/src/SupportView.mxml
+++ b/examples/flexjs/FlexJSStore_jquery/src/SupportView.mxml
@@ -137,9 +137,9 @@ The width and height are hard-coded in the root tag to help the Design view.
</js:VContainer>
<js:Container width="68%" height="100%">
- <js:Image source="assets/support_map.png">
+ <js:Image source="assets/427px-Bayarea_map.png">
<js:style>
- <js:SimpleCSSStyles left="2" right="2" top="2" bottom="2"/>
+ <js:SimpleCSSStyles left="12" top="12"/>
</js:style>
</js:Image>
</js:Container>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cc7f0d01/examples/flexjs/FlexJSStore_jquery/src/assets/427px-Bayarea_map.png
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore_jquery/src/assets/427px-Bayarea_map.png b/examples/flexjs/FlexJSStore_jquery/src/assets/427px-Bayarea_map.png
new file mode 100644
index 0000000..a183699
Binary files /dev/null and b/examples/flexjs/FlexJSStore_jquery/src/assets/427px-Bayarea_map.png differ
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cc7f0d01/examples/flexjs/FlexJSStore_jquery/src/assets/support_map.png
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore_jquery/src/assets/support_map.png b/examples/flexjs/FlexJSStore_jquery/src/assets/support_map.png
deleted file mode 100755
index c2f2394..0000000
Binary files a/examples/flexjs/FlexJSStore_jquery/src/assets/support_map.png and /dev/null differ
[3/9] git commit: [flex-asjs] [refs/heads/develop] - eat errors
Posted by ah...@apache.org.
eat errors
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c9bd62d6
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c9bd62d6
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c9bd62d6
Branch: refs/heads/develop
Commit: c9bd62d613c1fb82e2b5b109f645f6c1ded7e006
Parents: 9e5abdf
Author: Alex Harui <ah...@apache.org>
Authored: Tue Sep 8 23:19:31 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Sep 10 14:14:16 2015 -0700
----------------------------------------------------------------------
.../Binding/as/src/org/apache/flex/binding/SimpleBinding.as | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c9bd62d6/frameworks/projects/Binding/as/src/org/apache/flex/binding/SimpleBinding.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/as/src/org/apache/flex/binding/SimpleBinding.as b/frameworks/projects/Binding/as/src/org/apache/flex/binding/SimpleBinding.as
index fa86ed1..386571c 100644
--- a/frameworks/projects/Binding/as/src/org/apache/flex/binding/SimpleBinding.as
+++ b/frameworks/projects/Binding/as/src/org/apache/flex/binding/SimpleBinding.as
@@ -157,7 +157,11 @@ package org.apache.flex.binding
else
source = document as IEventDispatcher;
source.addEventListener(eventName, changeHandler);
- destination[destinationPropertyName] = source[sourcePropertyName];
+ try
+ {
+ destination[destinationPropertyName] = source[sourcePropertyName];
+ }
+ catch (e:Error) {}
}
/**
[4/9] git commit: [flex-asjs] [refs/heads/develop] - handle units for
left/right
Posted by ah...@apache.org.
handle units for left/right
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e7c02358
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e7c02358
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e7c02358
Branch: refs/heads/develop
Commit: e7c023589ed450556a6ff950c96124048624c00a
Parents: 019e958
Author: Alex Harui <ah...@apache.org>
Authored: Thu Sep 10 14:10:39 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Sep 10 14:14:17 2015 -0700
----------------------------------------------------------------------
.../flex/html/beads/layouts/VerticalLayout.as | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e7c02358/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VerticalLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VerticalLayout.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VerticalLayout.as
index 53f60ce..675a586 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VerticalLayout.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VerticalLayout.as
@@ -28,10 +28,10 @@ package org.apache.flex.html.beads.layouts
import org.apache.flex.core.ValuesManager;
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
- import org.apache.flex.geom.Rectangle;
+ import org.apache.flex.geom.Rectangle;
+ import org.apache.flex.utils.CSSContainerUtils;
+ import org.apache.flex.utils.CSSUtils;
import org.apache.flex.utils.dbg.DOMPathUtil;
- import org.apache.flex.utils.CSSUtils;
- import org.apache.flex.utils.CSSContainerUtils;
/**
* The VerticalLayout class is a simple layout
@@ -93,6 +93,7 @@ package org.apache.flex.html.beads.layouts
var marginBottom:Object;
var margin:Object;
var maxWidth:Number = 0;
+ var cssValue:*;
// asking for contentView.width can result in infinite loop if host isn't sized already
var w:Number = hostSizedToContent ? 0 : contentView.width;
var h:Number = contentView.height;
@@ -102,8 +103,14 @@ package org.apache.flex.html.beads.layouts
var child:IUIBase = contentView.getElementAt(i) as IUIBase;
if (child == null || !child.visible) continue;
ilc = child as ILayoutChild;
- var left:Number = ValuesManager.valuesImpl.getValue(child, "left");
- var right:Number = ValuesManager.valuesImpl.getValue(child, "right");
+ var left:Number = NaN;
+ cssValue = ValuesManager.valuesImpl.getValue(child, "left");
+ if (cssValue !== undefined)
+ left = CSSUtils.toNumber(cssValue);
+ var right:Number = NaN;
+ cssValue = ValuesManager.valuesImpl.getValue(child, "right");
+ if (cssValue !== undefined)
+ right = CSSUtils.toNumber(cssValue);
margin = ValuesManager.valuesImpl.getValue(child, "margin");
marginLeft = ValuesManager.valuesImpl.getValue(child, "margin-left");
marginTop = ValuesManager.valuesImpl.getValue(child, "margin-top");