CCActionCallFunc set target node to weak, Setup scheduler in CCAnimationManager only if added to a node (onEnter)

Author: cocojoe

cocos2d-ui/CCBReader/CCAnimationManager.m

@@ -52,11 +52,6 @@ - (id)init {
     _nodeSequences = [[NSMutableDictionary alloc] init];
     _baseValues = [[NSMutableDictionary alloc] init];
 
-    // Scheduler
-    _scheduler = [[CCDirector sharedDirector] scheduler];
-    [_scheduler scheduleTarget:self];
-    [_scheduler setPaused:NO target:self];
-    
     // Current Sequence Actions
     _currentActions = [[NSMutableArray alloc] init];
     _playbackSpeed  = 1.0f;
@@ -81,6 +76,13 @@ - (CGSize)containerSize:(CCNode*)node {
     }
 }
 
+-(void) onEnter {
+    // Setup Scheduler
+    _scheduler = [[CCDirector sharedDirector] scheduler];
+    [_scheduler scheduleTarget:self];
+    [_scheduler setPaused:NO target:self];
+}
+
 - (void)addNode:(CCNode*)node andSequences:(NSDictionary*)seq
 {
 #ifdef DEBUG

cocos2d/CCActionInstant.h

@@ -184,12 +184,12 @@
  *  This action allows a custom function to be called.
  */
 @interface CCActionCallFunc : CCActionInstant <NSCopying> {
-	id _targetCallback;
+	__weak id _targetCallback;
 	SEL _selector;
 }
 
 /** Target function that will be called. */
-@property (nonatomic, readwrite, strong) id targetCallback;
+@property (nonatomic, readwrite, weak) id targetCallback;
 
 
 /// -----------------------------------------------------------------------

cocos2d/CCNode.m

@@ -1108,6 +1108,10 @@ -(void) onEnter
 		[[CCDirector sharedDirector].actionManager migrateActions:self from:[CCDirector sharedDirector].actionManagerFixed];
 		[self setActionManager:[CCDirector sharedDirector].actionManager];
 	}
+
+    if(_animationManager) {
+        [_animationManager performSelector:@selector(onEnter)];
+    }
 
 	[self wasRunning:wasRunning];
 }