diff options
author | Jon Reid | 2012-06-15 10:10:41 -0700 |
---|---|---|
committer | Jon Reid | 2012-06-15 10:10:41 -0700 |
commit | 526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch) | |
tree | 65939e59615aaa10a7db77211e71616ad531bd0e /node_modules/montage/ui/condition.reel/condition.js | |
parent | b5b760ee82e5cc4da176914983a6002cbf86c11a (diff) | |
parent | 5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff) | |
download | ninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz |
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Diffstat (limited to 'node_modules/montage/ui/condition.reel/condition.js')
-rwxr-xr-x | node_modules/montage/ui/condition.reel/condition.js | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/node_modules/montage/ui/condition.reel/condition.js b/node_modules/montage/ui/condition.reel/condition.js index 7553c14f..a1a421ab 100755 --- a/node_modules/montage/ui/condition.reel/condition.js +++ b/node_modules/montage/ui/condition.reel/condition.js | |||
@@ -26,7 +26,6 @@ exports.Condition = Montage.create(Component, /** @lends module:"montage/ui/cond | |||
26 | @default {Boolean} false | 26 | @default {Boolean} false |
27 | */ | 27 | */ |
28 | hasTemplate: { | 28 | hasTemplate: { |
29 | enumerable: false, | ||
30 | value: false | 29 | value: false |
31 | }, | 30 | }, |
32 | /** | 31 | /** |
@@ -34,7 +33,6 @@ exports.Condition = Montage.create(Component, /** @lends module:"montage/ui/cond | |||
34 | @private | 33 | @private |
35 | */ | 34 | */ |
36 | _condition: { | 35 | _condition: { |
37 | enumerable: false, | ||
38 | value: null | 36 | value: null |
39 | }, | 37 | }, |
40 | /** | 38 | /** |
@@ -43,7 +41,6 @@ exports.Condition = Montage.create(Component, /** @lends module:"montage/ui/cond | |||
43 | @default null | 41 | @default null |
44 | */ | 42 | */ |
45 | condition: { | 43 | condition: { |
46 | enumerable: false, | ||
47 | set: function(value) { | 44 | set: function(value) { |
48 | 45 | ||
49 | if (value === this._condition) { | 46 | if (value === this._condition) { |
@@ -63,15 +60,15 @@ exports.Condition = Montage.create(Component, /** @lends module:"montage/ui/cond | |||
63 | }, | 60 | }, |
64 | get: function() { | 61 | get: function() { |
65 | return this._condition; | 62 | return this._condition; |
66 | } | 63 | }, |
64 | serializable: true | ||
67 | }, | 65 | }, |
68 | 66 | ||
69 | /** | 67 | /** |
70 | @private | 68 | @private |
71 | */ | 69 | */ |
72 | _removalStrategy:{ | 70 | _removalStrategy:{ |
73 | value: "remove", | 71 | value: "remove" |
74 | enumerable:false | ||
75 | }, | 72 | }, |
76 | 73 | ||
77 | // TODO should this strategy be part of another class? | 74 | // TODO should this strategy be part of another class? |
@@ -89,7 +86,8 @@ exports.Condition = Montage.create(Component, /** @lends module:"montage/ui/cond | |||
89 | } | 86 | } |
90 | this._removalStrategy = value; | 87 | this._removalStrategy = value; |
91 | this.needsDraw = true; | 88 | this.needsDraw = true; |
92 | } | 89 | }, |
90 | serializable: true | ||
93 | }, | 91 | }, |
94 | 92 | ||
95 | prepareForDraw: { | 93 | prepareForDraw: { |
@@ -105,7 +103,6 @@ exports.Condition = Montage.create(Component, /** @lends module:"montage/ui/cond | |||
105 | @function | 103 | @function |
106 | */ | 104 | */ |
107 | draw: { | 105 | draw: { |
108 | enumerable: false, | ||
109 | value: function() { | 106 | value: function() { |
110 | 107 | ||
111 | if (this.condition) { | 108 | if (this.condition) { |