Permalink
Browse files

Merge remote-tracking branch 'yzen/demo' into demo

* yzen/demo:
  FLUID-4947: fixed 2 audio outputs (in uienhancer).
  • Loading branch information...
2 parents 0b6421a + 53117e9 commit 963e1d7b6f465864d21f00f1bd2f6a03ad8be304 @michelled michelled committed Apr 2, 2013
@@ -94,9 +94,9 @@ var fluid_1_5 = fluid_1_5 || {};
fluid.uiOptions.actionAnts.selfVoicingEnactor.attachAudio = function (that) {
that.audio = $(that.options.markup);
- that.audio.attr("id", that.options.audioSelector);
+ that.audio.attr("id", that.options.audioSelector.substr(1));
that.audio.hide();
- $("body").remove(that.options.audioSelector);
+ $(that.options.audioSelector).remove();
$("body").append(that.audio);
var audioElement = that.audio[0];
audioElement.addEventListener("canplaythrough", function () {
@@ -70,4 +70,14 @@
});
};
+ fluid.demands("iframeEnhancer", null, {
+ options: {
+ components: {
+ selfVoicingEnactor: {
+ type: "fluid.emptySubcomponent"
+ }
+ }
+ }
+ });
+
})(jQuery, fluid);

0 comments on commit 963e1d7

Please sign in to comment.