Updated Branches: refs/heads/develop 5238a9725 -> 07d0d2501
Cleaned up issues with JavaScript code and Google Closure requirements. Added missing ISelectionModel to JavaScript framework. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/07d0d250 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/07d0d250 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/07d0d250 Branch: refs/heads/develop Commit: 07d0d2501bee36025d0b4ac3025e390464232d83 Parents: 5238a97 Author: Peter Ent <[email protected]> Authored: Tue Dec 3 16:20:04 2013 -0500 Committer: Peter Ent <[email protected]> Committed: Tue Dec 3 16:20:04 2013 -0500 ---------------------------------------------------------------------- .../flex/html/staticControls/beads/IListView.as | 4 - .../src/org/apache/flex/core/ISelectionModel.js | 85 ++++++++++++++++++++ .../src/org/apache/flex/core/ValuesManager.js | 10 +-- .../flex/html/staticControls/beads/IListView.js | 12 ++- .../beads/models/ArraySelectionModel.js | 4 +- 5 files changed, 100 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/07d0d250/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IListView.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IListView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IListView.as index 8e74ff4..590dad0 100644 --- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IListView.as +++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IListView.as @@ -20,13 +20,9 @@ package org.apache.flex.html.staticControls.beads { import org.apache.flex.core.IItemRendererParent; import org.apache.flex.core.IStrand; - import org.apache.flex.html.staticControls.supportClasses.Border; - import org.apache.flex.html.staticControls.supportClasses.ScrollBar; public interface IListView { - function get border():Border; - function get vScrollBar():ScrollBar; function get dataGroup():IItemRendererParent; function get strand():IStrand; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/07d0d250/frameworks/js/FlexJS/src/org/apache/flex/core/ISelectionModel.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/ISelectionModel.js b/frameworks/js/FlexJS/src/org/apache/flex/core/ISelectionModel.js new file mode 100644 index 0000000..15382f5 --- /dev/null +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/ISelectionModel.js @@ -0,0 +1,85 @@ +/** + * 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. + */ + +/** + * org.apache.flex.core.ISelectionModel + * + * @fileoverview + * + * @suppress {checkTypes} + */ + +goog.provide('org.apache.flex.core.ISelectionModel'); + + + +/** + * @interface + * @extends {org.apache.flex.events.IEventDispatcher} + * @extends {org.apache.flex.core.IBeadModel} + */ +org.apache.flex.core.ISelectionModel = function() { +}; + + +/** + * @expose + * @param {Object} value + */ +org.apache.flex.core.ISelectionModel.prototype.set_dataProvider = function(value) {}; + + +/** + * @expose + * @return {Object} The dataProvider. + */ +org.apache.flex.core.ISelectionModel.prototype.get_dataProvider = function() {}; + + +/** + * @expose + * @param {number} value + */ +org.apache.flex.core.ISelectionModel.prototype.set_selectedIndex = function(value) {}; + + +/** + * @expose + * @return {number} The selected index. + */ +org.apache.flex.core.ISelectionModel.prototype.get_selectedIndex = function() {}; + + +/** + * @expose + * @param {Object} value + */ +org.apache.flex.core.ISelectionModel.prototype.set_selectedItem = function(value) {}; + + +/** + * @expose + * @return {Object} The selected item. + */ +org.apache.flex.core.ISelectionModel.prototype.get_selectedItem = function() {}; + + +/** + * Metadata + * + * @type {Object.<string, Array.<Object>>} + */ +org.apache.flex.core.ISelectionModel.prototype.FLEXJS_CLASS_INFO = +{ names: [{ name: 'ISelectionModel', qName: 'org.apache.flex.core.ISelectionModel'}], + interfaces: [org.apache.flex.events.IEventDispatcher, org.apache.flex.core.IBeadModel] }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/07d0d250/frameworks/js/FlexJS/src/org/apache/flex/core/ValuesManager.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/ValuesManager.js b/frameworks/js/FlexJS/src/org/apache/flex/core/ValuesManager.js index a70dd4a..8f08975 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/ValuesManager.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/ValuesManager.js @@ -37,24 +37,24 @@ org.apache.flex.core.ValuesManager.prototype.FLEXJS_CLASS_INFO = * @expose * @return {org.apache.flex.core.ValuesManager} */ -org.apache.flex.core.ValuesManager.prototype.valuesImpl = null; +org.apache.flex.core.ValuesManager.prototype.valuesImpl; /** * @expose * @this {org.apache.flex.core.ValuesManager} - * @return {object} The value. + * @return {Object} The value. */ org.apache.flex.core.ValuesManager.get_valuesImpl = function() { - return this.valuesImpl; + return org.apache.flex.core.ValuesManager.valuesImpl; }; /** * @expose * @this {org.apache.flex.core.ValuesManager} - * @param {object} value being set. + * @param {Object} value being set. */ org.apache.flex.core.ValuesManager.set_valuesImpl = function(value) { - this.valuesImpl = value; + org.apache.flex.core.ValuesManager.valuesImpl = value; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/07d0d250/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/IListView.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/IListView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/IListView.js index 7717ade..9f4cb33 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/IListView.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/IListView.js @@ -12,20 +12,24 @@ * limitations under the License. */ +/** + * @fileoverview + * @suppress {checkTypes} + */ + goog.provide('org.apache.flex.html.staticControls.beads.IListView'); -goog.require('org.apache.flex.html.staticControls.supportClasses.Border'); -goog.require('org.apache.flex.html.staticControls.supportClasses.ScrollBar'); +goog.require('org.apache.flex.core.IBeadView'); /** + * IListView + * * @interface - * @extends {org.apache.flex.core.IBeadView} */ org.apache.flex.html.staticControls.beads.IListView = function() { }; -org.apache.flex.html.staticControls.beads.IListView.prototype.border; /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/07d0d250/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/ArraySelectionModel.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/ArraySelectionModel.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/ArraySelectionModel.js index 3bc4c12..5fd5d55 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/ArraySelectionModel.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/ArraySelectionModel.js @@ -78,7 +78,7 @@ org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype. /** * @expose - * @return {Object} value The selected index. + * @return {number} value The selected index. */ org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype. get_selectedIndex = function() { @@ -88,7 +88,7 @@ org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype. /** * @expose - * @param {Object} value The selected index. + * @param {number} value The selected index. */ org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype. set_selectedIndex = function(value) {
