diff --git a/server/handlers/list_change.js b/server/handlers/list_change.js index 8e056afd..6e11c771 100644 --- a/server/handlers/list_change.js +++ b/server/handlers/list_change.js @@ -415,8 +415,9 @@ function add_function(arr, coll, guid, offline, socket) { } db.collection(coll + "_settings").find(function(err, docs){ if(docs.length > 0 && (docs[0].userpass == undefined || docs[0].userpass == "" || (arr.hasOwnProperty('pass') && docs[0].userpass == arr.pass))) { - Functions.check_inlist(coll, guid, socket, offline, undefined, "place 5"); - + if((arr.hasOwnProperty("offsiteAdd") && !arr.offsiteAdd) || !arr.hasOwnProperty("offsiteAdd")) { + Functions.check_inlist(coll, guid, socket, offline, undefined, "place 5"); + } var id = arr.id + ""; var title = arr.title; var hash = arr.adminpass; diff --git a/server/public/assets/css/style.css b/server/public/assets/css/style.css index 06fc6131..ed2353a7 100755 --- a/server/public/assets/css/style.css +++ b/server/public/assets/css/style.css @@ -2610,6 +2610,8 @@ nav ul li:hover, nav ul li.active { line-height: 31px; } + + .ui-slider-vertical { width: .8em; height: 100px; @@ -2842,7 +2844,7 @@ nav ul li:hover, nav ul li.active { width: 100vw !important; } -#seekToDuration{ +#seekToDuration, #addToListInput{ position: absolute; background: #2d2d2d; color:white; @@ -2858,6 +2860,23 @@ nav ul li:hover, nav ul li.active { pointer-events: none; } +#addToListInput { + top: -105px; + right: 10px; + z-index: 999999; + pointer-events: all; +} + +#addToListInput .input-field { + margin-right: 25px; + margin-top: 0px; + margin-bottom: 0px; +} + +#addToListInput .input-field input { + color: white; +} + .ewresize{ cursor: ew-resize; } diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js index 31268668..d6c346b2 100755 --- a/server/public/assets/js/listeners.js +++ b/server/public/assets/js/listeners.js @@ -987,6 +987,18 @@ function addDynamicListeners() { Player.playVideo(); }); + addListener("click", "#addToOtherList", function(event) { + this.preventDefault(); + Helper.toggleClass("#addToListInput", "hide"); + }); + + addListener("submit", "#addToOtherListForm", function() { + this.preventDefault(); + emit("add", {offsiteAdd: true, id: Player.np.id, start: Player.np.start, end: Player.np.end, title: Player.np.title, list: document.getElementById("other-list-name-add").value.toLowerCase(), duration: Player.np.duration, source: Player.np.source, thumbnail: Player.np.thumbnail}); + Helper.toggleClass("#addToListInput", "hide"); + document.getElementById("other-list-name-add").value = ""; + }); + addListener("click", "#listExport", function(event){ this.preventDefault(); if(!youtube_authenticated){ diff --git a/server/public/partials/channel/players.handlebars b/server/public/partials/channel/players.handlebars index 72643887..837af371 100644 --- a/server/public/partials/channel/players.handlebars +++ b/server/public/partials/channel/players.handlebars @@ -66,10 +66,17 @@
- +