merge
authorRob Campbell <rcampbell@mozilla.com>
Tue, 01 Nov 2011 17:02:44 -0300
changeset 79559 127fc739a43fb1e07c800e7c216e7efdcc3ada5d
parent 79558 9f51745bdd6df902ccff9ba21f567245b7c56a9f (current diff)
parent 79557 75692b1af68f8cfb2f08bc7d53d666eac5976099 (diff)
child 79560 0c3d5e7ce23cab04d34fe68eb98d5d62f096ce14
push id3053
push userkhuey@mozilla.com
push dateWed, 02 Nov 2011 12:53:44 +0000
treeherdermozilla-inbound@80af665378fd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone10.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
merge
--- a/toolkit/content/widgets/videocontrols.xml
+++ b/toolkit/content/widgets/videocontrols.xml
@@ -1018,17 +1018,18 @@
                                 else
                                     newval = oldval + maxtime / 10;
                                 this.video.currentTime = (newval <= maxtime ? newval : maxtime);
                                 break;
                             case "home": /* Seek to beginning */
                                 this.video.currentTime = 0;
                                 break;
                             case "end": /* Seek to end */
-                                this.video.currentTime = (this.video.duration || this.maxCurrentTimeSeen / 1000);
+                                if (this.video.currentTime != this.video.duration)
+                                    this.video.currentTime = (this.video.duration || this.maxCurrentTimeSeen / 1000);
                                 break;
                             default:
                                 return;
                         }
                     } catch(e) { /* ignore any exception from setting .currentTime */ }
 
                     event.preventDefault(); // Prevent page scrolling
                 },