Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

ContextMenu classes were in the wrong package.

  • Loading branch information...
commit c45e24faa7d1d13c8dae08fc2ac06c6bdbe11338 1 parent f5d8cbe
@mbebenita mbebenita authored
View
2  examples/inspector/inspector.html
@@ -143,7 +143,7 @@
<script src="../../src/flash/display/Bitmap.js"></script>
<script src="../../src/flash/display/BitmapData.js"></script>
<script src="../../src/flash/display/ContextMenu.js"></script>
- <script src="../../src/flash/display/ContextMenuItem.js"></script>
+ <script src="../../src/flash/ui/ContextMenuItem.js"></script>
<script src="../../src/flash/display/DisplayObject.js"></script>
<script src="../../src/flash/display/DisplayObjectContainer.js"></script>
<script src="../../src/flash/display/FrameLabel.js"></script>
View
2  examples/racing/index.html
@@ -109,7 +109,7 @@
<script src="../../src/flash/display/Bitmap.js"></script>
<script src="../../src/flash/display/BitmapData.js"></script>
<script src="../../src/flash/display/ContextMenu.js"></script>
- <script src="../../src/flash/display/ContextMenuItem.js"></script>
+ <script src="../../src/flash/ui/ContextMenuItem.js"></script>
<script src="../../src/flash/display/DisplayObject.js"></script>
<script src="../../src/flash/display/DisplayObjectContainer.js"></script>
<script src="../../src/flash/display/FrameLabel.js"></script>
View
4 src/avm2/domain.js
@@ -192,7 +192,9 @@ var Domain = (function () {
var keys = Object.keys(props);
for (var i = 0, j = keys.length; i < j; i++) {
var p = keys[i];
- var qn = Multiname.getQualifiedName(Multiname.fromSimpleName(props[p]));
+ var propName = props[p];
+ assert (typeof propName === "string", "Make sure it's not a function.");
+ var qn = Multiname.getQualifiedName(Multiname.fromSimpleName(propName));
release || assert(typeof qn === "string");
var desc = Object.getOwnPropertyDescriptor(obj, qn);
if (desc && desc.get) {
View
72 src/flash/display/ContextMenu.js
@@ -1,72 +0,0 @@
-var ContextMenuDefinition = (function () {
- return {
- // ()
- __class__: "flash.ui.ContextMenu",
- initialize: function () {
- },
- __glue__: {
- native: {
- static: {
- _checkSupported: function _checkSupported() { // (void) -> Boolean
- notImplemented("ContextMenu._checkSupported");
- }
- },
- instance: {
- cloneLinkAndClipboardProperties: function cloneLinkAndClipboardProperties(c) { // (c:ContextMenu) -> void
- notImplemented("ContextMenu.cloneLinkAndClipboardProperties");
- },
- builtInItems: {
- get: function builtInItems() { // (void) -> ContextMenuBuiltInItems
- notImplemented("ContextMenu.builtInItems");
- return this._builtInItems;
- },
- set: function builtInItems(value) { // (value:ContextMenuBuiltInItems) -> void
- notImplemented("ContextMenu.builtInItems");
- this._builtInItems = value;
- }
- },
- customItems: {
- get: function customItems() { // (void) -> Array
- notImplemented("ContextMenu.customItems");
- return this._customItems;
- },
- set: function customItems(value) { // (value:Array) -> void
- notImplemented("ContextMenu.customItems");
- this._customItems = value;
- }
- },
- link: {
- get: function link() { // (void) -> URLRequest
- notImplemented("ContextMenu.link");
- return this._link;
- },
- set: function link(value) { // (value:URLRequest) -> void
- notImplemented("ContextMenu.link");
- this._link = value;
- }
- },
- clipboardMenu: {
- get: function clipboardMenu() { // (void) -> Boolean
- notImplemented("ContextMenu.clipboardMenu");
- return this._clipboardMenu;
- },
- set: function clipboardMenu(value) { // (value:Boolean) -> void
- notImplemented("ContextMenu.clipboardMenu");
- this._clipboardMenu = value;
- }
- },
- clipboardItems: {
- get: function clipboardItems() { // (void) -> ContextMenuClipboardItems
- notImplemented("ContextMenu.clipboardItems");
- return this._clipboardItems;
- },
- set: function clipboardItems(value) { // (value:ContextMenuClipboardItems) -> void
- notImplemented("ContextMenu.clipboardItems");
- this._clipboardItems = value;
- }
- }
- }
- }
- }
- };
-}).call(this);
View
13 src/flash/ui/ContextMenu.js
@@ -66,19 +66,6 @@ var ContextMenuDefinition = (function () {
}
}
}
- },
- script: {
- static: {
- // ...
- },
- instance: {
- hideBuiltInItems: function hideBuiltInItems() { // (void) -> void
- notImplemented("ContextMenu.hideBuiltInItems");
- },
- clone: function clone() { // (void) -> ContextMenu
- notImplemented("ContextMenu.clone");
- }
- }
}
}
};
View
0  src/flash/display/ContextMenuItem.js → src/flash/ui/ContextMenuItem.js
File renamed without changes
View
2  test/harness/slave.html
@@ -103,7 +103,7 @@
<script src="../../src/flash/display/Bitmap.js"></script>
<script src="../../src/flash/display/BitmapData.js"></script>
<script src="../../src/flash/display/ContextMenu.js"></script>
- <script src="../../src/flash/display/ContextMenuItem.js"></script>
+ <script src="../../src/flash/ui/ContextMenuItem.js"></script>
<script src="../../src/flash/display/DisplayObject.js"></script>
<script src="../../src/flash/display/DisplayObjectContainer.js"></script>
<script src="../../src/flash/display/FrameLabel.js"></script>
Please sign in to comment.
Something went wrong with that request. Please try again.