diff options
author | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
commit | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch) | |
tree | 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/stage/layout.js | |
parent | c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff) | |
parent | 40c6eb2c06b34f65a74d59ef9687251952858bab (diff) | |
download | ninja-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/stage/layout.js')
-rwxr-xr-x | js/stage/layout.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/stage/layout.js b/js/stage/layout.js index 650d448f..bf7e79c3 100755 --- a/js/stage/layout.js +++ b/js/stage/layout.js | |||
@@ -221,7 +221,7 @@ exports.Layout = Montage.create(Component, { | |||
221 | 221 | ||
222 | var zoomFactor = 1; | 222 | var zoomFactor = 1; |
223 | if (this.stage._viewport && this.stage._viewport.style && this.stage._viewport.style.zoom) { | 223 | if (this.stage._viewport && this.stage._viewport.style && this.stage._viewport.style.zoom) { |
224 | zoomFactor = Number(this.stage._viewport.style.zoom); | 224 | zoomFactor = Number(this.stage._viewport.style.zoom); |
225 | } | 225 | } |
226 | 226 | ||
227 | var sSL = this.stage._scrollLeft; | 227 | var sSL = this.stage._scrollLeft; |
@@ -309,7 +309,7 @@ exports.Layout = Montage.create(Component, { | |||
309 | { | 309 | { |
310 | return; | 310 | return; |
311 | } | 311 | } |
312 | 312 | ||
313 | try { | 313 | try { |
314 | if(element.nodeType == 1 && this.application.ninja.currentDocument.inExclusion(element) === -1 ) { | 314 | if(element.nodeType == 1 && this.application.ninja.currentDocument.inExclusion(element) === -1 ) { |
315 | 315 | ||
@@ -393,5 +393,5 @@ exports.Layout = Montage.create(Component, { | |||
393 | } | 393 | } |
394 | } | 394 | } |
395 | 395 | ||
396 | 396 | ||
397 | }); | 397 | }); |