From 3669eea4bde3518ce080048e9f53d2dd111fd8be Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Wed, 21 Mar 2012 11:37:48 -0700
Subject: Timeline: Bug fix: style collapsers not staying in synch. Also,
 removed console.log calls in hintable component.

---
 js/components/editable.reel/editable.js |  8 ++++----
 js/components/hintable.reel/hintable.js | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'js/components')

diff --git a/js/components/editable.reel/editable.js b/js/components/editable.reel/editable.js
index 9c8946c4..7a31e7fd 100644
--- a/js/components/editable.reel/editable.js
+++ b/js/components/editable.reel/editable.js
@@ -120,7 +120,7 @@ exports.Editable = Montage.create(Component, {
                 }
                 
                 if(this.stopOnBlur) {
-                    console.log('adding mousedown event listener');
+                    //console.log('adding mousedown event listener');
                     ///// Simulate blur on editable node by listening to the doc
                     document.addEventListener('mouseup', this, false);
                 }
@@ -189,7 +189,7 @@ exports.Editable = Montage.create(Component, {
     handleKeydown : {
         value : function(e) {
             var k = e.keyCode;
-            console.log('keyCode:  ' + k);
+            //console.log('keyCode:  ' + k);
         }
     },
     ///// Text input has changed values
@@ -204,7 +204,7 @@ exports.Editable = Montage.create(Component, {
     },
     handleMouseup : {
         value : function(e) {
-            console.log('handle mouse down');
+            //console.log('handle mouse down');
             ///// Listen for simulated blur event
             if(this.stopOnBlur && e._event.target !== this._element) {
                 this.blur();
@@ -213,7 +213,7 @@ exports.Editable = Montage.create(Component, {
     },
     handleEvent : {
         value : function(e) {
-            console.log("event type : " + e._event.type);
+            //console.log("event type : " + e._event.type);
             ///// If configured, start on specified event
             if(e._event.type === this.startOnEvent) {
                 this.start();
diff --git a/js/components/hintable.reel/hintable.js b/js/components/hintable.reel/hintable.js
index 5ed46b3c..cbfe2d9b 100644
--- a/js/components/hintable.reel/hintable.js
+++ b/js/components/hintable.reel/hintable.js
@@ -90,10 +90,10 @@ exports.Hintable = Montage.create(Editable, {
     hintNext : {
         value : function(e) {
             if(e) { e.preventDefault(); }
-                console.log('next1');
+                //console.log('next1');
             
             if(this._matchIndex < this.matches.length - 1) {
-                console.log('next');
+                //console.log('next');
                 ++this._matchIndex;
                 this.hint = this._getHintDifference();
             }
@@ -102,9 +102,9 @@ exports.Hintable = Montage.create(Editable, {
     hintPrev : {
         value : function(e) {
             if(e) { e.preventDefault(); }
-                console.log('prev1');
+                //console.log('prev1');
             if(this._matchIndex !== 0) {
-                console.log('prev');
+                //console.log('prev');
                 --this._matchIndex;
                 this.hint = this._getHintDifference();
             }
@@ -135,7 +135,7 @@ exports.Hintable = Montage.create(Editable, {
                 /// revert to old value
                 this.value = (this._preEditValue);
                 this._sendEvent('revert');
-                console.log('reverting');
+                //console.log('reverting');
                 
             }
         }
@@ -180,7 +180,7 @@ exports.Hintable = Montage.create(Editable, {
             
             var val = this.value,
                  matches, hint;
-            console.log('val = "' + val + '"');
+            //console.log('val = "' + val + '"');
             //// Handle auto-suggest if configured
             if(this.hints instanceof Array) {
 
-- 
cgit v1.2.3


From e93827d6c157c7648eb52e6c10b7f458b215b580 Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Fri, 23 Mar 2012 07:34:11 -0700
Subject: Timeline : Bug Fix : IKNINJA 1374

Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 js/components/layout/bread-crumb.reel/bread-crumb.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'js/components')

diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index f35972b6..4776265a 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -23,6 +23,7 @@ exports.Breadcrumb = Montage.create(Component, {
         value: function(){
             if(!this.application.ninja.documentController.activeDocument) {
                 this.disabled = true;
+                this.application.ninja.currentSelectedContainer = this.application.ninja.currentDocument.documentRoot;
             }
         }
     },
@@ -79,6 +80,7 @@ exports.Breadcrumb = Montage.create(Component, {
     handleAction: {
         value: function(evt) {
 
+           this.application.ninja.breadCrumbClick=true;
             if(evt.target.value === this.container.uuid) {
                 return;
             }
-- 
cgit v1.2.3


From 969137ba4520103348a496ac9b99063dc4ec8f96 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Thu, 5 Apr 2012 10:38:57 -0700
Subject: Timeline: Bug fix for IKNINJA-1086, "CSS Style Suggestion stops
 working"

---
 js/components/hintable.reel/hintable.js | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'js/components')

diff --git a/js/components/hintable.reel/hintable.js b/js/components/hintable.reel/hintable.js
index cbfe2d9b..6e3b2aaf 100644
--- a/js/components/hintable.reel/hintable.js
+++ b/js/components/hintable.reel/hintable.js
@@ -157,6 +157,14 @@ exports.Hintable = Montage.create(Editable, {
                 
             this._super(arguments);
             
+			/// Remove the phantom "<BR>" element that is generated when 
+			/// content editable element is empty
+			this._children(this._element, function(item) { 
+			    return item.nodeName === 'BR';
+			}).forEach(function(item) {
+			    this._element.removeChild(item);
+			}, this);
+            
             if(k === 39) {
                 selection = window.getSelection();
                 text = selection.baseNode.textContent;
-- 
cgit v1.2.3


From d343c7b3f482c17176cca3ddb6e7f8753169ad48 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Mon, 9 Apr 2012 15:15:59 -0700
Subject: Timeline: Bug fix, IKNINJA 1467, "Timeline: Changing layer names
 should not require hitting "Return" key to commit the change"

---
 js/components/editable.reel/editable.js | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'js/components')

diff --git a/js/components/editable.reel/editable.js b/js/components/editable.reel/editable.js
index 7a31e7fd..ca65bc2a 100644
--- a/js/components/editable.reel/editable.js
+++ b/js/components/editable.reel/editable.js
@@ -115,6 +115,9 @@ exports.Editable = Montage.create(Component, {
                 ///// Save the preEditValue
                 this._preEditValue = this.value;
                 
+                // Initialize enteredValue with current value
+                this.enteredValue = this.value;
+                
                 if(this.selectOnStart) {
                     this.selectAll();
                 }
@@ -189,6 +192,10 @@ exports.Editable = Montage.create(Component, {
     handleKeydown : {
         value : function(e) {
             var k = e.keyCode;
+            
+            // Record change
+            this.enteredValue = this._element.firstChild.data;
+            
             //console.log('keyCode:  ' + k);
         }
     },
-- 
cgit v1.2.3


From 96f78dec0e8ddd9ad975ec8150733f4945ff9095 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Fri, 13 Apr 2012 12:03:12 -0700
Subject: Timeline: Bug fix: problem with editing layers missing last letter in
 new value.

---
 js/components/editable.reel/editable.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'js/components')

diff --git a/js/components/editable.reel/editable.js b/js/components/editable.reel/editable.js
index ca65bc2a..dad93b31 100644
--- a/js/components/editable.reel/editable.js
+++ b/js/components/editable.reel/editable.js
@@ -38,6 +38,7 @@ exports.Editable = Montage.create(Component, {
         set : function(el) {
             this._element = el;
             this._element.addEventListener('keydown', this, false);
+            this._element.addEventListener('keyup', this, false);
             this._element.addEventListener('input', this, false);
             
             if(this.startOnEvent) {
@@ -192,11 +193,13 @@ exports.Editable = Montage.create(Component, {
     handleKeydown : {
         value : function(e) {
             var k = e.keyCode;
-            
-            // Record change
+        }
+    },
+    
+    handleKeyup : {
+        value : function(e) {
+            // Record change in value
             this.enteredValue = this._element.firstChild.data;
-            
-            //console.log('keyCode:  ' + k);
         }
     },
     ///// Text input has changed values
-- 
cgit v1.2.3


From b7d5b9e9b69644cdafdcc9b7ef2fe2674f35db18 Mon Sep 17 00:00:00 2001
From: Kruti Shah
Date: Thu, 19 Apr 2012 13:48:28 -0700
Subject: BreadCrumb Bug Fix

Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
---
 js/components/layout/bread-crumb.reel/bread-crumb.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js/components')

diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index 4776265a..faf5e2f8 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -71,7 +71,7 @@ exports.Breadcrumb = Montage.create(Component, {
 
             // This is always the top container which is now hardcoded to body
             this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"});
-
+            NJevent("breadCrumbBinding",this)
 
 
         }
@@ -80,7 +80,7 @@ exports.Breadcrumb = Montage.create(Component, {
     handleAction: {
         value: function(evt) {
 
-           this.application.ninja.breadCrumbClick=true;
+           this.application.ninja.currentDocument.breadCrumbClick=true;
             if(evt.target.value === this.container.uuid) {
                 return;
             }
-- 
cgit v1.2.3


From c5e66f69b108e359b00c8fd897a4278812484c55 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Fri, 20 Apr 2012 12:09:54 -0700
Subject: Fixing translate handles to draw without zoom value.  Also fixed some
 typos in zoom code.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/components/layout/document-bar.reel/document-bar.js | 1 -
 1 file changed, 1 deletion(-)

(limited to 'js/components')

diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js
index 4dc39fd6..66a02725 100755
--- a/js/components/layout/document-bar.reel/document-bar.js
+++ b/js/components/layout/document-bar.reel/document-bar.js
@@ -57,7 +57,6 @@ exports.DocumentBar = Montage.create(Component, {
 				this._zoomFactor = value;
 				if (!this._firstDraw)
 				{
-					var viewUtils = this.application.ninja.stage.viewUtils;
 					this.application.ninja.stage.setZoom(value);
 				}
 			}
-- 
cgit v1.2.3


From 933338e13e73243965d105170a269a41f7efd77f Mon Sep 17 00:00:00 2001
From: Kruti Shah
Date: Fri, 20 Apr 2012 16:25:36 -0700
Subject: Breadcrumb Fix

Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
---
 js/components/layout/bread-crumb.reel/bread-crumb.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js/components')

diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index faf5e2f8..f3eedfd0 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -71,7 +71,7 @@ exports.Breadcrumb = Montage.create(Component, {
 
             // This is always the top container which is now hardcoded to body
             this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"});
-            NJevent("breadCrumbBinding",this)
+//            NJevent("breadCrumbBinding",this)
 
 
         }
@@ -80,7 +80,7 @@ exports.Breadcrumb = Montage.create(Component, {
     handleAction: {
         value: function(evt) {
 
-           this.application.ninja.currentDocument.breadCrumbClick=true;
+//           this.application.ninja.currentDocument.breadCrumbClick=true;
             if(evt.target.value === this.container.uuid) {
                 return;
             }
-- 
cgit v1.2.3


From a0daa3668883c8c35ce277b60509a3a3dcf303b2 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Tue, 24 Apr 2012 11:42:42 -0700
Subject: Allow users to toggle application of stroke and border settings when
 using the ink bottle tool.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 .../ink-bottle-properties.css                      |  24 ++++
 .../ink-bottle-properties.html                     | 137 ++++++++++++++++++---
 .../ink-bottle-properties.js                       |  49 +++++---
 3 files changed, 179 insertions(+), 31 deletions(-)

(limited to 'js/components')

diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css
index 7f1b0f7f..a926a0b4 100755
--- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css
+++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css
@@ -4,3 +4,27 @@
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
 
+.inkBottleProperties input[type="checkbox"].nj-skinned {
+    float:left;
+    margin-top:5px;
+}
+
+.inkBottleProperties select.nj-skinned {
+    float:left;
+    margin:2px 5px 0 0;
+}
+
+.inkBottleProperties label.disabled {
+    color:#999999;
+}
+
+.inkBottleProperties label.disabled:hover {
+    color:#999999;
+    background-color: transparent;
+    cursor:default;
+}
+
+.inkBottleProperties div.disabled:hover {
+    background-color: transparent;
+    cursor:default;
+}
\ No newline at end of file
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
index 1602e793..81facc49 100755
--- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
+++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
@@ -11,6 +11,30 @@
 
         <script type="text/montage-serialization">
         {
+            "borderWidthCh": {
+                "prototype": "montage/ui/checkbox.reel",
+                "properties": {
+                    "element": {"#": "useBorderWidthCh"},
+                    "identifier": "useBorderWidth",
+                    "checked": true
+                },
+                "listeners": [
+                    {
+                        "type": "action",
+                        "listener": {"@": "owner"},
+                        "capture": false
+                    }
+                ]
+            },
+
+            "borderWidthLabel": {
+                "prototype": "montage/ui/dynamic-text.reel",
+                "properties": {
+                    "element": {"#": "borderWidthLabel"},
+                    "value": "Border:"
+                }
+            },
+
             "borderWidthHT": {
                 "module": "js/components/hottextunit.reel",
                 "name": "HotTextUnit",
@@ -23,6 +47,54 @@
                 }
             },
 
+            "borderStyleCh": {
+                "prototype": "montage/ui/checkbox.reel",
+                "properties": {
+                    "element": {"#": "useBorderStyleCh"},
+                    "identifier": "useBorderStyle",
+                    "checked": true
+                },
+                "listeners": [
+                    {
+                        "type": "action",
+                        "listener": {"@": "owner"},
+                        "capture": false
+                    }
+                ]
+            },
+
+            "borderStyleLabel": {
+                "prototype": "montage/ui/dynamic-text.reel",
+                "properties": {
+                    "element": {"#": "borderStyleLabel"},
+                    "value": "Style:"
+                }
+            },
+
+            "strokeSizeCh": {
+                "prototype": "montage/ui/checkbox.reel",
+                "properties": {
+                    "element": {"#": "useStrokeSizeCh"},
+                    "identifier": "useStrokeSize",
+                    "checked": true
+                },
+                "listeners": [
+                    {
+                        "type": "action",
+                        "listener": {"@": "owner"},
+                        "capture": false
+                    }
+                ]
+            },
+
+            "strokeSizeLabel": {
+                "prototype": "montage/ui/dynamic-text.reel",
+                "properties": {
+                    "element": {"#": "strokeSizeLabel"},
+                    "value": "Stroke:"
+                }
+            },
+
             "strokeSizeHT": {
                 "module": "js/components/hottextunit.reel",
                 "name": "HotTextUnit",
@@ -36,6 +108,22 @@
                 }
             },
 
+            "webGlCh": {
+                "prototype": "montage/ui/checkbox.reel",
+                "properties": {
+                    "element": {"#": "useWebGLCHIB"},
+                    "identifier": "useWebGl",
+                    "checked": true
+                },
+                "listeners": [
+                    {
+                        "type": "action",
+                        "listener": {"@": "owner"},
+                        "capture": false
+                    }
+                ]
+            },
+
             "_strokeMaterialCB": {
                 "module": "js/components/combobox.reel",
                 "name": "Combobox",
@@ -52,12 +140,19 @@
                 "properties": {
                     "element": {"#": "inkBottleProperties"},
 
+                    "useBorderWidth": {"@": "borderWidthCh"},
+                    "borderWidthLabel": {"@": "borderWidthLabel"},
                     "_borderWidth": {"@": "borderWidthHT"},
+
+                    "useBorderStyle": {"@": "borderStyleCh"},
+                    "borderStyleLabel": {"@": "borderStyleLabel"},
                     "_borderStyle": {"#": "borderStyleCB"},
 
+                    "useStrokeSize": {"@": "strokeSizeCh"},
+                    "strokeSizeLabel": {"@": "strokeSizeLabel"},
                     "_strokeSize": {"@": "strokeSizeHT"},
 
-                    "_useWebGL": {"#": "useWebGLCHIB"},
+                    "_useWebGL": {"@": "webGlCh"},
                     "_materialsContainer": {"#": "materialsContainerIB"},
                     "_strokeMaterial": {"@": "_strokeMaterialCB"}
                 }
@@ -68,13 +163,15 @@
     </head>
 
     <body>
-        <div id="inkBottleProperties" class="subToolHolderPanel">
+        <div data-montage-id="inkBottleProperties" class="subToolHolderPanel inkBottleProperties">
 
-            <div id="bordersContainer" class="leftLabel" style="padding-top: 3px;">
-                <label class="label"> Border:</label>
-                <div id="borderWidth" class="label"></div>
-                <label class="label"> Style:</label>
-                <select id="borderStyleCB" class="nj-skinned">
+            <div data-montage-id="elementInkOptions" class="leftLabel" style="padding-top: 3px;">
+                <input data-montage-id="useBorderWidthCh" type="checkbox" name="useBorderWidthControl" class="nj-skinned" title="Apply border-width"/>
+                <label data-montage-id="borderWidthLabel" class="label"> Border:</label>
+                <div data-montage-id="borderWidth" class="label"></div>
+                <input data-montage-id="useBorderStyleCh" type="checkbox" name="useBorderStyleControl" class="nj-skinned" title="Apply border-style"/>
+                <label data-montage-id="borderStyleLabel" class="label"> Style:</label>
+                <select data-montage-id="borderStyleCB" class="nj-skinned">
                     <option value="none">none</option>
                     <option value="solid" selected>solid</option>
                     <option value="hidden">hidden</option>
@@ -88,18 +185,26 @@
                 </select>
             </div>
 
-            <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;">
-                <label class="label"> Stroke:</label>
-                <div id="strokeSize" class="label"></div>
+            <div class="nj-divider divider-vertical" style="margin:8px 20px; float: left;">&nbsp;</div>
+
+            <div data-montage-id="shapeInkOptions" class="leftLabel" style="margin-top: 5px;">
+                <input data-montage-id="useStrokeSizeCh" type="checkbox" name="useStrokeControl" class="nj-skinned" title="Apply stroke size"/>
+                <label data-montage-id="strokeSizeLabel" class="label"> Stroke:</label>
+                <div data-montage-id="strokeSize" class="label"></div>
             </div>
 
-            <label class="label subOption"><input id="useWebGLCHIB" type="checkbox" name="useWebGLControl" class="checkBoxAlign"/> Use WebGL</label>
+            <div data-montage-id="webGLInkOptions" class="leftLabel">
+                <label class="label">
+                    <input data-montage-id="useWebGLCHIB" type="checkbox" name="useWebGLControl" class="nj-skinned"/>
+                    <label class="label"> Use WebGL</label>
+                </label>
 
-            <div id="materialsContainerIB" class="leftLabel" style="padding-top: 3px;">
-                <label class="label"> Materials:</label>
-                <div id="strokeIconIB" class="pencilToolUp" style="float: left;"></div>
-                <select id="strokeMaterialIBCB" class="nj-skinned">
-                </select>
+                <div data-montage-id="materialsContainerIB" class="leftLabel">
+                    <label class="label"> Materials:</label>
+                    <div data-montage-id="strokeIconIB" class="pencilToolUp" style="float: left; margin: 0 2px 0 5px;"></div>
+                    <select data-montage-id="strokeMaterialIBCB" class="nj-skinned">
+                    </select>
+                </div>
             </div>
         </div>
     </body>
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js
index e3ffc359..6d5c46f6 100755
--- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js
+++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js
@@ -10,8 +10,6 @@ var Montage = require("montage/core/core").Montage,
 
 exports.InkBottleProperties = Montage.create(ToolProperties, {
 
-    _use3D:    { value: false },
-
     _subPrepare: {
         value: function() {
             Object.defineBinding(this._strokeMaterial, "items", {
@@ -19,23 +17,44 @@ exports.InkBottleProperties = Montage.create(ToolProperties, {
                 boundObjectPropertyPath: "materials",
                 oneway: false
             });
-
-            this.handleChange(null);
-            this._useWebGL.addEventListener("change", this, false);
         }
     },
 
-    handleChange: {
+    handleAction: {
         value: function(event) {
-            if(this._useWebGL.checked)
-            {
-                this._use3D = true;
-                this._materialsContainer.style["display"] = "";
-            }
-            else
-            {
-                this._use3D = false;
-                this._materialsContainer.style["display"] = "none";
+            var ch = event.currentTarget,
+                val = event.currentTarget.identifier;
+            switch(val) {
+                case "useBorderWidth":
+                    if(ch.checked) {
+                        this.borderWidthLabel.element.classList.remove("disabled");
+                        this._borderWidth.enabled = true;
+                    } else {
+                        this.borderWidthLabel.element.classList.add("disabled");
+                        this._borderWidth.enabled = false;
+                    }
+                    break;
+                case "useBorderStyle":
+                    if(ch.checked) {
+                        this.borderStyleLabel.element.classList.remove("disabled");
+                        this._borderStyle.removeAttribute("disabled")
+                    } else {
+                        this.borderStyleLabel.element.classList.add("disabled");
+                        this._borderStyle.setAttribute("disabled", "disabled");
+                    }
+                    break;
+                case "useStrokeSize":
+                    if(ch.checked) {
+                        this.strokeSizeLabel.element.classList.remove("disabled");
+                        this._strokeSize.enabled = true
+                    } else {
+                        this.strokeSizeLabel.element.classList.add("disabled");
+                        this._strokeSize.enabled = false;
+                    }
+                    break;
+                case "useWebGl":
+                    (ch.checked) ? this._materialsContainer.style["display"] = "" : this._materialsContainer.style["display"] = "none";
+                    break;
             }
         }
     }
-- 
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

---
 js/components/about-box.reel/about-box.html        |  5 +-
 js/components/checkbox.reel/checkbox.html          |  3 +-
 js/components/colorbar.reel/colorbar.html          |  5 +-
 js/components/colorwheel.reel/colorwheel.html      |  5 +-
 js/components/combobox.reel/combobox.html          |  3 +-
 .../gradientpicker.reel/gradientpicker.html        |  5 +-
 js/components/hottext.reel/hottext.html            |  5 +-
 js/components/hottextunit.reel/hottextunit.html    |  5 +-
 .../layout/bread-crumb.reel/bread-crumb.html       | 11 ++--
 .../layout/document-bar.reel/document-bar.html     |  8 +--
 .../layout/document-entry.reel/document-entry.html |  5 +-
 .../layout/documents-tab.reel/documents-tab.html   | 11 ++--
 .../layout/stage-mode.reel/stage-mode.html         |  5 +-
 .../layout/subtool-button.reel/subtool-button.html |  5 +-
 .../layout/tool-button.reel/tool-button.html       |  5 +-
 .../layout/tools-list.reel/tools-list.html         | 77 ++++++++--------------
 .../tools-properties.reel/tools-properties.html    | 56 ++++++----------
 js/components/menu/menu-entry.reel/menu-entry.html | 14 ++--
 js/components/menu/menu-item.reel/menu-item.html   | 14 ++--
 js/components/menu/menu.reel/menu.html             | 17 ++---
 .../popup-manager.reel/popup-manager.html          |  5 +-
 js/components/popup-manager.reel/popup-manager.js  |  4 +-
 js/components/popup.reel/popup.html                |  5 +-
 js/components/radio.reel/radio.html                |  3 +-
 js/components/slider.reel/slider.html              |  5 +-
 js/components/textfield.reel/textfield.html        |  3 +-
 .../brush-properties.reel/brush-properties.html    | 17 ++---
 .../eraser-properties.reel/eraser-properties.html  |  5 +-
 .../eyedropper-properties.html                     |  5 +-
 .../fill-properties.reel/fill-properties.html      |  8 +--
 .../ink-bottle-properties.html                     | 14 ++--
 .../line-properties.reel/line-properties.html      |  5 +-
 .../object3d-properties.html                       |  5 +-
 .../oval-properties.reel/oval-properties.html      |  8 +--
 .../pan-properties.reel/pan-properties.html        |  5 +-
 .../pen-properties.reel/pen-properties.html        |  8 +--
 .../pencil-properties.reel/pencil-properties.html  |  5 +-
 .../rect-properties.reel/rect-properties.html      | 17 ++---
 .../rotate-stage-properties.html                   |  5 +-
 .../selection-properties.html                      |  3 +-
 .../shape-properties.reel/shape-properties.html    | 27 +++-----
 .../subselection-properties.html                   |  5 +-
 .../tag-properties.reel/tag-properties.html        |  3 +-
 .../text-properties.reel/text-properties.html      | 56 ++++++----------
 .../zoom-properties.reel/zoom-properties.html      |  5 +-
 js/components/treeview/branch.reel/branch.html     | 23 +++----
 js/components/treeview/leaf.reel/leaf.html         |  8 +--
 .../treeview/ninja-branch.reel/ninja-branch.html   | 23 +++----
 .../treeview/ninja-leaf.reel/ninja-leaf.html       |  8 +--
 js/components/treeview/treeview.reel/treeview.html | 17 ++---
 js/components/ui/color-chip.reel/color-chip.html   |  5 +-
 js/components/ui/file-input.reel/file-input.html   |  5 +-
 .../ui/icon-list-basic/icon.reel/icon.html         |  5 +-
 .../icon-list-basic/iconsList.reel/iconsList.html  | 11 ++--
 js/components/ui/input-group.reel/input-group.html | 14 ++--
 .../ui/property-control.reel/property-control.html |  8 +--
 js/components/ui/tree-basic/tree.reel/tree.html    | 11 ++--
 .../ui/tree-basic/treeItem.reel/treeItem.html      |  5 +-
 58 files changed, 230 insertions(+), 408 deletions(-)

(limited to 'js/components')

diff --git a/js/components/about-box.reel/about-box.html b/js/components/about-box.reel/about-box.html
index 7142d605..1f41699e 100644
--- a/js/components/about-box.reel/about-box.html
+++ b/js/components/about-box.reel/about-box.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/components/about-box.reel",
-                 "name": "AboutBox",
+                 "prototype": "js/components/about-box.reel",
                  "properties": {
                      "element": {"#": "mainAboutBoxContainer"}
                  }
diff --git a/js/components/checkbox.reel/checkbox.html b/js/components/checkbox.reel/checkbox.html
index 3d523a98..a03d72fb 100755
--- a/js/components/checkbox.reel/checkbox.html
+++ b/js/components/checkbox.reel/checkbox.html
@@ -9,8 +9,7 @@
     <script type="text/montage-serialization">
     {
         "owner": {
-            "module": "js/components/checkbox.reel",
-            "name": "Checkbox",
+            "prototype": "js/components/checkbox.reel",
             "properties": {
                 "element": {"#": "ch_comp"}
             }
diff --git a/js/components/colorbar.reel/colorbar.html b/js/components/colorbar.reel/colorbar.html
index f74f1437..c5bc186a 100755
--- a/js/components/colorbar.reel/colorbar.html
+++ b/js/components/colorbar.reel/colorbar.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/components/colorbar.reel",
-                	"name": "ColorBar",
+                	"prototype": "js/components/colorbar.reel[ColorBar]",
                 	"properties": {
                     	"element": {"#": "colorbar"}
 
diff --git a/js/components/colorwheel.reel/colorwheel.html b/js/components/colorwheel.reel/colorwheel.html
index a9fbfbd9..ef955c2d 100755
--- a/js/components/colorwheel.reel/colorwheel.html
+++ b/js/components/colorwheel.reel/colorwheel.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/components/colorwheel.reel",
-                	"name": "ColorWheel",
+                	"prototype": "js/components/colorwheel.reel[ColorWheel]",
                 	"properties": {
                     	"element": {"#": "colorwheel"}
 
diff --git a/js/components/combobox.reel/combobox.html b/js/components/combobox.reel/combobox.html
index d78cc9c1..a68dd37f 100755
--- a/js/components/combobox.reel/combobox.html
+++ b/js/components/combobox.reel/combobox.html
@@ -9,8 +9,7 @@
     <script type="text/montage-serialization">
     {
         "owner": {
-            "module": "js/components/combobox.reel",
-            "name": "Combobox",
+            "prototype": "js/components/combobox.reel",
             "properties": {
                 "element": {"#": "cb_comp"}
             }
diff --git a/js/components/gradientpicker.reel/gradientpicker.html b/js/components/gradientpicker.reel/gradientpicker.html
index f71c6705..afd42925 100755
--- a/js/components/gradientpicker.reel/gradientpicker.html
+++ b/js/components/gradientpicker.reel/gradientpicker.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/components/gradientpicker.reel",
-                	"name": "GradientPicker",
+                	"prototype": "js/components/gradientpicker.reel[GradientPicker]",
                 	"properties": {
                     	"element": {"#": "gradientpicker"}
 
diff --git a/js/components/hottext.reel/hottext.html b/js/components/hottext.reel/hottext.html
index 3531999c..314d4ca3 100755
--- a/js/components/hottext.reel/hottext.html
+++ b/js/components/hottext.reel/hottext.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/components/hottext.reel",
-                "name": "HotText",
+                "prototype": "js/components/hottext.reel[HotText]",
                 "properties": {
                     "element": {"#": "hottext"}
                 }
diff --git a/js/components/hottextunit.reel/hottextunit.html b/js/components/hottextunit.reel/hottextunit.html
index cc0835fb..3f946f9b 100755
--- a/js/components/hottextunit.reel/hottextunit.html
+++ b/js/components/hottextunit.reel/hottextunit.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/components/hottextunit.reel",
-                "name": "HotTextUnit",
+                "prototype": "js/components/hottextunit.reel[HotTextUnit]",
                 "properties": {
                     "element": {"#": "hottextunit"}
                 }
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html
index 413f588d..7e14157e 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.html
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.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/components/layout/bread-crumb.reel",
-                    "name": "Breadcrumb",
+                    "prototype": "js/components/layout/bread-crumb.reel[Breadcrumb]",
                     "properties": {
                         "element": {"#": "breadcrumbTrail"},
                         "breadcrumbBt": {"@": "breadCrumbButton"}
@@ -22,8 +21,7 @@
                 },
 
                 "breadCrumbButton": {
-                    "module": "montage/ui/button.reel",
-                    "name": "Button",
+                    "prototype": "montage/ui/button.reel",
                     "properties": {
                         "element": {"#": "breadcrumb_button"}
                     },
@@ -48,8 +46,7 @@
                 },
 
                 "repetition1": {
-                    "module": "montage/ui/repetition.reel",
-                    "name": "Repetition",
+                    "prototype": "montage/ui/repetition.reel",
                     "properties": {
                         "element": {"#": "breadcrumb_container"}
                     },
diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html
index bd13f231..8dcaf178 100755
--- a/js/components/layout/document-bar.reel/document-bar.html
+++ b/js/components/layout/document-bar.reel/document-bar.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">
         {
             "hottext1": {
-                "module": "js/components/hottextunit.reel",
-                "name": "HotTextUnit",
+                "prototype": "js/components/hottextunit.reel[HotTextUnit]",
                 "properties": {
                     "element": {"#": "zoomControlHT"},
                     "minValue":25,
@@ -47,8 +46,7 @@
             },
 
             "owner": {
-                "module": "js/components/layout/document-bar.reel",
-                "name": "DocumentBar",
+                "prototype": "js/components/layout/document-bar.reel",
                 "properties": {
                     "element": {"#": "documentBar"},
                     "designView": {"#": "design"},
diff --git a/js/components/layout/document-entry.reel/document-entry.html b/js/components/layout/document-entry.reel/document-entry.html
index 1cf01737..451d9cc4 100755
--- a/js/components/layout/document-entry.reel/document-entry.html
+++ b/js/components/layout/document-entry.reel/document-entry.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 @@
         {
             
             "owner": {
-                "module": "js/components/layout/document-entry.reel",
-                "name": "DocumentEntry",
+                "prototype": "js/components/layout/document-entry.reel",
                 "properties": {
                     "element": {"#": "documentEntry"},
                     "label":    {"#": "name"},
diff --git a/js/components/layout/documents-tab.reel/documents-tab.html b/js/components/layout/documents-tab.reel/documents-tab.html
index 737dfbcb..1516a8ce 100755
--- a/js/components/layout/documents-tab.reel/documents-tab.html
+++ b/js/components/layout/documents-tab.reel/documents-tab.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,16 +14,14 @@
         {
 
             "owner": {
-                "module": "js/components/layout/documents-tab.reel",
-                "name": "DocumentsTab",
+                "prototype": "js/components/layout/documents-tab.reel",
                 "properties": {
                     "element": {"#": "openDocumentsTabComponent"}
                 }
             },
 
             "documentEntry": {
-                "module": "js/components/layout/document-entry.reel",
-                "name": "DocumentEntry",
+                "prototype": "js/components/layout/document-entry.reel",
                 "properties": {
                     "element": {"#": "document"}
                 },
@@ -52,8 +50,7 @@
             },
             
             "repetition1": {
-                "module": "montage/ui/repetition.reel",
-                "name": "Repetition",
+                "prototype": "montage/ui/repetition.reel",
                 "properties": {
                     "element": {"#": "openDocuments"}
                 },
diff --git a/js/components/layout/stage-mode.reel/stage-mode.html b/js/components/layout/stage-mode.reel/stage-mode.html
index ab111136..15d4955c 100755
--- a/js/components/layout/stage-mode.reel/stage-mode.html
+++ b/js/components/layout/stage-mode.reel/stage-mode.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/components/layout/stage-mode.reel",
-                "name": "StageMode",
+                "prototype": "js/components/layout/stage-mode.reel",
                 "properties": {
                     "element": {"#": "stageMode"}
                 }
diff --git a/js/components/layout/subtool-button.reel/subtool-button.html b/js/components/layout/subtool-button.reel/subtool-button.html
index 24fce57c..501193d3 100755
--- a/js/components/layout/subtool-button.reel/subtool-button.html
+++ b/js/components/layout/subtool-button.reel/subtool-button.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/components/layout/subtool-button.reel",
-                "name": "SubToolButton",
+                "prototype": "js/components/layout/subtool-button.reel[SubToolButton]",
                 "properties": {
                     "element":             {"#": "toolButton"}
                 }
diff --git a/js/components/layout/tool-button.reel/tool-button.html b/js/components/layout/tool-button.reel/tool-button.html
index 476b66f3..3980b92c 100755
--- a/js/components/layout/tool-button.reel/tool-button.html
+++ b/js/components/layout/tool-button.reel/tool-button.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/components/layout/tool-button.reel",
-                "name": "ToolButton",
+                "prototype": "js/components/layout/tool-button.reel",
                 "properties": {
                     "element": {"#": "toolBarButton"}
                 }
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index 5996e446..acee20b2 100755
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.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">
         {
             "toolbutton1": {
-                "module": "js/components/layout/tool-button.reel",
-                "name": "ToolButton",
+                "prototype": "js/components/layout/tool-button.reel",
                 "properties": {
                     "element": {"#": "toolbutton"}
                 },
@@ -26,8 +25,7 @@
             },
 
             "groupLine": {
-                "module": "montage/ui/condition.reel",
-                "name": "Condition",
+                "prototype": "montage/ui/condition.reel",
                 "properties": {
                     "element": {"#": "groupLine"}
                 },
@@ -41,8 +39,7 @@
             },
 
             "repetition1": {
-                "module": "montage/ui/repetition.reel",
-                "name": "Repetition",
+                "prototype": "montage/ui/repetition.reel",
                 "properties": {
                     "element": {"#": "toolscontainer"}
                 },
@@ -56,89 +53,68 @@
             },
 
             "SelectionTool1": {
-                "module": "js/tools/SelectionTool",
-                "name": "SelectionTool"
+                "prototype": "js/tools/SelectionTool"
             },
             "SubselectionTool1": {
-                "module": "js/tools/SubSelectTool",
-                "name": "SubSelectTool"
+                "prototype": "js/tools/SubSelectTool"
             },
             "Rotate3DTool1": {
-                "module": "js/tools/RotateObject3DTool",
-                "name": "RotateObject3DTool"
+                "prototype": "js/tools/RotateObject3DTool"
             },
             "Translate3DTool1": {
-                "module": "js/tools/TranslateObject3DTool",
-                "name": "TranslateObject3DTool"
+                "prototype": "js/tools/TranslateObject3DTool"
             },
             "TagTool1": {
-                "module": "js/tools/TagTool",
-                "name": "TagTool"
+                "prototype": "js/tools/TagTool"
             },
             "PenTool1": {
-                "module": "js/tools/PenTool",
-                "name": "PenTool"
+                "prototype": "js/tools/PenTool"
             },
             "TextTool1": {
-                "module": "js/tools/TextTool",
-                "name": "TextTool"
+                "prototype": "js/tools/TextTool"
             },
             "ShapeTool1": {
-                "module": "js/tools/ShapeTool",
-                "name": "ShapeTool"
+                "prototype": "js/tools/ShapeTool"
             },
             "OvalTool1": {
-                "module": "js/tools/OvalTool",
-                "name": "OvalTool"
+                "prototype": "js/tools/OvalTool"
             },
             "RectTool1": {
-                "module": "js/tools/RectTool",
-                "name": "RectTool"
+                "prototype": "js/tools/RectTool"
             },
             "LineTool1": {
-                "module": "js/tools/LineTool",
-                "name": "LineTool"
+                "prototype": "js/tools/LineTool"
             },
             "PencilTool1": {
-                "module": "js/tools/PencilTool",
-                "name": "PencilTool"
+                "prototype": "js/tools/PencilTool"
             },
             "BrushTool1": {
-                "module": "js/tools/BrushTool",
-                "name": "BrushTool"
+                "prototype": "js/tools/BrushTool"
             },
             "FillTool1": {
-                "module": "js/tools/FillTool",
-                "name": "FillTool"
+                "prototype": "js/tools/FillTool"
             },
             "InkBottleTool1": {
-                "module": "js/tools/InkBottleTool",
-                "name": "InkBottleTool"
+                "prototype": "js/tools/InkBottleTool"
             },
             "EyedropperTool1": {
-                "module": "js/tools/EyedropperTool",
-                "name": "EyedropperTool"
+                "prototype": "js/tools/EyedropperTool"
             },
             "EraserTool1": {
-                "module": "js/tools/EraserTool",
-                "name": "EraserTool"
+                "prototype": "js/tools/EraserTool"
             },
             "RotateStageTool3D1": {
-                "module": "js/tools/RotateStage3DTool",
-                "name": "RotateStage3DTool"
+                "prototype": "js/tools/RotateStage3DTool"
             },
             "PanTool1": {
-                "module": "js/tools/PanTool",
-                "name": "PanTool"
+                "prototype": "js/tools/PanTool"
             },
             "ZoomTool1": {
-                "module": "js/tools/ZoomTool",
-                "name": "ZoomTool"
+                "prototype": "js/tools/ZoomTool"
             },
 
             "disable": {
-                "module": "montage/ui/condition.reel",
-                "name": "Condition",
+                "prototype": "montage/ui/condition.reel",
                 "properties": {
                     "element": {"#": "disabledCondition"}
                 },
@@ -152,8 +128,7 @@
             },
 
             "owner": {
-                "module": "js/components/layout/tools-list.reel",
-                "name": "ToolsList",
+                "prototype": "js/components/layout/tools-list.reel",
                 "properties": {
                     "element": {"#": "toolsList"},
                     "SelectionTool":          {"@": "SelectionTool1"},
diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html
index 3c7a92fa..8dd0f713 100755
--- a/js/components/layout/tools-properties.reel/tools-properties.html
+++ b/js/components/layout/tools-properties.reel/tools-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/>
@@ -13,50 +13,43 @@
         {
 
             "selectionProperties1": {
-                "module": "js/components/tools-properties/selection-properties.reel",
-                "name": "SelectionProperties",
+                "prototype": "js/components/tools-properties/selection-properties.reel",
                 "properties": {
                     "element": {"#": "selectionProperties"}
                 }
             },
             "subSelectionProperties1": {
-                "module": "js/components/tools-properties/subselection-properties.reel",
-                "name": "SubSelectionProperties",
+                "prototype": "js/components/tools-properties/subselection-properties.reel[SubSelectionProperties]",
                 "properties": {
                     "element": {"#": "subSelectionProperties"}
                 }
             },
             "object3DProperties1": {
-                "module": "js/components/tools-properties/object3d-properties.reel",
-                "name": "Object3DProperties",
+                "prototype": "js/components/tools-properties/object3d-properties.reel[Object3DProperties]",
                 "properties": {
                     "element": {"#": "object3DProperties"}
                 }
             },
             "tagProperties1": {
-                "module": "js/components/tools-properties/tag-properties.reel",
-                "name": "TagProperties",
+                "prototype": "js/components/tools-properties/tag-properties.reel",
                 "properties": {
                     "element": {"#": "tagProperties"}
                 }
             },
             "penProperties1": {
-                "module": "js/components/tools-properties/pen-properties.reel",
-                "name": "PenProperties",
+                "prototype": "js/components/tools-properties/pen-properties.reel",
                 "properties": {
                     "element": {"#": "penProperties"}
                 }
             },
             "textProperties1": {
-                "module": "js/components/tools-properties/text-properties.reel",
-                "name": "TextProperties",
+                "prototype": "js/components/tools-properties/text-properties.reel",
                 "properties": {
                     "element": {"#": "textProperties"}
                 }
             },
             "shapeProperties1": {
-                "module": "js/components/tools-properties/shape-properties.reel",
-                "name": "ShapeProperties",
+                "prototype": "js/components/tools-properties/shape-properties.reel",
                 "properties": {
                     "element": {"#": "shapeProperties"}
                 },
@@ -74,72 +67,62 @@
                 }
             },
             "pencilProperties1": {
-                "module": "js/components/tools-properties/pencil-properties.reel",
-                "name": "PencilProperties",
+                "prototype": "js/components/tools-properties/pencil-properties.reel",
                 "properties": {
                     "element": {"#": "pencilProperties"}
                 }
             },
             "brushProperties1": {
-                "module": "js/components/tools-properties/brush-properties.reel",
-                "name": "BrushProperties",
+                "prototype": "js/components/tools-properties/brush-properties.reel",
                 "properties": {
                     "element": {"#": "brushProperties"}
                 }
             },
             "fillProperties1": {
-                "module": "js/components/tools-properties/fill-properties.reel",
-                "name": "FillProperties",
+                "prototype": "js/components/tools-properties/fill-properties.reel",
                 "properties": {
                     "element": {"#": "fillProperties"}
                 }
             },
             "inkbottleProperties1": {
-                "module": "js/components/tools-properties/ink-bottle-properties.reel",
-                "name": "InkBottleProperties",
+                "prototype": "js/components/tools-properties/ink-bottle-properties.reel",
                 "properties": {
                     "element": {"#": "inkbottleProperties"}
                 }
             },
             "eyedropperProperties1": {
-                "module": "js/components/tools-properties/eyedropper-properties.reel",
-                "name": "EyedropperProperties",
+                "prototype": "js/components/tools-properties/eyedropper-properties.reel",
                 "properties": {
                     "element": {"#": "eyedropperProperties"}
                 }
             },
             "eraserProperties1": {
-                "module": "js/components/tools-properties/eraser-properties.reel",
-                "name": "EraserProperties",
+                "prototype": "js/components/tools-properties/eraser-properties.reel",
                 "properties": {
                     "element": {"#": "eraserProperties"}
                 }
             },
             "rotateStageProperties1": {
-                "module": "js/components/tools-properties/rotate-stage-properties.reel",
-                "name": "RotateStageProperties",
+                "prototype": "js/components/tools-properties/rotate-stage-properties.reel",
                 "properties": {
                     "element": {"#": "rotateStageProperties"}
                 }
             },
             "panProperties1": {
-                "module": "js/components/tools-properties/pan-properties.reel",
-                "name": "PanProperties",
+                "prototype": "js/components/tools-properties/pan-properties.reel",
                 "properties": {
                     "element": {"#": "panProperties"}
                 }
             },
             "zoomProperties1": {
-                "module": "js/components/tools-properties/zoom-properties.reel",
-                "name": "ZoomProperties",
+                "prototype": "js/components/tools-properties/zoom-properties.reel",
                 "properties": {
                     "element": {"#": "zoomProperties"}
                 }
             },
 
             "disable": {
-                "module": "montage/ui/condition.reel",
-                "name": "Condition",
+                "prototype": "montage/ui/condition.reel",
                 "properties": {
                     "element": {"#": "disabledCondition"}
                 },
@@ -153,8 +136,7 @@
             },
             
             "owner": {
-                "module": "js/components/layout/tools-properties.reel",
-                "name": "ToolsProperties",
+                "prototype": "js/components/layout/tools-properties.reel",
                 "properties": {
                     "element": {"#": "toolsProperties"},
                     "selectionProperties":          {"@": "selectionProperties1"},
diff --git a/js/components/menu/menu-entry.reel/menu-entry.html b/js/components/menu/menu-entry.reel/menu-entry.html
index bba5e65d..7ebbcec8 100755
--- a/js/components/menu/menu-entry.reel/menu-entry.html
+++ b/js/components/menu/menu-entry.reel/menu-entry.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">
         {
             "entriesController": {
-                "name": "ArrayController",
-                "module": "montage/ui/controller/array-controller",
+                "prototype": "montage/ui/controller/array-controller",
                 "properties": {
                     "automaticallyOrganizeObjects": false
                 },
@@ -27,8 +26,7 @@
             },
 
             "repetition": {
-                "module": "montage/ui/repetition.reel",
-                "name": "Repetition",
+                "prototype": "montage/ui/repetition.reel",
                 "properties": {
                     "element": { "#": "subEntries" },
                     "contentController": {"@": "entriesController"}
@@ -36,8 +34,7 @@
             },
 
             "menuItem": {
-                "module": "js/components/menu/menu-item.reel",
-                "name": "MenuItem",
+                "prototype": "js/components/menu/menu-item.reel",
                 "properties": {
                     "element": { "#": "menuEntryItem" }
                 },
@@ -51,8 +48,7 @@
             },
 
             "owner": {
-                "module": "js/components/menu/menu-entry.reel",
-                "name": "MenuEntry",
+                "prototype": "js/components/menu/menu-entry.reel",
                 "properties": {
                     "element":              {"#": "menuItem"},
                     "topHeader":            {"#": "topHeaderBackground"},
diff --git a/js/components/menu/menu-item.reel/menu-item.html b/js/components/menu/menu-item.reel/menu-item.html
index d199a440..92e9aafc 100755
--- a/js/components/menu/menu-item.reel/menu-item.html
+++ b/js/components/menu/menu-item.reel/menu-item.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">
         {
             "entriesController": {
-                "name": "ArrayController",
-                "module": "montage/ui/controller/array-controller",
+                "prototype": "montage/ui/controller/array-controller",
                 "properties": {
                     "automaticallyOrganizeObjects": false
                 },
@@ -27,8 +26,7 @@
             },
 
             "repetition": {
-                "module": "montage/ui/repetition.reel",
-                "name": "Repetition",
+                "prototype": "montage/ui/repetition.reel",
                 "properties": {
                     "element": {"#": "subEntries"},
                     "contentController": {"@": "entriesController"}
@@ -36,8 +34,7 @@
             },
 
             "menuItem": {
-                "module": "js/components/menu/menu-item.reel",
-                "name": "MenuItem",
+                "prototype": "js/components/menu/menu-item.reel",
                 "properties": {
                     "element": {"#": "menuEntryItem" }
                 },
@@ -51,8 +48,7 @@
             },
 
             "owner": {
-                "module": "js/components/menu/menu-item.reel",
-                "name": "MenuItem",
+                "prototype": "js/components/menu/menu-item.reel",
                 "properties": {
                     "element":          {"#": "menuItem"},
                     "itemBackground":   {"#": "menuItemBackground"},
diff --git a/js/components/menu/menu.reel/menu.html b/js/components/menu/menu.reel/menu.html
index 2cc6bf9b..adaf68ea 100755
--- a/js/components/menu/menu.reel/menu.html
+++ b/js/components/menu/menu.reel/menu.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,13 +12,11 @@
     <script type="text/montage-serialization">
         {
             "menudata": {
-                "name": "MenuData",
-                "module": "js/data/menu-data"
+                "prototype": "js/data/menu-data"
             },
 
             "menuController": {
-                "name": "ArrayController",
-                "module": "montage/ui/controller/array-controller",
+                "prototype": "montage/ui/controller/array-controller",
                 "properties": {
                     "automaticallyOrganizeObjects": false
                 },
@@ -32,8 +30,7 @@
             },
 
             "repetition": {
-                "module": "montage/ui/repetition.reel",
-                "name": "Repetition",
+                "prototype": "montage/ui/repetition.reel",
                 "properties": {
                     "element": { "#": "topMenu" },
                     "contentController": {"@": "menuController"},
@@ -42,8 +39,7 @@
             },
 
             "menuEntry": {
-                "module": "js/components/menu/menu-entry.reel",
-                "name": "MenuEntry",
+                "prototype": "js/components/menu/menu-entry.reel",
                 "properties": {
                     "element": { "#": "menuItem" }
                 },
@@ -64,8 +60,7 @@
             },
             
             "owner": {
-                "module": "js/components/menu/menu.reel",
-                "name": "Menu",
+                "prototype": "js/components/menu/menu.reel",
                 "properties": {
                     "element":  {"#": "mainMenuBar"},
                     "controller": {"@": "menuController"},
diff --git a/js/components/popup-manager.reel/popup-manager.html b/js/components/popup-manager.reel/popup-manager.html
index 7fbbc86e..1ae93e15 100755
--- a/js/components/popup-manager.reel/popup-manager.html
+++ b/js/components/popup-manager.reel/popup-manager.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- 
 <copyright>
 	This file contains proprietary software owned by Motorola Mobility, Inc.
@@ -14,8 +14,7 @@
         <script type="text/montage-serialization">
         {
             "owner": {
-                "module": "js/components/popup-manager.reel",
-                "name": "PopupMananger",
+