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/04/16 16:34:18 UTC
[8/9] git commit: [flex-asjs] [refs/heads/develop] - More removal on
'NonVirtual'
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/NonVirtualBasicScrollingLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/NonVirtualBasicScrollingLayout.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/NonVirtualBasicScrollingLayout.js
deleted file mode 100644
index 4cdf12f..0000000
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/NonVirtualBasicScrollingLayout.js
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * Licensed 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.
- */
-
-goog.provide('org_apache_flex_html_beads_layouts_NonVirtualBasicScrollingLayout');
-
-goog.require('org_apache_flex_core_IBeadLayout');
-
-
-
-/**
- * @constructor
- * @implements {org_apache_flex_core_IBeadLayout}
- */
-org_apache_flex_html_beads_layouts_NonVirtualBasicScrollingLayout =
- function() {
- this.strand_ = null;
- this.className = 'NonVirtualBasicScrollingLayout';
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org_apache_flex_html_beads_layouts_NonVirtualBasicScrollingLayout.prototype.FLEXJS_CLASS_INFO =
- { names: [{ name: 'NonVirtualBasicScrollingLayout',
- qName: 'org_apache_flex_html_beads_layouts_NonVirtualBasicScrollingLayout'}],
- interfaces: [org_apache_flex_core_IBeadLayout] };
-
-
-Object.defineProperties(org_apache_flex_html_beads_layouts_NonVirtualBasicScrollingLayout.prototype, {
- /** @expose */
- strand: {
- /** @this {org_apache_flex_html_beads_layouts_NonVirtualBasicScrollingLayout} */
- set: function(value) {
- if (this.strand_ !== value) {
- this.strand_ = value;
- this.strand_.addEventListener('childrenAdded',
- goog.bind(this.changeHandler, this));
- this.strand_.addEventListener('layoutNeeded',
- goog.bind(this.changeHandler, this));
- }
- }
- }
-});
-
-
-/**
- * @param {org_apache_flex_events_Event} event The text getter.
- */
-org_apache_flex_html_beads_layouts_NonVirtualBasicScrollingLayout.
- prototype.changeHandler = function(event) {
- var i, n, h, w;
-
- var viewBead = this.strand_.getBeadByType(org_apache_flex_core_ILayoutParent);
- var contentView = viewBead.contentView;
- contentView.element.style.overflow = 'auto';
- w = contentView.width;
- h = contentView.height;
- n = contentView.numElements;
- for (i = 0; i < n; i++) {
- var child = contentView.getElementAt(i);
- child.positioner.internalDisplay = 'block';
- var left = org_apache_flex_core_ValuesManager.valuesImpl.getValue(child, 'left');
- var right = org_apache_flex_core_ValuesManager.valuesImpl.getValue(child, 'right');
- var top = org_apache_flex_core_ValuesManager.valuesImpl.getValue(child, 'top');
- var bottom = org_apache_flex_core_ValuesManager.valuesImpl.getValue(child, 'bottom');
-
- if (!isNaN(left)) {
- child.positioner.style.position = 'absolute';
- child.positioner.style.left = left.toString() + 'px';
- }
- if (!isNaN(top)) {
- child.positioner.style.position = 'absolute';
- child.positioner.style.top = top.toString() + 'px';
- }
- if (!isNaN(right)) {
- child.positioner.style.position = 'absolute';
- child.positioner.style.right = right.toString() + 'px';
- }
- if (!isNaN(bottom)) {
- child.positioner.style.position = 'absolute';
- child.positioner.style.bottom = bottom.toString() + 'px';
- }
- child.dispatchEvent('sizeChanged');
- }
-};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.js
deleted file mode 100644
index 514de64..0000000
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.js
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- * Licensed 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.
- */
-
-goog.provide('org_apache_flex_html_beads_layouts_NonVirtualHorizontalLayout');
-
-goog.require('org_apache_flex_core_IBeadLayout');
-
-
-
-/**
- * @constructor
- * @implements {org_apache_flex_core_IBeadLayout}
- */
-org_apache_flex_html_beads_layouts_NonVirtualHorizontalLayout =
- function() {
- this.strand_ = null;
- this.className = 'NonVirtualHorizontalLayout';
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org_apache_flex_html_beads_layouts_NonVirtualHorizontalLayout.
- prototype.FLEXJS_CLASS_INFO =
- { names: [{ name: 'NonVirtualHorizontalLayout',
- qName: 'org_apache_flex_html_beads_layouts_NonVirtualHorizontalLayout' }],
- interfaces: [org_apache_flex_core_IBeadLayout] };
-
-
-Object.defineProperties(org_apache_flex_html_beads_layouts_NonVirtualHorizontalLayout.prototype, {
- /** @expose */
- strand: {
- /** @this {org_apache_flex_html_beads_layouts_NonVirtualHorizontalLayout} */
- set: function(value) {
- if (this.strand_ !== value) {
- this.strand_ = value;
- if (this.strand_.isWidthSizedToContent() &&
- this.strand_.isHeightSizedToContent())
- this.addOtherListeners();
- else {
- this.strand_.addEventListener('heightChanged',
- goog.bind(this.changeHandler, this));
- this.strand_.addEventListener('widthChanged',
- goog.bind(this.changeHandler, this));
- this.strand_.addEventListener('sizeChanged',
- goog.bind(this.sizeChangeHandler, this));
- if (!isNaN(this.strand_.explicitWidth) &&
- !isNaN(this.strand_.explicitHeight))
- this.addOtherListeners();
- }
- this.strand_.element.style.display = 'block';
- }
- }
- }
-});
-
-
-/**
- *
- */
-org_apache_flex_html_beads_layouts_NonVirtualHorizontalLayout.
- prototype.addOtherListeners = function() {
- this.strand_.addEventListener('childrenAdded',
- goog.bind(this.changeHandler, this));
- this.strand_.addEventListener('layoutNeeded',
- goog.bind(this.changeHandler, this));
- this.strand_.addEventListener('itemsCreated',
- goog.bind(this.changeHandler, this));
-};
-
-
-/**
- * @param {org_apache_flex_events_Event} event The event.
- */
-org_apache_flex_html_beads_layouts_NonVirtualHorizontalLayout.
- prototype.sizeChangeHandler = function(event) {
- this.addOtherListeners();
- this.changeHandler(event);
-};
-
-
-/**
- * @param {org_apache_flex_events_Event} event The text getter.
- */
-org_apache_flex_html_beads_layouts_NonVirtualHorizontalLayout.
- prototype.changeHandler = function(event) {
- var children, i, n;
-
- children = this.strand_.internalChildren();
- n = children.length;
- for (i = 0; i < n; i++)
- {
- var child = children[i];
- child.internalDisplay = 'inline-block';
- if (child.style.display == 'none')
- child.lastDisplay_ = 'inline-block';
- else
- child.style.display = 'inline-block';
- child.style.verticalAlign = 'middle';
- child.flexjs_wrapper.dispatchEvent('sizeChanged');
- }
-};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.js
deleted file mode 100644
index 210df3f..0000000
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.js
+++ /dev/null
@@ -1,114 +0,0 @@
-/**
- * Licensed 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.
- */
-
-goog.provide('org_apache_flex_html_beads_layouts_NonVirtualVerticalLayout');
-
-goog.require('org_apache_flex_core_IBeadLayout');
-
-
-
-/**
- * @constructor
- * @implements {org_apache_flex_core_IBeadLayout}
- */
-org_apache_flex_html_beads_layouts_NonVirtualVerticalLayout =
- function() {
- this.strand_ = null;
- this.className = 'NonVirtualVerticalLayout';
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org_apache_flex_html_beads_layouts_NonVirtualVerticalLayout.prototype.FLEXJS_CLASS_INFO =
- { names: [{ name: 'NonVirtualVerticalLayout',
- qName: 'org_apache_flex_html_beads_layouts_NonVirtualVerticalLayout'}],
- interfaces: [org_apache_flex_core_IBeadLayout] };
-
-
-Object.defineProperties(org_apache_flex_html_beads_layouts_NonVirtualVerticalLayout.prototype, {
- /** @expose */
- strand: {
- /** @this {org_apache_flex_html_beads_layouts_NonVirtualVerticalLayout} */
- set: function(value) {
- if (this.strand_ !== value) {
- this.strand_ = value;
- if (this.strand_.isWidthSizedToContent() &&
- this.strand_.isHeightSizedToContent())
- this.addOtherListeners();
- else {
- this.strand_.addEventListener('heightChanged',
- goog.bind(this.changeHandler, this));
- this.strand_.addEventListener('widthChanged',
- goog.bind(this.changeHandler, this));
- this.strand_.addEventListener('sizeChanged',
- goog.bind(this.sizeChangeHandler, this));
- if (!isNaN(this.strand_.explicitWidth) &&
- !isNaN(this.strand_.explicitHeight))
- this.addOtherListeners();
- }
- }
- }
- }
-});
-
-
-/**
- *
- */
-org_apache_flex_html_beads_layouts_NonVirtualVerticalLayout.
- prototype.addOtherListeners = function() {
- this.strand_.addEventListener('childrenAdded',
- goog.bind(this.changeHandler, this));
- this.strand_.addEventListener('layoutNeeded',
- goog.bind(this.changeHandler, this));
- this.strand_.addEventListener('itemsCreated',
- goog.bind(this.changeHandler, this));
-};
-
-
-/**
- * @param {org_apache_flex_events_Event} event The event.
- */
-org_apache_flex_html_beads_layouts_NonVirtualVerticalLayout.
- prototype.sizeChangeHandler = function(event) {
- this.addOtherListeners();
- this.changeHandler(event);
-};
-
-
-/**
- * @param {org_apache_flex_events_Event} event The text getter.
- */
-org_apache_flex_html_beads_layouts_NonVirtualVerticalLayout.
- prototype.changeHandler = function(event) {
- var children, i, n;
-
- children = this.strand_.internalChildren();
- n = children.length;
- for (i = 0; i < n; i++)
- {
- var child = children[i];
- child.internalDisplay = 'block';
- if (child.style.display === 'none') {
- child.lastDisplay_ = 'block';
- } else {
- child.style.display = 'block';
- }
- child.flexjs_wrapper.dispatchEvent('sizeChanged');
- }
-};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.js
deleted file mode 100644
index 0d9fbda..0000000
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Licensed 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.
- */
-
-goog.provide('org_apache_flex_html_beads_layouts_NonVirtualVerticalScrollingLayout');
-
-goog.require('org_apache_flex_core_IBeadLayout');
-
-
-
-/**
- * @constructor
- * @implements {org_apache_flex_core_IBeadLayout}
- */
-org_apache_flex_html_beads_layouts_NonVirtualVerticalScrollingLayout = function() {
- this.strand_ = null;
- this.className = 'NonVirtualVerticalScrollingLayout';
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org_apache_flex_html_beads_layouts_NonVirtualVerticalScrollingLayout.prototype.FLEXJS_CLASS_INFO =
- { names: [{ name: 'NonVirtualVerticalScrollingLayout',
- qName: 'org_apache_flex_html_beads_layouts_NonVirtualVerticalScrollingLayout' }],
- interfaces: [org_apache_flex_core_IBeadLayout] };
-
-
-Object.defineProperties(org_apache_flex_html_beads_layouts_NonVirtualVerticalScrollingLayout.prototype, {
- /** @expose */
- strand: {
- /** @this {org_apache_flex_html_beads_layouts_NonVirtualVerticalScrollingLayout} */
- set: function(value) {
- if (this.strand_ !== value) {
- this.strand_ = value;
- }
- }
- }
-});
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/VerticalLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/VerticalLayout.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/VerticalLayout.js
new file mode 100644
index 0000000..f3214eb
--- /dev/null
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/VerticalLayout.js
@@ -0,0 +1,114 @@
+/**
+ * Licensed 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.
+ */
+
+goog.provide('org_apache_flex_html_beads_layouts_VerticalLayout');
+
+goog.require('org_apache_flex_core_IBeadLayout');
+
+
+
+/**
+ * @constructor
+ * @implements {org_apache_flex_core_IBeadLayout}
+ */
+org_apache_flex_html_beads_layouts_VerticalLayout =
+ function() {
+ this.strand_ = null;
+ this.className = 'VerticalLayout';
+};
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org_apache_flex_html_beads_layouts_VerticalLayout.prototype.FLEXJS_CLASS_INFO =
+ { names: [{ name: 'VerticalLayout',
+ qName: 'org_apache_flex_html_beads_layouts_VerticalLayout'}],
+ interfaces: [org_apache_flex_core_IBeadLayout] };
+
+
+Object.defineProperties(org_apache_flex_html_beads_layouts_VerticalLayout.prototype, {
+ /** @expose */
+ strand: {
+ /** @this {org_apache_flex_html_beads_layouts_VerticalLayout} */
+ set: function(value) {
+ if (this.strand_ !== value) {
+ this.strand_ = value;
+ if (this.strand_.isWidthSizedToContent() &&
+ this.strand_.isHeightSizedToContent())
+ this.addOtherListeners();
+ else {
+ this.strand_.addEventListener('heightChanged',
+ goog.bind(this.changeHandler, this));
+ this.strand_.addEventListener('widthChanged',
+ goog.bind(this.changeHandler, this));
+ this.strand_.addEventListener('sizeChanged',
+ goog.bind(this.sizeChangeHandler, this));
+ if (!isNaN(this.strand_.explicitWidth) &&
+ !isNaN(this.strand_.explicitHeight))
+ this.addOtherListeners();
+ }
+ }
+ }
+ }
+});
+
+
+/**
+ *
+ */
+org_apache_flex_html_beads_layouts_VerticalLayout.
+ prototype.addOtherListeners = function() {
+ this.strand_.addEventListener('childrenAdded',
+ goog.bind(this.changeHandler, this));
+ this.strand_.addEventListener('layoutNeeded',
+ goog.bind(this.changeHandler, this));
+ this.strand_.addEventListener('itemsCreated',
+ goog.bind(this.changeHandler, this));
+};
+
+
+/**
+ * @param {org_apache_flex_events_Event} event The event.
+ */
+org_apache_flex_html_beads_layouts_VerticalLayout.
+ prototype.sizeChangeHandler = function(event) {
+ this.addOtherListeners();
+ this.changeHandler(event);
+};
+
+
+/**
+ * @param {org_apache_flex_events_Event} event The text getter.
+ */
+org_apache_flex_html_beads_layouts_VerticalLayout.
+ prototype.changeHandler = function(event) {
+ var children, i, n;
+
+ children = this.strand_.internalChildren();
+ n = children.length;
+ for (i = 0; i < n; i++)
+ {
+ var child = children[i];
+ child.internalDisplay = 'block';
+ if (child.style.display === 'none') {
+ child.lastDisplay_ = 'block';
+ } else {
+ child.style.display = 'block';
+ }
+ child.flexjs_wrapper.dispatchEvent('sizeChanged');
+ }
+};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/VerticalScrollingLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/VerticalScrollingLayout.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/VerticalScrollingLayout.js
new file mode 100644
index 0000000..6df6e0c
--- /dev/null
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/VerticalScrollingLayout.js
@@ -0,0 +1,52 @@
+/**
+ * Licensed 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.
+ */
+
+goog.provide('org_apache_flex_html_beads_layouts_VerticalScrollingLayout');
+
+goog.require('org_apache_flex_core_IBeadLayout');
+
+
+
+/**
+ * @constructor
+ * @implements {org_apache_flex_core_IBeadLayout}
+ */
+org_apache_flex_html_beads_layouts_VerticalScrollingLayout = function() {
+ this.strand_ = null;
+ this.className = 'VerticalScrollingLayout';
+};
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org_apache_flex_html_beads_layouts_VerticalScrollingLayout.prototype.FLEXJS_CLASS_INFO =
+ { names: [{ name: 'VerticalScrollingLayout',
+ qName: 'org_apache_flex_html_beads_layouts_VerticalScrollingLayout' }],
+ interfaces: [org_apache_flex_core_IBeadLayout] };
+
+
+Object.defineProperties(org_apache_flex_html_beads_layouts_VerticalScrollingLayout.prototype, {
+ /** @expose */
+ strand: {
+ /** @this {org_apache_flex_html_beads_layouts_VerticalScrollingLayout} */
+ set: function(value) {
+ if (this.strand_ !== value) {
+ this.strand_ = value;
+ }
+ }
+ }
+});
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/HTML/js/src/org/apache/flex/html/supportClasses/DataGroup.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/supportClasses/DataGroup.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/supportClasses/DataGroup.js
new file mode 100644
index 0000000..b40edfc
--- /dev/null
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/supportClasses/DataGroup.js
@@ -0,0 +1,134 @@
+/**
+ * Licensed 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.
+ */
+
+goog.provide('org_apache_flex_html_supportClasses_DataGroup');
+
+goog.require('org_apache_flex_core_UIBase');
+goog.require('org_apache_flex_html_supportClasses_DataItemRenderer');
+goog.require('org_apache_flex_utils_Language');
+
+
+
+/**
+ * @constructor
+ * @extends {org_apache_flex_core_UIBase}
+ */
+org_apache_flex_html_supportClasses_DataGroup =
+ function() {
+ this.renderers = [];
+ org_apache_flex_html_supportClasses_DataGroup.base(this, 'constructor');
+};
+goog.inherits(
+ org_apache_flex_html_supportClasses_DataGroup,
+ org_apache_flex_core_UIBase);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org_apache_flex_html_supportClasses_DataGroup.prototype.FLEXJS_CLASS_INFO =
+ { names: [{ name: 'DataGroup',
+ qName: 'org_apache_flex_html_supportClasses_DataGroup' }] };
+
+
+Object.defineProperties(org_apache_flex_html_supportClasses_DataGroup.prototype, {
+ /** @expose */
+ strand: {
+ /** @this {org_apache_flex_html_supportClasses_DataGroup} */
+ set: function(value) {
+ this.strand_ = value;
+ }
+ },
+ /** @expose */
+ numElements: {
+ /** @this {org_apache_flex_html_supportClasses_DataGroup} */
+ get: function() {
+
+ var n = this.element.childNodes.length;
+ return n;
+ }
+ }
+});
+
+
+/**
+ * @override
+ */
+org_apache_flex_html_supportClasses_DataGroup.
+ prototype.createElement = function() {
+ this.element = document.createElement('div');
+ this.element.style.overflow = 'auto';
+ this.element.style.display = 'inline-block';
+ this.element.style.position = 'inherit';
+ this.element.flexjs_wrapper = this;
+ this.className = 'DataGroup';
+
+ this.positioner = this.element;
+
+ return this.element;
+};
+
+
+/**
+ * @override
+ * @param {Object} value The child element being added.
+ */
+org_apache_flex_html_supportClasses_DataGroup.
+ prototype.addElement = function(value) {
+ org_apache_flex_html_supportClasses_DataGroup.base(this, 'addElement', value);
+
+ var itemRenderer = org_apache_flex_utils_Language.as(value,
+ org_apache_flex_html_supportClasses_DataItemRenderer);
+ itemRenderer.index = this.renderers.length;
+ itemRenderer.itemRendererParent = this;
+ this.renderers.push(value);
+};
+
+
+/**
+ * @expose
+ */
+org_apache_flex_html_supportClasses_DataGroup.
+ prototype.removeAllElements = function() {
+
+ while (this.element.hasChildNodes()) {
+ this.element.removeChild(this.element.lastChild);
+ }
+};
+
+
+/**
+ * @expose
+ * @param {number} index The index of the desired element.
+ * @return {Object} The element at the given index.
+ */
+org_apache_flex_html_supportClasses_DataGroup.
+ prototype.getElementAt = function(index) {
+
+ var e = this.element.childNodes[index];
+ return e.flexjs_wrapper;
+};
+
+
+/**
+ * @expose
+ * @param {Object} index The index for the itemRenderer.
+ * @return {Object} The itemRenderer that matches the index.
+ */
+org_apache_flex_html_supportClasses_DataGroup.
+ prototype.getItemRendererForIndex = function(index) {
+ return this.renderers[index];
+};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/HTML/js/src/org/apache/flex/html/supportClasses/NonVirtualDataGroup.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/supportClasses/NonVirtualDataGroup.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/supportClasses/NonVirtualDataGroup.js
deleted file mode 100644
index 5d9465d..0000000
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/supportClasses/NonVirtualDataGroup.js
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
- * Licensed 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.
- */
-
-goog.provide('org_apache_flex_html_supportClasses_NonVirtualDataGroup');
-
-goog.require('org_apache_flex_core_UIBase');
-goog.require('org_apache_flex_html_supportClasses_DataItemRenderer');
-goog.require('org_apache_flex_utils_Language');
-
-
-
-/**
- * @constructor
- * @extends {org_apache_flex_core_UIBase}
- */
-org_apache_flex_html_supportClasses_NonVirtualDataGroup =
- function() {
- this.renderers = [];
- org_apache_flex_html_supportClasses_NonVirtualDataGroup.base(this, 'constructor');
-};
-goog.inherits(
- org_apache_flex_html_supportClasses_NonVirtualDataGroup,
- org_apache_flex_core_UIBase);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org_apache_flex_html_supportClasses_NonVirtualDataGroup.prototype.FLEXJS_CLASS_INFO =
- { names: [{ name: 'NonVirtualDataGroup',
- qName: 'org_apache_flex_html_supportClasses_NonVirtualDataGroup' }] };
-
-
-Object.defineProperties(org_apache_flex_html_supportClasses_NonVirtualDataGroup.prototype, {
- /** @expose */
- strand: {
- /** @this {org_apache_flex_html_supportClasses_NonVirtualDataGroup} */
- set: function(value) {
- this.strand_ = value;
- }
- },
- /** @expose */
- numElements: {
- /** @this {org_apache_flex_html_supportClasses_NonVirtualDataGroup} */
- get: function() {
-
- var n = this.element.childNodes.length;
- return n;
- }
- }
-});
-
-
-/**
- * @override
- */
-org_apache_flex_html_supportClasses_NonVirtualDataGroup.
- prototype.createElement = function() {
- this.element = document.createElement('div');
- this.element.style.overflow = 'auto';
- this.element.style.display = 'inline-block';
- this.element.style.position = 'inherit';
- this.element.flexjs_wrapper = this;
- this.className = 'NonVirtualDataGroup';
-
- this.positioner = this.element;
-
- return this.element;
-};
-
-
-/**
- * @override
- * @param {Object} value The child element being added.
- */
-org_apache_flex_html_supportClasses_NonVirtualDataGroup.
- prototype.addElement = function(value) {
- org_apache_flex_html_supportClasses_NonVirtualDataGroup.base(this, 'addElement', value);
-
- var itemRenderer = org_apache_flex_utils_Language.as(value,
- org_apache_flex_html_supportClasses_DataItemRenderer);
- itemRenderer.index = this.renderers.length;
- itemRenderer.itemRendererParent = this;
- this.renderers.push(value);
-};
-
-
-/**
- * @expose
- */
-org_apache_flex_html_supportClasses_NonVirtualDataGroup.
- prototype.removeAllElements = function() {
-
- while (this.element.hasChildNodes()) {
- this.element.removeChild(this.element.lastChild);
- }
-};
-
-
-/**
- * @expose
- * @param {number} index The index of the desired element.
- * @return {Object} The element at the given index.
- */
-org_apache_flex_html_supportClasses_NonVirtualDataGroup.
- prototype.getElementAt = function(index) {
-
- var e = this.element.childNodes[index];
- return e.flexjs_wrapper;
-};
-
-
-/**
- * @expose
- * @param {Object} index The index for the itemRenderer.
- * @return {Object} The itemRenderer that matches the index.
- */
-org_apache_flex_html_supportClasses_NonVirtualDataGroup.
- prototype.getItemRendererForIndex = function(index) {
- return this.renderers[index];
-};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/Mobile/asjs/src/org/apache/flex/mobile/beads/StackedViewManagerView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/asjs/src/org/apache/flex/mobile/beads/StackedViewManagerView.as b/frameworks/projects/Mobile/asjs/src/org/apache/flex/mobile/beads/StackedViewManagerView.as
index 1d3ae57..b66d397 100644
--- a/frameworks/projects/Mobile/asjs/src/org/apache/flex/mobile/beads/StackedViewManagerView.as
+++ b/frameworks/projects/Mobile/asjs/src/org/apache/flex/mobile/beads/StackedViewManagerView.as
@@ -23,7 +23,7 @@ package org.apache.flex.mobile.beads
import org.apache.flex.core.IStrand;
import org.apache.flex.core.IUIBase;
import org.apache.flex.events.Event;
- import org.apache.flex.html.beads.layouts.NonVirtualHorizontalLayout;
+ import org.apache.flex.html.beads.layouts.HorizontalLayout;
import org.apache.flex.mobile.ManagerBase;
import org.apache.flex.mobile.chrome.NavigationBar;
import org.apache.flex.mobile.chrome.ToolBar;
@@ -85,7 +85,7 @@ package org.apache.flex.mobile.beads
{
_navigationBar = new NavigationBar();
_navigationBar.controls = model.navigationBarItems;
- _navigationBar.addBead(new NonVirtualHorizontalLayout());
+ _navigationBar.addBead(new HorizontalLayout());
_strand.addElement(_navigationBar);
}
@@ -93,7 +93,7 @@ package org.apache.flex.mobile.beads
{
_toolBar = new ToolBar();
_toolBar.controls = model.toolBarItems;
- _toolBar.addBead(new NonVirtualHorizontalLayout());
+ _toolBar.addBead(new HorizontalLayout());
_strand.addElement(_toolBar);
}
@@ -181,4 +181,4 @@ package org.apache.flex.mobile.beads
return _strand.height;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/Mobile/asjs/src/org/apache/flex/mobile/beads/TabbedViewManagerView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/asjs/src/org/apache/flex/mobile/beads/TabbedViewManagerView.as b/frameworks/projects/Mobile/asjs/src/org/apache/flex/mobile/beads/TabbedViewManagerView.as
index e5652c8..138bf3c 100644
--- a/frameworks/projects/Mobile/asjs/src/org/apache/flex/mobile/beads/TabbedViewManagerView.as
+++ b/frameworks/projects/Mobile/asjs/src/org/apache/flex/mobile/beads/TabbedViewManagerView.as
@@ -23,7 +23,7 @@ package org.apache.flex.mobile.beads
import org.apache.flex.core.IStrand;
import org.apache.flex.core.IUIBase;
import org.apache.flex.events.Event;
- import org.apache.flex.html.beads.layouts.NonVirtualHorizontalLayout;
+ import org.apache.flex.html.beads.layouts.HorizontalLayout;
import org.apache.flex.mobile.ManagerBase;
import org.apache.flex.mobile.chrome.NavigationBar;
import org.apache.flex.mobile.chrome.TabBar;
@@ -82,7 +82,7 @@ package org.apache.flex.mobile.beads
{
_navigationBar = new NavigationBar();
_navigationBar.controls = model.navigationBarItems;
- _navigationBar.addBead(new NonVirtualHorizontalLayout());
+ _navigationBar.addBead(new HorizontalLayout());
_strand.addElement(_navigationBar);
}
@@ -181,4 +181,4 @@ package org.apache.flex.mobile.beads
return _strand.height;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/mustella/tests/basicTests/BasicTests.css
----------------------------------------------------------------------
diff --git a/mustella/tests/basicTests/BasicTests.css b/mustella/tests/basicTests/BasicTests.css
index ce61bba..fe43f2b 100644
--- a/mustella/tests/basicTests/BasicTests.css
+++ b/mustella/tests/basicTests/BasicTests.css
@@ -155,7 +155,7 @@ TextInput {
*/
my|VBox {
- IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.NonVirtualVerticalLayout");
+ IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.VerticalLayout");
}
/*
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/mustella/tests/basicTests/shim/VBox.as
----------------------------------------------------------------------
diff --git a/mustella/tests/basicTests/shim/VBox.as b/mustella/tests/basicTests/shim/VBox.as
index 6bbe665..df94727 100644
--- a/mustella/tests/basicTests/shim/VBox.as
+++ b/mustella/tests/basicTests/shim/VBox.as
@@ -22,7 +22,7 @@ package shim
import flash.display.DisplayObjectContainer;
import org.apache.flex.html.Container;
- import org.apache.flex.html.beads.layouts.NonVirtualVerticalLayout;
+ import org.apache.flex.html.beads.layouts.VerticalLayout;
[DefaultProperty("mxmlContent")]
@@ -42,7 +42,7 @@ package shim
public function VBox()
{
super();
- addBead(new NonVirtualVerticalLayout());
+ addBead(new VerticalLayout());
}
}