diff options
| author | Kris Kowal | 2012-07-09 16:38:08 -0700 |
|---|---|---|
| committer | Kris Kowal | 2012-07-09 16:38:08 -0700 |
| commit | 7bee50379c1df86bb571e0e8d6c08e24d25231f5 (patch) | |
| tree | 5b11abd0414e0a3ab50ec6276b6334fbd168db7e /js/panels/properties.reel/sections/three-d-view.reel | |
| parent | 26d4b5ce30e6e0ea6e0fde870853c1e2a673a7b4 (diff) | |
| download | ninja-7bee50379c1df86bb571e0e8d6c08e24d25231f5.tar.gz | |
BSD License
Diffstat (limited to 'js/panels/properties.reel/sections/three-d-view.reel')
| -rwxr-xr-x | js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html | 23 | ||||
| -rwxr-xr-x | js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js | 25 |
2 files changed, 25 insertions, 23 deletions
diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html index 86e5d79b..3d0e3c2b 100755 --- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html +++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html | |||
| @@ -1,25 +1,26 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility LLC. |
| 4 | All Rights Reserved. | 4 | All Rights Reserved. |
| 5 | BSD License. | ||
| 6 | 5 | ||
| 7 | Redistribution and use in source and binary forms, with or without | 6 | Redistribution and use in source and binary forms, with or without |
| 8 | modification, are permitted provided that the following conditions are met: | 7 | modification, are permitted provided that the following conditions are met: |
| 9 | 8 | ||
| 10 | - Redistributions of source code must retain the above copyright notice, | 9 | * Redistributions of source code must retain the above copyright notice, |
| 11 | this list of conditions and the following disclaimer. | 10 | this list of conditions and the following disclaimer. |
| 12 | - Redistributions in binary form must reproduce the above copyright | 11 | |
| 13 | notice, this list of conditions and the following disclaimer in the | 12 | * Redistributions in binary form must reproduce the above copyright notice, |
| 14 | documentation and/or other materials provided with the distribution. | 13 | this list of conditions and the following disclaimer in the documentation |
| 15 | - Neither the name of Motorola Mobility nor the names of its contributors | 14 | and/or other materials provided with the distribution. |
| 16 | may be used to endorse or promote products derived from this software | 15 | |
| 17 | without specific prior written permission. | 16 | * Neither the name of Motorola Mobility LLC nor the names of its |
| 17 | contributors may be used to endorse or promote products derived from this | ||
| 18 | software without specific prior written permission. | ||
| 18 | 19 | ||
| 19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 20 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
| 20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 21 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 22 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
| 22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 23 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
| 23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 24 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
| 24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 25 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
| 25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 26 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js index 52750f13..f4c31f53 100755 --- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js +++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.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 |
| @@ -49,7 +50,7 @@ exports.ThreeD = Montage.create(Component, { | |||
| 49 | }, | 50 | }, |
| 50 | set: function(value) { | 51 | set: function(value) { |
| 51 | this._axisMode = value; | 52 | this._axisMode = value; |
| 52 | 53 | ||
| 53 | if(value === 0) { | 54 | if(value === 0) { |
| 54 | this.inGlobalMode = false; | 55 | this.inGlobalMode = false; |
| 55 | this.x3D = 0; | 56 | this.x3D = 0; |