From ea4385add0e9087487ccded929c2d6674d326db8 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Wed, 18 Apr 2012 00:29:52 -0700
Subject: - collapse panels for code view, restore for design view - apply
 theme selection to all code view documents

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/panels/Splitter.js | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

(limited to 'js/panels')

diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js
index 98ebb36a..0640abb2 100755
--- a/js/panels/Splitter.js
+++ b/js/panels/Splitter.js
@@ -55,7 +55,6 @@ exports.Splitter = Montage.create(Component, {
         },
         set: function(value) {
             this._collapsed = value;
-
             this.application.localStorage.setItem(this.element.getAttribute("data-montage-id"), {"version": this.version, "value": value});
         }
     },
@@ -139,5 +138,39 @@ exports.Splitter = Montage.create(Component, {
         value: function() {
             this.handleClick();
         }
+    },
+
+    collapse:{
+        value: function() {
+            if (this.collapsed === false) {
+                if(this.panel.element) {
+                    this.panel.element.addEventListener("webkitTransitionEnd", this, false);
+                } else {
+                    this.panel.addEventListener("webkitTransitionEnd", this, false);
+                }
+                this._collapsed = true;
+                this.needsDraw = true;
+            }
+        }
+    },
+    restore:{
+        value: function() {
+            //Get splitter initial value from SettingManager
+            var storedData = this.application.localStorage.getItem(this.element.getAttribute("data-montage-id")), temp = this.collapsed;
+            if(storedData && this.element.getAttribute("data-montage-id") !== null) {
+                this._collapsed = storedData.value;
+
+            } else {
+                this._collapsed = false;
+            }
+            if(temp != this._collapsed){
+                if(this.panel.element) {
+                    this.panel.element.addEventListener("webkitTransitionEnd", this, false);
+                } else {
+                    this.panel.addEventListener("webkitTransitionEnd", this, false);
+                }
+                this.needsDraw = true;
+            }
+        }
     }
 });
-- 
cgit v1.2.3


From 03787df5da551620831c134aa11ee198397c9f6d Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Thu, 26 Apr 2012 10:51:57 -0700
Subject: We don't currently support perspective values on individual elements,
 so removing perspective values from the animation presets.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/panels/presets/default-animation-presets.js | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'js/panels')

diff --git a/js/panels/presets/default-animation-presets.js b/js/panels/presets/default-animation-presets.js
index 578c1622..753b3365 100644
--- a/js/panels/presets/default-animation-presets.js
+++ b/js/panels/presets/default-animation-presets.js
@@ -52,7 +52,6 @@ exports.animationPresets = {
                     "-webkit-animation-direction": "normal",
                     "-webkit-animation-timing-function": "ease",
                     "-webkit-transform-style": "preserve-3d",
-                    "-webkit-transform": "perspective(1000)",
                     "-webkit-animation-delay": "0s"
                 }
             },{
@@ -100,7 +99,6 @@ exports.animationPresets = {
                         "-webkit-animation-timing-function": "ease-out",
                         "-webkit-transform-origin": "100% 50%",
                         "-webkit-transform-style": "preserve-3d",
-                        "-webkit-transform": "perspective(1000)",
                         "-webkit-animation-delay": "0s"
                     }
                 },{
@@ -109,31 +107,31 @@ exports.animationPresets = {
                         "keyText": "0%",
                         "styles": {
                             "opacity": "1",
-                            "-webkit-transform": "perspective(1000) rotateY(0deg)"
+                            "-webkit-transform": "rotateY(0deg)"
                         }
                     }, {
                         "keyText": "70%",
                         "styles": {
                             "opacity": "1",
-                            "-webkit-transform": "perspective(1000) rotateY(0deg)"
+                            "-webkit-transform": "rotateY(0deg)"
                         }
                     }, {
                         "keyText": "85%",
                         "styles": {
                             "opacity": "0",
-                            "-webkit-transform": "perspective(1000) rotateY(95deg)"
+                            "-webkit-transform": "rotateY(95deg)"
                         }
                     }, {
                         "keyText": "86%",
                         "styles": {
                             "opacity": "0",
-                            "-webkit-transform": "perspective(1000) rotateY(-90deg)"
+                            "-webkit-transform": "rotateY(-90deg)"
                         }
                     }, {
                         "keyText": "100%",
                         "styles": {
                             "opacity": "1",
-                            "-webkit-transform": "perspective(1000) rotateY(0deg)"
+                            "-webkit-transform": "rotateY(0deg)"
                         }
                     }]
                 }]
@@ -151,7 +149,6 @@ exports.animationPresets = {
                         "-webkit-animation-timing-function": "ease-out",
                         "-webkit-transform-origin": "100% 50%",
                         "-webkit-transform-style": "preserve-3d",
-                        "-webkit-transform": "perspective(1000)",
                         "-webkit-animation-delay": "0s"
                     }
                 },{
@@ -160,25 +157,25 @@ exports.animationPresets = {
                         "keyText": "0%",
                         "styles": {
                             "opacity": "0",
-                            "-webkit-transform": "perspective(1000) rotateY(-90deg)"
+                            "-webkit-transform": "rotateY(-90deg)"
                         }
                     }, {
                         "keyText": "15%",
                         "styles": {
                             "opacity": "1",
-                            "-webkit-transform": "perspective(1000) rotateY(0deg)"
+                            "-webkit-transform": "rotateY(0deg)"
                         }
                     }, {
                         "keyText": "85%",
                         "styles": {
                             "opacity": "1",
-                            "-webkit-transform": "perspective(1000) rotateY(0deg)"
+                            "-webkit-transform": "rotateY(0deg)"
                         }
                     }, {
                         "keyText": "100%",
                         "styles": {
                             "opacity": "0",
-                            "-webkit-transform": "perspective(1000) rotateY(95deg)"
+                            "-webkit-transform": "rotateY(95deg)"
                         }
                     }]
                 }]
-- 
cgit v1.2.3


From 1ccc4d6dcff232b00763a5a49d7ad7a91f78ad3f Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Thu, 26 Apr 2012 13:24:51 -0700
Subject: Fixing the element model and adding get element

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/panels/properties.reel/properties.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'js/panels')

diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index b21014c1..ee90cd64 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -174,6 +174,7 @@ exports.Properties = Montage.create(Component, {
     handleSelectionChange: {
         value: function(event) {
             if(event.detail.isDocument) {
+                if(this.application.ninja.currentDocument.documentRoot.nodeName.toLowerCase() === "body") return;
                 this.displayStageProperties();
             } else {
                 if(this.application.ninja.selectedElements.length === 1) {
-- 
cgit v1.2.3


From bcfb200482c26b2bfc0d6577b1eb0de7a19a6762 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Thu, 26 Apr 2012 16:23:59 -0700
Subject: Removing all "module" declarations and replaced with "prototype" in
 preparation for montage converting to the new "prototype" format fully

---
 .../CSSPanel/CSSPanelBase.reel/CSSPanelBase.html   | 11 ++---
 .../ComputedStyleSubPanel.html                     |  5 +--
 .../materials-library-panel.html                   | 17 +++-----
 .../materials-popup.reel/materials-popup.html      | 18 +++------
 js/panels/Panel.reel/Panel.html                    | 24 ++++-------
 js/panels/PanelContainer.reel/PanelContainer.html  | 24 ++++-------
 .../projectpanelbase.reel/projectpanelbase.html    |  5 +--
 js/panels/Timeline/Keyframe.reel/Keyframe.html     |  5 +--
 js/panels/Timeline/Layer.reel/Layer.html           | 47 ++++++++--------------
 .../Timeline/PropertyTrack.reel/PropertyTrack.html |  5 +--
 js/panels/Timeline/Span.reel/Span.html             |  5 +--
 js/panels/Timeline/Style.reel/Style.html           | 14 +++----
 .../Timeline/TimelinePanel.reel/TimelinePanel.html | 23 ++++-------
 .../Timeline/TimelineTrack.reel/TimelineTrack.html | 38 ++++++-----------
 js/panels/Timeline/Track.reel/Track.html           | 11 ++---
 .../Timeline/TrackSpacer.reel/TrackSpacer.html     |  5 +--
 js/panels/Timeline/Tween.reel/Tween.html           | 11 ++---
 .../color/colorchippopup.reel/colorchippopup.html  |  5 +--
 .../color/colorpanelbase.reel/colorpanelbase.html  |  5 +--
 .../colorpanelpopup.reel/colorpanelpopup.html      |  5 +--
 .../color/colortoolbar.reel/colortoolbar.html      |  5 +--
 .../components-panel.reel/components-panel.html    | 14 +++----
 .../animations-presets.html                        | 14 +++----
 js/panels/presets/content.reel/content.html        | 17 +++-----
 .../presets/style-presets.reel/style-presets.html  | 14 +++----
 .../transitions-presets.html                       | 14 +++----
 js/panels/properties.reel/properties.html          | 26 +++++-------
 .../properties.reel/section.reel/section.html      |  9 ++---
 .../color-select.reel/color-select.html            |  9 ++---
 .../custom-rows/dual-row.reel/dual-row.html        |  9 ++---
 .../custom-rows/single-row.reel/single-row.html    |  6 +--
 .../sections/custom.reel/custom.html               |  9 ++---
 .../position-and-size.reel/position-and-size.html  | 15 +++----
 .../sections/three-d-view.reel/three-d-view.html   | 36 ++++++-----------
 34 files changed, 168 insertions(+), 312 deletions(-)

(limited to 'js/panels')

diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
index 98b2b61d..c62b2b23 100755
--- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
+++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
         <script type="text/montage-serialization">
         {
             "resizer1": {
-                "module": "js/panels/Resizer",
-                "name": "Resizer",
+                "prototype": "js/panels/Resizer",
                 "properties": {
                     "element": {"#": "subPanelResizer"},
                     "panel": {"#": "nj-section-stylesheets"},
@@ -21,16 +20,14 @@
             },
 
             "ComputedStyleSubPanel1": {
-                "module": "js/panels/CSSPanel/ComputedStyleSubPanel.reel",
-                "name": "ComputedStyleSubPanel",
+                "prototype": "js/panels/CSSPanel/ComputedStyleSubPanel.reel",
                 "properties": {
                     "element": {"#": "nj-computed-sub-panel"}
                 }
             },
 
             "owner": {
-                "module": "js/panels/CSSPanel/CSSPanelBase.reel",
-                "name": "CSSPanelBase",
+                "prototype": "js/panels/CSSPanel/CSSPanelBase.reel",
                 "properties": {
                     "element": {"#": "css_panel"},
                     "computedStyleSubPanel": {"@": "ComputedStyleSubPanel1"}
diff --git a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
index c30d2fb4..53c243a8 100755
--- a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
+++ b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -12,8 +12,7 @@
     <script type="text/montage-serialization">
         {
             "owner": {
-                "module": "js/panels/CSSPanel/ComputedStyleSubPanel.reel",
-                "name": "ComputedStyleSubPanel",
+                "prototype": "js/panels/CSSPanel/ComputedStyleSubPanel.reel",
                 "properties": {
                     "element": {"#": "nj-css-panel-computed"},
                     "groupDropDown": {"#": "nj-css-group-select"},
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
index 4e41512f..741ff6aa 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -47,12 +47,10 @@
                 ]
              },
             "materialInfo": {
-                "module": "js/panels/Materials/materials-popup.reel",
-                "name": "MaterialsPopup"
+                "prototype": "js/panels/Materials/materials-popup.reel"
             },
             "materialsController" : {
-                "module": "js/controllers/tree-controller",
-                "name": "TreeController",
+                "prototype": "js/controllers/tree-controller",
                 "properties" : {
                     "branchKey" : "children",
                     "labelKey" : "label",
@@ -66,8 +64,7 @@
                 }
             },
             "materialsContainer" : {
-                "module" : "js/components/treeview/treeview.reel",
-                "name" : "Treeview",
+                "prototype" : "js/components/treeview/treeview.reel",
                 "properties" : {
                     "element" : {"#": "materials_library_tree"},
                     "branchComponent" : {"@": "branch" },
@@ -76,12 +73,10 @@
                 }
             },
             "branch" : {
-                "module" : "js/components/treeview/ninja-branch.reel",
-                "name" : "Branch"
+                "prototype" : "js/components/treeview/ninja-branch.reel[Branch]"
             },
             "owner": {
-                "module": "js/panels/Materials/materials-library-panel.reel",
-                "name": "MaterialsLibraryPanels",
+                "prototype": "js/panels/Materials/materials-library-panel.reel[MaterialsLibraryPanels]",
                 "properties": {
                     "element": {"#": "materials_library_panel"},
                     "_materialInfo": {"@": "materialInfo"}
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.html b/js/panels/Materials/materials-popup.reel/materials-popup.html
index ae0ee2c8..9fdbc00d 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.html
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.html
@@ -14,32 +14,28 @@
    		<script type="text/montage-serialization">
         {
             "okButton": {
-                "module": "montage/ui/button.reel",
-                "name": "Button",
+                "prototype": "montage/ui/button.reel",
                 "properties": {
                     "element": {"#": "mp_ok_btn"},
                     "label": "OK"
                 }
             },
             "cancelButton": {
-                "module": "montage/ui/button.reel",
-                "name": "Button",
+                "prototype": "montage/ui/button.reel",
                 "properties": {
                     "element": {"#": "mp_cancel_btn"},
                     "label": "Cancel"
                 }
             },
             "eventDelegator": {
-                "module": "montage/core/event/action-event-listener",
-                "name": "ActionEventListener",
+                "prototype": "montage/core/event/action-event-listener",
                 "properties": {
                     "handler": {"@": "owner"},
                     "action": "updatePreview"
                 }
             },
             "propControl1": {
-                "module": "js/components/ui/property-control.reel",
-                "name": "PropertyControl",
+                "prototype": "js/components/ui/property-control.reel",
                 "properties": {
                     "element": {"#": "mp_property"}
                 },
@@ -64,8 +60,7 @@
                             ]
             },
             "materialsProperties": {
-                "module": "montage/ui/repetition.reel",
-                "name": "Repetition",
+                "prototype": "montage/ui/repetition.reel",
                 "properties": {
                     "element": {"#": "mp_properties_list"}
                 },
@@ -78,8 +73,7 @@
                 }
             },
             "owner": {
-                "module": "js/panels/Materials/materials-popup.reel",
-                "name": "MaterialsPopup",
+                "prototype": "js/panels/Materials/materials-popup.reel",
                 "properties": {
                     "materialsProperties": {"@": "materialsProperties"},
                     "element": {"#": "materials_popup"},
diff --git a/js/panels/Panel.reel/Panel.html b/js/panels/Panel.reel/Panel.html
index 43b87940..a0e1bbe9 100755
--- a/js/panels/Panel.reel/Panel.html
+++ b/js/panels/Panel.reel/Panel.html
@@ -9,8 +9,7 @@
     <script type="text/montage-serialization">
         {
             "Resizer": {
-                "module": "js/panels/resize-composer",
-                "name": "ResizeComposer",
+                "prototype": "js/panels/resize-composer",
                 "properties": {
                     "element": {"#": "resizeBar"},
                     "component": {"@": "owner"}
@@ -32,8 +31,7 @@
             },
 
             "DragDrop": {
-                "module": "js/panels/drag-drop-composer",
-                "name": "DragDropComposer",
+                "prototype": "js/panels/drag-drop-composer",
                 "properties": {
                     "element": {"@": "panelTitle"},
                     "component": {"@": "owner"}
@@ -59,8 +57,7 @@
             },
 
             "btnCollapse": {
-                "module": "montage/ui/toggle-button.reel",
-                "name": "ToggleButton",
+                "prototype": "montage/ui/toggle-button.reel",
                 "properties": {
                     "element": {"#": "btnCollapse"},
                     "pressedClass": "hide",
@@ -75,8 +72,7 @@
             },
 
             "btnClose": {
-                "module": "montage/ui/button.reel",
-                "name": "Button",
+                "prototype": "montage/ui/button.reel",
                 "properties": {
                     "element": {"#": "btnClose"},
                     "pressedClass": "hide",
@@ -91,16 +87,14 @@
             },
 
             "slot1": {
-                "module": "montage/ui/slot.reel",
-                "name": "Slot",
+                "prototype": "montage/ui/slot.reel",
                 "properties": {
                     "element": {"#": "panelObject"}
                 }
             },
 
             "panelTitle": {
-                "module": "montage/ui/dynamic-text.reel",
-                "name": "DynamicText",
+                "prototype": "montage/ui/dynamic-text.reel",
                 "properties": {
                     "element": {"#": "panelTitle"}
                 },
@@ -114,8 +108,7 @@
             },
 
             "disabledCondition": {
-                "module": "montage/ui/condition.reel",
-                "name": "Condition",
+                "prototype": "montage/ui/condition.reel",
                 "properties": {
                     "element": {"#": "disabledCondition"}
                 },
@@ -129,8 +122,7 @@
             },
 
             "owner": {
-                "module": "js/panels/Panel.reel",
-                "name": "Panel",
+                "prototype": "js/panels/Panel.reel",
                 "properties": {
                     "element": {"#": "panel"},
                     "resizer": {"@": "Resizer"},
diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html
index d3673105..e5cbbe32 100755
--- a/js/panels/PanelContainer.reel/PanelContainer.html
+++ b/js/panels/PanelContainer.reel/PanelContainer.html
@@ -10,53 +10,46 @@
     <script type="text/montage-serialization">
         {
             "panelData": {
-                "module": "js/data/panels-data",
-                "name": "PanelsData"
+                "prototype": "js/data/panels-data"
             },
 
             "panel_0": {
-                "module": "js/panels/Panel.reel",
-                "name": "Panel",
+                "prototype": "js/panels/Panel.reel",
                 "properties": {
                     "element": {"#": "panel_0"}
                 }
             },
 
             "panel_1": {
-                "module": "js/panels/Panel.reel",
-                "name": "Panel",
+                "prototype": "js/panels/Panel.reel",
                 "properties": {
                     "element": {"#": "panel_1"}
                 }
             },
 
             "panel_2": {
-                "module": "js/panels/Panel.reel",
-                "name": "Panel",
+                "prototype": "js/panels/Panel.reel",
                 "properties": {
                     "element": {"#": "panel_2"}
                 }
             },
 
             "panel_3": {
-                "module": "js/panels/Panel.reel",
-                "name": "Panel",
+                "prototype": "js/panels/Panel.reel",
                 "properties": {
                     "element": {"#": "panel_3"}
                 }
             },
 
             "panel_4": {
-                "module": "js/panels/Panel.reel",
-                "name": "Panel",
+                "prototype": "js/panels/Panel.reel",
                 "properties": {
                     "element": {"#": "panel_4"}
                 }
             },
 
             "panel_5": {
-                "module": "js/panels/Panel.reel",
-                "name": "Panel",
+                "prototype": "js/panels/Panel.reel",
                 "properties": {
                     "element": {"#": "panel_5"}
                 }
@@ -70,8 +63,7 @@
             },
 
             "owner": {
-                "module": "js/panels/PanelContainer.reel",
-                "name": "PanelContainer",
+                "prototype": "js/panels/PanelContainer.reel",
                 "properties": {
                     "element": {"#": "panelContainer"},
                     "panelData": {"@": "panelData" },
diff --git a/js/panels/Project/projectpanelbase.reel/projectpanelbase.html b/js/panels/Project/projectpanelbase.reel/projectpanelbase.html
index 697fff81..ba0cb56b 100755
--- a/js/panels/Project/projectpanelbase.reel/projectpanelbase.html
+++ b/js/panels/Project/projectpanelbase.reel/projectpanelbase.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
          <script type="text/montage-serialization">
         {
             "owner": {
-                "module": "js/panels/project/ProjectPanelBase.reel",
-                "name": "ProjectPanelBase",
+                "prototype": "js/panels/project/ProjectPanelBase.reel",
                 "properties": {
                     "element": {"#": "project-panel"}
                 }
diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.html b/js/panels/Timeline/Keyframe.reel/Keyframe.html
index 7e917b5a..6f9a6d05 100644
--- a/js/panels/Timeline/Keyframe.reel/Keyframe.html
+++ b/js/panels/Timeline/Keyframe.reel/Keyframe.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
         <script type="text/montage-serialization">
                     {
                         "owner": {
-                            "module": "js/panels/Timeline/Keyframe.reel",
-                            "name": "Keyframe",
+                            "prototype": "js/panels/Timeline/Keyframe.reel",
                             "properties": {
                                 "element": {"#": "keyframespace"}
                             }
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html
index 79b522ee..25827f72 100644
--- a/js/panels/Timeline/Layer.reel/Layer.html
+++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
    		<script type="text/montage-serialization">
             {
                 "owner": {
-                    "module": "js/panels/Timeline/Layer.reel",
-                    "name": "Layer",
+                    "prototype": "js/panels/Timeline/Layer.reel",
                     "properties": {
                         "element": {"#": "layer"},
 						"styleRepetition" : {"@":"repetition1"},
@@ -26,8 +25,7 @@
                     }
                 },
 	            "dtext1" : {
-	            	"module" : "montage/ui/dynamic-text.reel",
-	            	"name" : "DynamicText",
+	            	"prototype" : "montage/ui/dynamic-text.reel",
 	            	"properties" : {
 	            		"element" : {"#" : "layer-label-text"}
 	            	},
@@ -40,8 +38,7 @@
 	            	}
 	            },
 	            "repetition1": {
-	                "module": "montage/ui/repetition.reel",
-	                "name": "Repetition",
+	                "prototype": "montage/ui/repetition.reel",
 	                "properties": {
 	                    "element": {"#": "style-container"},
 	                    "isSelectionEnabled" : true
@@ -55,8 +52,7 @@
 	                }
 	            },
 	            "style" : {
-	            	"module" : "js/panels/Timeline/Style.reel",
-	            	"name" : "LayerStyle",
+	            	"prototype" : "js/panels/Timeline/Style.reel[LayerStyle]",
 	            	"properties" : {
 	            		"element" : {"#" : "layer-style"}
 	            	},
@@ -99,8 +95,7 @@
 	            	}
 	            },
 				"dtext_position_x" : {
-                    "module": "js/components/hottextunit.reel",
-            	    "name": "HotTextUnit",
+                    "prototype": "js/components/hottextunit.reel[HotTextUnit]",
             	    "properties": {
             	        "element": {"#": "position-x"},
             	        "maxValue" : 100000,
@@ -118,8 +113,7 @@
 	                }
 				},
 				"dtext_position_y" : {
-                    "module": "js/components/hottextunit.reel",
-            	    "name": "HotTextUnit",
+                    "prototype": "js/components/hottextunit.reel[HotTextUnit]",
             	    "properties": {
             	        "element": {"#": "position-y"},
             	        "maxValue" : 100000,
@@ -137,8 +131,7 @@
 	                }
 				},
 				"dtext_scale_x" : {
-                    "module": "js/components/hottextunit.reel",
-            	    "name": "HotTextUnit",
+                    "prototype": "js/components/hottextunit.reel[HotTextUnit]",
             	    "properties": {
             	        "element": {"#": "scale-x"},
             	        "maxValue" : 100,
@@ -156,8 +149,7 @@
 	                }
 				},
 				"dtext_scale_y" : {
-                    "module": "js/components/hottextunit.reel",
-            	    "name": "HotTextUnit",
+                    "prototype": "js/components/hottextunit.reel[HotTextUnit]",
             	    "properties": {
             	        "element": {"#": "scale-y"},
             	        "maxValue" : 100,
@@ -175,8 +167,7 @@
 	                }
 				},
 				"dtext_skew_x" : {
-                    "module": "js/components/hottextunit.reel",
-            	    "name": "HotTextUnit",
+                    "prototype": "js/components/hottextunit.reel[HotTextUnit]",
             	    "properties": {
             	        "element": {"#": "skew-x"},
             	        "maxValue" : 100,
@@ -194,8 +185,7 @@
 	                }
 				},
 				"dtext_skew_y" : {
-                    "module": "js/components/hottextunit.reel",
-            	    "name": "HotTextUnit",
+                    "prototype": "js/components/hottextunit.reel[HotTextUnit]",
             	    "properties": {
             	        "element": {"#": "skew-y"},
             	        "maxValue" : 100,
@@ -213,8 +203,7 @@
 	                }
 				},
 				"dtext_rotate" : {
-                    "module": "js/components/hottextunit.reel",
-            	    "name": "HotTextUnit",
+                    "prototype": "js/components/hottextunit.reel[HotTextUnit]",
             	    "properties": {
             	        "element": {"#": "rotation"},
             	        "maxValue" : 360,
@@ -233,8 +222,7 @@
 				},
 					
 				"mainCollapser" : {
-					"module" : "js/panels/timeline/Collapser.js",
-					"name" : "Collapser",
+					"prototype" : "js/panels/timeline/Collapser",
 					"properties" : {
 						"element" : {"#" : "content-main"},
 						"myContent" : {"#" : "content-main"},
@@ -254,8 +242,7 @@
 				},
 					
 				"positionCollapser" : {
-					"module" : "js/panels/timeline/Collapser.js",
-					"name" : "Collapser",
+					"prototype" : "js/panels/timeline/Collapser",
 					"properties" : {
 						"element" : {"#" : "content-position"},
 						"myContent" : {"#":"content-position"},
@@ -275,8 +262,7 @@
 				},
 					
 				"transformCollapser" : {
-					"module" : "js/panels/timeline/Collapser.js",
-					"name" : "Collapser",
+					"prototype" : "js/panels/timeline/Collapser",
 					"properties" : {
 						"element" : {"#" : "content-transform"},
 						"myContent" : {"#":"content-transform"},
@@ -296,8 +282,7 @@
 				},
 					
 				"styleCollapser" : {
-					"module" : "js/panels/timeline/Collapser.js",
-					"name" : "Collapser",
+					"prototype" : "js/panels/timeline/Collapser",
 					"properties" : {
 						"element" : {"#" : "content-style"},
 						"myContent" : {"#":"content-style"},
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html
index 01cad6cb..2af78f9a 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
         <script type="text/montage-serialization">
                     {
                         "owner": {
-                            "module": "js/panels/Timeline/PropertyTrack.reel",
-                            "name": "PropertyTrack",
+                            "prototype": "js/panels/Timeline/PropertyTrack.reel",
                             "properties": {
                                 "element": {"#": "property-track"}
                             }
diff --git a/js/panels/Timeline/Span.reel/Span.html b/js/panels/Timeline/Span.reel/Span.html
index f7e05982..3d3aef1b 100644
--- a/js/panels/Timeline/Span.reel/Span.html
+++ b/js/panels/Timeline/Span.reel/Span.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
         <script type="text/montage-serialization">
                     {
                         "owner": {
-                            "module": "js/panels/Timeline/Span.reel",
-                            "name": "Span",
+                            "prototype": "js/panels/Timeline/Span.reel",
                             "properties": {
                                 "element": {"#": "spanspace"}
                             }
diff --git a/js/panels/Timeline/Style.reel/Style.html b/js/panels/Timeline/Style.reel/Style.html
index 48714432..9fb098de 100644
--- a/js/panels/Timeline/Style.reel/Style.html
+++ b/js/panels/Timeline/Style.reel/Style.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
    		<script type="text/montage-serialization">
             {
                 "owner": {
-                    "module": "js/panels/Timeline/Style.reel",
-                    "name": "Style",
+                    "prototype": "js/panels/Timeline/Style.reel",
                     "properties": {
                         "element": {"#": "style-container"},
                         "styleContainer" : {"#" : "style-container"},
@@ -24,8 +23,7 @@
                     }
                 },
 	            "dtext1" : {
-	            	"module" : "montage/ui/dynamic-text.reel",
-	            	"name" : "DynamicText",
+	            	"prototype" : "montage/ui/dynamic-text.reel",
 	            	"properties" : {
 	            		"element" : {"#" : "container-property"}
 	            	},
@@ -38,8 +36,7 @@
 	            	}
 	            },
 	            "hottextunit" : {
-	            	"module" : "js/components/hottextunit.reel",
-	            	"name" : "HotTextUnit",
+	            	"prototype" : "js/components/hottextunit.reel[HotTextUnit]",
 	            	"properties" : {
 	            		"element" : {"#":"value-editor-hottext"}
 	            	},
@@ -52,8 +49,7 @@
 	            	}
 	            },
 	            "hintable" : {
-	            	"module" : "js/components/hintable.reel",
-	            	"name" : "Hintable",
+	            	"prototype" : "js/components/hintable.reel",
 	            	"properties" : {
 	            		"element" : {"#":"style-hintable"}
 	            	},
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 14c5f1c8..daeb9a3c 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -13,8 +13,7 @@
         <script type="text/montage-serialization">
             {
                 "owner": {
-                    "module": "js/panels/Timeline/TimelinePanel.reel",
-                    "name": "TimelinePanel",
+                    "prototype": "js/panels/Timeline/TimelinePanel.reel",
                     "properties": {
                         "element": {"#": "timeline_panel"},
                         "user_layers": {"#": "user_layers"},
@@ -39,8 +38,7 @@
                 },
 
                 "timelineResize" : {
-                    "module": "js/panels/Resizer",
-                    "name": "Resizer",
+                    "prototype": "js/panels/Resizer",
                     "properties": {
                         "element": {"#": "layer_resizer"},
                         "panel" : {"#" : "timeline_leftpane"},
@@ -52,8 +50,7 @@
 
                 
 	            "repetition1": {
-	                "module": "montage/ui/repetition.reel",
-	                "name": "Repetition",
+	                "prototype": "montage/ui/repetition.reel",
 	                "properties": {
 	                    "element": {"#": "container-layers"},
 	                    "isSelectionEnabled" : true
@@ -67,8 +64,7 @@
 	                }
 	            },
 	            "layer" : {
-	            	"module" : "js/panels/Timeline/Layer.reel",
-	            	"name" : "Layer",
+	            	"prototype" : "js/panels/Timeline/Layer.reel",
 	            	"properties" : {
 	            		"element": {"#": "container-layer"}
 	            	},
@@ -82,8 +78,7 @@
 	            },
 	            
 	            "repetition2" : {
-	                "module": "montage/ui/repetition.reel",
-	                "name": "Repetition",
+	                "prototype": "montage/ui/repetition.reel",
 	                "properties": {
 	                    "element": {"#": "container-tracks"},
 	                    "isSelectionEnabled" : false
@@ -97,8 +92,7 @@
 	                }
 	            },
 	            "track" : {
-	            	"module" : "js/panels/Timeline/TimelineTrack.reel",
-	            	"name" : "TimelineTrack",
+	            	"prototype" : "js/panels/Timeline/TimelineTrack.reel",
 	            	"properties" : {
 	            		"element": {"#": "container-track"}
 	            	},
@@ -111,8 +105,7 @@
 	            	}
 	            },
                 "endHottext" : {
-                    "module": "js/components/hottextunit.reel",
-            	    "name": "HotTextUnit",
+                    "prototype": "js/components/hottextunit.reel[HotTextUnit]",
             	    "properties": {
             	        "element": {"#": "end_hottext"},
             	        "maxValue" : 100000,
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
index 7e9b8a21..2dc9518b 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
         <script type="text/montage-serialization">
                {
                    "owner": {
-                       "module": "js/panels/Timeline/TimelineTrack.reel",
-                       "name": "Track",
+                       "prototype": "js/panels/Timeline/TimelineTrack.reel[Track]",
                        "properties": {
                            "element": {"#": "track"},
                            "tweenRepetition" : {"@" : "tweenRepetition"},
@@ -26,8 +25,7 @@
                    },
 
                    "tween" : {
-                   		"module" : "js/panels/timeline/Tween.reel",
-                   		"name" : "Tween",
+                   		"prototype" : "js/panels/timeline/Tween.reel",
                    		"properties" : {
                    			"element":{"#": "track_lane"}
                    		},
@@ -41,8 +39,7 @@
                    },
 
                    "tweenRepetition": {
-                       "module": "montage/ui/repetition.reel",
-                   	   "name": "Repetition",
+                       "prototype": "montage/ui/repetition.reel",
                    	   "properties": {
                    	       "element": {"#": "track_lanes"},
                    	       "isSelectionEnabled" : false
@@ -57,8 +54,7 @@
                    },
 
                    "styleTrackRepetition": {
-                       "module": "montage/ui/repetition.reel",
-                   	   "name": "Repetition",
+                       "prototype": "montage/ui/repetition.reel",
                    	   "properties": {
                    	       "element": {"#": "content-styles"},
                    	       "isSelectionEnabled" : false
@@ -72,8 +68,7 @@
                    	   }
                    },
                    "positionTracksRepetition": {
-                       "module": "montage/ui/repetition.reel",
-                   	   "name": "Repetition",
+                       "prototype": "montage/ui/repetition.reel",
                    	   "properties": {
                    	       "element": {"#": "content-position-tracks"},
                    	       "isSelectionEnabled" : false
@@ -87,15 +82,13 @@
                    	   }
                    },
 					"positionPropertyTrack" : {
-						"module" : "js/panels/Timeline/PropertyTrack.reel",
-						"name" : "PropertyTrack",
+						"prototype" : "js/panels/Timeline/PropertyTrack.reel",
 						"properties" : {
 							"element":{"#": "position-track-base"}
 						}
 					},
                    "transformTracksRepetition": {
-                       "module": "montage/ui/repetition.reel",
-                   	   "name": "Repetition",
+                       "prototype": "montage/ui/repetition.reel",
                    	   "properties": {
                    	       "element": {"#": "content-transform-tracks"},
                    	       "isSelectionEnabled" : false
@@ -109,16 +102,14 @@
                    	   }
                    },
 					"transformPropertyTrack" : {
-						"module" : "js/panels/Timeline/PropertyTrack.reel",
-						"name" : "PropertyTrack",
+						"prototype" : "js/panels/Timeline/PropertyTrack.reel",
 						"properties" : {
 							"element":{"#": "transform-track-base"}
 						}
 					},
 					
 					"mainCollapser" : {
-						"module" : "js/panels/timeline/Collapser.js",
-						"name" : "Collapser",
+						"prototype" : "js/panels/timeline/Collapser",
 						"properties" : {
 							"element" : {"#" : "content-main"},
 							"myContent" : {"#":"content-main"},
@@ -143,8 +134,7 @@
 					},
 					
 					"positionCollapser" : {
-						"module" : "js/panels/timeline/Collapser.js",
-						"name" : "Collapser",
+						"prototype" : "js/panels/timeline/Collapser",
 						"properties" : {
 							"element" : {"#" : "content-position-tracks"},
 							"myContent" : {"#":"content-position-tracks"},
@@ -169,8 +159,7 @@
 					},
 					
 					"transformCollapser" : {
-						"module" : "js/panels/timeline/Collapser.js",
-						"name" : "Collapser",
+						"prototype" : "js/panels/timeline/Collapser",
 						"properties" : {
 							"element" : {"#" : "content-transform-tracks"},
 							"myContent" : {"#":"content-transform-tracks"},
@@ -195,8 +184,7 @@
 					},
 					
 					"styleCollapser" : {
-						"module" : "js/panels/timeline/Collapser.js",
-						"name" : "Collapser",
+						"prototype" : "js/panels/timeline/Collapser",
 						"properties" : {
 							"element" : {"#" : "content-styles"},
 							"myContent" : {"#":"content-styles"},
diff --git a/js/panels/Timeline/Track.reel/Track.html b/js/panels/Timeline/Track.reel/Track.html
index 39b387e2..9c72f430 100644
--- a/js/panels/Timeline/Track.reel/Track.html
+++ b/js/panels/Timeline/Track.reel/Track.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
    		<script type="text/montage-serialization">
             {
                 "owner": {
-                    "module": "js/panels/Timeline/Track.reel",
-                    "name": "Track",
+                    "prototype": "js/panels/Timeline/Track.reel",
                     "properties": {
                         "element": {"#": "track"},
                         "spanRepetition" : {"@" : "spanRepetition"},
@@ -21,8 +20,7 @@
                 },
 
                 "trackslot": {
-                    "module": "montage/ui/slot.reel",
-                    "name": "Slot",
+                    "prototype": "montage/ui/slot.reel",
                     "properties": {
                         "element": {"#": "track_lane"}
                     },
@@ -36,8 +34,7 @@
                 },
 
                 "spanRepetition": {
-                	"module": "montage/ui/repetition.reel",
-                	"name": "Repetition",
+                	"prototype": "montage/ui/repetition.reel",
                 	"properties": {
                 	    "element": {"#": "track_lanes"},
                 	        "isSelectionEnabled" : true
diff --git a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
index 94f5c278..47778b5d 100644
--- a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
+++ b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
         <script type="text/montage-serialization">
                     {
                         "owner": {
-                            "module": "js/panels/Timeline/TrackSpacer.reel",
-                            "name": "TrackSpacer",
+                            "prototype": "js/panels/Timeline/TrackSpacer.reel",
                             "properties": {
                                 "element": {"#": "trackspace"}
                             }
diff --git a/js/panels/Timeline/Tween.reel/Tween.html b/js/panels/Timeline/Tween.reel/Tween.html
index ce51cb70..c161b3f8 100644
--- a/js/panels/Timeline/Tween.reel/Tween.html
+++ b/js/panels/Timeline/Tween.reel/Tween.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
         <script type="text/montage-serialization">
                     {
                         "owner": {
-                            "module": "js/panels/Timeline/Tween.reel",
-                            "name": "Tween",
+                            "prototype": "js/panels/Timeline/Tween.reel",
                             "properties": {
                                 "element": {"#": "tweenspace"},
                                 "keyframe": {"@": "keyframe"},
@@ -21,16 +20,14 @@
                         },
                         
                         "span": {
-                            "module": "js/panels/Timeline/Span.reel",
-                            "name": "Span",
+                            "prototype": "js/panels/Timeline/Span.reel",
                             "properties": {
                                 "element": {"#": "span_container"}
                             }
                         },
 
                         "keyframe": {
-                            "module": "js/panels/Timeline/Keyframe.reel",
-                            "name": "Keyframe",
+                            "prototype": "js/panels/Timeline/Keyframe.reel",
                             "properties": {
                                 "element": {"#": "keyframe_container"}
                             }
diff --git a/js/panels/color/colorchippopup.reel/colorchippopup.html b/js/panels/color/colorchippopup.reel/colorchippopup.html
index 1ae40cc1..ff0c6498 100755
--- a/js/panels/color/colorchippopup.reel/colorchippopup.html
+++ b/js/panels/color/colorchippopup.reel/colorchippopup.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- 
 	<copyright>
 	This file contains proprietary software owned by Motorola Mobility, Inc.
@@ -16,8 +16,7 @@
    		<script type="text/montage-serialization">
     	{
             "owner": {
-                "module": "js/panels/Color/colorchippopup.reel",
-                "name": "colorchippopup",
+                "prototype": "js/panels/Color/colorchippopup.reel",
                 "properties": {
                     "element": {"#": "cc_popup"}
                 }
diff --git a/js/panels/color/colorpanelbase.reel/colorpanelbase.html b/js/panels/color/colorpanelbase.reel/colorpanelbase.html
index d4330596..f40bd448 100755
--- a/js/panels/color/colorpanelbase.reel/colorpanelbase.html
+++ b/js/panels/color/colorpanelbase.reel/colorpanelbase.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -13,8 +13,7 @@
    		<script type="text/montage-serialization">
         {
             "owner": {
-                "module": "js/panels/Color/ColorPanelBase.reel",
-                "name": "ColorPanelBase",
+                "prototype": "js/panels/Color/ColorPanelBase.reel",
                 "properties": {
                     "element": {"#": "cp_expanded"}
                 }
diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
index feebb45c..0698a6dc 100755
--- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
+++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -14,8 +14,7 @@
    		<script type="text/montage-serialization">	
     	{
             "owner": {
-                "module": "js/panels/Color/colorpanelpopup.reel",
-                "name": "ColorPanelPopup",
+                "prototype": "js/panels/Color/colorpanelpopup.reel[ColorPanelPopup]",
                 "properties": {
                     "element": {"#": "cpp_popup"}
                 }
diff --git a/js/panels/color/colortoolbar.reel/colortoolbar.html b/js/panels/color/colortoolbar.reel/colortoolbar.html
index 9ab54836..e32a475c 100755
--- a/js/panels/color/colortoolbar.reel/colortoolbar.html
+++ b/js/panels/color/colortoolbar.reel/colortoolbar.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 
 <!DOCTYPE html>
 <!-- <copyright>
@@ -16,8 +16,7 @@
         {
 
             "owner": {
-                "module": "js/panels/Color/colortoolbar.reel",
-                "name": "ColorToolbar",
+                "prototype": "js/panels/Color/colortoolbar.reel[ColorToolbar]",
                 "properties": {
                     "element": {"#": "colortoolbar"}
                 }
diff --git a/js/panels/components-panel.reel/components-panel.html b/js/panels/components-panel.reel/components-panel.html
index f598a1ee..c78988e0 100755
--- a/js/panels/components-panel.reel/components-panel.html
+++ b/js/panels/components-panel.reel/components-panel.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -12,8 +12,7 @@
         <script type="text/montage-serialization">
         {
             "owner": {
-                "module": "js/panels/components-panel.reel",
-                "name": "ComponentsPanel",
+                "prototype": "js/panels/components-panel.reel",
                 "properties": {
                     "element": {"#": "components_panel"},
                     "controller": {"@": "componentsTree"}
@@ -21,8 +20,7 @@
             },
 
             "componentsController" : {
-                "module": "js/components/controllers/tree-controller",
-                "name": "TreeController",
+                "prototype": "js/components/controllers/tree-controller",
                 "properties" : {
                     "branchKey" : "children",
                     "labelKey" : "text",
@@ -37,8 +35,7 @@
             },
 
             "componentsTree" : {
-                "module" : "js/components/treeview/treeview.reel",
-                "name" : "Treeview",
+                "prototype" : "js/components/treeview/treeview.reel",
                 "properties" : {
                     "element" : {"#": "componentsContainer"},
                     "branchComponent" : {"@": "branch" },
@@ -48,8 +45,7 @@
             },
 
             "branch" : {
-                "module" : "js/components/treeview/ninja-branch.reel",
-                "name" : "Branch"
+                "prototype" : "js/components/treeview/ninja-branch.reel[Branch]"
             }
         }
         </script>
diff --git a/js/panels/presets/animations-presets.reel/animations-presets.html b/js/panels/presets/animations-presets.reel/animations-presets.html
index c9d752af..d333cf97 100644
--- a/js/panels/presets/animations-presets.reel/animations-presets.html
+++ b/js/panels/presets/animations-presets.reel/animations-presets.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,16 +11,14 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
     <script type="text/montage-serialization">
         {
             "owner": {
-                "module" : "js/panels/presets/animations-presets.reel",
-                "name" : "AnimationsLibrary",
+                "prototype" : "js/panels/presets/animations-presets.reel[AnimationsLibrary]",
                 "properties" : {
                     "element" : {"#" : "animationsLibrary"},
                     "treeList" : {"@" : "treeList"}
                 }
             },
             "presetsController" : {
-                "module": "js/controllers/tree-controller",
-                "name": "TreeController",
+                "prototype": "js/controllers/tree-controller",
                 "properties" : {
                     "branchKey" : "children",
                     "labelKey" : "text",
@@ -34,8 +32,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 }
             },
             "presetsContainer" : {
-                "module" : "js/components/treeview/treeview.reel",
-                "name" : "Treeview",
+                "prototype" : "js/components/treeview/treeview.reel",
                 "properties" : {
                     "element" : {"#": "libraryContainer"},
                     "branchComponent" : {"@": "branch" },
@@ -45,8 +42,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 }
             },
             "branch" : {
-                "module" : "js/components/treeview/ninja-branch.reel",
-                "name" : "Branch"
+                "prototype" : "js/components/treeview/ninja-branch.reel[Branch]"
             }
         }
     </script>
diff --git a/js/panels/presets/content.reel/content.html b/js/panels/presets/content.reel/content.html
index afbdd559..27928670 100644
--- a/js/panels/presets/content.reel/content.html
+++ b/js/panels/presets/content.reel/content.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
         <script type="text/montage-serialization">
         {
             "owner": {
-                "module" : "js/panels/presets/content.reel",
-                "name" : "Content",
+                "prototype" : "js/panels/presets/content.reel",
                 "properties" : {
                     "element" : {"#" : "presetsPanel"},
                     "activeTabIndex": 0,
@@ -25,8 +24,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 }
             },
             "substitution": {
-                "module": "montage/ui/substitution.reel",
-                "name": "Substitution",
+                "prototype": "montage/ui/substitution.reel",
                 "properties": {
                     "element": {"#": "librarySlot"},
                     "switchComponents": {
@@ -44,16 +42,13 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 }
             },
             "stylesLibrary": {
-                "module": "js/panels/presets/style-presets.reel",
-                "name": "StylesLibrary"
+                "prototype": "js/panels/presets/style-presets.reel[StylesLibrary]"
             },
             "transitionsLibrary": {
-                "module": "js/panels/presets/transitions-presets.reel",
-                "name": "TransitionsLibrary"
+                "prototype": "js/panels/presets/transitions-presets.reel[TransitionsLibrary]"
             },
             "animationsLibrary": {
-                "module": "js/panels/presets/animations-presets.reel",
-                "name": "AnimationsLibrary"
+                "prototype": "js/panels/presets/animations-presets.reel[AnimationsLibrary]"
             }
 
     	}
diff --git a/js/panels/presets/style-presets.reel/style-presets.html b/js/panels/presets/style-presets.reel/style-presets.html
index 0db4d3c0..7490a73b 100644
--- a/js/panels/presets/style-presets.reel/style-presets.html
+++ b/js/panels/presets/style-presets.reel/style-presets.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,16 +11,14 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
     <script type="text/montage-serialization">
         {
             "owner": {
-                "module" : "js/panels/presets/style-presets.reel",
-                "name" : "StylesLibrary",
+                "prototype" : "js/panels/presets/style-presets.reel[StylesLibrary]",
                 "properties" : {
                     "element" : {"#" : "stylesLibrary"},
                     "treeList" : {"@" : "treeList"}
                 }
             },
             "presetsController" : {
-                "module": "js/controllers/tree-controller",
-                "name": "TreeController",
+                "prototype": "js/controllers/tree-controller",
                 "properties" : {
                     "branchKey" : "children",
                     "labelKey" : "text",
@@ -34,8 +32,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 }
             },
             "presetsContainer" : {
-                "module" : "js/components/treeview/treeview.reel",
-                "name" : "Treeview",
+                "prototype" : "js/components/treeview/treeview.reel",
                 "properties" : {
                     "element" : {"#": "libraryContainer"},
                     "branchComponent" : {"@": "branch" },
@@ -45,8 +42,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 }
             },
             "branch" : {
-                "module" : "js/components/treeview/ninja-branch.reel",
-                "name" : "Branch"
+                "prototype" : "js/components/treeview/ninja-branch.reel[Branch]"
             }
         }
     </script>
diff --git a/js/panels/presets/transitions-presets.reel/transitions-presets.html b/js/panels/presets/transitions-presets.reel/transitions-presets.html
index 5dc28edf..2f084463 100644
--- a/js/panels/presets/transitions-presets.reel/transitions-presets.html
+++ b/js/panels/presets/transitions-presets.reel/transitions-presets.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,16 +11,14 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
     <script type="text/montage-serialization">
         {
             "owner": {
-                "module" : "js/panels/presets/transitions-presets.reel",
-                "name" : "TransitionsLibrary",
+                "prototype" : "js/panels/presets/transitions-presets.reel[TransitionsLibrary]",
                 "properties" : {
                     "element" : {"#" : "transitionsLibrary"},
                     "treeList" : {"@" : "treeList"}
                 }
             },
             "presetsController" : {
-                "module": "js/controllers/tree-controller",
-                "name": "TreeController",
+                "prototype": "js/controllers/tree-controller",
                 "properties" : {
                     "branchKey" : "children",
                     "labelKey" : "text",
@@ -34,8 +32,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 }
             },
             "presetsContainer" : {
-                "module" : "js/components/treeview/treeview.reel",
-                "name" : "Treeview",
+                "prototype" : "js/components/treeview/treeview.reel",
                 "properties" : {
                     "element" : {"#": "libraryContainer"},
                     "branchComponent" : {"@": "branch" },
@@ -45,8 +42,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 }
             },
             "branch" : {
-                "module" : "js/components/treeview/ninja-branch.reel",
-                "name" : "Branch"
+                "prototype" : "js/components/treeview/ninja-branch.reel[Branch]"
             }
         }
     </script>
diff --git a/js/panels/properties.reel/properties.html b/js/panels/properties.reel/properties.html
index d212ae80..554d1477 100755
--- a/js/panels/properties.reel/properties.html
+++ b/js/panels/properties.reel/properties.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -27,8 +27,7 @@
             },
 
             "elementClass": {
-                "module": "montage/ui/textfield.reel",
-                "name": "Textfield",
+                "prototype": "montage/ui/textfield.reel",
                 "properties": {
                     "element": {"#": "elementClass"},
                     "readOnly": false
@@ -36,8 +35,7 @@
             },
 
             "PosSizeSection": {
-                "module": "js/panels/properties.reel/section.reel",
-                "name": "Section",
+                "prototype": "js/panels/properties.reel/section.reel",
                 "properties": {
                     "element": {"#": "PosSize"},