diff options
Diffstat (limited to 'js/stage/layout.js')
-rwxr-xr-x | js/stage/layout.js | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/js/stage/layout.js b/js/stage/layout.js index 650d448f..d133f100 100755 --- a/js/stage/layout.js +++ b/js/stage/layout.js | |||
@@ -1,24 +1,25 @@ | |||
1 | /* <copyright> | 1 | /* <copyright> |
2 | Copyright (c) 2012, Motorola Mobility, Inc | 2 | Copyright (c) 2012, Motorola Mobility LLC. |
3 | All Rights Reserved. | 3 | All Rights Reserved. |
4 | BSD License. | ||
5 | 4 | ||
6 | Redistribution and use in source and binary forms, with or without | 5 | Redistribution and use in source and binary forms, with or without |
7 | modification, are permitted provided that the following conditions are met: | 6 | modification, are permitted provided that the following conditions are met: |
8 | 7 | ||
9 | - Redistributions of source code must retain the above copyright notice, | 8 | * Redistributions of source code must retain the above copyright notice, |
10 | this list of conditions and the following disclaimer. | 9 | this list of conditions and the following disclaimer. |
11 | - Redistributions in binary form must reproduce the above copyright | 10 | |
12 | notice, this list of conditions and the following disclaimer in the | 11 | * Redistributions in binary form must reproduce the above copyright notice, |
13 | documentation and/or other materials provided with the distribution. | 12 | this list of conditions and the following disclaimer in the documentation |
14 | - Neither the name of Motorola Mobility nor the names of its contributors | 13 | and/or other materials provided with the distribution. |
15 | may be used to endorse or promote products derived from this software | 14 | |
16 | without specific prior written permission. | 15 | * Neither the name of Motorola Mobility LLC nor the names of its |
16 | contributors may be used to endorse or promote products derived from this | ||
17 | software without specific prior written permission. | ||
17 | 18 | ||
18 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
19 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
20 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
21 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
22 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
23 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
24 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -221,7 +222,7 @@ exports.Layout = Montage.create(Component, { | |||
221 | 222 | ||
222 | var zoomFactor = 1; | 223 | var zoomFactor = 1; |
223 | if (this.stage._viewport && this.stage._viewport.style && this.stage._viewport.style.zoom) { | 224 | if (this.stage._viewport && this.stage._viewport.style && this.stage._viewport.style.zoom) { |
224 | zoomFactor = Number(this.stage._viewport.style.zoom); | 225 | zoomFactor = Number(this.stage._viewport.style.zoom); |
225 | } | 226 | } |
226 | 227 | ||
227 | var sSL = this.stage._scrollLeft; | 228 | var sSL = this.stage._scrollLeft; |
@@ -309,7 +310,7 @@ exports.Layout = Montage.create(Component, { | |||
309 | { | 310 | { |
310 | return; | 311 | return; |
311 | } | 312 | } |
312 | 313 | ||
313 | try { | 314 | try { |
314 | if(element.nodeType == 1 && this.application.ninja.currentDocument.inExclusion(element) === -1 ) { | 315 | if(element.nodeType == 1 && this.application.ninja.currentDocument.inExclusion(element) === -1 ) { |
315 | 316 | ||
@@ -393,5 +394,5 @@ exports.Layout = Montage.create(Component, { | |||
393 | } | 394 | } |
394 | } | 395 | } |
395 | 396 | ||
396 | 397 | ||
397 | }); | 398 | }); |