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