|
|
@@ -16,13 +16,16 @@ $(document).ready(function () {
|
|
|
for (var i = 0; i < e.data.updates.length; i++) {
|
|
|
update = e.data.updates[i];
|
|
|
switch (update.action) {
|
|
|
- case 0:
|
|
|
+ case 0: // see updates.go:addAction
|
|
|
drawAdd(update);
|
|
|
break;
|
|
|
+ case 1:
|
|
|
+ drawRemove(update.yid);
|
|
|
+ break;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- poller.postMessage({'pid': pid});
|
|
|
+ poller.postMessage({pid: pid});
|
|
|
});
|
|
|
|
|
|
function drawBar(id) {
|
|
|
@@ -121,14 +124,14 @@ function showPause(yid) {
|
|
|
|
|
|
function search(query) {
|
|
|
params = {
|
|
|
- 'q': query,
|
|
|
+ q: query,
|
|
|
'max-results': 10,
|
|
|
- 'v': 2,
|
|
|
- 'strict': true,
|
|
|
- 'alt': 'json',
|
|
|
- 'fields': 'entry(title,media:group(yt:videoid))',
|
|
|
- 'safeSearch': 'none',
|
|
|
- 'key': 'AI39si7SaaRqtvAZTa8lePOq6XC5r7S5Xzp3AB6oYPfeCArPbA4dIq7tSVeuIDwAkcFFDeI3rzNmYxkyN_fg8X_7w800pIvVOA'
|
|
|
+ v: 2,
|
|
|
+ strict: true,
|
|
|
+ alt: 'json',
|
|
|
+ fields: 'entry(title,media:group(yt:videoid))',
|
|
|
+ safeSearch: 'none',
|
|
|
+ key: 'AI39si7SaaRqtvAZTa8lePOq6XC5r7S5Xzp3AB6oYPfeCArPbA4dIq7tSVeuIDwAkcFFDeI3rzNmYxkyN_fg8X_7w800pIvVOA'
|
|
|
}
|
|
|
$.getJSON('https://gdata.youtube.com/feeds/api/videos', params,
|
|
|
function (data) {
|
|
|
@@ -136,9 +139,10 @@ function search(query) {
|
|
|
var items = [];
|
|
|
for (var i = 0; i < entries.length; i++) {
|
|
|
var title = entries[i].title.$t;
|
|
|
+ var escapedTitle = escape(title.replace("'", '\\\''));
|
|
|
var id = entries[i].media$group.yt$videoid.$t;
|
|
|
var html = '<li id="r_' + id + '">';
|
|
|
- html += '<a href="javascript:add(\'' + id + '\', \'' + escape(title) + '\')">';
|
|
|
+ html += '<a href="javascript:add(\'' + id + '\', \'' + escapedTitle + '\')">';
|
|
|
html += '<img src="http://i.ytimg.com/vi/' + id + '/1.jpg" alt="' + id + '">';
|
|
|
html += title;
|
|
|
html += '</a></li>';
|
|
|
@@ -154,18 +158,12 @@ function search(query) {
|
|
|
function add(id, title) {
|
|
|
var user = $('#user').val();
|
|
|
params = {
|
|
|
- 'pid': pid,
|
|
|
- 'yid': id,
|
|
|
- 'title': title,
|
|
|
- 'user': user
|
|
|
+ pid: pid,
|
|
|
+ yid: id,
|
|
|
+ title: title,
|
|
|
+ user: user
|
|
|
}
|
|
|
- $.getJSON('/add/', params,
|
|
|
- function (data) {
|
|
|
- if (data != 1)
|
|
|
- return;
|
|
|
- drawAdd(params);
|
|
|
- }
|
|
|
- );
|
|
|
+ $.getJSON('/add/', params);
|
|
|
}
|
|
|
|
|
|
function drawAdd(s) {
|
|
|
@@ -194,17 +192,15 @@ function drawAdd(s) {
|
|
|
function remove(id) {
|
|
|
var user = $('#user').val();
|
|
|
params = {
|
|
|
- 'pid': pid,
|
|
|
- 'yid': id,
|
|
|
+ pid: pid,
|
|
|
+ yid: id,
|
|
|
}
|
|
|
- $.getJSON('/remove/', params,
|
|
|
- function (data) {
|
|
|
- if (data == 1) {
|
|
|
- var element = $('#' + id);
|
|
|
- element.slideUp(100, function () {
|
|
|
- element.remove();
|
|
|
- });
|
|
|
- }
|
|
|
- }
|
|
|
- );
|
|
|
+ $.getJSON('/remove/', params);
|
|
|
+}
|
|
|
+
|
|
|
+function drawRemove(id) {
|
|
|
+ var element = $('#' + id);
|
|
|
+ element.slideUp(100, function () {
|
|
|
+ element.remove();
|
|
|
+ });
|
|
|
}
|