Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 2 contributors
Commits on Apr 02, 2013
@yzen yzen FLUID-4947: fixed 2 audio outputs (in uienhancer). 53117e9
@michelled Merge remote-tracking branch 'yzen/demo' into demo
* yzen/demo:
  FLUID-4947: fixed 2 audio outputs (in uienhancer).
963e1d7
View
4 src/webapp/integration-demos/uiOptions/js/SelfVoicingEnactor.js
@@ -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 () {
View
10 src/webapp/integration-demos/uiOptions/js/uiOptionsDemo.js
@@ -70,4 +70,14 @@
});
};
+ fluid.demands("iframeEnhancer", null, {
+ options: {
+ components: {
+ selfVoicingEnactor: {
+ type: "fluid.emptySubcomponent"
+ }
+ }
+ }
+ });
+
})(jQuery, fluid);

No commit comments for this range

Something went wrong with that request. Please try again.