You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by er...@apache.org on 2013/11/06 10:05:26 UTC
[1/5] git commit: [flex-asjs] [refs/heads/develop] - FlexJS interface
support is now implemented. Changing the framework in order to make the
'asjs' examples work again.
Updated Branches:
refs/heads/develop bbba578de -> 9250591b6
FlexJS interface support is now implemented. Changing the framework in order to make the 'asjs' examples work again.
These changes are for the 'DataBindingTest' example.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/50ee92e7
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/50ee92e7
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/50ee92e7
Branch: refs/heads/develop
Commit: 50ee92e772f95c590392cde24235aa8c1abb1769
Parents: bbba578
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Wed Nov 6 06:40:13 2013 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Wed Nov 6 06:40:13 2013 +0100
----------------------------------------------------------------------
.../js/FlexJS/src/org/apache/flex/core/IBead.js | 41 +++++++++++++++++++
.../src/org/apache/flex/core/IBeadLayout.js | 25 ++++++++----
.../src/org/apache/flex/core/IDocument.js | 42 ++++++++++++++++++++
.../beads/layouts/NonVirtualVerticalLayout.js | 17 +++++---
4 files changed, 112 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/50ee92e7/frameworks/js/FlexJS/src/org/apache/flex/core/IBead.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/IBead.js b/frameworks/js/FlexJS/src/org/apache/flex/core/IBead.js
new file mode 100644
index 0000000..6b9e016
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/IBead.js
@@ -0,0 +1,41 @@
+/**
+ * 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.
+ */
+
+/*jshint globalstrict: true, indent: 2, maxlen: 80, strict: true,
+ white: false */
+/*global goog, org */
+
+'use strict';
+
+goog.provide('org.apache.flex.core.IBead');
+
+
+
+/**
+ * IBead
+ *
+ * @interface
+ */
+org.apache.flex.core.IBead = function() {
+};
+
+
+/**
+ * set_strand()
+ *
+ * @expose
+ * @param {Object} value The new host.
+ */
+org.apache.flex.core.IBead.prototype.set_strand =
+ function(value) {};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/50ee92e7/frameworks/js/FlexJS/src/org/apache/flex/core/IBeadLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/IBeadLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/core/IBeadLayout.js
index 8c990a3..0e27fb5 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/core/IBeadLayout.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/IBeadLayout.js
@@ -12,17 +12,28 @@
* limitations under the License.
*/
+/*jshint globalstrict: true, indent: 2, maxlen: 80, strict: true,
+ white: false */
+/*global goog, org */
+
+'use strict';
+
goog.provide('org.apache.flex.core.IBeadLayout');
-goog.require('org.apache.flex.events.EventDispatcher');
+goog.require('org.apache.flex.core.IBead');
+
+
/**
- * @constructor
- * @extends {org.apache.flex.events.EventDispatcher}
+ * @interface
+ * @implements {org.apache.flex.core.IBead}
*/
org.apache.flex.core.IBeadLayout = function() {
- goog.base(this);
};
-goog.inherits(
- org.apache.flex.core.IBeadLayout,
- org.apache.flex.events.EventDispatcher);
+
+
+/**
+ * @const
+ */
+org.apache.flex.core.IBeadLayout.prototype.AFJS_INTERFACES =
+ [org.apache.flex.core.IBead];
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/50ee92e7/frameworks/js/FlexJS/src/org/apache/flex/core/IDocument.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/IDocument.js b/frameworks/js/FlexJS/src/org/apache/flex/core/IDocument.js
new file mode 100644
index 0000000..9f44ef2
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/IDocument.js
@@ -0,0 +1,42 @@
+/**
+ * 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.
+ */
+
+/*jshint globalstrict: true, indent: 2, maxlen: 80, strict: true,
+ white: false */
+/*global goog, org */
+
+'use strict';
+
+goog.provide('org.apache.flex.core.IDocument');
+
+
+
+/**
+ * IDocument
+ *
+ * @interface
+ */
+org.apache.flex.core.IDocument = function() {
+};
+
+
+/**
+ * setDocument()
+ *
+ * @expose
+ * @param {Object} document The DOM document element.
+ * @param {string=} opt_id The id (optional).
+ */
+org.apache.flex.core.IDocument.prototype.setDocument =
+ function(document, opt_id) {};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/50ee92e7/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalLayout.js
index 42dd052..46ea9ac 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalLayout.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalLayout.js
@@ -12,22 +12,26 @@
* limitations under the License.
*/
+/*jshint globalstrict: true, indent: 2, maxlen: 80, strict: true,
+ white: false */
+/*global goog, org */
+
+'use strict';
+
goog.provide('org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout');
goog.require('org.apache.flex.core.IBeadLayout');
/**
* @constructor
- * @extends {org.apache.flex.core.IBeadLayout}
+ * @implements {org.apache.flex.core.IBeadLayout}
*/
org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout =
function() {
- goog.base(this);
this.strand_ = null;
this.className = 'NonVirtualVerticalLayout';
};
-goog.inherits(org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout,
-org.apache.flex.core.IBeadLayout);
+
/**
* @expose
@@ -55,10 +59,11 @@ org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout.proto
n = children.length;
for (i = 0; i < n; i++)
{
- if (children[i].style.display == 'none')
+ if (children[i].style.display === 'none') {
children[i].lastDisplay_ = 'block';
- else
+ } else {
children[i].style.display = 'block';
+ }
}
};
[3/5] git commit: [flex-asjs] [refs/heads/develop] - These changes
for the interface implementation are needed to make the 'DataGridExample'
example work.
Posted by er...@apache.org.
These changes for the interface implementation are needed to make the 'DataGridExample' example work.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/87aad029
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/87aad029
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/87aad029
Branch: refs/heads/develop
Commit: 87aad029b52c546c36053b27caff0200699bb616
Parents: eb1c389
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Wed Nov 6 07:23:35 2013 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Wed Nov 6 07:23:35 2013 +0100
----------------------------------------------------------------------
.../src/org/apache/flex/core/IItemRenderer.js | 9 +--
.../DataItemRendererFactoryForColumnData.js | 61 ++++++++++++--------
2 files changed, 38 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87aad029/frameworks/js/FlexJS/src/org/apache/flex/core/IItemRenderer.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/IItemRenderer.js b/frameworks/js/FlexJS/src/org/apache/flex/core/IItemRenderer.js
index d39e5a2..cde196d 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/core/IItemRenderer.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/IItemRenderer.js
@@ -14,15 +14,10 @@
goog.provide('org.apache.flex.core.IItemRenderer');
-goog.require('org.apache.flex.events.EventDispatcher');
+
/**
- * @constructor
- * @extends {org.apache.flex.events.EventDispatcher}
+ * @interface
*/
org.apache.flex.core.IItemRenderer = function() {
- goog.base(this);
};
-goog.inherits(
- org.apache.flex.core.IItemRenderer,
- org.apache.flex.events.EventDispatcher);
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87aad029/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForColumnData.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForColumnData.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForColumnData.js
index 38d634a..9407cff 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForColumnData.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForColumnData.js
@@ -14,26 +14,27 @@
goog.provide('org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForColumnData');
-goog.require('org.apache.flex.events.EventDispatcher');
goog.require('org.apache.flex.core.IItemRenderer');
+goog.require('org.apache.flex.core.ValuesManager');
+goog.require('org.apache.flex.events.EventDispatcher');
+goog.require('org.apache.flex.html.staticControls.beads.DataGridColumnView');
goog.require('org.apache.flex.html.staticControls.beads.models.ArraySelectionModel');
goog.require('org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer');
-goog.require('org.apache.flex.html.staticControls.beads.DataGridColumnView');
-goog.require('org.apache.flex.core.ValuesManager');
+
+
/**
* @constructor
- * @extends {org.apache.flex.core.IItemRenderer}
+ * @extends {org.apache.flex.events.EventDispatcher}
+ * @implements {org.apache.flex.core.IItemRenderer}
*/
org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForColumnData =
-function() {
+ function() {
goog.base(this);
};
goog.inherits(
- org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForColumnData,
- org.apache.flex.core.IItemRenderer,
- org.apache.flex.events.EventDispatcher);
-
+ org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForColumnData,
+ org.apache.flex.events.EventDispatcher);
/**
@@ -43,28 +44,31 @@ goog.inherits(
* @param {object} value The component strand.
*/
org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForColumnData.
-prototype.set_strand = function(value) {
+ prototype.set_strand = function(value) {
+ var Irf;
+
this.strand_ = value;
this.model = value.getBeadByType(
- org.apache.flex.html.staticControls.beads.models.ArraySelectionModel);
-
+ org.apache.flex.html.staticControls.beads.models.ArraySelectionModel);
+
this.listView = value.getBeadByType(
- org.apache.flex.html.staticControls.beads.DataGridColumnView);
+ org.apache.flex.html.staticControls.beads.DataGridColumnView);
this.dataGroup = this.listView.get_dataGroup();
this.model.addEventListener('dataProviderChanged',
goog.bind(this.dataProviderChangedHandler, this));
if (!this.itemRendererFactory_) {
- var irf = org.apache.flex.core.ValuesManager.valuesImpl.getValue(this.strand_, 'iItemRendererClassFactory');
- this.itemRendererFactory_ = new irf;
+ Irf = org.apache.flex.core.ValuesManager.valuesImpl.getValue(this.strand_, 'iItemRendererClassFactory');
+ this.itemRendererFactory_ = new Irf();
this.strand_.addBead(this.itemRendererFactory_);
}
this.dataProviderChangedHandler(null);
};
+
/**
* @expose
* @this {org.apache.flex.html.staticControls.beads.
@@ -72,10 +76,11 @@ prototype.set_strand = function(value) {
* @return {object} The factory class to use for creating item renderers.
*/
org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForColumnData.
-prototype.get_itemRendererFactory = function() {
+ prototype.get_itemRendererFactory = function() {
return this.itemRendererFactory_;
};
+
/**
* @expose
* @this {org.apache.flex.html.staticControls.beads.
@@ -83,7 +88,7 @@ prototype.get_itemRendererFactory = function() {
* @param {object} value The factory class to use for creating item renderers.
*/
org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForColumnData.
-prototype.set_itemRendererFactory = function(value) {
+ prototype.set_itemRendererFactory = function(value) {
this.itemRendererFactory_ = value;
};
@@ -95,25 +100,31 @@ prototype.set_itemRendererFactory = function(value) {
* @param {object} event The event that triggered the dataProvider change.
*/
org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForColumnData.
-prototype.dataProviderChangedHandler = function(event) {
- var dp, i, n, opt;
-
+ prototype.dataProviderChangedHandler = function(event) {
+ var dp, fieldName, i, n, newEvent, opt, view;
dp = this.model.get_dataProvider();
n = dp.length;
// todo: this.dataGroup.removeAllElements();
- var view = this.listView;
+ view = this.listView;
for (i = 0; i < n; i++) {
- var fieldName = view.get_labelField();
-
+ fieldName = view.get_labelField();
+
// todo: grab an itemRenderer from a factory for this column
- var opt = new org.apache.flex.html.staticControls.supportClasses.StringItemRenderer();
+ opt = new org.apache.flex.html.staticControls.supportClasses.StringItemRenderer();
this.dataGroup.addElement(opt);
opt.set_text(dp[i][fieldName]);
}
- var newEvent = new org.apache.flex.events.Event('itemsCreated');
+ newEvent = new org.apache.flex.events.Event('itemsCreated');
this.strand_.dispatchEvent(newEvent);
};
+
+
+/**
+ * @const
+ */
+org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForColumnData
+ .prototype.AFJS_INTERFACES = [org.apache.flex.core.IItemRenderer];
[5/5] git commit: [flex-asjs] [refs/heads/develop] - Changed JS
framework classes to implement the new FLEXJS_CLASS_INFO metadata storage.
Posted by er...@apache.org.
Changed JS framework classes to implement the new FLEXJS_CLASS_INFO metadata storage.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9250591b
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9250591b
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9250591b
Branch: refs/heads/develop
Commit: 9250591b65e934910a46a06be7480957ceeefa3a
Parents: 8e8ef07
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Wed Nov 6 10:04:58 2013 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Wed Nov 6 10:04:58 2013 +0100
----------------------------------------------------------------------
frameworks/js/FlexJS/src/org/apache/flex/core/IBeadLayout.js | 4 ++--
.../staticControls/beads/DataItemRendererFactoryForColumnData.js | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9250591b/frameworks/js/FlexJS/src/org/apache/flex/core/IBeadLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/IBeadLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/core/IBeadLayout.js
index 0386bcd..76b4634 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/core/IBeadLayout.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/IBeadLayout.js
@@ -29,5 +29,5 @@ org.apache.flex.core.IBeadLayout = function() {
/**
* @const
*/
-org.apache.flex.core.IBeadLayout.prototype.AFJS_INTERFACES =
- [org.apache.flex.core.IBead];
+org.apache.flex.core.IBeadLayout.prototype.FLEXJS_CLASS_INFO =
+ { interfaces: [org.apache.flex.core.IBead] };
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9250591b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForColumnData.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForColumnData.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForColumnData.js
index 9407cff..e1cff11 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForColumnData.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForColumnData.js
@@ -127,4 +127,4 @@ org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForColumnData.
* @const
*/
org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForColumnData
- .prototype.AFJS_INTERFACES = [org.apache.flex.core.IItemRenderer];
+ .prototype.FLEXJS_CLASS_INFO = { interfaces: [org.apache.flex.core.IItemRenderer] };
[2/5] git commit: [flex-asjs] [refs/heads/develop] - 'goog' doesn't
like 'use strict' when running in debug mode.
Posted by er...@apache.org.
'goog' doesn't like 'use strict' when running in debug mode.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/eb1c3896
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/eb1c3896
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/eb1c3896
Branch: refs/heads/develop
Commit: eb1c389605b83ddbe9a088d0c692e79304bd89a2
Parents: 50ee92e
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Wed Nov 6 07:21:37 2013 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Wed Nov 6 07:21:37 2013 +0100
----------------------------------------------------------------------
.../js/FlexJS/src/org/apache/flex/core/IBead.js | 6 ------
.../FlexJS/src/org/apache/flex/core/IBeadLayout.js | 6 ------
.../js/FlexJS/src/org/apache/flex/core/IDocument.js | 6 ------
.../beads/layouts/NonVirtualVerticalLayout.js | 6 ------
.../js/FlexJS/src/org/apache/flex/utils/Language.js | 15 +++++----------
5 files changed, 5 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eb1c3896/frameworks/js/FlexJS/src/org/apache/flex/core/IBead.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/IBead.js b/frameworks/js/FlexJS/src/org/apache/flex/core/IBead.js
index 6b9e016..b22265c 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/core/IBead.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/IBead.js
@@ -12,12 +12,6 @@
* limitations under the License.
*/
-/*jshint globalstrict: true, indent: 2, maxlen: 80, strict: true,
- white: false */
-/*global goog, org */
-
-'use strict';
-
goog.provide('org.apache.flex.core.IBead');
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eb1c3896/frameworks/js/FlexJS/src/org/apache/flex/core/IBeadLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/IBeadLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/core/IBeadLayout.js
index 0e27fb5..0386bcd 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/core/IBeadLayout.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/IBeadLayout.js
@@ -12,12 +12,6 @@
* limitations under the License.
*/
-/*jshint globalstrict: true, indent: 2, maxlen: 80, strict: true,
- white: false */
-/*global goog, org */
-
-'use strict';
-
goog.provide('org.apache.flex.core.IBeadLayout');
goog.require('org.apache.flex.core.IBead');
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eb1c3896/frameworks/js/FlexJS/src/org/apache/flex/core/IDocument.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/IDocument.js b/frameworks/js/FlexJS/src/org/apache/flex/core/IDocument.js
index 9f44ef2..21a1a1c 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/core/IDocument.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/IDocument.js
@@ -12,12 +12,6 @@
* limitations under the License.
*/
-/*jshint globalstrict: true, indent: 2, maxlen: 80, strict: true,
- white: false */
-/*global goog, org */
-
-'use strict';
-
goog.provide('org.apache.flex.core.IDocument');
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eb1c3896/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalLayout.js
index 46ea9ac..eadc47e 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalLayout.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalLayout.js
@@ -12,12 +12,6 @@
* limitations under the License.
*/
-/*jshint globalstrict: true, indent: 2, maxlen: 80, strict: true,
- white: false */
-/*global goog, org */
-
-'use strict';
-
goog.provide('org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout');
goog.require('org.apache.flex.core.IBeadLayout');
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eb1c3896/frameworks/js/FlexJS/src/org/apache/flex/utils/Language.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/utils/Language.js b/frameworks/js/FlexJS/src/org/apache/flex/utils/Language.js
index e9f919f..a785d96 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/utils/Language.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/utils/Language.js
@@ -12,11 +12,6 @@
* limitations under the License.
*/
-/*jshint globalstrict: true, indent: 2, maxlen: 80, strict: true, white: false */
-/*global goog, org */
-
-'use strict';
-
goog.provide('org.apache.flex.utils.Language');
@@ -70,21 +65,21 @@ org.apache.flex.utils.Language._int = function(value) {
*/
org.apache.flex.utils.Language.is = function(leftOperand, rightOperand) {
var checkInterfaces;
-
+
checkInterfaces = function (left) {
var i, interfaces;
-
+
interfaces = left.AFJS_INTERFACES;
for (i = interfaces.length - 1; i > -1; i--) {
if (interfaces[i] === rightOperand) {
return true;
- }
-
+ }
+
if (interfaces[i].prototype.AFJS_INTERFACES) {
return checkInterfaces(new interfaces[i]());
}
}
-
+
return false;
}
[4/5] git commit: [flex-asjs] [refs/heads/develop] - Changed 'is'
operator handling to use the new FLEXJS_CLASS_INFO metadata storage.
Posted by er...@apache.org.
Changed 'is' operator handling to use the new FLEXJS_CLASS_INFO metadata storage.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8e8ef07f
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8e8ef07f
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8e8ef07f
Branch: refs/heads/develop
Commit: 8e8ef07f8c99ebd800fbb0be2e1ced10219621aa
Parents: 87aad02
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Wed Nov 6 10:04:17 2013 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Wed Nov 6 10:04:17 2013 +0100
----------------------------------------------------------------------
frameworks/js/FlexJS/src/org/apache/flex/utils/Language.js | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8e8ef07f/frameworks/js/FlexJS/src/org/apache/flex/utils/Language.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/utils/Language.js b/frameworks/js/FlexJS/src/org/apache/flex/utils/Language.js
index a785d96..a4d7792 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/utils/Language.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/utils/Language.js
@@ -20,7 +20,6 @@ goog.provide('org.apache.flex.utils.Language');
* @constructor
*/
org.apache.flex.utils.Language = function() {
- //
};
@@ -69,13 +68,14 @@ org.apache.flex.utils.Language.is = function(leftOperand, rightOperand) {
checkInterfaces = function (left) {
var i, interfaces;
- interfaces = left.AFJS_INTERFACES;
+ interfaces = left.FLEXJS_CLASS_INFO.interfaces;
for (i = interfaces.length - 1; i > -1; i--) {
if (interfaces[i] === rightOperand) {
return true;
}
- if (interfaces[i].prototype.AFJS_INTERFACES) {
+ if (interfaces[i].prototype.FLEXJS_CLASS_INFO &&
+ interfaces[i].prototype.FLEXJS_CLASS_INFO.interfaces) {
return checkInterfaces(new interfaces[i]());
}
}
@@ -85,7 +85,8 @@ org.apache.flex.utils.Language.is = function(leftOperand, rightOperand) {
if (leftOperand instanceof rightOperand) {
return true;
- } else if (leftOperand.AFJS_INTERFACES) {
+ } else if (leftOperand.FLEXJS_CLASS_INFO &&
+ leftOperand.FLEXJS_CLASS_INFO.interfaces) {
return checkInterfaces(leftOperand);
}