Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

FLUID-2881: Stopgap fix forking "deferredCall" to "deferredInvokeCall…

…" since the latter has some subtle impact on environmental resolution - it appears if used in the environment of component expansion the connection to the "that stack" is broken. For now, different views in CSpace will use different versions although in theory there should be only one of these. We do need to look into the general performance implications of always using "fluid.invoke" though.

svn path=/fluid/infusion/trunk/; revision=10022
  • Loading branch information...
commit 02fbd67ee7e801e0da59d6ec92f6a05b5cf3d61a 1 parent 13c9b2f
Antranig Basman authored September 02, 2010

Showing 1 changed file with 9 additions and 2 deletions. Show diff stats Hide diff stats

  1. 11  src/webapp/framework/core/js/FluidIoC.js
11  src/webapp/framework/core/js/FluidIoC.js
@@ -651,12 +651,19 @@ var fluid_1_2 = fluid_1_2 || {};
651 651
     fluid.expander.deferredCall = function(target, source) {
652 652
         var expander = source.expander;
653 653
         var args = (!expander.args || fluid.isArrayable(expander.args))? expander.args : $.makeArray(expander.args); 
654  
-        //return fluid.invokeGlobalFunction(expander.func, args);
655  
-        return fluid.invoke(expander.func, args);
  654
+        return fluid.invokeGlobalFunction(expander.func, args);
656 655
     };
657 656
     
658 657
     fluid.deferredCall = fluid.expander.deferredCall; // put in top namespace for convenience
659 658
     
  659
+    // TODO: The case of an "invoke" call as part of the course of resolving some component options
  660
+    // proved problematic here and interrupted the ability to resolve contextualised values inside the invoker.
  661
+    fluid.deferredInvokeCall = function(target, source) {
  662
+        var expander = source.expander;
  663
+        var args = (!expander.args || fluid.isArrayable(expander.args))? expander.args : $.makeArray(expander.args); 
  664
+        return fluid.invoke(expander.func, args);
  665
+    };
  666
+    
660 667
     // The "noexpand" expander which simply unwraps one level of expansion and ceases.
661 668
     fluid.expander.noexpand = function(target, source) {
662 669
         return $.extend(target, source.expander.tree);

0 notes on commit 02fbd67

Please sign in to comment.
Something went wrong with that request. Please try again.