Merge and resolve conflicts to be ready for pull request merge

travist · Oct 26, 2014 · ffa11fe · ffa11fe
2 parents 0a8c30a + 1bcd059
commit ffa11fe
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/bin/minplayer.compressed.js b/bin/minplayer.compressed.js
diff --git a/bin/minplayer.js b/bin/minplayer.js
@@ -3439,7 +3439,7 @@ minplayer.players = minplayer.players || {};
 minplayer.players.dailymotion = function(context, options, queue) {
 
   /** The quality of the Dailymotion stream. */
-  this.quality = 'default';
+  this.quality = '380';
 
   // Derive from players base.
   minplayer.players.base.call(this, context, options, queue);
@@ -3742,6 +3742,7 @@ minplayer.players.dailymotion.prototype.pause = function(callback) {
 minplayer.players.dailymotion.prototype.stop = function(callback) {
   minplayer.players.base.prototype.stop.call(this, function() {
     this.player.pause();
+    this.player.seek(0);
     if (callback) {
       callback.call(this);
     }

diff --git a/bin/minplayer.min.js b/bin/minplayer.min.js
diff --git a/src/minplayer.players.dailymotion.js b/src/minplayer.players.dailymotion.js
@@ -18,7 +18,7 @@ minplayer.players = minplayer.players || {};
 minplayer.players.dailymotion = function(context, options, queue) {
 
   /** The quality of the Dailymotion stream. */
-  this.quality = 'default';
+  this.quality = '380';
 
   // Derive from players base.
   minplayer.players.base.call(this, context, options, queue);
@@ -321,6 +321,7 @@ minplayer.players.dailymotion.prototype.pause = function(callback) {
 minplayer.players.dailymotion.prototype.stop = function(callback) {
   minplayer.players.base.prototype.stop.call(this, function() {
     this.player.pause();
+    this.player.seek(0);
     if (callback) {
       callback.call(this);
     }