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/panels/presets
parent: 51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent: 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
download: ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
7 files changed, 12 insertions, 12 deletions
diff --git a/js/panels/presets/animations-presets.reel/animations-presets.html b/js/panels/presets/animations-presets.reel/animations-presets.html
index 13e31d8d..fad23595 100644
--- a/js/panels/presets/animations-presets.reel/animations-presets.html
+++ b/js/panels/presets/animations-presets.reel/animations-presets.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <!-- <copyright>
 Copyright (c) 2012, Motorola Mobility, Inc
 All Rights Reserved.
diff --git a/js/panels/presets/animations-presets.reel/animations-presets.js b/js/panels/presets/animations-presets.reel/animations-presets.js
index c577d076..729b336a 100644
--- a/js/panels/presets/animations-presets.reel/animations-presets.js
+++ b/js/panels/presets/animations-presets.reel/animations-presets.js
@@ -47,6 +47,6 @@ exports.AnimationsLibrary = Montage.create(Component, {
    handleNodeActivation: {
        value: function(presetData) {
            this.application.ninja.presetsController.applyPreset(presetData);
-        }
+        }
-        }
+    }
 });
diff --git a/js/panels/presets/content.reel/content.html b/js/panels/presets/content.reel/content.html
index 6d8b053a..ddd1981a 100644
--- a/js/panels/presets/content.reel/content.html
+++ b/js/panels/presets/content.reel/content.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <!-- <copyright>
 Copyright (c) 2012, Motorola Mobility, Inc
 All Rights Reserved.
@@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
 </copyright> -->
 <html lang="en">
 <head>
-        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
        <link rel="stylesheet" href="content.css" type="text/css">
        <script type="text/montage-serialization">
        {
@@ -75,8 +75,8 @@ POSSIBILITY OF SUCH DAMAGE.
                "prototype": "js/panels/presets/animations-presets.reel[AnimationsLibrary]"
            }
-        }
+        }
-                </script>
+        </script>
 </head>
 <body>
    <section data-montage-id="presetsPanel" class="presetsPanel">
diff --git a/js/panels/presets/style-presets.reel/style-presets.html b/js/panels/presets/style-presets.reel/style-presets.html
index 099c1438..35c8367b 100644
--- a/js/panels/presets/style-presets.reel/style-presets.html
+++ b/js/panels/presets/style-presets.reel/style-presets.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <!-- <copyright>
 Copyright (c) 2012, Motorola Mobility, Inc
 All Rights Reserved.
diff --git a/js/panels/presets/style-presets.reel/style-presets.js b/js/panels/presets/style-presets.reel/style-presets.js
index 01faceef..d35eb549 100644
--- a/js/panels/presets/style-presets.reel/style-presets.js
+++ b/js/panels/presets/style-presets.reel/style-presets.js
@@ -53,6 +53,6 @@ exports.StylesLibrary = Montage.create(Component, {
        value: function(sourceObject) {
            console.log(sourceObject);
        }
-        }
+    }
 });
diff --git a/js/panels/presets/transitions-presets.reel/transitions-presets.html b/js/panels/presets/transitions-presets.reel/transitions-presets.html
index 4685728e..c1a5bdcb 100644
--- a/js/panels/presets/transitions-presets.reel/transitions-presets.html
+++ b/js/panels/presets/transitions-presets.reel/transitions-presets.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <!-- <copyright>
 Copyright (c) 2012, Motorola Mobility, Inc
 All Rights Reserved.
diff --git a/js/panels/presets/transitions-presets.reel/transitions-presets.js b/js/panels/presets/transitions-presets.reel/transitions-presets.js
index 5b471d7d..c5220755 100644
--- a/js/panels/presets/transitions-presets.reel/transitions-presets.js
+++ b/js/panels/presets/transitions-presets.reel/transitions-presets.js
@@ -47,6 +47,6 @@ exports.TransitionsLibrary = Montage.create(Component, {
    handleNodeActivation: {
        value: function(presetData) {
            this.application.ninja.presetsController.applyPreset(presetData);
-        }
+        }
-        }
+    }
 });
author	hwc487	2012-07-09 16:08:02 -0700
committer	hwc487	2012-07-09 16:08:02 -0700
commit	5085d0f67df89a21715308956004164597a6ba79 (patch)
tree	2c896163143a66331205a39b0a3b1b45d51bf12a /js/panels/presets
parent	51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent	84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
download	ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz

diff --git a/js/panels/presets/animations-presets.reel/animations-presets.html b/js/panels/presets/animations-presets.reel/animations-presets.html index 13e31d8d..fad23595 100644 --- a/js/panels/presets/animations-presets.reel/animations-presets.html +++ b/js/panels/presets/animations-presets.reel/animations-presets.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.


diff --git a/js/panels/presets/animations-presets.reel/animations-presets.js b/js/panels/presets/animations-presets.reel/animations-presets.js index c577d076..729b336a 100644 --- a/js/panels/presets/animations-presets.reel/animations-presets.js +++ b/js/panels/presets/animations-presets.reel/animations-presets.js
@@ -47,6 +47,6 @@ exports.AnimationsLibrary = Montage.create(Component, {
47	handleNodeActivation: {	47	handleNodeActivation: {
48	value: function(presetData) {	48	value: function(presetData) {
49	this.application.ninja.presetsController.applyPreset(presetData);	49	this.application.ninja.presetsController.applyPreset(presetData);
50	}	50	}
51	}	51	}
52	});	52	});


diff --git a/js/panels/presets/content.reel/content.html b/js/panels/presets/content.reel/content.html index 6d8b053a..ddd1981a 100644 --- a/js/panels/presets/content.reel/content.html +++ b/js/panels/presets/content.reel/content.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.
@@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
30	</copyright> -->	30	</copyright> -->
31	<html lang="en">	31	<html lang="en">
32	<head>	32	<head>
33	<meta http-equiv="content-type" content="text/html; charset=utf-8" />	33	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
34	<link rel="stylesheet" href="content.css" type="text/css">	34	<link rel="stylesheet" href="content.css" type="text/css">
35	<script type="text/montage-serialization">	35	<script type="text/montage-serialization">
36	{	36	{
@@ -75,8 +75,8 @@ POSSIBILITY OF SUCH DAMAGE.
75	"prototype": "js/panels/presets/animations-presets.reel[AnimationsLibrary]"	75	"prototype": "js/panels/presets/animations-presets.reel[AnimationsLibrary]"
76	}	76	}
77		77
78	}	78	}
79	</script>	79	</script>
80	</head>	80	</head>
81	<body>	81	<body>
82	<section data-montage-id="presetsPanel" class="presetsPanel">	82	<section data-montage-id="presetsPanel" class="presetsPanel">


diff --git a/js/panels/presets/style-presets.reel/style-presets.html b/js/panels/presets/style-presets.reel/style-presets.html index 099c1438..35c8367b 100644 --- a/js/panels/presets/style-presets.reel/style-presets.html +++ b/js/panels/presets/style-presets.reel/style-presets.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.


diff --git a/js/panels/presets/style-presets.reel/style-presets.js b/js/panels/presets/style-presets.reel/style-presets.js index 01faceef..d35eb549 100644 --- a/js/panels/presets/style-presets.reel/style-presets.js +++ b/js/panels/presets/style-presets.reel/style-presets.js
@@ -53,6 +53,6 @@ exports.StylesLibrary = Montage.create(Component, {
53	value: function(sourceObject) {	53	value: function(sourceObject) {
54	console.log(sourceObject);	54	console.log(sourceObject);
55	}	55	}
56	}	56	}
57		57
58	});	58	});


diff --git a/js/panels/presets/transitions-presets.reel/transitions-presets.html b/js/panels/presets/transitions-presets.reel/transitions-presets.html index 4685728e..c1a5bdcb 100644 --- a/js/panels/presets/transitions-presets.reel/transitions-presets.html +++ b/js/panels/presets/transitions-presets.reel/transitions-presets.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.


diff --git a/js/panels/presets/transitions-presets.reel/transitions-presets.js b/js/panels/presets/transitions-presets.reel/transitions-presets.js index 5b471d7d..c5220755 100644 --- a/js/panels/presets/transitions-presets.reel/transitions-presets.js +++ b/js/panels/presets/transitions-presets.reel/transitions-presets.js
@@ -47,6 +47,6 @@ exports.TransitionsLibrary = Montage.create(Component, {
47	handleNodeActivation: {	47	handleNodeActivation: {
48	value: function(presetData) {	48	value: function(presetData) {
49	this.application.ninja.presetsController.applyPreset(presetData);	49	this.application.ninja.presetsController.applyPreset(presetData);
50	}	50	}
51	}	51	}
52	});	52	});