aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties
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/components/tools-properties
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/components/tools-properties')
-rwxr-xr-xjs/components/tools-properties/binding-properties.reel/binding-properties.html10
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.css2
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.html6
-rwxr-xr-xjs/components/tools-properties/eraser-properties.reel/eraser-properties.html8
-rwxr-xr-xjs/components/tools-properties/eraser-properties.reel/eraser-properties.js2
-rwxr-xr-xjs/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html8
-rwxr-xr-xjs/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.js2
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.html4
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css2
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html4
-rwxr-xr-xjs/components/tools-properties/line-properties.reel/line-properties.html6
-rwxr-xr-xjs/components/tools-properties/line-properties.reel/line-properties.js2
-rwxr-xr-xjs/components/tools-properties/object3d-properties.reel/object3d-properties.html6
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.css4
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.html6
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.js6
-rwxr-xr-xjs/components/tools-properties/pan-properties.reel/pan-properties.html6
-rwxr-xr-xjs/components/tools-properties/pan-properties.reel/pan-properties.js2
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.html2
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.js2
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.html6
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.js2
-rwxr-xr-xjs/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.html8
-rwxr-xr-xjs/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.js2
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.html6
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.css2
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.html12
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.js2
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.html8
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.js2
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html8
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.js62
-rwxr-xr-xjs/components/tools-properties/tool-properties.js2
-rwxr-xr-xjs/components/tools-properties/zoom-properties.reel/zoom-properties.html10
34 files changed, 111 insertions, 111 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 @@
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.
@@ -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)
27ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 27ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28POSSIBILITY OF SUCH DAMAGE. 28POSSIBILITY 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>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All 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>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All 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
35exports.EraserProperties = Montage.create(ToolProperties, { 35exports.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>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All 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
35exports.EyedropperProperties = Montage.create(ToolProperties, { 35exports.EyedropperProperties = Montage.create(ToolProperties, {
36 36