moon
/
sync
mirror of https://github.com/calzoneman/sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix "end poll" button for leaders 

Fixes Issue #30
This commit is contained in:
calzoneman 2013-04-16 10:43:53 -05:00
parent 7b57e411bb
commit 6ae16d5671
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server.js
View File

@ -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. 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.1.5"; const VERSION = "1.1.6";
var fs = require("fs"); var fs = require("fs");
var Logger = require("./logger.js"); var Logger = require("./logger.js");

25
www/assets/js/functions.js
View File

@ -501,8 +501,8 @@ function addPoll(data) {
$("<button/>").addClass("close pull-right").text("×") $("<button/>").addClass("close pull-right").text("×")
.appendTo(poll) .appendTo(poll)
.click(function() { poll.remove(); }); .click(function() { poll.remove(); });
if(RANK >= Rank.Moderator) { if(RANK >= Rank.Moderator || LEADER) {
$("<button/>").addClass("btn btn-danger pull-right").text("Close Poll") $("<button/>").addClass("btn btn-danger pull-right").text("End Poll")
.appendTo(poll) .appendTo(poll)
.click(function() { .click(function() {
socket.emit("closePoll") socket.emit("closePoll")
@ -657,17 +657,20 @@ function handleRankChange() {
$("#playlist_controls button").each(function() { $("#playlist_controls button").each(function() {
$(this).attr("disabled", false); $(this).attr("disabled", false);
}); });
} $("#pollcontainer .active").each(function() {
if(RANK >= Rank.Moderator) { var btns = $(this).find(".btn-danger");
$("#qlockbtn").css("display", "block"); if(btns.length == 0) {
var poll = $("#pollcontainer .active"); $("<button/>").addClass("btn btn-danger pull-right")
if(poll.length > 0) { .text("End Poll")
$("<button/>").addClass("btn btn-danger pull-right").text("Close Poll") .insertAfter($(this).find(".close"))
.insertAfter(poll.find(".close"))
.click(function() { .click(function() {
socket.emit("closePoll") socket.emit("closePoll")
}); });
} }
});
}
if(RANK >= Rank.Moderator) {
$("#qlockbtn").css("display", "block");
var users = $("#userlist").children(); var users = $("#userlist").children();
for(var i = 0; i < users.length; i++) { for(var i = 0; i < users.length; i++) {
addUserDropdown(users[i], users[i].children[1].innerHTML); addUserDropdown(users[i], users[i].children[1].innerHTML);
@ -690,6 +693,10 @@ function handleRankChange() {
else { else {
$("#playlist_controls").css("display", "none"); $("#playlist_controls").css("display", "none");
} }
$("#pollcontainer .active").each(function() {
$(this).find(".btn-danger").remove();
});
} }
} }