aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout
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/layout
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/layout')
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.html4
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.html8
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.js32
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.html8
-rwxr-xr-xjs/components/layout/documents-tab.reel/documents-tab.html4
-rwxr-xr-xjs/components/layout/stage-mode.reel/stage-mode.html2
-rwxr-xr-xjs/components/layout/subtool-button.reel/subtool-button.html2
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.html2
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html6
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.js2
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.html12
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.js2
12 files changed, 42 insertions, 42 deletions
<
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html
index 02105616..3f170ad0 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.html
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.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.
@@ -99,4 +99,4 @@ POSSIBILITY OF SUCH DAMAGE.
99 </section> 99 </section>
100 100
101 </body> 101 </body>
102</html> 102</html>
diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html
index 945ab689..d107609e 100755
--- a/js/components/layout/document-bar.reel/document-bar.html
+++ b/js/components/layout/document-bar.reel/document-bar.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.
@@ -72,9 +72,9 @@ POSSIBILITY OF SUCH DAMAGE.
72 "zoomControl": {"@": "hottext1"} 72 "zoomControl": {"@": "hottext1"}
73 } 73 }
74 } 74 }
75 } 75 }
76 </script> 76 </script>
77 77
78 78
79</head> 79</head>
80 80
diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js
index 86c55267..890640b1 100755
--- a/js/components/layout/document-bar.reel/document-bar.js
+++ b/js/components/layout/document-bar.reel/document-bar.js
@@ -127,21 +127,21 @@ exports.DocumentBar = Montage.create(Component, {
127 value: 100 127 value: 100
128 }, 128 },
129 129
130 zoomFactor: { 130 zoomFactor: {
131 get: function() { return this._zoomFactor; }, 131 get: function() { return this._zoomFactor; },
132 132
133 set: function(value) 133 set: function(value)
134 { 134 {
135 if(value !== this._zoomFactor) 135 if(value !== this._zoomFactor)
136 { 136 {
137 this._zoomFactor = value; 137 this._zoomFactor = value;
138 if (!this._firstDraw) 138 if (!this._firstDraw)
139 { 139 {
140 this.application.ninja.stage.setZoom(value); 140 this.application.ninja.stage.setZoom(value);
141 } 141 }
142 } 142 }
143 } 143 }
144 }, 144 },
145 145
146 draw: { 146 draw: {
147 value: function() { 147 value: function() {
@@ -157,7 +157,7 @@ exports.DocumentBar = Montage.create(Component, {
157 this.codeView.classList.add("selected"); 157 this.codeView.classList.add("selected");
158 if(this.designView.classList.contains("selected")) this.designView.classList.toggle("selected"); 158 if(this.designView.classList.contains("selected")) this.designView.classList.toggle("selected");
159 } 159 }
160 160
161 } else if(this.type) { 161 } else if(this.type) {
162 this.designView.classList.remove("active"); 162 this.designView.classList.remove("active");
163 } 163 }
diff --git a/js/components/layout/document-entry.reel/document-entry.html b/js/components/layout/document-entry.reel/document-entry.html
index 4d89d6d7..52bd1930 100755
--- a/js/components/layout/document-entry.reel/document-entry.html
+++ b/js/components/layout/document-entry.reel/document-entry.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.
@@ -34,7 +34,7 @@ POSSIBILITY OF SUCH DAMAGE.
34 <link rel="stylesheet" type="text/css" href="document-entry.css"> 34 <link rel="stylesheet" type="text/css" href="document-entry.css">
35 <script type="text/montage-serialization"> 35 <script type="text/montage-serialization">
36 { 36 {
37 37
38 "owner": { 38 "owner": {
39 "prototype": "js/components/layout/document-entry.reel", 39 "prototype": "js/components/layout/document-entry.reel",
40 "properties": { 40 "properties": {
@@ -57,8 +57,8 @@ POSSIBILITY OF SUCH DAMAGE.
57 } 57 }
58 ] 58 ]
59 } 59 }
60 } 60 }
61 </script> 61 </script>
62 </head> 62 </head>
63 <body> 63 <body>
64 <li data-montage-id="documentEntry" class="documentEntry"> 64 <li data-montage-id="documentEntry" class="documentEntry">
diff --git a/js/components/layout/documents-tab.reel/documents-tab.html b/js/components/layout/documents-tab.reel/documents-tab.html
index 2f2e0461..ae472724 100755
--- a/js/components/layout/documents-tab.reel/documents-tab.html
+++ b/js/components/layout/documents-tab.reel/documents-tab.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.
@@ -55,7 +55,7 @@ POSSIBILITY OF SUCH DAMAGE.
55 "saveFlag": {"<-": "@repetition1.objectAtCurrentIteration.model.needsSave"} 55 "saveFlag": {"<-": "@repetition1.objectAtCurrentIteration.model.needsSave"}
56 } 56 }
57 }, 57 },
58 58
59 "repetition1": { 59 "repetition1": {
60 "prototype": "montage/ui/repetition.reel", 60 "prototype": "montage/ui/repetition.reel",
61 "properties": { 61 "properties": {
diff --git a/js/components/layout/stage-mode.reel/stage-mode.html b/js/components/layout/stage-mode.reel/stage-mode.html
index e8fa1d7c..cdce3c1c 100755
--- a/js/components/layout/stage-mode.reel/stage-mode.html
+++ b/js/components/layout/stage-mode.reel/stage-mode.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/components/layout/subtool-button.reel/subtool-button.html b/js/components/layout/subtool-button.reel/subtool-button.html
index 5e7d79b8..e50c8927 100755
--- a/js/components/layout/subtool-button.reel/subtool-button.html
+++ b/js/components/layout/subtool-button.reel/subtool-button.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/components/layout/tool-button.reel/tool-button.html b/js/components/layout/tool-button.reel/tool-button.html
index 7e7717d7..4ebd7d1b 100755
--- a/js/components/layout/tool-button.reel/tool-button.html
+++ b/js/components/layout/tool-button.reel/tool-button.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/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index 76422d9e..300c8069 100755
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.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.
@@ -160,8 +160,8 @@ POSSIBILITY OF SUCH DAMAGE.
160 ] 160 ]
161 } 161 }
162 } 162 }
163 } 163 }
164 </script> 164 </script>
165 165
166 </head> 166 </head>
167