Commits

John Peberdy committed 3ca1884

Add class name to raw output

  • Participants
  • Parent commits 87646ac

Comments (0)

Files changed (6)

src/com/nexj/njsdoc/SlotValue.java

      *            The class this most likely belongs to. May be null.
      */
     public void setInClass(JSClass jsClass) {
-        if (this.jsClass != null) {
-            return;
-        }
         switch (classification) {
         case DATA:
             classification = Type.FIELD;
         writtenSet.put(this, writtenSet.size());
 
         sw.append(classification.toString());
-        if (!classification.isStatic() && jsClass == null) {
-            sw.append('-');
+        if (!classification.isStatic()) {
+            if (jsClass == null) {
+                sw.append('-');
+            } else {
+                sw.append(" from ");
+                sw.append(jsClass.name);
+            }
         }
         sw.append(' ');
 

test/com/nexj/njsdoc/Test1.raw

        <ObjectPrototype>: Object.prototype
     }
     MyClass: constructor @Test1.js:12, Test1.js:113 (Comment) (C) {
-       prototype: field {
-          myFun1: method @Test1.js:120 {
-             prototype: field {
+       prototype: field from MyClass {
+          myFun1: method from MyClass @Test1.js:120 {
+             prototype: field from MyClass {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          myVarStr: field @Test1.js:127 (Comment) 
-          myVarNull: field @Test1.js:129 
+          myVarStr: field from MyClass @Test1.js:127 (Comment) 
+          myVarNull: field from MyClass @Test1.js:129 
           <ObjectPrototype>: Object.prototype
        }
        <ObjectPrototype>: Function.prototype
     }
     MySubClass: constructor @Test1.js:134, Test1.js:11 (Comment) (C) {
        superclass: ref(18 Comment Alias)
-       prototype: field @Test1.js:10 {
-          noProtoVar: field @Test1.js:117 (Comment) 
+       prototype: field from MySubClass @Test1.js:10 {
+          noProtoVar: field from MySubClass @Test1.js:117 (Comment) 
           constructor: ref(24 Comment)
-          subFun: method @Test1.js:143 (Comment) {
-             prototype: field {
+          subFun: method from MySubClass @Test1.js:143 (Comment) {
+             prototype: field from MySubClass {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype

test/com/nexj/njsdoc/Test3.raw

        <ObjectPrototype>: Function.prototype
     }
     MySubClass: constructor @Test3.js:56, Test3.js:30, Test3.js:10 (Comment) (C) {
-       prototype: field @Test3.js:9 {
-          noProtoVar: field @Test3.js:39 (Comment) 
+       prototype: field from MySubClass @Test3.js:9 {
+          noProtoVar: field from MySubClass @Test3.js:39 (Comment) 
           constructor: ref(3 Comment)
-          subFun: method @Test3.js:65 (Comment) {
-             prototype: field {
+          subFun: method from MySubClass @Test3.js:65 (Comment) {
+             prototype: field from MySubClass {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          <ObjectPrototype>: field {
-             myFun1: method @Test3.js:42 {
-                prototype: field {
+          <ObjectPrototype>: field from MyClass {
+             myFun1: method from MyClass @Test3.js:42 {
+                prototype: field from MyClass {
                    <ObjectPrototype>: Object.prototype
                 }
                 <ObjectPrototype>: Function.prototype
              }
-             myVarStr: field @Test3.js:49 (Comment) 
-             myVarNull: field @Test3.js:51 
+             myVarStr: field from MyClass @Test3.js:49 (Comment) 
+             myVarNull: field from MyClass @Test3.js:51 
              <ObjectPrototype>: Object.prototype
           }
        }

test/com/nexj/njsdoc/Test4.raw

        <ObjectPrototype>: Function.prototype
     }
     MySubClass: constructor @Test4.js:62, Test4.js:30, Test4.js:10 (Comment) (C) {
-       prototype: field @Test4.js:9 {
-          noProtoVar: field @Test4.js:39 (Comment) 
+       prototype: field from MySubClass @Test4.js:9 {
+          noProtoVar: field from MySubClass @Test4.js:39 (Comment) 
           constructor: ref(3 Comment Alias)
-          subFun: method @Test4.js:71 (Comment) {
-             prototype: field {
+          subFun: method from MySubClass @Test4.js:71 (Comment) {
+             prototype: field from MySubClass {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          <ObjectPrototype>: field {
-             myFun1: method @Test4.js:47, Test4.js:42 (Comment) {
+          <ObjectPrototype>: field from MyClass {
+             myFun1: method from MyClass @Test4.js:47, Test4.js:42 (Comment) {
                 prototype: field- {
                    <ObjectPrototype>: Object.prototype
                 }

test/com/nexj/njsdoc/Test5.raw

 variable {
     window: ref(0 Alias)
     HiWorld: constructor @Test5.js:2 (C) {
-       prototype: field {
-          foo: method @Test5.js:11 (Comment) {
-             prototype: field {
+       prototype: field from HiWorld {
+          foo: method from HiWorld @Test5.js:11 (Comment) {
+             prototype: field from HiWorld {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
     }
     HelloWorld: constructor @Test5.js:19 (Comment) (C) {
        staticMember: variable @Test5.js:41 (Comment) 
-       prototype: field @Test5.js:29 {
-          myMember: field @Test5.js:36 (Comment) 
-          myFun: method @Test5.js:49, Test5.js:38 (Comment) {
+       prototype: field from HelloWorld @Test5.js:29 {
+          myMember: field from HelloWorld @Test5.js:36 (Comment) 
+          myFun: method from HelloWorld @Test5.js:49, Test5.js:38 (Comment) {
              prototype: field- {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          monkeyPatchingIsBad: method @Test5.js:72 {
-             prototype: field {
+          monkeyPatchingIsBad: method from HelloWorld @Test5.js:72 {
+             prototype: field from HelloWorld {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype

test/com/nexj/njsdoc/jquery.raw

 variable {
     window: ref(0 Alias)
     $: constructor @jquery.js:9454, jquery.js:15, jquery.js:96, jquery.js:313 (C) {
-       fn: field @jquery.js:95, jquery.js:289, jquery.js:313 {
+       fn: field from $ @jquery.js:95, jquery.js:289, jquery.js:313 {
           constructor: ref(1 Alias)
-          init: method @jquery.js:97 {
+          init: method from $ @jquery.js:97 {
              prototype: ref(2)
              <ObjectPrototype>: Function.prototype
           }
-          selector: field @jquery.js:186 
-          jquery: field @jquery.js:189 
-          length: field @jquery.js:192 
-          size: method @jquery.js:195 {
-             prototype: field {
+          selector: field from $ @jquery.js:186 
+          jquery: field from $ @jquery.js:189 
+          length: field from $ @jquery.js:192 
+          size: method from $ @jquery.js:195 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          toArray: method @jquery.js:199 {
-             prototype: field {
+          toArray: method from $ @jquery.js:199 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          get: method @jquery.js:205 {
-             prototype: field {
+          get: method from $ @jquery.js:205 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          pushStack: method @jquery.js:217 {
-             prototype: field {
+          pushStack: method from $ @jquery.js:217 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          each: method @jquery.js:240 {
-             prototype: field {
+          each: method from $ @jquery.js:240 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          ready: method @jquery.js:244 {
-             prototype: field {
+          ready: method from $ @jquery.js:244 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          eq: method @jquery.js:251 {
-             prototype: field {
+          eq: method from $ @jquery.js:251 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          first: method @jquery.js:258 {
-             prototype: field {
+          first: method from $ @jquery.js:258 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          last: method @jquery.js:262 {
-             prototype: field {
+          last: method from $ @jquery.js:262 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          slice: method @jquery.js:266 {
-             prototype: field {
+          slice: method from $ @jquery.js:266 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          map: method @jquery.js:271 {
-             prototype: field {
+          map: method from $ @jquery.js:271 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          end: method @jquery.js:277 {
-             prototype: field {
+          end: method from $ @jquery.js:277 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          push: method @jquery.js:283, jquery.js:15, jquery.js:3671 {
+          push: method from $ @jquery.js:283, jquery.js:15, jquery.js:3671 {
              <ObjectPrototype>: Function.prototype
           }
-          sort: method @jquery.js:284 {
+          sort: method from $ @jquery.js:284 {
              <ObjectPrototype>: Function.prototype
           }
-          splice: method @jquery.js:285 {
+          splice: method from $ @jquery.js:285 {
              <ObjectPrototype>: Function.prototype
           }
-          extend: method @jquery.js:291 (Alias) {
-             prototype: field {
+          extend: method from $ @jquery.js:291 (Alias) {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          data: method @jquery.js:1727, jquery.js:323 {
-             prototype: field {
+          data: method from $ @jquery.js:1727, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          removeData: method @jquery.js:1794, jquery.js:323 {
-             prototype: field {
+          removeData: method from $ @jquery.js:1794, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          queue: method @jquery.js:1916, jquery.js:323 {
-             prototype: field {
+          queue: method from $ @jquery.js:1916, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          dequeue: method @jquery.js:1942, jquery.js:323 {
-             prototype: field {
+          dequeue: method from $ @jquery.js:1942, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          delay: method @jquery.js:1949, jquery.js:323 {
-             prototype: field {
+          delay: method from $ @jquery.js:1949, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          clearQueue: method @jquery.js:1960, jquery.js:323 {
-             prototype: field {
+          clearQueue: method from $ @jquery.js:1960, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          promise: method @jquery.js:1965, jquery.js:323 {
-             prototype: field {
+          promise: method from $ @jquery.js:1965, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          attr: method @jquery.js:2004, jquery.js:323 {
-             prototype: field {
+          attr: method from $ @jquery.js:2004, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          removeAttr: method @jquery.js:2008, jquery.js:323 {
-             prototype: field {
+          removeAttr: method from $ @jquery.js:2008, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          prop: method @jquery.js:2014, jquery.js:323 {
-             prototype: field {
+          prop: method from $ @jquery.js:2014, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          removeProp: method @jquery.js:2018, jquery.js:323 {
-             prototype: field {
+          removeProp: method from $ @jquery.js:2018, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          addClass: method @jquery.js:2029, jquery.js:323 {
-             prototype: field {
+          addClass: method from $ @jquery.js:2029, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          removeClass: method @jquery.js:2066, jquery.js:323 {
-             prototype: field {
+          removeClass: method from $ @jquery.js:2066, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          toggleClass: method @jquery.js:2098, jquery.js:323 {
-             prototype: field {
+          toggleClass: method from $ @jquery.js:2098, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          hasClass: method @jquery.js:2135, jquery.js:323 {
-             prototype: field {
+          hasClass: method from $ @jquery.js:2135, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          val: method @jquery.js:2148, jquery.js:323 {
-             prototype: field {
+          val: method from $ @jquery.js:2148, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          on: method @jquery.js:3485, jquery.js:323 {
-             prototype: field {
+          on: method from $ @jquery.js:3485, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          one: method @jquery.js:3538, jquery.js:323 {
-             prototype: field {
+          one: method from $ @jquery.js:3538, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          off: method @jquery.js:3541, jquery.js:323 {
-             prototype: field {
+          off: method from $ @jquery.js:3541, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          bind: method @jquery.js:3573, jquery.js:323 {
-             prototype: field {
+          bind: method from $ @jquery.js:3573, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          unbind: method @jquery.js:3576, jquery.js:323 {
-             prototype: field {
+          unbind: method from $ @jquery.js:3576, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          live: method @jquery.js:3580, jquery.js:323 {
-             prototype: field {
+          live: method from $ @jquery.js:3580, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          die: method @jquery.js:3584, jquery.js:323 {
-             prototype: field {
+          die: method from $ @jquery.js:3584, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          delegate: method @jquery.js:3589, jquery.js:323 {
-             prototype: field {
+          delegate: method from $ @jquery.js:3589, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          undelegate: method @jquery.js:3592, jquery.js:323 {
-             prototype: field {
+          undelegate: method from $ @jquery.js:3592, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          trigger: method @jquery.js:3597, jquery.js:323 {
-             prototype: field {
+          trigger: method from $ @jquery.js:3597, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          triggerHandler: method @jquery.js:3602, jquery.js:323 {
-             prototype: field {
+          triggerHandler: method from $ @jquery.js:3602, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          toggle: method {
-             prototype: field {
+          toggle: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          hover: method @jquery.js:3634, jquery.js:323 {
-             prototype: field {
+          hover: method from $ @jquery.js:3634, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          blur: method {
-             prototype: field {
+          blur: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          focus: method {
-             prototype: field {
+          focus: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          focusin: method {
-             prototype: field {
+          focusin: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          focusout: method {
-             prototype: field {
+          focusout: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          load: method @jquery.js:7424 {
-             prototype: field {
+          load: method from $ @jquery.js:7424 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          resize: method {
-             prototype: field {
+          resize: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          scroll: method {
-             prototype: field {
+          scroll: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          unload: method {
-             prototype: field {
+          unload: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          click: method {
-             prototype: field {
+          click: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          dblclick: method {
-             prototype: field {
+          dblclick: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          mousedown: method {
-             prototype: field {
+          mousedown: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          mouseup: method {
-             prototype: field {
+          mouseup: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          mousemove: method {
-             prototype: field {
+          mousemove: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          mouseover: method {
-             prototype: field {
+          mouseover: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          mouseout: method {
-             prototype: field {
+          mouseout: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          mouseenter: method {
-             prototype: field {
+          mouseenter: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          mouseleave: method {
-             prototype: field {
+          mouseleave: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          change: method {
-             prototype: field {
+          change: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          select: method {
-             prototype: field {
+          select: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          submit: method {
-             prototype: field {
+          submit: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          keydown: method {
-             prototype: field {
+          keydown: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          keypress: method {
-             prototype: field {
+          keypress: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          keyup: method {
-             prototype: field {
+          keyup: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          error: method {
-             prototype: field {
+          error: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          contextmenu: method {
-             prototype: field {
+          contextmenu: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          find: method @jquery.js:5367, jquery.js:323 {
-             prototype: field {
+          find: method from $ @jquery.js:5367, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          has: method @jquery.js:5403, jquery.js:323 {
-             prototype: field {
+          has: method from $ @jquery.js:5403, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          not: method @jquery.js:5417, jquery.js:323 {
-             prototype: field {
+          not: method from $ @jquery.js:5417, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          filter: method @jquery.js:5421, jquery.js:323 {
-             prototype: field {
+          filter: method from $ @jquery.js:5421, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          is: method @jquery.js:5425, jquery.js:323 {
-             prototype: field {
+          is: method from $ @jquery.js:5425, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          closest: method @jquery.js:5436, jquery.js:323 {
-             prototype: field {
+          closest: method from $ @jquery.js:5436, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          index: method @jquery.js:5464, jquery.js:323 {
-             prototype: field {
+          index: method from $ @jquery.js:5464, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          add: method @jquery.js:5482, jquery.js:323 {
-             prototype: field {
+          add: method from $ @jquery.js:5482, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          addBack: method @jquery.js:5500, jquery.js:5493, jquery.js:323 {
-             prototype: field {
+          addBack: method from $ @jquery.js:5500, jquery.js:5493, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
           andSelf: ref(160 Alias)
-          parent: method {
-             prototype: field {
+          parent: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          parents: method {
-             prototype: field {
+          parents: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          parentsUntil: method {
-             prototype: field {
+          parentsUntil: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          next: method {
-             prototype: field {
+          next: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          prev: method {
-             prototype: field {
+          prev: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          nextAll: method {
-             prototype: field {
+          nextAll: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          prevAll: method {
-             prototype: field {
+          prevAll: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          nextUntil: method {
-             prototype: field {
+          nextUntil: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          prevUntil: method {
-             prototype: field {
+          prevUntil: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          siblings: method {
-             prototype: field {
+          siblings: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          children: method {
-             prototype: field {
+          children: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          contents: method {
-             prototype: field {
+          contents: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          text: method @jquery.js:5703, jquery.js:323 {
-             prototype: field {
+          text: method from $ @jquery.js:5703, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          wrapAll: method @jquery.js:5711, jquery.js:323 {
-             prototype: field {
+          wrapAll: method from $ @jquery.js:5711, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          wrapInner: method @jquery.js:5740, jquery.js:323 {
-             prototype: field {
+          wrapInner: method from $ @jquery.js:5740, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          wrap: method @jquery.js:5760, jquery.js:323 {
-             prototype: field {
+          wrap: method from $ @jquery.js:5760, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          unwrap: method @jquery.js:5768, jquery.js:323 {
-             prototype: field {
+          unwrap: method from $ @jquery.js:5768, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          append: method @jquery.js:5776, jquery.js:323 {
-             prototype: field {
+          append: method from $ @jquery.js:5776, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          prepend: method @jquery.js:5784, jquery.js:323 {
-             prototype: field {
+          prepend: method from $ @jquery.js:5784, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          before: method @jquery.js:5792, jquery.js:323 {
-             prototype: field {
+          before: method from $ @jquery.js:5792, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          after: method @jquery.js:5805, jquery.js:323 {
-             prototype: field {
+          after: method from $ @jquery.js:5805, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          remove: method @jquery.js:5819, jquery.js:323 {
-             prototype: field {
+          remove: method from $ @jquery.js:5819, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          empty: method @jquery.js:5839, jquery.js:323 {
-             prototype: field {
+          empty: method from $ @jquery.js:5839, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          clone: method @jquery.js:5858, jquery.js:323 {
-             prototype: field {
+          clone: method from $ @jquery.js:5858, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          html: method @jquery.js:5867, jquery.js:323 {
-             prototype: field {
+          html: method from $ @jquery.js:5867, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          replaceWith: method @jquery.js:5909, jquery.js:323 {
-             prototype: field {
+          replaceWith: method from $ @jquery.js:5909, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          detach: method @jquery.js:5943, jquery.js:323 {
-             prototype: field {
+          detach: method from $ @jquery.js:5943, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          domManip: method @jquery.js:5947, jquery.js:323 {
-             prototype: field {
+          domManip: method from $ @jquery.js:5947, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          appendTo: method {
-             prototype: field {
+          appendTo: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          prependTo: method {
-             prototype: field {
+          prependTo: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          insertBefore: method {
-             prototype: field {
+          insertBefore: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          insertAfter: method {
-             prototype: field {
+          insertAfter: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          replaceAll: method {
-             prototype: field {
+          replaceAll: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          css: method @jquery.js:6640, jquery.js:323 {
-             prototype: field {
+          css: method from $ @jquery.js:6640, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          show: method {
-             prototype: field {
+          show: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          hide: method {
-             prototype: field {
+          hide: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          serialize: method @jquery.js:7185, jquery.js:323 {
-             prototype: field {
+          serialize: method from $ @jquery.js:7185, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          serializeArray: method @jquery.js:7188, jquery.js:323 {
-             prototype: field {
+          serializeArray: method from $ @jquery.js:7188, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          ajaxStart: method {
-             prototype: field {
+          ajaxStart: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          ajaxStop: method {
-             prototype: field {
+          ajaxStop: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          ajaxComplete: method {
-             prototype: field {
+          ajaxComplete: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          ajaxError: method {
-             prototype: field {
+          ajaxError: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          ajaxSuccess: method {
-             prototype: field {
+          ajaxSuccess: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          ajaxSend: method {
-             prototype: field {
+          ajaxSend: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          fadeTo: method @jquery.js:9021, jquery.js:323 {
-             prototype: field {
+          fadeTo: method from $ @jquery.js:9021, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          animate: method @jquery.js:9029, jquery.js:323 {
-             prototype: field {
+          animate: method from $ @jquery.js:9029, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          stop: method @jquery.js:9046, jquery.js:323 {
-             prototype: field {
+          stop: method from $ @jquery.js:9046, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          slideDown: method {
-             prototype: field {
+          slideDown: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          slideUp: method {
-             prototype: field {
+          slideUp: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          slideToggle: method {
-             prototype: field {
+          slideToggle: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          fadeIn: method {
-             prototype: field {
+          fadeIn: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          fadeOut: method {
-             prototype: field {
+          fadeOut: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          fadeToggle: method {
-             prototype: field {
+          fadeToggle: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          offset: method @jquery.js:9229 {
-             prototype: field {
+          offset: method from $ @jquery.js:9229 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          position: method @jquery.js:9335, jquery.js:323 {
-             prototype: field {
+          position: method from $ @jquery.js:9335, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          offsetParent: method @jquery.js:9366, jquery.js:323 {
-             prototype: field {
+          offsetParent: method from $ @jquery.js:9366, jquery.js:323 {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          scrollLeft: method {
-             prototype: field {
+          scrollLeft: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          scrollTop: method {
-             prototype: field {
+          scrollTop: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          innerHeight: method {
-             prototype: field {
+          innerHeight: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          height: method {
-             prototype: field {
+          height: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          outerHeight: method {
-             prototype: field {
+          outerHeight: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          innerWidth: method {
-             prototype: field {
+          innerWidth: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          width: method {
-             prototype: field {
+          width: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           }
-          outerWidth: method {
-             prototype: field {
+          outerWidth: method from $ {
+             prototype: field from $ {
                 <ObjectPrototype>: Object.prototype
              }
              <ObjectPrototype>: Function.prototype
           <ObjectPrototype>: Function.prototype
        }
        Event: constructor @jquery.js:3241 (C) {
-          prototype: field @jquery.js:3283 {
-             preventDefault: method @jquery.js:3284 {
-                prototype: field {
+          prototype: field from Event @jquery.js:3283 {
+             preventDefault: method from Event @jquery.js:3284 {
+                prototype: field from Event {
                    <ObjectPrototype>: Object.prototype
                 }
                 <ObjectPrototype>: Function.prototype
              }
-             stopPropagation: method @jquery.js:3301 {
-                prototype: field {
+             stopPropagation: method from Event @jquery.js:3301 {
+                prototype: field from Event {
                    <ObjectPrototype>: Object.prototype
                 }
                 <ObjectPrototype>: Function.prototype
              }
-             stopImmediatePropagation: method @jquery.js:3315 {
-                prototype: field {
+             stopImmediatePropagation: method from Event @jquery.js:3315 {
+                prototype: field from Event {
                    <ObjectPrototype>: Object.prototype
                 }
                 <ObjectPrototype>: Function.prototype
              }
-             isDefaultPrevented: method @jquery.js:3321, jquery.js:3274, jquery.js:3319, jquery.js:3320 {
-                prototype: field {
+             isDefaultPrevented: method from Event @jquery.js:3321, jquery.js:3274, jquery.js:3319, jquery.js:3320 {
+                prototype: field from Event {
                    <ObjectPrototype>: Object.prototype
                 }
                 <ObjectPrototype>: Function.prototype
              scrollTop: ref(874 Alias)
              <ObjectPrototype>: Object.prototype
           }
-          prototype: field @jquery.js:8920, jquery.js:8964 {
+          prototype: field from Tween @jquery.js:8920, jquery.js:8964 {
              constructor: ref(867)
              init: constructor @jquery.js:9175, jquery.js:8922 (C) {
                 tick: function @jquery.js:9176 {
                 prototype: ref(877)
                 <ObjectPrototype>: Function.prototype
              }
-             cur: method @jquery.js:8931 {
-                prototype: field {
+             cur: method from Tween @jquery.js:8931 {
+                prototype: field from Tween {
                    <ObjectPrototype>: Object.prototype
                 }
                 <ObjectPrototype>: Function.prototype
              }
-             run: method @jquery.js:8938 {
-                prototype: field {
+             run: method from Tween @jquery.js:8938 {
+                prototype: field from Tween {
                    <ObjectPrototype>: Object.prototype
                 }
                 <ObjectPrototype>: Function.prototype