Skip to content

Commit

Permalink
Merge remote-tracking branch 'amb26/FLUID-5128'
Browse files Browse the repository at this point in the history 
* amb26/FLUID-5128:
  FLUID-5128: Fix and test case for soft namespace deregistration issue, some linting
  • Loading branch information
@colinbdclark
colinbdclark committed Sep 17, 2013
2 parents a725f9d + a1b6e5d commit a739752
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 21 deletions.
44 changes: 26 additions & 18 deletions src/framework/core/js/Fluid.js
View file
Expand Up @@ -121,7 +121,7 @@ var fluid = fluid || fluid_1_5;
fluid.activityTrace.push(record);
}
if (fluid.passLogLevel(fluid.logLevel.TRACE)) {
fluid.doLog(fluid.renderOneActivity(record, true));
fluid.doLog(fluid.renderOneActivity(record, true));
}
var activityStack = fluid.getActivityStack();
activityStack.push(record);
Expand Down Expand Up @@ -286,7 +286,7 @@ var fluid = fluid || fluid_1_5;
* YAHOO logger or the Opera "postError" stream will be used. On capable environments (those other than
* IE8 or IE9) the entire argument set will be dispatched to the logger - otherwise they will be flattened into
* a string first, destroying any information held in non-primitive values.
*/
*/
fluid.doLog = function (args) {
var str = args.join("");
if (typeof (console) !== "undefined") {
Expand All @@ -301,7 +301,7 @@ var fluid = fluid || fluid_1_5;
YAHOO.log(str);
} else if (typeof (opera) !== "undefined") {
opera.postError(str);
}
}
};

/** Log a message to a suitable environmental console. If the first argument to fluid.log is
Expand Down Expand Up @@ -813,7 +813,7 @@ var fluid = fluid || fluid_1_5;
segs = initSegs.concat(segs);
}
var uncess = newValue === fluid.NO_VALUE ? 0 : 1;
var root = traverser(root, segs, initPos, config, uncess);
root = traverser(root, segs, initPos, config, uncess);
if (newValue === fluid.NO_VALUE || newValue === fluid.VALUE) { // get or custom
return returnSegs ? {root: root, segs: segs} : root;
}
Expand Down Expand Up @@ -910,7 +910,7 @@ var fluid = fluid || fluid_1_5;
*/
fluid.bind = function (obj, fnName, args) {
return obj[fnName].apply(obj, fluid.makeArray(args));
}
};

/**
* Allows for the calling of a function from an EL expression "functionPath", with the arguments "args", scoped to an framework version "environment".
Expand Down Expand Up @@ -1002,8 +1002,8 @@ var fluid = fluid || fluid_1_5;
fluid.event.sortListeners = function (listeners) {
var togo = [];
fluid.each(listeners, function (listener) {
if (listener.length) {
togo = togo.concat(listener)
if (listener.length !== undefined) {
togo = togo.concat(listener);
} else {
togo.push(listener);
}
Expand Down Expand Up @@ -1117,7 +1117,7 @@ var fluid = fluid || fluid_1_5;

removeListener: function (listener) {
if (!listeners) { return; }
var namespace;
var namespace, id;
if (typeof (listener) === "string") {
namespace = listener;
var record = listeners[listener];
Expand All @@ -1127,14 +1127,22 @@ var fluid = fluid || fluid_1_5;
listener = record.length !== undefined ? record : record.listener;
}
if (typeof(listener) === "function") {
var id = identify(listener);
id = identify(listener);
if (!id) {
fluid.fail("Cannot remove unregistered listener function ", listener, " from event " + that.name);
}
}
namespace = namespace || (byId[id] && byId[id].namespace) || id;
var rec = byId[id];
var softNamespace = rec && rec.softNamespace;
namespace = namespace || (rec && rec.namespace) || id;
delete byId[id];
delete listeners[namespace];
if (softNamespace) {
fluid.remove_if(listeners[namespace], function (thisLis) {
return thisLis.listener.$$fluid_guid === id;
});
} else {
delete listeners[namespace];
}
sortedListeners = fluid.event.sortListeners(listeners);
},
// NB - this method exists currently solely for the convenience of the new,
Expand Down Expand Up @@ -1210,7 +1218,7 @@ var fluid = fluid || fluid_1_5;
}
firer = events[key];
}
record = fluid.event.resolveListenerRecord(value, that, key, namespace);
var record = fluid.event.resolveListenerRecord(value, that, key, namespace);
fluid.event.addListenerToFirer(firer, record.records, namespace, record.adderWrapper);
});
};
Expand Down Expand Up @@ -1315,7 +1323,7 @@ var fluid = fluid || fluid_1_5;
}
fluid.each(gradeNames, function (gradeName) {
if (gradeName && !gs.gradeHash[gradeName]) {
var isDynamic = gradeName.charAt(0) === "{"
var isDynamic = gradeName.charAt(0) === "{";
var options = (isDynamic ? null : (raw ? fluid.rawDefaults(gradeName) : fluid.getGradedDefaults(gradeName))) || {};
var thisTick = gradeTickStore[gradeName] || (gradeTick - 1); // a nonexistent grade is recorded as previous to current
gs.lastTick = Math.max(gs.lastTick, thisTick);
Expand All @@ -1335,7 +1343,7 @@ var fluid = fluid || fluid_1_5;
else if (!isAuto) {
resolveGradesImpl(gs, oGradeName);
}
};
}
}
});
return gs;
Expand Down Expand Up @@ -1392,7 +1400,7 @@ var fluid = fluid || fluid_1_5;
var lastTick = 0; // check if cache should be invalidated through real latest tick being later than the one stored
var searchGrades = mergedDefaults.defaults.gradeNames || [];
for (var i = 0; i < searchGrades.length; ++ i) {
lastTick = Math.max(lastTick, gradeTickStore[searchGrades[i]] || 0);
lastTick = Math.max(lastTick, gradeTickStore[searchGrades[i]] || 0);
}
if (lastTick > mergedDefaults.lastTick) {
fluid.log("Clearing cache for component " + defaultName + " with gradeNames ", searchGrades);
Expand Down Expand Up @@ -1440,7 +1448,7 @@ var fluid = fluid || fluid_1_5;
for (var i = 0; i < requiredGrades.length; ++ i) {
if (!fluid.hasGrade(defaults, requiredGrades[i])) return;
}
var indexFunc = typeof(indexSpec.indexFunc) === "function" ? indexSpec.indexFunc : fluid.getGlobalValue(indexSpec.indexFunc);
var indexFunc = typeof(indexSpec.indexFunc) === "function" ? indexSpec.indexFunc : fluid.getGlobalValue(indexSpec.indexFunc);
var keys = indexFunc(defaults) || [];
for (var j = 0; j < keys.length; ++ j) {
(index[keys[j]] = index[keys[j]] || []).push(defaultName);
Expand All @@ -1461,7 +1469,7 @@ var fluid = fluid || fluid_1_5;
var index = {};
for (var defaultName in defaultsStore) {
var defaults = fluid.getGradedDefaults(defaultName);
fluid.doIndexDefaults(defaultName, defaults, index, indexSpec);
fluid.doIndexDefaults(defaultName, defaults, index, indexSpec);
}
return index;
};
Expand Down Expand Up @@ -1818,7 +1826,7 @@ var fluid = fluid || fluid_1_5;

// unsupported, NON-API function
fluid.transformOptionsBlocks = function (mergeBlocks, transformOptions, recordTypes) {
fluid.each(recordTypes, function (recordType) {
fluid.each(recordTypes, function (recordType) {
var blocks = fluid.findMergeBlocks(mergeBlocks, recordType);
fluid.each(blocks, function (block) {
block[block.simple? "target": "source"] = fluid.transformOptions(block.source, transformOptions);
Expand Down
5 changes: 2 additions & 3 deletions src/framework/core/js/FluidIoC.js
View file
Expand Up @@ -547,8 +547,7 @@ var fluid_1_5 = fluid_1_5 || {};

// unsupported, non-API function
fluid.dumpThat = function (that) {
return "{ typeName: \"" + that.typeName + "\"" +
fluid.dumpGradeNames(that) + " id: " + that.id + "}";
return "{ typeName: \"" + that.typeName + "\"" + fluid.dumpGradeNames(that) + " id: " + that.id + "}";
};

// unsupported, non-API function
Expand Down Expand Up @@ -607,7 +606,7 @@ var fluid_1_5 = fluid_1_5 || {};
if (!foundComponent && parsed.path !== "") {
var ref = fluid.renderContextReference(parsed);
fluid.fail("Failed to resolve reference " + ref + " - could not match context with name "
+ context + " from component leaf ", parentThat);
+ context + " from component " + fluid.dumpThat(parentThat), parentThat);
}
return fluid.getForComponent(foundComponent, parsed.path);
};
Expand Down
47 changes: 47 additions & 0 deletions src/tests/framework-tests/core/js/FluidIoCTests.js
View file
Expand Up @@ -954,6 +954,53 @@ fluid.registerNamespace("fluid.tests");
jqUnit.assertDeepEq("Subcomponent listeners fired", [4, 5, 6, 7, 8], that3.fireRecord);
});

/** FLUID-5128 - Soft Namespaces removal test **/

fluid.tests.fluid5128listener = function (that, index) {
that.fireRecord.push(index);
};

fluid.defaults("fluid.tests.fluid5128child", {
gradeNames: ["fluid.eventedComponent", "autoInit"],
listeners: {
"{fluid5128head}.events.subscrEvent": {
funcName: "fluid.tests.fluid5128listener",
args: ["{fluid5128head}", "{arguments}.0"]
}
}
});

fluid.defaults("fluid.tests.fluid5128head", {
gradeNames: ["fluid.eventedComponent", "autoInit"],
members: {
fireRecord: []
},
events: {
createEvent: null,
subscrEvent: null
},
components: {
child1: {
type: "fluid.tests.fluid5128child",
createOnEvent: "createEvent"
},
child2: {
type: "fluid.tests.fluid5128child",
createOnEvent: "createEvent"
}
}
});

jqUnit.test("FLUID-5128 Soft listener deregistration test", function () {
var that = fluid.tests.fluid5128head();
that.events.createEvent.fire();
that.events.subscrEvent.fire(1);
jqUnit.assertDeepEq("Two initial firings", [1, 1], that.fireRecord);
that.events.createEvent.fire();
that.events.subscrEvent.fire(2);
jqUnit.assertDeepEq("Two subsequent firings", [1, 1, 2, 2], that.fireRecord);
});

/** withEnvironment tests - eventually to be deprecated **/

fluid.defaults("fluid.tests.fluid3818head", {
Expand Down

0 comments on commit a739752

Please sign in to comment.