Merge branch 'master' of https://github.com/mayhewinator/ninja-internal into serialization

6 files changed, 28 insertions, 56 deletions

diff --git a/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html b/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html
index 58a50a0d..990dc739 100755
--- a/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html
+++ b/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html
@@ -9,8 +9,7 @@
     <script type="text/montage-serialization">
     {
         "owner": {
-            "module" : "js/panels/properties.reel/sections/custom-rows/color-select.reel",
-            "name" : "ColorSelect",
+            "prototype" : "js/panels/properties.reel/sections/custom-rows/color-select.reel",
             "properties" : {
                 "element" : {"#": "section"},
                 "Stroke" : {"#": "Stroke"},
@@ -22,16 +21,14 @@
 
 
         "colorChip": {
-            "module" : "js/components/ui/color-chip.reel",
-            "name" : "ColorChip",
+            "prototype" : "js/components/ui/color-chip.reel",
             "properties" : {
                 "element" : {"#": "Stroke"}
             }
         },
 
         "colorChip2": {
-               "module" : "js/components/ui/color-chip.reel",
-               "name" : "ColorChip",
+               "prototype" : "js/components/ui/color-chip.reel",
                "properties" : {
                    "element" : {"#": "Fill"},
                    "mode": "fill"
diff --git a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html
index be4ae431..d1b5f28b 100755
--- a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html
+++ b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html
@@ -9,8 +9,7 @@
     <script type="text/montage-serialization">
     {
         "owner": {
-            "module" : "js/panels/properties.reel/sections/custom-rows/dual-row.reel",
-            "name" : "DualRow",
+            "prototype" : "js/panels/properties.reel/sections/custom-rows/dual-row.reel",
             "properties" : {
                 "element" : {"#": "section"},
                 "slot" : {"@": "slot"},
@@ -18,8 +17,7 @@
             }
         },
         "slot": {
-            "module": "montage/ui/slot.reel",
-            "name": "Slot",
+            "prototype": "montage/ui/slot.reel",
             "properties": {
                 "element": { "#": "slotElement" }
             },
@@ -31,8 +29,7 @@
             }
         },
         "slot2": {
-            "module": "montage/ui/slot.reel",
-            "name": "Slot",
+            "prototype": "montage/ui/slot.reel",
             "properties": {
                 "element": { "#": "slotElement2" }
             },
diff --git a/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html b/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html
index 4de3f1ae..b606e5db 100755
--- a/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html
+++ b/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html
@@ -9,16 +9,14 @@
     <script type="text/montage-serialization">
     {
         "owner": {
-            "module" : "js/panels/properties.reel/sections/custom-rows/single-row.reel",
-            "name" : "SingleRow",
+            "prototype" : "js/panels/properties.reel/sections/custom-rows/single-row.reel",
             "properties" : {
                 "element" : {"#": "section"},
                 "slot" : {"@": "slot"}
             }
         },
         "slot": {
-            "module": "montage/ui/slot.reel",
-            "name": "Slot",
+            "prototype": "montage/ui/slot.reel",
             "properties": {
                 "element": { "#": "slotElement" }
             },
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.html b/js/panels/properties.reel/sections/custom.reel/custom.html
index 99a68264..cc48d2e7 100755
--- a/js/panels/properties.reel/sections/custom.reel/custom.html
+++ b/js/panels/properties.reel/sections/custom.reel/custom.html
@@ -10,8 +10,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
     <script type="text/montage-serialization">
         {
             "owner": {
-                "module" : "js/panels/properties.reel/sections/custom.reel",
-                "name" : "CustomSection",
+                "prototype" : "js/panels/properties.reel/sections/custom.reel[CustomSection]",
                 "properties" : {
                     "element" : {"#": "section"},
                     "repeat" : {"@": "repeat"}
@@ -19,8 +18,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
             },
 
             "repeat": {
-                "module": "montage/ui/repetition.reel",
-                "name": "Repetition",
+                "prototype": "montage/ui/repetition.reel",
                 "properties": {
                     "element" : {"#": "repetitionContainer"}
                 },
@@ -34,8 +32,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
             },
 
             "slot": {
-                "module": "montage/ui/slot.reel",
-                "name": "Slot",
+                "prototype": "montage/ui/slot.reel",
                 "properties": {
                     "element": { "#": "repeitionContent" }
                 },
diff --git a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html b/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html
index f50724c5..59bbe346 100755
--- a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html
+++ b/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html
@@ -10,8 +10,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
     <script type="text/montage-serialization">
     {
         "owner": {
-            "module" : "js/panels/properties.reel/sections/position-and-size.reel",
-            "name" : "PosSize",
+            "prototype" : "js/panels/properties.reel/sections/position-and-size.reel[PosSize]",
             "properties" : {
                 "element" :         {"#": "section"},
                 "position":         {"#": "position"},
@@ -25,8 +24,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
             }
         },
         "PosX": {
-            "module": "js/components/hottextunit.reel",
-            "name": "HotTextUnit",
+            "prototype": "js/components/hottextunit.reel[HotTextUnit]",
             "properties": {
                 "element": {"#": "PosX"},
                 "maxValue": 10000,
@@ -41,8 +39,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
             }
         },
         "PosY": {
-            "module": "js/components/hottextunit.reel",
-            "name": "HotTextUnit",
+            "prototype": "js/components/hottextunit.reel[HotTextUnit]",
             "properties": {
                 "element": {"#": "PosY"},