diff options
author | Pushkar Joshi | 2012-02-07 07:21:27 -0800 |
---|---|---|
committer | Pushkar Joshi | 2012-02-07 07:21:27 -0800 |
commit | 4bbe42e6d01fd0f81d13357a75b40eae9925dda3 (patch) | |
tree | 57f49ebfa5d3fcef28753b34015209edda6e620a /js/ninja.reel | |
parent | e7aa17a9b472640355e95c54841399f6203050d4 (diff) | |
parent | 8950b342d1eda8bfa195372e1c17363a409651cd (diff) | |
download | ninja-4bbe42e6d01fd0f81d13357a75b40eae9925dda3.tar.gz |
Merge branch 'master' into pentool
Diffstat (limited to 'js/ninja.reel')
-rw-r--r-- | js/ninja.reel/ninja.js | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 465533cd..90015f5a 100644 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
@@ -94,9 +94,16 @@ exports.Ninja = Montage.create(Component, { | |||
94 | } | 94 | } |
95 | }, | 95 | }, |
96 | 96 | ||
97 | _didDraw: { | ||
98 | value: false | ||
99 | }, | ||
100 | |||
97 | didDraw: { | 101 | didDraw: { |
98 | value: function() { | 102 | value: function() { |
99 | NJevent("appLoaded"); | 103 | if(!this._didDraw) { |
104 | NJevent("appLoaded"); | ||
105 | this._didDraw = true; | ||
106 | } | ||
100 | } | 107 | } |
101 | }, | 108 | }, |
102 | 109 | ||
@@ -163,12 +170,6 @@ exports.Ninja = Montage.create(Component, { | |||
163 | } | 170 | } |
164 | }, | 171 | }, |
165 | 172 | ||
166 | handleLivePreview: { | ||
167 | value: function(event) { | ||
168 | |||
169 | } | ||
170 | }, | ||
171 | |||
172 | executeLivePreview: { | 173 | executeLivePreview: { |
173 | value: function() { | 174 | value: function() { |
174 | var background, overflow, transitionStopRule; | 175 | var background, overflow, transitionStopRule; |