Permalink
Browse files

Merge branch 'udemo' into FLUID-4744

  • Loading branch information...
2 parents 8c0ab5a + a752873 commit f0d28063501e99ceeb0779e97816df1209fdbe70 @anvk anvk committed Aug 30, 2012
View

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -10,26 +10,6 @@
<div class="flc-videoPlayer-controller fl-videoPlayer-controller">
- <div class="flc-videoPlayer-scrubberContainer fl-videoPlayer-scrubberContainer">
- <div class="flc-videoPlayer-scrubber fl-videoPlayer-scrubber">
- <a class="ui-slider-handle" href="#">
- <span>
- <span class="flc-videoPlayer-current fl-videoPlayer-time fl-videoPlayer-current"></span>/<span class="flc-videoPlayer-total fl-videoPlayer-time fl-videoPlayer-total"></span>
- </span>
- </a>
- </div>
-
- <div class="flc-videoPlayer-buffered-progress fl-videoPlayer-buffered-progress">
- <div class="flc-progress fl-progress-popUp">
- <div class="flc-progress-bar fl-progress-theBar">
- <div class="flc-progress-indicator fl-progress-indicator">
- </div>
- </div>
- </div>
- </div>
-
- </div>
-
<div class="fl-videoPlayer-controller-buttons">
<div class="fl-videoPlayer-controller-buttons-main">
<button type="button" class="flc-videoPlayer-play fl-videoPlayer-button"></button>
@@ -40,6 +20,23 @@
</div>
</div>
+ <div class="flc-videoPlayer-scrubberContainer fl-videoPlayer-scrubberContainer">
+ <div class="flc-videoPlayer-scrubber fl-videoPlayer-scrubber">
+ <a class="ui-slider-handle" href="#">
+ <span class="flc-videoPlayer-current fl-videoPlayer-time fl-videoPlayer-current"></span>/<span class="flc-videoPlayer-total fl-videoPlayer-time fl-videoPlayer-total"></span>
+ </a>
+ </div>
+
+ <div class="flc-videoPlayer-buffered-progress fl-videoPlayer-buffered-progress">
+ <div class="flc-progress fl-progress-popUp">
+ <div class="flc-progress-bar fl-progress-theBar">
+ <div class="flc-progress-indicator fl-progress-indicator">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
<div class="fl-videoPlayer-controller-buttons-secondary">
<div class="flc-videoPlayer-captionControls-container fl-videoPlayer-captions">
<button class="flc-videoPlayer-captions-button fl-videoPlayer-button"></button>
View
@@ -64,6 +64,12 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
}
button.prop("aria-pressed", pressed);
};
+
+ that.press = function () {
+ that.requestStateChange();
+ that.events.onPress.fire(that);
+ return false;
+ };
};
fluid.toggleButton.setUpToggleButton = function (that) {
@@ -85,11 +91,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
fluid.toggleButton.bindToggleButtonEvents = function (that) {
var button = that.locate("button");
- button.click(function () {
- that.requestStateChange();
- that.events.onPress.fire();
- return false;
- });
+ button.click(that.press);
that.applier.modelChanged.addListener(that.options.modelPath, function () {
that.refreshView();
View
@@ -91,6 +91,9 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
rewind: {
modifier: $.ui.keyCode.SHIFT,
key: $.ui.keyCode.LEFT
+ },
+ escape: {
+ key: $.ui.keyCode.ESCAPE
}
};
@@ -438,16 +441,35 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
var videoEl = video[0];
if (that.model.fullscreen === true) {
- if (videoEl.mozRequestFullScreen) {
- videoEl.mozRequestFullScreen();
- } else if (videoEl.webkitEnterFullScreen) {
- videoEl.webkitEnterFullScreen();
- }
- // else {
- // TODO: Fallback to other versions of browsers
- // }
+ // FLUID-4661: Using browser'ss full screen video mode for now until we implement our own fullscreen mode
+ fluid.each(["moz", "webkit", "o"], function (value) {
+ var functionName = value + "RequestFullScreen";
+ if (videoEl[functionName]) {
+ videoEl[functionName]();
+ return false;
+ }
+ });
}
};
+
+ // FLUID-4661: Change the fullscreen model flag back to false when browser exits its HTML5 fullscreen mode
+ // Once our own custome fullscreen mode is implemented we want to call this fireChangeRequest in another function
+ // which will be called by pressing a full screen toggle Button or when a key shortcut for exiting a fullscreen is pressed
+ fluid.each({
+ "fullscreenchange": "fullscreen",
+ "mozfullscreenchange": "mozFullScreen",
+ "webkitfullscreenchange": "webkitIsFullScreen",
+ "ofullscreenchange": "oFullScreen"
+ }, function (value, key) {
+ document.addEventListener(key, function () {
+ if (!document[value]) {
+ that.applier.fireChangeRequest({
+ path: "fullscreen",
+ value: false
+ });
+ }
+ });
+ });
};
fluid.videoPlayer.postInit = function (that) {
@@ -540,6 +562,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
}
that.locate("controllers").hide();
+
that.events.onReady.fire(that);
});
@@ -458,7 +458,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
fluid.tabindex(that.locate("handle"), -1);
fluid.activatable(that.container, function (evt) {
- that.muteButton.events.onPress.fire();
+ that.muteButton.press();
});
// TODO: This will be converted to use the activatable plugin
// as part of FLUID-4552
@@ -86,7 +86,7 @@ var fluid_1_5 = fluid_1_5 || {};
var newValue = fluid.get(that.pentModel, key);
// synthetic change summarising ultimate individual effect of pent change
var synthChange = {type: "ADD", path: key, value: newValue};
- // console.log("Replaying pent change ", synthChange, " to target ", target);
+ // fluid.log("Replaying pent change ", synthChange, " to target ", target);
var changes = value.func(newValue, key, target, [synthChange]);
fluid.requestChanges(target.applier, changes);
}
@@ -135,7 +135,7 @@ var fluid_1_5 = fluid_1_5 || {};
fluid.modelRelay.registerTarget(that, that);
if (that.events.bindingTrigger) {
that.events.bindingTrigger.addListener(function () { // TODO: add this as a framework facility
- console.log("Binding triggered");
+ // fluid.log("Binding triggered");
that.options.bindingTriggered = true;
});
}
@@ -169,7 +169,7 @@ var fluid_1_5 = fluid_1_5 || {};
if (newValue < min) {
newValue = min;
} else if (newValue > max) {
- newValue = model.max;
+ newValue = max;
}
changeRequest.value = newValue;
}
Oops, something went wrong.

0 comments on commit f0d2806

Please sign in to comment.