Backed out changeset 6fd779fb622d due to orange

This commit is contained in:
Blair McBride 2011-08-25 17:49:46 +12:00
parent 71ae941b5d
commit bc0ae5b4ed
2 changed files with 0 additions and 49 deletions

View File

@ -53,23 +53,3 @@
.statusOverlay[fadeout] {
opacity: 0;
}
.controlBar[sizemode="hidden"],
.controlBar[sizemode="small"] .durationBox,
.controlBar[sizemode="small"] .durationLabel,
.controlBar[sizemode="small"] .positionLabel {
visibility: collapse;
}
.controlBar[sizemode="small"] .scrubberStack {
visibility: hidden;
}
.controlBar[sizemode="small"] .scrubberStack > * {
min-width: 0;
width: 0;
padding-left: 0;
padding-right: 0;
margin-left: 0;
margin-right: 0;
}

View File

@ -860,32 +860,6 @@
if (this.debug)
dump("videoctl: " + msg + "\n");
},
adjustControlSize : function adjustControlSize() {
let videoHeight = this.video.clientHeight;
let videoWidth = this.video.clientWidth;
// The scrubber has |flex=1|, therefore |minimumScrubberWidth|
// was generated by empirical testing.
let minimumScrubberWidth = 25;
let minWidthAllControls = this.playButton.clientWidth +
minimumScrubberWidth +
this.durationLabel.clientWidth +
this.muteButton.clientWidth;
let minimumHeightForControlBar = this.controlBar.clientHeight;
let sizeMode = "normal";
if (videoHeight < minimumHeightForControlBar) {
sizeMode = "hidden";
} else {
var minWidthOnlyPlayPause = this.playButton.clientWidth + this.muteButton.clientWidth;
if (videoWidth < minWidthOnlyPlayPause)
sizeMode = "hidden";
else if (videoWidth < minWidthAllControls)
sizeMode = "small";
}
this.controlBar.setAttribute("sizemode", sizeMode);
},
init : function (binding) {
this.video = binding.parentNode;
@ -945,9 +919,6 @@
this.video.setAttribute("tabindex", 0);
this.video.addEventListener("keypress", function (e) { self.keyHandler(e) }, false);
// An event handler for |onresize| should be added when bug 227495 is fixed.
self.adjustControlSize();
this.log("--- videocontrols initialized ---");
}
}) ]]>