pull 130 part 2 Caridy@ allow HTMLFrameMojit child

config to specify action
isao · May 8, 2012 · a80817f · a80817f
1 parent 6fd3520
commit a80817f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/source/lib/app/mojits/HTMLFrameMojit/controller.server.js b/source/lib/app/mojits/HTMLFrameMojit/controller.server.js
@@ -51,8 +51,9 @@ YUI.add('HTMLFrameMojit', function(Y, NAME) {
             var child = ac.config.get('child'),
                 cfg;
 
-            // Map the action to the child
-            child.action = ac.action;
+            // Map the action to the child if the action
+            // is not specified as part of the child config.
+            child.action = child.action || ac.action;
 
             // Create a config object for the composite addon
             cfg = {