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 2014/11/15 07:34:00 UTC
[6/7] git commit: [flex-asjs] [refs/heads/develop] - fix warnings
from GCC
fix warnings from GCC
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/bb7dde99
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/bb7dde99
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/bb7dde99
Branch: refs/heads/develop
Commit: bb7dde9912b4fbb9a242485d8a730ee8bd8bddec
Parents: a66f78e
Author: Alex Harui <ah...@apache.org>
Authored: Fri Nov 14 16:49:35 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Nov 14 22:29:52 2014 -0800
----------------------------------------------------------------------
.../src/org/apache/flex/core/CallLaterBead.js | 2 +-
.../src/org/apache/flex/events/MouseEvent.js | 43 ++++++++++++++++++++
.../src/org/apache/flex/html/HContainer.js | 2 +-
.../js/FlexJS/src/org/apache/flex/html/HRule.js | 2 +-
.../org/apache/flex/html/ImageAndTextButton.js | 8 ++--
.../FlexJS/src/org/apache/flex/html/Spacer.js | 2 +-
.../org/apache/flex/html/ToggleTextButton.js | 6 +--
.../FlexJS/src/org/apache/flex/html/ToolTip.js | 3 +-
.../src/org/apache/flex/html/VContainer.js | 2 +-
.../flex/html/beads/ScrollingContainerView.js | 4 +-
.../src/org/apache/flex/utils/PointUtils.js | 4 +-
11 files changed, 60 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bb7dde99/frameworks/js/FlexJS/src/org/apache/flex/core/CallLaterBead.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/CallLaterBead.js b/frameworks/js/FlexJS/src/org/apache/flex/core/CallLaterBead.js
index 41855c5..5b9c20c 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/core/CallLaterBead.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/CallLaterBead.js
@@ -71,7 +71,7 @@ org.apache.flex.core.CallLaterBead.prototype.callLater =
else
this.calls_.push({thisArg: opt_thisArg, fn: fn, args: opt_args });
- window.setTimeout(callback, 0);
+ window.setTimeout(this.callback, 0);
};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bb7dde99/frameworks/js/FlexJS/src/org/apache/flex/events/MouseEvent.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/events/MouseEvent.js b/frameworks/js/FlexJS/src/org/apache/flex/events/MouseEvent.js
index 88025e6..7ccdfae 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/events/MouseEvent.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/events/MouseEvent.js
@@ -29,6 +29,49 @@ org.apache.flex.events.MouseEvent = function() {
};
goog.inherits(org.apache.flex.events.MouseEvent,
window.MouseEvent);
+
+
+/**
+ * @type {string}
+ */
+org.apache.flex.events.MouseEvent.ROLL_OVER = "rollOver";
+
+
+/**
+ * @type {string}
+ */
+org.apache.flex.events.MouseEvent.ROLL_OUT = "rollOout";
+
+
+/**
+ * @type {string}
+ */
+org.apache.flex.events.MouseEvent.MOUSE_OVER = "mouseOver";
+
+
+/**
+ * @type {string}
+ */
+org.apache.flex.events.MouseEvent.MOUSE_OUT = "mouseOut";
+
+
+/**
+ * @type {string}
+ */
+org.apache.flex.events.MouseEvent.MOUSE_UP = "mouseUp";
+
+
+/**
+ * @type {string}
+ */
+org.apache.flex.events.MouseEvent.MOUSE_DOWN = "mouseDown";
+
+
+/**
+ * @type {string}
+ */
+org.apache.flex.events.MouseEvent.MOUSE_MOVE = "mouseMove";
+
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bb7dde99/frameworks/js/FlexJS/src/org/apache/flex/html/HContainer.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/HContainer.js b/frameworks/js/FlexJS/src/org/apache/flex/html/HContainer.js
index f00c395..13b96e3 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/HContainer.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/HContainer.js
@@ -22,7 +22,7 @@ goog.require('org.apache.flex.html.Container');
/**
* @constructor
* @implements {org.apache.flex.core.IContainer}
- * @extends {org.apache.flex.core.HContainerBase}
+ * @extends {org.apache.flex.html.Container}
*/
org.apache.flex.html.HContainer = function() {
org.apache.flex.html.HContainer.base(this, 'constructor');
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bb7dde99/frameworks/js/FlexJS/src/org/apache/flex/html/HRule.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/HRule.js b/frameworks/js/FlexJS/src/org/apache/flex/html/HRule.js
index 9c81982..4d87be1 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/HRule.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/HRule.js
@@ -38,7 +38,7 @@ goog.inherits(org.apache.flex.html.HRule,
*
* @type {Object.<string, Array.<Object>>}
*/
-org.apache.flex.html.Label.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.HRule.prototype.FLEXJS_CLASS_INFO =
{ names: [{ name: 'HRule',
qName: 'org.apache.flex.html.HRule' }] };
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bb7dde99/frameworks/js/FlexJS/src/org/apache/flex/html/ImageAndTextButton.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/ImageAndTextButton.js b/frameworks/js/FlexJS/src/org/apache/flex/html/ImageAndTextButton.js
index e33eae4..0f03214 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/ImageAndTextButton.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/ImageAndTextButton.js
@@ -49,7 +49,7 @@ org.apache.flex.html.ImageAndTextButton.prototype.createElement =
this.element = document.createElement('button');
this.element.setAttribute('type', 'button');
this.img = document.createElement('img');
- this.element.appendChild(img);
+ this.element.appendChild(this.img);
this.positioner = this.element;
this.element.flexjs_wrapper = this;
@@ -84,7 +84,7 @@ org.apache.flex.html.ImageAndTextButton.prototype.set_text =
/**
* @expose
- * @return {string} The text getter.
+ * @return {string} The image url.
*/
org.apache.flex.html.ImageAndTextButton.prototype.get_image = function() {
return this.img.src;
@@ -93,9 +93,9 @@ org.apache.flex.html.ImageAndTextButton.prototype.get_image = function() {
/**
* @expose
- * @param {string} value The text setter.
+ * @param {string} value The image url.
*/
-org.apache.flex.html.ImageAndTextButton.prototype.set_text =
+org.apache.flex.html.ImageAndTextButton.prototype.set_image =
function(value) {
this.img.src = value;
};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bb7dde99/frameworks/js/FlexJS/src/org/apache/flex/html/Spacer.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Spacer.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Spacer.js
index 96e2dcd..2024bd4 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/Spacer.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Spacer.js
@@ -38,7 +38,7 @@ goog.inherits(org.apache.flex.html.Spacer,
*
* @type {Object.<string, Array.<Object>>}
*/
-org.apache.flex.html.Label.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.Spacer.prototype.FLEXJS_CLASS_INFO =
{ names: [{ name: 'Spacer',
qName: 'org.apache.flex.html.Spacer' }] };
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bb7dde99/frameworks/js/FlexJS/src/org/apache/flex/html/ToggleTextButton.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/ToggleTextButton.js b/frameworks/js/FlexJS/src/org/apache/flex/html/ToggleTextButton.js
index 065df45..27af8d3 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/ToggleTextButton.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/ToggleTextButton.js
@@ -85,14 +85,14 @@ org.apache.flex.html.ToggleTextButton.prototype.set_selected =
if (this.selected_ != value) {
this.selected_ = value;
- var className = this._strand.className;
+ var className = this.strand.className;
if (value) {
if (className.indexOf(this.SELECTED) == className.length - this.SELECTED.length)
- this._strand.className = className.substring(0, className.length - this.SELECTED.length);
+ this.strand.className = className.substring(0, className.length - this.SELECTED.length);
}
else {
if (className.indexOf(this.SELECTED) == -1)
- this._strand.className += this.SELECTED;
+ this.strand.className += this.SELECTED;
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bb7dde99/frameworks/js/FlexJS/src/org/apache/flex/html/ToolTip.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/ToolTip.js b/frameworks/js/FlexJS/src/org/apache/flex/html/ToolTip.js
index f1bf5a8..a3670df 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/ToolTip.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/ToolTip.js
@@ -20,8 +20,7 @@ goog.require('org.apache.flex.html.Label');
/**
* @constructor
- * @implements {org.apache.flex.core.IContainer}
- * @extends {org.apache.flex.core.ToolTipBase}
+ * @extends {org.apache.flex.html.Label}
*/
org.apache.flex.html.ToolTip = function() {
org.apache.flex.html.ToolTip.base(this, 'constructor');
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bb7dde99/frameworks/js/FlexJS/src/org/apache/flex/html/VContainer.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/VContainer.js b/frameworks/js/FlexJS/src/org/apache/flex/html/VContainer.js
index 8d646a0..e1198eb 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/VContainer.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/VContainer.js
@@ -22,7 +22,7 @@ goog.require('org.apache.flex.html.Container');
/**
* @constructor
* @implements {org.apache.flex.core.IContainer}
- * @extends {org.apache.flex.core.HContainerBase}
+ * @extends {org.apache.flex.html.Container}
*/
org.apache.flex.html.VContainer = function() {
org.apache.flex.html.VContainer.base(this, 'constructor');
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bb7dde99/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ScrollingContainerView.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ScrollingContainerView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ScrollingContainerView.js
index dcf4aad..d300b5f 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ScrollingContainerView.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ScrollingContainerView.js
@@ -69,7 +69,7 @@ function() {
/**
* @expose
- * @return {Object} value The resizeable view.
+ * @return {number} value The resizeable view.
*/
org.apache.flex.html.beads.ScrollingContainerView.prototype.get_verticalScrollPosition =
function() {
@@ -80,7 +80,7 @@ function() {
/**
* @expose
- * @return {Object} value The resizeable view.
+ * @return {number} value The resizeable view.
*/
org.apache.flex.html.beads.ScrollingContainerView.prototype.get_maxVerticalScrollPosition =
function() {
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bb7dde99/frameworks/js/FlexJS/src/org/apache/flex/utils/PointUtils.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/utils/PointUtils.js b/frameworks/js/FlexJS/src/org/apache/flex/utils/PointUtils.js
index e18aa71..6b861f1 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/utils/PointUtils.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/utils/PointUtils.js
@@ -52,7 +52,7 @@ org.apache.flex.utils.PointUtils.globalToLocal =
element = element.offsetParent;
}
while (element);
- return new Point(x, y);
+ return new org.apache.flex.geom.Point(x, y);
};
@@ -73,5 +73,5 @@ org.apache.flex.utils.PointUtils.localToGlobal =
element = element.offsetParent;
}
while (element);
- return new Point(x, y);
+ return new org.apache.flex.geom.Point(x, y);
};