From a6fff1c849dca8ce56cef48cf341cad6f394b221 Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Sun, 12 May 2013 21:37:03 -0400
Subject: [PATCH] Fixes

---
 auth.js                    |  2 +-
 package.json               |  2 +-
 server.js                  |  2 +-
 www/assets/js/callbacks.js |  2 +-
 www/assets/js/functions.js |  4 ++--
 www/assets/js/media.js     | 18 ++++++++++++++++++
 6 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/auth.js b/auth.js
index d43fbb38..1e8ca0f7 100644
--- a/auth.js
+++ b/auth.js
@@ -56,7 +56,7 @@ exports.register = function(name, pw) {
         return false;
     }
     var hash = bcrypt.hashSync(pw, 10);
-    var query = "INSERT INTO registrations VALUES (NULL, '{1}', '{2}', 1, '', 0)"
+    var query = "INSERT INTO registrations VALUES (NULL, '{1}', '{2}', 1, '', 0, '', '')"
         .replace(/\{1\}/, name)
         .replace(/\{2\}/, hash);
     var results = db.querySync(query);
diff --git a/package.json b/package.json
index b43919f3..97e1e254 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "author": "Calvin Montgomery",
     "name": "CyTube",
     "description": "Online media synchronizer and chat",
-    "version": "1.7.0",
+    "version": "1.7.1",
     "repository": {
         "url": "http://github.com/calzoneman/sync"
     },
diff --git a/server.js b/server.js
index 14ea2e42..cd7c2ec2 100644
--- a/server.js
+++ b/server.js
@@ -9,7 +9,7 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-const VERSION = "1.7.0";
+const VERSION = "1.7.1";
 
 var fs = require("fs");
 var Logger = require("./logger.js");
diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js
index 4b7f4687..20039dc4 100644
--- a/www/assets/js/callbacks.js
+++ b/www/assets/js/callbacks.js
@@ -29,7 +29,7 @@ Callbacks = {
     announcement: function(data) {
         var div = $("<div/>").addClass("alert")
             .insertAfter($(".row")[0]);
-        $("<button/>").addClass("close pull-right").data.text("×")
+        $("<button/>").addClass("close pull-right").text("×")
             .appendTo(div)
             .click(function() { div.remove(); });
         $("<h3/>").data.text(data.title).appendTo(div);
diff --git a/www/assets/js/functions.js b/www/assets/js/functions.js
index 98773579..936c39ea 100644
--- a/www/assets/js/functions.js
+++ b/www/assets/js/functions.js
@@ -806,7 +806,7 @@ function showLoginFrame() {
 }
 
 function showUserOpts() {
-    var vid = $("#ytapiplayer").detach();
+    PLAYER.hide();
     var modal = $("<div/>").addClass("modal hide fade")
         .appendTo($("body"));
     var head = $("<div/>").addClass("modal-header")
@@ -932,7 +932,7 @@ function showUserOpts() {
     });
 
     modal.on("hidden", function() {
-        vid.appendTo($("#videodiv"));
+        PLAYER.unhide();
         applyOpts();
         modal.remove();
     });
diff --git a/www/assets/js/media.js b/www/assets/js/media.js
index b40711f4..6c2fa178 100644
--- a/www/assets/js/media.js
+++ b/www/assets/js/media.js
@@ -349,3 +349,21 @@ Media.prototype.removeOld = function() {
     old.remove();
     placeholder.attr("id", "ytapiplayer");
 }
+
+Media.prototype.hide = function() {
+    this.getTime(function(seconds) {
+        this.time = seconds;
+        this.hidden = $("#ytapiplayer").detach();
+    }.bind(this));
+}
+
+Media.prototype.unhide = function() {
+    this.hidden.appendTo($("#videodiv"));
+    var data = {
+        id: this.id,
+        currentTime: this.time
+    };
+    setTimeout(function() { this.load(data); }.bind(this), 1000);
+    delete this.hidden;
+    delete this.time;
+}