Merge lp:~doctormo/smil/seperate-enable into lp:~smilteam/smil/MAIN

[Martin Owens]

[Martin Owens (doctormo)]

This is a simple extraction of some functionality so it can be called by javascript animation methods and not just at load time.

[Lthere (helder-magalhaes)]

Sounds like a good idea. The changes are minimal and (like stated) help with dynamic element creation, so IMO this should be folded into the trunk.

review: Approve

Unmerged revisions

33. By Martin Owens on 2009-06-20

Move animate enabler into it's own function so javascript created animate objects have a way to be enabled after document load.

=== modified file 'smil.user.js'
--- smil.user.js	2009-05-25 19:54:10 +0000
+++ smil.user.js	2009-06-20 06:51:59 +0000
@@ -103,23 +103,27 @@
         (namespaceURI==smil3ns && !impl.hasFeature(smil3ns, "3.0")) ||
         (namespaceURI==timesheetns && !impl.hasFeature(timesheetns, "1.0"))) {
       if (nodeName=="set" || nodeName=="animate" || nodeName=="animateColor" || nodeName=="animateMotion" || nodeName=="animateTransform") {
-        var targets = getTargets(anim);
-        var elAnimators = new Array();
-        for(var i=0; i<targets.length ;i++) {
-          var target = targets[i];
-          var animator = new Animator(anim, target, i);
-          animators.push(animator);
-          elAnimators[i] = animator;
-        }
-        anim.animators = elAnimators;
-        var id = anim.getAttribute("id");
-        if (id)
-          id2anim[id] = anim;
+        enableAnimator(anim);
       }
     }
   }
 }
 
+function enableAnimator(anim) {
+  var targets = getTargets(anim);
+  var elAnimators = new Array();
+  for(var i=0; i<targets.length ;i++) {
+    var target = targets[i];
+    var animator = new Animator(anim, target, i);
+    animators.push(animator);
+    elAnimators[i] = animator;
+  }
+  anim.animators = elAnimators;
+  var id = anim.getAttribute("id");
+  if (id)
+    id2anim[id] = anim;
+}
+
 function getTargets(anim) {
   if (anim.hasAttribute("select"))
     return select(anim);
@@ -1430,4 +1434,4 @@
 
 try {
   window.addEventListener("load", initSMIL, false);
-} catch(exc) {}
 \ No newline at end of file
+} catch(exc) {}