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
parent: 51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent: 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
download: ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
35 files changed, 265 insertions, 411 deletions
diff --git a/js/components/tools-properties/binding-properties.reel/binding-properties.html b/js/components/tools-properties/binding-properties.reel/binding-properties.html
index 8271ff20..276b0eb9 100755
--- a/js/components/tools-properties/binding-properties.reel/binding-properties.html
+++ b/js/components/tools-properties/binding-properties.reel/binding-properties.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!doctype html>
 <!-- <copyright>
 Copyright (c) 2012, Motorola Mobility, Inc
 All Rights Reserved.
@@ -42,9 +42,9 @@ POSSIBILITY OF SUCH DAMAGE.
                    "element": {"#": "bindingProperties"}
                }
            }
-        }
+        }
-            </script>
+        </script>
-      
    </head>
    <body>
@@ -56,4 +56,4 @@ POSSIBILITY OF SUCH DAMAGE.
 </html>
-        
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.css b/js/components/tools-properties/brush-properties.reel/brush-properties.css
index 625887d6..a129fd37 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.css
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.css
@@ -27,5 +27,5 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
- 
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 5645b239..361fedbc 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.html
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!doctype html>
 <!-- <copyright>
 Copyright (c) 2012, Motorola Mobility, Inc
 All Rights Reserved.
@@ -98,8 +98,8 @@ POSSIBILITY OF SUCH DAMAGE.
                    "_angleLabel": {"#": "angleLabel"}
                }
            }
-        }
+        }
-            </script>
+        </script>
    </head>
diff --git a/js/components/tools-properties/eraser-properties.reel/eraser-properties.html b/js/components/tools-properties/eraser-properties.reel/eraser-properties.html
index 7148d1c2..fcfc943a 100755
--- a/js/components/tools-properties/eraser-properties.reel/eraser-properties.html
+++ b/js/components/tools-properties/eraser-properties.reel/eraser-properties.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!doctype html>
 <!-- <copyright>
 Copyright (c) 2012, Motorola Mobility, Inc
 All Rights Reserved.
@@ -42,9 +42,9 @@ POSSIBILITY OF SUCH DAMAGE.
                    "element": {"#": "eraserProperties"}
                }
            }
-        }
+        }
-            </script>
+        </script>
-        
    </head>
    <body>
diff --git a/js/components/tools-properties/eraser-properties.reel/eraser-properties.js b/js/components/tools-properties/eraser-properties.reel/eraser-properties.js
index 5c997ee3..dbab798a 100755
--- a/js/components/tools-properties/eraser-properties.reel/eraser-properties.js
+++ b/js/components/tools-properties/eraser-properties.reel/eraser-properties.js
@@ -34,7 +34,7 @@ var ToolProperties = require("js/components/tools-properties/tool-properties").T
 exports.EraserProperties = Montage.create(ToolProperties, {
-    
    _subPrepare: {
        value: function() {
            //this.divElement.addEventListener("click", this, false);
diff --git a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html
index 022e7bd0..031b40bf 100755
--- a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html
+++ b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!doctype html>
 <!-- <copyright>
 Copyright (c) 2012, Motorola Mobility, Inc
 All Rights Reserved.
@@ -42,9 +42,9 @@ POSSIBILITY OF SUCH DAMAGE.
                    "element": {"#": "eyedropperProperties"}
                }
            }
-        }
+        }
-            </script>
+        </script>
-       
    </head>
    <body>
diff --git a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.js b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.js
index e788b5f6..3442f95c 100755
--- a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.js
+++ b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.js
@@ -34,7 +34,7 @@ var ToolProperties = require("js/components/tools-properties/tool-properties").T
 exports.EyedropperProperties = Montage.create(ToolProperties, {
-    
    _subPrepare: {
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
parent	51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent	84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
download	ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz

diff --git a/js/components/tools-properties/binding-properties.reel/binding-properties.html b/js/components/tools-properties/binding-properties.reel/binding-properties.html index 8271ff20..276b0eb9 100755 --- a/js/components/tools-properties/binding-properties.reel/binding-properties.html +++ b/js/components/tools-properties/binding-properties.reel/binding-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.
@@ -42,9 +42,9 @@ POSSIBILITY OF SUCH DAMAGE.
42	"element": {"#": "bindingProperties"}	42	"element": {"#": "bindingProperties"}
43	}	43	}
44	}	44	}
45	}	45	}
46	</script>	46	</script>
47		47
48	</head>	48	</head>
49		49
50	<body>	50	<body>
@@ -56,4 +56,4 @@ POSSIBILITY OF SUCH DAMAGE.
56		56
57	</html>	57	</html>
58		58
59		59


diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.css b/js/components/tools-properties/brush-properties.reel/brush-properties.css index 625887d6..a129fd37 100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.css +++ b/js/components/tools-properties/brush-properties.reel/brush-properties.css
@@ -27,5 +27,5 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE	27	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28	POSSIBILITY OF SUCH DAMAGE.	28	POSSIBILITY OF SUCH DAMAGE.
29	</copyright> */	29	</copyright> */
30		30
31		31


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 5645b239..361fedbc 100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.html +++ b/js/components/tools-properties/brush-properties.reel/brush-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.
@@ -98,8 +98,8 @@ POSSIBILITY OF SUCH DAMAGE.
98	"_angleLabel": {"#": "angleLabel"}	98	"_angleLabel": {"#": "angleLabel"}
99	}	99	}
100	}	100	}
101	}	101	}
102	</script>	102	</script>
103		103
104	</head>	104	</head>
105		105


diff --git a/js/components/tools-properties/eraser-properties.reel/eraser-properties.html b/js/components/tools-properties/eraser-properties.reel/eraser-properties.html index 7148d1c2..fcfc943a 100755 --- a/js/components/tools-properties/eraser-properties.reel/eraser-properties.html +++ b/js/components/tools-properties/eraser-properties.reel/eraser-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.
@@ -42,9 +42,9 @@ POSSIBILITY OF SUCH DAMAGE.
42	"element": {"#": "eraserProperties"}	42	"element": {"#": "eraserProperties"}
43	}	43	}
44	}	44	}
45	}	45	}
46	</script>	46	</script>
47		47
48	</head>	48	</head>
49		49
50	<body>	50	<body>


diff --git a/js/components/tools-properties/eraser-properties.reel/eraser-properties.js b/js/components/tools-properties/eraser-properties.reel/eraser-properties.js index 5c997ee3..dbab798a 100755 --- a/js/components/tools-properties/eraser-properties.reel/eraser-properties.js +++ b/js/components/tools-properties/eraser-properties.reel/eraser-properties.js
@@ -34,7 +34,7 @@ var ToolProperties = require("js/components/tools-properties/tool-properties").T
34		34
35	exports.EraserProperties = Montage.create(ToolProperties, {	35	exports.EraserProperties = Montage.create(ToolProperties, {
36		36
37		37
38	_subPrepare: {	38	_subPrepare: {
39	value: function() {	39	value: function() {
40	//this.divElement.addEventListener("click", this, false);	40	//this.divElement.addEventListener("click", this, false);


diff --git a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html index 022e7bd0..031b40bf 100755 --- a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html +++ b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-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.
@@ -42,9 +42,9 @@ POSSIBILITY OF SUCH DAMAGE.
42	"element": {"#": "eyedropperProperties"}	42	"element": {"#": "eyedropperProperties"}
43	}	43	}
44	}	44	}
45	}	45	}
46	</script>	46	</script>
47		47
48	</head>	48	</head>
49		49
50	<body>	50	<body>


diff --git a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.js b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.js index e788b5f6..3442f95c 100755 --- a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.js +++ b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.js
@@ -34,7 +34,7 @@ var ToolProperties = require("js/components/tools-properties/tool-properties").T
34		34
35	exports.EyedropperProperties = Montage.create(ToolProperties, {	35	exports.EyedropperProperties = Montage.create(ToolProperties, {
36		36
37		37
38	_subPrepare: {	38	_subPrepare: {