Merge pull request #589 from Xaekai/polltime

Add timestamps to polls

package.json

@@ -2,7 +2,7 @@
   "author": "Calvin Montgomery",
   "name": "CyTube",
   "description": "Online media synchronizer and chat",
-  "version": "3.18.1",
+  "version": "3.18.2",
   "repository": {
     "url": "http://github.com/calzoneman/sync"
   },

src/channel/poll.js

@@ -43,6 +43,7 @@ PollModule.prototype.load = function (data) {
             this.poll.options = data.poll.options;
             this.poll.counts = data.poll.counts;
             this.poll.votes = data.poll.votes;
+            this.poll.timestamp = data.poll.timestamp;
         }
     }
 };
@@ -59,7 +60,8 @@ PollModule.prototype.save = function (data) {
         options: this.poll.options,
         counts: this.poll.counts,
         votes: this.poll.votes,
-        obscured: this.poll.obscured
+        obscured: this.poll.obscured,
+        timestamp: this.poll.timestamp
     };
 };
 

src/poll.js

@@ -17,6 +17,7 @@ var Poll = function(initiator, title, options, obscured) {
         this.counts[i] = 0;
     }
     this.votes = {};
+    this.timestamp = Date.now();
 }
 
 Poll.prototype.vote = function(ip, option) {
@@ -46,7 +47,8 @@ Poll.prototype.packUpdate = function (showhidden) {
         title: this.title,
         options: this.options,
         counts: counts,
-        initiator: this.initiator
+        initiator: this.initiator,
+        timestamp: this.timestamp
     };
     return packed;
 }

www/js/callbacks.js

@@ -937,6 +937,8 @@ Callbacks = {
             })(i);
 
         }
+        $("<span/>").addClass("label label-default pull-right").data('timestamp',data.timestamp).appendTo(poll)
+            .text(new Date(data.timestamp).toTimeString().split(" ")[0]);
 
         poll.find(".btn").attr("disabled", !hasPermission("pollvote"));
     },