Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements

Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
author: Ananya Sen 2012-04-26 12:57:56 -0700
committer: Ananya Sen 2012-04-26 12:57:56 -0700
commit: b2132103b12e499f26e6e0f311d48555a9f733ff (patch)
tree: 2eaa000b460e4be3c8050a369318584b2591e8d7 /js
parent: 07c611323c109aaa2208ebc15a354b81c3f04a0d (diff)
parent: 902dc18296fc78f3b8e67d952c42981d926bb2fc (diff)
download: ninja-b2132103b12e499f26e6e0f311d48555a9f733ff.tar.gz
48 files changed, 2244 insertions, 1259 deletions
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index f35972b6..597577f1 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -63,16 +63,27 @@ exports.Breadcrumb = Montage.create(Component, {
            parentNode = this.container;
-            while(parentNode.id !== "UserContent") {
+            // This is for the old template support.
+            // TODO: Remove marker for old template: NINJA-STAGE-REWORK
+            if(this.application.ninja.currentDocument.documentRoot.id === "UserContent") {
+                while(parentNode.id !== "UserContent") {
+                    this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
+                    parentNode = parentNode.parentNode;
+                }
+                // This is always the top container which is now hardcoded to body
+                this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"});
+            } else {
+                while(parentNode !== this.application.ninja.currentDocument.documentRoot) {
+                    this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
+                    parentNode = parentNode.parentNode;
+                }
+                // This is always the top container which is now hardcoded to body
                this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
-                parentNode = parentNode.parentNode;
+                console.log("this works!");
            }
-            // This is always the top container which is now hardcoded to body
-            this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"});
        }
    },
diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js
index 27402dff..56b61f1d 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);
                                }
                        }
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html
index 98442164..d9c35dc2 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.html
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html
@@ -84,7 +84,7 @@
    </head>
    <body>
-        <div id="brushProperties" class="subToolHolderPanel">
+        <div data-montage-id="brushProperties" class="subToolHolderPanel">
            <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;">
                <label class="label"> Width:</label>
                <div id="strokeSize" class="label"></div>
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:"
+                }
author	Ananya Sen	2012-04-26 12:57:56 -0700
committer	Ananya Sen	2012-04-26 12:57:56 -0700
commit	b2132103b12e499f26e6e0f311d48555a9f733ff (patch)
tree	2eaa000b460e4be3c8050a369318584b2591e8d7 /js
parent	07c611323c109aaa2208ebc15a354b81c3f04a0d (diff)
parent	902dc18296fc78f3b8e67d952c42981d926bb2fc (diff)
download	ninja-b2132103b12e499f26e6e0f311d48555a9f733ff.tar.gz

diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js index f35972b6..597577f1 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.js +++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -63,16 +63,27 @@ exports.Breadcrumb = Montage.create(Component, {
63		63
64	parentNode = this.container;	64	parentNode = this.container;
65		65
66	while(parentNode.id !== "UserContent") {	66	// This is for the old template support.
		67	// TODO: Remove marker for old template: NINJA-STAGE-REWORK
		68	if(this.application.ninja.currentDocument.documentRoot.id === "UserContent") {
		69	while(parentNode.id !== "UserContent") {
		70	this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
		71	parentNode = parentNode.parentNode;
		72	}
		73
		74	// This is always the top container which is now hardcoded to body
		75	this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"});
		76	} else {
		77	while(parentNode !== this.application.ninja.currentDocument.documentRoot) {
		78	this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
		79	parentNode = parentNode.parentNode;
		80	}
		81
		82	// This is always the top container which is now hardcoded to body
67	this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});	83	this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
68	parentNode = parentNode.parentNode;	84	console.log("this works!");
69	}	85	}
70		86
71	// This is always the top container which is now hardcoded to body
72	this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"});
73
74
75
76	}	87	}
77	},	88	},
78		89


diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js index 27402dff..56b61f1d 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, {
57	this._zoomFactor = value;	57	this._zoomFactor = value;
58	if (!this._firstDraw)	58	if (!this._firstDraw)
59	{	59	{
60	var viewUtils = this.application.ninja.stage.viewUtils;
61	this.application.ninja.stage.setZoom(value);	60	this.application.ninja.stage.setZoom(value);
62	}	61	}
63	}	62	}


diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html index 98442164..d9c35dc2 100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.html +++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html
@@ -84,7 +84,7 @@
84	</head>	84	</head>
85		85
86	<body>	86	<body>
87	<div id="brushProperties" class="subToolHolderPanel">	87	<div data-montage-id="brushProperties" class="subToolHolderPanel">
88	<div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;">	88	<div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;">
89	<label class="label"> Width:</label>	89	<label class="label"> Width:</label>
90	<div id="strokeSize" class="label"></div>	90	<div id="strokeSize" class="label"></div>


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 @@
4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.	4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5	</copyright> */	5	</copyright> */
6		6
		7	.inkBottleProperties input[type="checkbox"].nj-skinned {
		8	float:left;
		9	margin-top:5px;
		10	}
		11
		12	.inkBottleProperties select.nj-skinned {
		13	float:left;
		14	margin:2px 5px 0 0;
		15	}
		16
		17	.inkBottleProperties label.disabled {
		18	color:#999999;
		19	}
		20
		21	.inkBottleProperties label.disabled:hover {
		22	color:#999999;
		23	background-color: transparent;
		24	cursor:default;
		25	}
		26
		27	.inkBottleProperties div.disabled:hover {
		28	background-color: transparent;
		29	cursor:default;
		30	} \ 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 @@
11		11
12	<script type="text/montage-serialization">	12	<script type="text/montage-serialization">
13	{	13	{
		14	"borderWidthCh": {
		15	"prototype": "montage/ui/checkbox.reel",
		16	"properties": {
		17	"element": {"#": "useBorderWidthCh"},
		18	"identifier": "useBorderWidth",
		19	"checked": true
		20	},
		21	"listeners": [
		22	{
		23	"type": "action",
		24	"listener": {"@": "owner"},
		25	"capture": false
		26	}
		27	]
		28	},
		29
		30	"borderWidthLabel": {
		31	"prototype": "montage/ui/dynamic-text.reel",
		32	"properties": {
		33	"element": {"#": "borderWidthLabel"},
		34	"value": "Border:"
		35	}