Merge branch 'refs/heads/master' into CSSPanelUpdates

author: Eric Guzman 2012-04-26 03:16:50 -0700
committer: Eric Guzman 2012-04-26 03:16:50 -0700
commit: 110aa15b48ec24063815aa3b86c7f8f041543a02 (patch)
tree: d0debb235807dd73f48e0793a73d37cc41ecf59c /js
parent: 143105a0b9c7765898b22d53489b4bd8df3dff2e (diff)
parent: bcc8f8616f5ad4bf310928da6cbc01da12f6e468 (diff)
download: ninja-110aa15b48ec24063815aa3b86c7f8f041543a02.tar.gz
22 files changed, 1426 insertions, 1123 deletions
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);
                                }
                        }
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:"
+                }
+            },
            "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
author	Eric Guzman	2012-04-26 03:16:50 -0700
committer	Eric Guzman	2012-04-26 03:16:50 -0700
commit	110aa15b48ec24063815aa3b86c7f8f041543a02 (patch)
tree	d0debb235807dd73f48e0793a73d37cc41ecf59c /js
parent	143105a0b9c7765898b22d53489b4bd8df3dff2e (diff)
parent	bcc8f8616f5ad4bf310928da6cbc01da12f6e468 (diff)
download	ninja-110aa15b48ec24063815aa3b86c7f8f041543a02.tar.gz

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, {
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	}
		36	},
		37
14	"borderWidthHT": {	38	"borderWidthHT": {
15	"module": "js/components/hottextunit.reel",	39	"module": "js/components/hottextunit.reel",
16	"name": "HotTextUnit",	40	"name": "HotTextUnit",
@@ -23,6 +47,54 @@
23	}	47	}
24	},	48	},
25		49
		50	"borderStyleCh": {
		51	"prototype": "montage/ui/checkbox.reel",
		52	"properties": {
		53	"element": {"#": "useBorderStyleCh"},
		54	"identifier": "useBorderStyle",
		55	"checked": true
		56	},
		57	"listeners": [
		58	{
		59	"type": "action",
		60	"listener": {"@": "owner"},
		61	"capture": false
		62	}
		63	]
		64	},
		65
		66	"borderStyleLabel": {
		67	"prototype": "montage/ui/dynamic-text.reel",
		68	"properties": {
		69	"element": {"#": "borderStyleLabel"},
		70	"value": "Style:"
		71	}
		72	},
		73
		74	"strokeSizeCh": {
		75	"prototype": "montage/ui/checkbox.reel",
		76	"properties": {
		77	"element": {"#": "useStrokeSizeCh"},
		78	"identifier": "useStrokeSize",
		79	"checked": true
		80	},
		81	"listeners": [
		82	{
		83	"type": "action",
		84	"listener": {"@": "owner"},
		85	"capture": false
		86	}
		87	]
		88	},
		89
		90	"strokeSizeLabel": {
		91	"prototype": "montage/ui/dynamic-text.reel",
		92	"properties": {
		93	"element": {"#": "strokeSizeLabel"},
		94	"value": "Stroke:"
		95	}
		96	},
		97
26	"strokeSizeHT": {	98	"strokeSizeHT": {
27	"module": "js/components/hottextunit.reel",	99	"module": "js/components/hottextunit.reel",
28	"name": "HotTextUnit",	100	"name": "HotTextUnit",
@@ -36,6 +108,22 @@
36	}	108	}
37	},	109	},
38		110
		111	"webGlCh": {
		112	"prototype": "montage/ui/checkbox.reel",
		113	"properties": {
		114	"element": {"#": "useWebGLCHIB"},
		115	"identifier": "useWebGl",
		116	"checked": true