Fixed some errors with installation of extension, and added a function where the toast is closed when clicked

This commit is contained in:
Kasper Rynning-Tønnesen
2015-08-04 22:55:48 +02:00
parent 83e752c4a2
commit bba0470369
5 changed files with 28 additions and 14 deletions

View File

@@ -1848,6 +1848,26 @@ $(document).ready(function(){
} }
}); });
hammerHandler.on('tap', function(e) {
var deltaX = e.deltaX;
var activationDistance = 80;
// If toast dragged past activation point
Vel(toast, {marginTop: '-40px', opacity: 0}, { duration: 375,
easing: 'easeOutExpo',
queue: false,
complete: function(){
if(typeof(completeCallback) === "function") {
completeCallback();
}
toast.parentNode.removeChild(toast);
}
});
});
return toast; return toast;
} }
}; };

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1 +1 @@
!function(){function t(){chrome.webstore.install("",o,e)}function e(t){console.log(t)}function o(){console.log("Successfully installed")}var i=!0;$(document).ready(function(){document.title="Zöff Remote",setTimeout(function(){$("#search").focus()},500),socket=io.connect("//"+window.location.hostname+":3000"),id=window.location.pathname.split("/")[2],id&&(id=id.toLowerCase(),n.control()),git_info=$.ajax({type:"GET",url:"https://api.github.com/repos/zoff-music/zoff/commits",async:!1}).responseText,git_info=$.parseJSON(git_info),$("#latest-commit").html("Latest Commit: <br>"+git_info[0].commit.author.date.substring(0,10)+": "+git_info[0].committer.login+"<br><a href='"+git_info[0].html_url+"'>"+git_info[0].sha.substring(0,10)+"</a>: "+git_info[0].commit.message+"<br");var i=navigator.userAgent.toLowerCase().indexOf("chrome")>-1,c=chrome.app.isInstalled;i&&!c&&Materialize.toast("<a href='#' onclick='installRemote();' style='pointer-events:all;color:white;'>Install the extension!</a>",1e5),window.installRemote=t,window.failed=e,window.success=o}),$("#playbutton").on("click",function(){socket.emit("id",[id,"play","mock"])}),$("#pausebutton").on("click",function(){socket.emit("id",[id,"pause","mock"])}),$("#skipbutton").on("click",function(){socket.emit("id",[id,"skip","mock"])}),$("#remoteform").on("submit",function(){n.control()});var n={control:function(){i?(id||(id=document.getElementById("remoteform").chan.value,window.history.pushState("object or string","Title","/remote/"+id)),document.getElementById("remoteform").chan.value="",i=!1,$(".rc").css("display","block"),$("#remote-text").text("Controlling "+id.toUpperCase()),document.getElementById("search").setAttribute("length","18"),document.getElementById("search").setAttribute("maxlength","18"),$("#forsearch").html("Type new channel name to change to"),$("#volume-control").slider({min:0,max:100,value:100,range:"min",animate:!0,stop:function(t,e){socket.emit("id",[id,"volume",e.value]),console.log("volume")}})):(socket.emit("id",[id,"channel",$("#search").val().toLowerCase()]),$("#search").val(""))}}}(); !function(){function e(){chrome.webstore.install("",o,t)}function t(e){console.log(e)}function o(){console.log("Successfully installed")}var n=!0;$(document).ready(function(){document.title="Zöff Remote",setTimeout(function(){$("#search").focus()},500),socket=io.connect("//"+window.location.hostname+":3000"),id=window.location.pathname.split("/")[2],id&&(id=id.toLowerCase(),a.control()),git_info=$.ajax({type:"GET",url:"https://api.github.com/repos/zoff-music/zoff/commits",async:!1}).responseText,git_info=$.parseJSON(git_info),$("#latest-commit").html("Latest Commit: <br>"+git_info[0].commit.author.date.substring(0,10)+": "+git_info[0].committer.login+"<br><a href='"+git_info[0].html_url+"'>"+git_info[0].sha.substring(0,10)+"</a>: "+git_info[0].commit.message+"<br");var n=navigator.userAgent.toLowerCase().indexOf("chrome")>-1;setTimeout(function(){n&&!document.getElementById("extension-is-installed")&&Materialize.toast("<a href='#' onclick='installRemote();' style='pointer-events:all;color:white;'>Install the extension!</a>",1e5)},5),window.installRemote=e,window.failed=t,window.success=o}),$("#playbutton").on("click",function(){socket.emit("id",[id,"play","mock"])}),$("#pausebutton").on("click",function(){socket.emit("id",[id,"pause","mock"])}),$("#skipbutton").on("click",function(){socket.emit("id",[id,"skip","mock"])}),$("#remoteform").on("submit",function(){a.control()});var a={control:function(){n?(id||(id=document.getElementById("remoteform").chan.value,window.history.pushState("object or string","Title","/remote/"+id)),document.getElementById("remoteform").chan.value="",n=!1,$(".rc").css("display","block"),$("#remote-text").text("Controlling "+id.toUpperCase()),document.getElementById("search").setAttribute("length","18"),document.getElementById("search").setAttribute("maxlength","18"),$("#forsearch").html("Type new channel name to change to"),$("#volume-control").slider({min:0,max:100,value:100,range:"min",animate:!0,stop:function(e,t){socket.emit("id",[id,"volume",t.value]),console.log("volume")}})):(socket.emit("id",[id,"channel",$("#search").val().toLowerCase()]),$("#search").val(""))}}}();

View File

@@ -25,11 +25,10 @@ $(document).ready(function (){
+ git_info[0].commit.message+"<br"); + git_info[0].commit.message+"<br");
var _isChrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1; var _isChrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1;
var _isRemoteInstalled = chrome.app.isInstalled; setTimeout(function(){
if (_isChrome && !document.getElementById('extension-is-installed'))
if (_isChrome && !_isRemoteInstalled)
Materialize.toast("<a href='#' onclick='installRemote();' style='pointer-events:all;color:white;'>Install the extension!</a>", 100000); Materialize.toast("<a href='#' onclick='installRemote();' style='pointer-events:all;color:white;'>Install the extension!</a>", 100000);
}, 5);
window.installRemote = installRemote; window.installRemote = installRemote;
window.failed = failed; window.failed = failed;
window.success = success; window.success = success;