Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes

Conflicts: js/helper-classes/3D/StageLine.js
author: hwc487 2012-07-09 16:08:02 -0700
committer: hwc487 2012-07-09 16:08:02 -0700
commit: 5085d0f67df89a21715308956004164597a6ba79 (patch)
tree: 2c896163143a66331205a39b0a3b1b45d51bf12a /js/components/tools-properties/oval-properties.reel
parent: 51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent: 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
download: ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
3 files changed, 8 insertions, 8 deletions
diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.css b/js/components/tools-properties/oval-properties.reel/oval-properties.css
index f75355c6..a6fff483 100755
--- a/js/components/tools-properties/oval-properties.reel/oval-properties.css
+++ b/js/components/tools-properties/oval-properties.reel/oval-properties.css
@@ -33,9 +33,9 @@ POSSIBILITY OF SUCH DAMAGE.
 .ovalProperties  hottextunit {
    width: 22px;
-}   
+}
 .ovalProperties  label {
    margin-left: 6px;
    margin-right: 6px;
-}  
+}
diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.html b/js/components/tools-properties/oval-properties.reel/oval-properties.html
index c60ba2a0..8b155371 100755
--- a/js/components/tools-properties/oval-properties.reel/oval-properties.html
+++ b/js/components/tools-properties/oval-properties.reel/oval-properties.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!doctype html>
 <!-- <copyright>
 Copyright (c) 2012, Motorola Mobility, Inc
 All Rights Reserved.
@@ -54,8 +54,8 @@ POSSIBILITY OF SUCH DAMAGE.
                    "innerRadius": {"@": "hottext1"}
                }
            }
-        }
+        }
-            </script>
+        </script>
    </head>
    <body>
diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.js b/js/components/tools-properties/oval-properties.reel/oval-properties.js
index dabe646f..195f5f97 100755
--- a/js/components/tools-properties/oval-properties.reel/oval-properties.js
+++ b/js/components/tools-properties/oval-properties.reel/oval-properties.js
@@ -41,7 +41,7 @@ exports.OvalProperties = Montage.create(ToolProperties, {
        value: null,
        serializable: true
    },
-    
    _subPrepare: {
        value: function() {
            //this.divElement.addEventListener("click", this, false);
@@ -66,11 +66,11 @@ exports.OvalProperties = Montage.create(ToolProperties, {
    use3D: {
        get: function() { return this.base._use3D; }
    },
-    
    strokeSize: {
        get: function() { return this.base._strokeSize; }
    },
-    
    strokeStyle : {
        get: function() {
 //            return this.base._strokeStyle.options[this.base._strokeStyle.value].text;
author	hwc487	2012-07-09 16:08:02 -0700
committer	hwc487	2012-07-09 16:08:02 -0700
commit	5085d0f67df89a21715308956004164597a6ba79 (patch)
tree	2c896163143a66331205a39b0a3b1b45d51bf12a /js/components/tools-properties/oval-properties.reel
parent	51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent	84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
download	ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz

diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.css b/js/components/tools-properties/oval-properties.reel/oval-properties.css index f75355c6..a6fff483 100755 --- a/js/components/tools-properties/oval-properties.reel/oval-properties.css +++ b/js/components/tools-properties/oval-properties.reel/oval-properties.css
@@ -33,9 +33,9 @@ POSSIBILITY OF SUCH DAMAGE.
33		33
34	.ovalProperties hottextunit {	34	.ovalProperties hottextunit {
35	width: 22px;	35	width: 22px;
36	}	36	}
37		37
38	.ovalProperties label {	38	.ovalProperties label {
39	margin-left: 6px;	39	margin-left: 6px;
40	margin-right: 6px;	40	margin-right: 6px;
41	}	41	}


diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.html b/js/components/tools-properties/oval-properties.reel/oval-properties.html index c60ba2a0..8b155371 100755 --- a/js/components/tools-properties/oval-properties.reel/oval-properties.html +++ b/js/components/tools-properties/oval-properties.reel/oval-properties.html
@@ -1,4 +1,4 @@
1	<!DOCTYPE HTML>	1	<!doctype html>
2	<!-- <copyright>	2	<!-- <copyright>
3	Copyright (c) 2012, Motorola Mobility, Inc	3	Copyright (c) 2012, Motorola Mobility, Inc
4	All Rights Reserved.	4	All Rights Reserved.
@@ -54,8 +54,8 @@ POSSIBILITY OF SUCH DAMAGE.
54	"innerRadius": {"@": "hottext1"}	54	"innerRadius": {"@": "hottext1"}
55	}	55	}
56	}	56	}
57	}	57	}
58	</script>	58	</script>
59	</head>	59	</head>
60		60
61	<body>	61	<body>


diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.js b/js/components/tools-properties/oval-properties.reel/oval-properties.js index dabe646f..195f5f97 100755 --- a/js/components/tools-properties/oval-properties.reel/oval-properties.js +++ b/js/components/tools-properties/oval-properties.reel/oval-properties.js
@@ -41,7 +41,7 @@ exports.OvalProperties = Montage.create(ToolProperties, {
41	value: null,	41	value: null,
42	serializable: true	42	serializable: true
43	},	43	},
44		44
45	_subPrepare: {	45	_subPrepare: {
46	value: function() {	46	value: function() {
47	//this.divElement.addEventListener("click", this, false);	47	//this.divElement.addEventListener("click", this, false);
@@ -66,11 +66,11 @@ exports.OvalProperties = Montage.create(ToolProperties, {
66	use3D: {	66	use3D: {
67	get: function() { return this.base._use3D; }	67	get: function() { return this.base._use3D; }
68	},	68	},
69		69
70	strokeSize: {	70	strokeSize: {
71	get: function() { return this.base._strokeSize; }	71	get: function() { return this.base._strokeSize; }
72	},	72	},
73		73
74	strokeStyle : {	74	strokeStyle : {
75	get: function() {	75	get: function() {
76	// return this.base._strokeStyle.options[this.base._strokeStyle.value].text;	76	// return this.base._strokeStyle.options[this.base._strokeStyle.value].text;