diff options
Diffstat (limited to 'js/stage/objects-tray.reel/objects-tray.js')
-rw-r--r-- | js/stage/objects-tray.reel/objects-tray.js | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/js/stage/objects-tray.reel/objects-tray.js b/js/stage/objects-tray.reel/objects-tray.js index 2494c2b5..ce1f4169 100644 --- a/js/stage/objects-tray.reel/objects-tray.js +++ b/js/stage/objects-tray.reel/objects-tray.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 |
@@ -46,19 +47,19 @@ exports.ObjectsTray = Montage.create(Component, { | |||
46 | offStageObjectsController : { | 47 | offStageObjectsController : { |
47 | value: null | 48 | value: null |
48 | }, | 49 | }, |
49 | 50 | ||
50 | _showAllObjects : { value: null }, | 51 | _showAllObjects : { value: null }, |
51 | showAllObjects : { | 52 | showAllObjects : { |
52 | get : function() { return this._showAllObjects; }, | 53 | get : function() { return this._showAllObjects; }, |
53 | set : function(value) { | 54 | set : function(value) { |
54 | if(value === this._showAllObjects) { return; } | 55 | if(value === this._showAllObjects) { return; } |
55 | 56 | ||
56 | this._showAllObjects = value; | 57 | this._showAllObjects = value; |
57 | 58 | ||
58 | this.needsDraw = true; | 59 | this.needsDraw = true; |
59 | } | 60 | } |
60 | }, | 61 | }, |
61 | 62 | ||
62 | workspaceMode : { | 63 | workspaceMode : { |
63 | get : function() { return this._workspaceMode; }, | 64 | get : function() { return this._workspaceMode; }, |
64 | set : function(value) { | 65 | set : function(value) { |
@@ -119,7 +120,7 @@ exports.ObjectsTray = Montage.create(Component, { | |||
119 | Draw Cycle | 120 | Draw Cycle |
120 | --------------------- */ | 121 | --------------------- */ |
121 | 122 | ||
122 | templateDidLoad: { | 123 | templateDidLoad: { |
123 | value: function() { | 124 | value: function() { |
124 | this.offStageObjectsController.filterFunction = this.offStageObjectFilter.bind(this); | 125 | this.offStageObjectsController.filterFunction = this.offStageObjectFilter.bind(this); |
125 | } | 126 | } |