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/layout')

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 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/layout')

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/layout')

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/layout')

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 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

---
 .../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 ++++++----------
 9 files changed, 64 insertions(+), 119 deletions(-)

(limited to 'js/components/layout')

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"},
-- 
cgit v1.2.3


From a0e730636083eff0c757cd9e16698e3b8e0066c1 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Thu, 26 Apr 2012 17:05:45 -0700
Subject: Fixed the stage border and layout in the new template

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/components/layout/bread-crumb.reel/bread-crumb.js | 1 -
 1 file changed, 1 deletion(-)

(limited to 'js/components/layout')

diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index 597577f1..cf7b0685 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -81,7 +81,6 @@ 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": parentNode.nodeName});
-                console.log("this works!");
             }
 
         }
-- 
cgit v1.2.3


From c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Fri, 27 Apr 2012 14:26:41 -0700
Subject: Merge cleanup

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/components/layout/bread-crumb.reel/bread-crumb.js | 2 --
 1 file changed, 2 deletions(-)

(limited to 'js/components/layout')

diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index 2dc0ccb9..e396bdbf 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -89,8 +89,6 @@ exports.Breadcrumb = Montage.create(Component, {
 
     handleAction: {
         value: function(evt) {
-
-//           this.application.ninja.currentDocument.breadCrumbClick=true;
             if(evt.target.value === this.container.uuid) {
                 return;
             }
-- 
cgit v1.2.3