aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-09 14:35:44 -0700
committerValerio Virgillito2012-07-09 14:35:44 -0700
commit84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/panels/presets
parentc0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
downloadninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/panels/presets')
-rw-r--r--js/panels/presets/animations-presets.reel/animations-presets.html2
-rw-r--r--js/panels/presets/animations-presets.reel/animations-presets.js4
-rw-r--r--js/panels/presets/content.reel/content.html8
-rw-r--r--js/panels/presets/style-presets.reel/style-presets.html2
-rw-r--r--js/panels/presets/style-presets.reel/style-presets.js2
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.html2
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.js4
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 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All 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>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All 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>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All 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>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All 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});