You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ha...@apache.org on 2016/08/11 07:32:29 UTC
git commit: [flex-asjs] [refs/heads/refactor-sprite] - Renamed
HTMLElementWrapper
Repository: flex-asjs
Updated Branches:
refs/heads/refactor-sprite 1da11d9d1 -> 4558126d0
Renamed HTMLElementWrapper
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4558126d
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4558126d
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4558126d
Branch: refs/heads/refactor-sprite
Commit: 4558126d0ae3e99b0b2ae50ad1f457d0ebe3542e
Parents: 1da11d9
Author: Harbs <ha...@in-tools.com>
Authored: Thu Aug 11 10:32:22 2016 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Thu Aug 11 10:32:22 2016 +0300
----------------------------------------------------------------------
.../flex/org/apache/flex/core/ElementWrapper.as | 352 +++++++++++++++++++
.../org/apache/flex/core/HTMLElementWrapper.as | 352 -------------------
.../flex/org/apache/flex/core/IFlexJSElement.as | 4 +-
.../apache/flex/core/UIHTMLElementWrapper.as | 2 +-
.../org/apache/flex/core/WrappedMovieClip.as | 6 +-
.../flex/org/apache/flex/core/WrappedShape.as | 6 +-
.../org/apache/flex/core/WrappedSimpleButton.as | 6 +-
.../flex/org/apache/flex/core/WrappedSprite.as | 6 +-
.../org/apache/flex/core/WrappedTextField.as | 6 +-
.../main/flex/org/apache/flex/events/Event.as | 2 +-
.../org/apache/flex/html/beads/ComboBoxView.as | 2 +-
.../flex/org/apache/flex/net/HTTPServiceBase.as | 4 +-
12 files changed, 374 insertions(+), 374 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4558126d/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ElementWrapper.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ElementWrapper.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ElementWrapper.as
new file mode 100644
index 0000000..dea4088
--- /dev/null
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ElementWrapper.as
@@ -0,0 +1,352 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You 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.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.flex.core
+{
+ COMPILE::JS
+ {
+ import window.Event;
+ import org.apache.flex.events.BrowserEvent;
+ import org.apache.flex.events.ElementEvents;
+ import goog.events;
+ import goog.events.EventTarget;
+ }
+ COMPILE::SWF
+ {
+ import flash.events.Event;
+ import flash.events.IEventDispatcher;
+ import org.apache.flex.events.ElementEvents;
+ import org.apache.flex.events.IFlexJSEvent;
+ }
+
+ import org.apache.flex.events.Event;
+ import org.apache.flex.events.EventDispatcher;
+
+ COMPILE::SWF
+ public class ElementWrapper extends EventDispatcher implements IStrand
+ {
+ public function ElementWrapper()
+ {
+ }
+
+ //--------------------------------------
+ // Property
+ //--------------------------------------
+
+ protected var _element:IFlexJSElement;
+
+ public function get element():IFlexJSElement
+ {
+ return _element;
+ }
+
+ public function set element(value:IFlexJSElement):void
+ {
+ _element = value;
+ }
+
+ protected var _beads:Vector.<IBead>;
+
+ //--------------------------------------
+ // Function
+ //--------------------------------------
+
+ /**
+ * @param bead The new bead.
+ */
+ public function addBead(bead:IBead):void
+ {
+ if (!_beads)
+ {
+ _beads = new Vector.<IBead>();
+ }
+
+ _beads.push(bead);
+ bead.strand = this;
+ }
+
+ /**
+ * @param classOrInterface The requested bead type.
+ * @return The bead.
+ */
+ public function getBeadByType(classOrInterface:Class):IBead
+ {
+ var bead:IBead, i:uint, n:uint;
+
+ if (!_beads) return null;
+
+ n = _beads.length;
+
+ for (i = 0; i < n; i++)
+ {
+ bead = _beads[i];
+
+ if (bead is classOrInterface)
+ {
+ return bead;
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * @param bead The bead to remove.
+ * @return The bead.
+ */
+ public function removeBead(bead:IBead):IBead
+ {
+ var i:uint, n:uint, value:Object;
+
+ n = _beads.length;
+
+ for (i = 0; i < n; i++)
+ {
+ value = _beads[i];
+
+ if (bead === value)
+ {
+ _beads.splice(i, 1);
+
+ return bead;
+ }
+ }
+
+ return null;
+ }
+
+ override public function addEventListener(type:String, handler:Function, opt_capture:Boolean = false, priority:int = 0, weak:Boolean = false):void
+ {
+ var source:IEventDispatcher = getActualDispatcher_(type) as IEventDispatcher;
+ if (source != this)
+ source.addEventListener(type, forwarder, opt_capture);
+
+ super.addEventListener(type, handler, opt_capture);
+ }
+
+ override public function removeEventListener(type:String, handler:Function, opt_capture:Boolean = false):void
+ {
+ var source:IEventDispatcher = getActualDispatcher_(type) as IEventDispatcher;
+ if (source != this)
+ source.removeEventListener(type, handler, opt_capture);
+
+ super.removeEventListener(type, handler, opt_capture);
+ }
+
+ private function getActualDispatcher_(type:String):IEventDispatcher
+ {
+ var source:IEventDispatcher = this;
+ if (ElementEvents.elementEvents[type]) {
+ // mouse and keyboard events also dispatch off the element.
+ source = this.element as IEventDispatcher;
+ }
+ return source;
+ }
+
+ private function forwarder(event:flash.events.Event):void
+ {
+ if (event is IFlexJSEvent)
+ event = IFlexJSEvent(event).cloneEvent() as flash.events.Event;
+ dispatchEvent(event);
+ }
+ }
+
+ COMPILE::JS
+ public class ElementWrapper extends EventDispatcher implements IStrand
+ {
+
+ //--------------------------------------
+ // Static Function
+ //--------------------------------------
+
+ /**
+ * @param listener The listener object to call {goog.events.Listener}.
+ * @param eventObject The event object to pass to the listener.
+ * @return Result of listener.
+ */
+ static public function fireListenerOverride(listener:Object, eventObject:BrowserEvent):Boolean
+ {
+ var e:BrowserEvent = new BrowserEvent();
+ e.wrappedEvent = eventObject;
+ return ElementWrapper.googFireListener(listener, e);
+ }
+
+ /**
+ * Static initializer
+ */
+ static public function installOverride():Boolean
+ {
+ ElementWrapper.googFireListener = goog.events.fireListener;
+ goog.events.fireListener = ElementWrapper.fireListenerOverride;
+ return true;
+ }
+
+ //--------------------------------------
+ // Static Property
+ //--------------------------------------
+
+ static public var googFireListener:Function;
+
+ /**
+ * The properties that triggers the static initializer.
+ * Note, in JS, this property has to be declared
+ * after the installOverride.
+ */
+ static public var installedOverride:Boolean = installOverride();
+
+ //--------------------------------------
+ // Property
+ //--------------------------------------
+
+ /**
+ * An optimization to skip the getter of the element property
+ */
+ protected var _element:WrappedHTMLElement;
+
+ public function get element():WrappedHTMLElement
+ {
+ return _element;
+ }
+
+ public function set element(value:WrappedHTMLElement):void
+ {
+ _element = value;
+ }
+
+
+ protected var _beads:Vector.<IBead>;
+
+ //--------------------------------------
+ // Function
+ //--------------------------------------
+
+ /**
+ * @param bead The new bead.
+ */
+ public function addBead(bead:IBead):void
+ {
+ if (!_beads)
+ {
+ _beads = new Vector.<IBead>();
+ }
+
+ _beads.push(bead);
+ bead.strand = this;
+ }
+
+ /**
+ * @param classOrInterface The requested bead type.
+ * @return The bead.
+ */
+ public function getBeadByType(classOrInterface:Class):IBead
+ {
+ var bead:IBead, i:uint, n:uint;
+
+ if (!_beads) return null;
+
+ n = _beads.length;
+
+ for (i = 0; i < n; i++)
+ {
+ bead = _beads[i];
+
+ if (bead is classOrInterface)
+ {
+ return bead;
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * @param bead The bead to remove.
+ * @return The bead.
+ */
+ public function removeBead(bead:IBead):IBead
+ {
+ var i:uint, n:uint, value:Object;
+
+ n = _beads.length;
+
+ for (i = 0; i < n; i++)
+ {
+ value = _beads[i];
+
+ if (bead === value)
+ {
+ _beads.splice(i, 1);
+
+ return bead;
+ }
+ }
+
+ return null;
+ }
+
+ override public function addEventListener(type:String, handler:Function, opt_capture:Boolean = false, opt_handlerScope:Object = null):void
+ {
+ var source:Object = getActualDispatcher_(type);
+ goog.events.listen(source, type, handler);
+ }
+
+ override public function removeEventListener(type:String, handler:Function, opt_capture:Boolean = false, opt_handlerScope:Object = null):void
+ {
+ var source:Object = getActualDispatcher_(type);
+ goog.events.unlisten(source, type, handler);
+ }
+
+ private function getActualDispatcher_(type:String):Object
+ {
+ var source:Object = this;
+ if (ElementEvents.elementEvents[type]) {
+ // mouse and keyboard events also dispatch off the element.
+ source = this.element;
+ }
+ return source;
+ }
+
+ override public function hasEventListener(type:String):Boolean
+ {
+ var source:Object = this.getActualDispatcher_(type);
+
+ return goog.events.hasListener(source, type);
+ }
+
+ override public function dispatchEvent(e:Object):Boolean
+ {
+ var t:String;
+ if (typeof(e) === 'string') {
+ t = e as String;
+ if (e === 'change')
+ e = new window.Event(t);
+ }
+ else {
+ t = e.type;
+ if (ElementEvents.elementEvents[t]) {
+ e = new window.Event(t);
+ }
+ }
+ var source:Object = this.getActualDispatcher_(t);
+ if (source == this)
+ return super.dispatchEvent(e);
+
+ return source.dispatchEvent(e);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4558126d/frameworks/projects/Core/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as
deleted file mode 100644
index 8d5dfc2..0000000
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as
+++ /dev/null
@@ -1,352 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You 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.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.core
-{
- COMPILE::JS
- {
- import window.Event;
- import org.apache.flex.events.BrowserEvent;
- import org.apache.flex.events.ElementEvents;
- import goog.events;
- import goog.events.EventTarget;
- }
- COMPILE::SWF
- {
- import flash.events.Event;
- import flash.events.IEventDispatcher;
- import org.apache.flex.events.ElementEvents;
- import org.apache.flex.events.IFlexJSEvent;
- }
-
- import org.apache.flex.events.Event;
- import org.apache.flex.events.EventDispatcher;
-
- COMPILE::SWF
- public class HTMLElementWrapper extends EventDispatcher implements IStrand
- {
- public function HTMLElementWrapper()
- {
- }
-
- //--------------------------------------
- // Property
- //--------------------------------------
-
- protected var _element:IFlexJSElement;
-
- public function get element():IFlexJSElement
- {
- return _element;
- }
-
- public function set element(value:IFlexJSElement):void
- {
- _element = value;
- }
-
- protected var _beads:Vector.<IBead>;
-
- //--------------------------------------
- // Function
- //--------------------------------------
-
- /**
- * @param bead The new bead.
- */
- public function addBead(bead:IBead):void
- {
- if (!_beads)
- {
- _beads = new Vector.<IBead>();
- }
-
- _beads.push(bead);
- bead.strand = this;
- }
-
- /**
- * @param classOrInterface The requested bead type.
- * @return The bead.
- */
- public function getBeadByType(classOrInterface:Class):IBead
- {
- var bead:IBead, i:uint, n:uint;
-
- if (!_beads) return null;
-
- n = _beads.length;
-
- for (i = 0; i < n; i++)
- {
- bead = _beads[i];
-
- if (bead is classOrInterface)
- {
- return bead;
- }
- }
-
- return null;
- }
-
- /**
- * @param bead The bead to remove.
- * @return The bead.
- */
- public function removeBead(bead:IBead):IBead
- {
- var i:uint, n:uint, value:Object;
-
- n = _beads.length;
-
- for (i = 0; i < n; i++)
- {
- value = _beads[i];
-
- if (bead === value)
- {
- _beads.splice(i, 1);
-
- return bead;
- }
- }
-
- return null;
- }
-
- override public function addEventListener(type:String, handler:Function, opt_capture:Boolean = false, priority:int = 0, weak:Boolean = false):void
- {
- var source:IEventDispatcher = getActualDispatcher_(type) as IEventDispatcher;
- if (source != this)
- source.addEventListener(type, forwarder, opt_capture);
-
- super.addEventListener(type, handler, opt_capture);
- }
-
- override public function removeEventListener(type:String, handler:Function, opt_capture:Boolean = false):void
- {
- var source:IEventDispatcher = getActualDispatcher_(type) as IEventDispatcher;
- if (source != this)
- source.removeEventListener(type, handler, opt_capture);
-
- super.removeEventListener(type, handler, opt_capture);
- }
-
- private function getActualDispatcher_(type:String):IEventDispatcher
- {
- var source:IEventDispatcher = this;
- if (ElementEvents.elementEvents[type]) {
- // mouse and keyboard events also dispatch off the element.
- source = this.element as IEventDispatcher;
- }
- return source;
- }
-
- private function forwarder(event:flash.events.Event):void
- {
- if (event is IFlexJSEvent)
- event = IFlexJSEvent(event).cloneEvent() as flash.events.Event;
- dispatchEvent(event);
- }
- }
-
- COMPILE::JS
- public class HTMLElementWrapper extends EventDispatcher implements IStrand
- {
-
- //--------------------------------------
- // Static Function
- //--------------------------------------
-
- /**
- * @param listener The listener object to call {goog.events.Listener}.
- * @param eventObject The event object to pass to the listener.
- * @return Result of listener.
- */
- static public function fireListenerOverride(listener:Object, eventObject:BrowserEvent):Boolean
- {
- var e:BrowserEvent = new BrowserEvent();
- e.wrappedEvent = eventObject;
- return HTMLElementWrapper.googFireListener(listener, e);
- }
-
- /**
- * Static initializer
- */
- static public function installOverride():Boolean
- {
- HTMLElementWrapper.googFireListener = goog.events.fireListener;
- goog.events.fireListener = HTMLElementWrapper.fireListenerOverride;
- return true;
- }
-
- //--------------------------------------
- // Static Property
- //--------------------------------------
-
- static public var googFireListener:Function;
-
- /**
- * The properties that triggers the static initializer.
- * Note, in JS, this property has to be declared
- * after the installOverride.
- */
- static public var installedOverride:Boolean = installOverride();
-
- //--------------------------------------
- // Property
- //--------------------------------------
-
- /**
- * An optimization to skip the getter of the element property
- */
- protected var _element:WrappedHTMLElement;
-
- public function get element():WrappedHTMLElement
- {
- return _element;
- }
-
- public function set element(value:WrappedHTMLElement):void
- {
- _element = value;
- }
-
-
- protected var _beads:Vector.<IBead>;
-
- //--------------------------------------
- // Function
- //--------------------------------------
-
- /**
- * @param bead The new bead.
- */
- public function addBead(bead:IBead):void
- {
- if (!_beads)
- {
- _beads = new Vector.<IBead>();
- }
-
- _beads.push(bead);
- bead.strand = this;
- }
-
- /**
- * @param classOrInterface The requested bead type.
- * @return The bead.
- */
- public function getBeadByType(classOrInterface:Class):IBead
- {
- var bead:IBead, i:uint, n:uint;
-
- if (!_beads) return null;
-
- n = _beads.length;
-
- for (i = 0; i < n; i++)
- {
- bead = _beads[i];
-
- if (bead is classOrInterface)
- {
- return bead;
- }
- }
-
- return null;
- }
-
- /**
- * @param bead The bead to remove.
- * @return The bead.
- */
- public function removeBead(bead:IBead):IBead
- {
- var i:uint, n:uint, value:Object;
-
- n = _beads.length;
-
- for (i = 0; i < n; i++)
- {
- value = _beads[i];
-
- if (bead === value)
- {
- _beads.splice(i, 1);
-
- return bead;
- }
- }
-
- return null;
- }
-
- override public function addEventListener(type:String, handler:Function, opt_capture:Boolean = false, opt_handlerScope:Object = null):void
- {
- var source:Object = getActualDispatcher_(type);
- goog.events.listen(source, type, handler);
- }
-
- override public function removeEventListener(type:String, handler:Function, opt_capture:Boolean = false, opt_handlerScope:Object = null):void
- {
- var source:Object = getActualDispatcher_(type);
- goog.events.unlisten(source, type, handler);
- }
-
- private function getActualDispatcher_(type:String):Object
- {
- var source:Object = this;
- if (ElementEvents.elementEvents[type]) {
- // mouse and keyboard events also dispatch off the element.
- source = this.element;
- }
- return source;
- }
-
- override public function hasEventListener(type:String):Boolean
- {
- var source:Object = this.getActualDispatcher_(type);
-
- return goog.events.hasListener(source, type);
- }
-
- override public function dispatchEvent(e:Object):Boolean
- {
- var t:String;
- if (typeof(e) === 'string') {
- t = e as String;
- if (e === 'change')
- e = new window.Event(t);
- }
- else {
- t = e.type;
- if (ElementEvents.elementEvents[t]) {
- e = new window.Event(t);
- }
- }
- var source:Object = this.getActualDispatcher_(t);
- if (source == this)
- return super.dispatchEvent(e);
-
- return source.dispatchEvent(e);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4558126d/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IFlexJSElement.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IFlexJSElement.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IFlexJSElement.as
index 9963c4e..6586fe9 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IFlexJSElement.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IFlexJSElement.as
@@ -33,8 +33,8 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.7
*/
- function get flexjs_wrapper():HTMLElementWrapper;
- function set flexjs_wrapper(value:HTMLElementWrapper):void;
+ function get flexjs_wrapper():ElementWrapper;
+ function set flexjs_wrapper(value:ElementWrapper):void;
}
COMPILE::JS
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4558126d/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIHTMLElementWrapper.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIHTMLElementWrapper.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIHTMLElementWrapper.as
index 22b90d1..c14a43e 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIHTMLElementWrapper.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIHTMLElementWrapper.as
@@ -63,7 +63,7 @@ COMPILE::SWF
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class UIHTMLElementWrapper extends HTMLElementWrapper implements IStrandWithModel, IEventDispatcher
+ public class UIHTMLElementWrapper extends ElementWrapper implements IStrandWithModel, IEventDispatcher
{
/**
* Constructor.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4558126d/frameworks/projects/Core/src/main/flex/org/apache/flex/core/WrappedMovieClip.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/WrappedMovieClip.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/WrappedMovieClip.as
index 195e8d9..ff9ed6d 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/WrappedMovieClip.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/WrappedMovieClip.as
@@ -26,7 +26,7 @@ package org.apache.flex.core
COMPILE::SWF
public class WrappedMovieClip extends MovieClip implements IFlexJSElement
{
- private var _flexjs_wrapper:HTMLElementWrapper;
+ private var _flexjs_wrapper:ElementWrapper;
//--------------------------------------
// Property
@@ -40,11 +40,11 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function get flexjs_wrapper():HTMLElementWrapper
+ public function get flexjs_wrapper():ElementWrapper
{
return _flexjs_wrapper;
}
- public function set flexjs_wrapper(value:HTMLElementWrapper):void
+ public function set flexjs_wrapper(value:ElementWrapper):void
{
_flexjs_wrapper = value;
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4558126d/frameworks/projects/Core/src/main/flex/org/apache/flex/core/WrappedShape.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/WrappedShape.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/WrappedShape.as
index eb90a21..020b50f 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/WrappedShape.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/WrappedShape.as
@@ -26,7 +26,7 @@ package org.apache.flex.core
COMPILE::SWF
public class WrappedShape extends Shape implements IFlexJSElement
{
- private var _flexjs_wrapper:HTMLElementWrapper;
+ private var _flexjs_wrapper:ElementWrapper;
//--------------------------------------
// Property
@@ -40,11 +40,11 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function get flexjs_wrapper():HTMLElementWrapper
+ public function get flexjs_wrapper():ElementWrapper
{
return _flexjs_wrapper;
}
- public function set flexjs_wrapper(value:HTMLElementWrapper):void
+ public function set flexjs_wrapper(value:ElementWrapper):void
{
_flexjs_wrapper = value;
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4558126d/frameworks/projects/Core/src/main/flex/org/apache/flex/core/WrappedSimpleButton.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/WrappedSimpleButton.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/WrappedSimpleButton.as
index 00249a0..a069f2e 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/WrappedSimpleButton.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/WrappedSimpleButton.as
@@ -33,7 +33,7 @@ package org.apache.flex.core
}
- private var _flexjs_wrapper:HTMLElementWrapper;
+ private var _flexjs_wrapper:ElementWrapper;
//--------------------------------------
// Property
@@ -47,11 +47,11 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function get flexjs_wrapper():HTMLElementWrapper
+ public function get flexjs_wrapper():ElementWrapper
{
return _flexjs_wrapper;
}
- public function set flexjs_wrapper(value:HTMLElementWrapper):void
+ public function set flexjs_wrapper(value:ElementWrapper):void
{
_flexjs_wrapper = value;
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4558126d/frameworks/projects/Core/src/main/flex/org/apache/flex/core/WrappedSprite.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/WrappedSprite.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/WrappedSprite.as
index e00e9f8..b77a1d1 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/WrappedSprite.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/WrappedSprite.as
@@ -27,7 +27,7 @@ package org.apache.flex.core
public class WrappedSprite extends Sprite implements IFlexJSElement
{
- private var _flexjs_wrapper:HTMLElementWrapper;
+ private var _flexjs_wrapper:ElementWrapper;
//--------------------------------------
// Property
@@ -41,11 +41,11 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function get flexjs_wrapper():HTMLElementWrapper
+ public function get flexjs_wrapper():ElementWrapper
{
return _flexjs_wrapper;
}
- public function set flexjs_wrapper(value:HTMLElementWrapper):void
+ public function set flexjs_wrapper(value:ElementWrapper):void
{
_flexjs_wrapper = value;
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4558126d/frameworks/projects/Core/src/main/flex/org/apache/flex/core/WrappedTextField.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/WrappedTextField.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/WrappedTextField.as
index bc36bad..c832d62 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/WrappedTextField.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/WrappedTextField.as
@@ -27,7 +27,7 @@ package org.apache.flex.core
public class WrappedTextField extends TextField implements IFlexJSElement
{
- private var _flexjs_wrapper:HTMLElementWrapper;
+ private var _flexjs_wrapper:ElementWrapper;
//--------------------------------------
// Property
@@ -41,11 +41,11 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function get flexjs_wrapper():HTMLElementWrapper
+ public function get flexjs_wrapper():ElementWrapper
{
return _flexjs_wrapper;
}
- public function set flexjs_wrapper(value:HTMLElementWrapper):void
+ public function set flexjs_wrapper(value:ElementWrapper):void
{
_flexjs_wrapper = value;
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4558126d/frameworks/projects/Core/src/main/flex/org/apache/flex/events/Event.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/Event.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/Event.as
index e27a88e..1b9edb7 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/Event.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/Event.as
@@ -138,7 +138,7 @@ package org.apache.flex.events
/**
* Google Closure doesn't seem to support stopImmediatePropagation, but
- * actually the HTMLElementWrapper fireListener override sends a
+ * actually the ElementWrapper fireListener override sends a
* BrowserEvent in most/all cases where folks need stopImmediatePropagation
* so we put this in here for compile time since it will exist in
* the BrowserEvent that does get sent around.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4558126d/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ComboBoxView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ComboBoxView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ComboBoxView.as
index b4cdac3..1bb67e1 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ComboBoxView.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ComboBoxView.as
@@ -23,7 +23,7 @@ package org.apache.flex.html.beads
import flash.display.Sprite;
import org.apache.flex.core.BeadViewBase;
- import org.apache.flex.core.HTMLElementWrapper;
+ import org.apache.flex.core.ElementWrapper;
import org.apache.flex.core.IBeadView;
import org.apache.flex.core.IComboBoxModel;
import org.apache.flex.core.IPopUpHost;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4558126d/frameworks/projects/Network/src/main/flex/org/apache/flex/net/HTTPServiceBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Network/src/main/flex/org/apache/flex/net/HTTPServiceBase.as b/frameworks/projects/Network/src/main/flex/org/apache/flex/net/HTTPServiceBase.as
index 1eb0805..960d76d 100644
--- a/frameworks/projects/Network/src/main/flex/org/apache/flex/net/HTTPServiceBase.as
+++ b/frameworks/projects/Network/src/main/flex/org/apache/flex/net/HTTPServiceBase.as
@@ -24,7 +24,7 @@ package org.apache.flex.net
}
COMPILE::JS
{
- import org.apache.flex.core.HTMLElementWrapper;
+ import org.apache.flex.core.ElementWrapper;
}
/**
@@ -41,7 +41,7 @@ package org.apache.flex.net
}
COMPILE::JS
- public class HTTPServiceBase extends HTMLElementWrapper
+ public class HTTPServiceBase extends ElementWrapper
{
}
}