ContextMenu classes were in the wrong package.

mozilla · Apr 9, 2013 · c45e24f · c45e24f
1 parent f5d8cbe
commit c45e24f
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 89 deletions.
diff --git a/examples/inspector/inspector.html b/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>

diff --git a/examples/racing/index.html b/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>

diff --git a/src/avm2/domain.js b/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) {

diff --git a/src/flash/display/ContextMenu.js b/src/flash/display/ContextMenu.js
diff --git a/src/flash/ui/ContextMenu.js b/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");
-          }
-        }
       }
     }
   };

diff --git a/src/flash/display/ContextMenuItem.js → src/flash/ui/ContextMenuItem.js b/src/flash/display/ContextMenuItem.js → src/flash/ui/ContextMenuItem.js
diff --git a/test/harness/slave.html b/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>