diff --git a/bilibili_injected.js b/bilibili_injected.js
index cda2c68..a0747c1 100755
--- a/bilibili_injected.js
+++ b/bilibili_injected.js
@@ -456,36 +456,40 @@
if (localStorage.getItem('bilimac_player_type') == 'force') {
biliHelper.switcher.set('bilimac');
}
- var helperBlock = $("
哔哩哔哩助手哔哩哔哩助手 " + biliHelper.version + " by
@啾咕咕www "),
- blockInfo = helperBlock.find('.info');
- biliHelper.mainBlock = blockInfo.find('.main');
- biliHelper.mainBlock.infoSection = $('视频信息
aid: ' + biliHelper.avid + 'pg: ' + biliHelper.page + '
');
- biliHelper.mainBlock.append(biliHelper.mainBlock.infoSection);
- if (biliHelper.redirectUrl && biliHelper.redirectUrl != "undefined") {
- biliHelper.mainBlock.redirectSection = $('');
- biliHelper.mainBlock.append(biliHelper.mainBlock.redirectSection);
- }
- biliHelper.mainBlock.switcherSection = $('');
- biliHelper.mainBlock.switcherSection.find('p').append($('原始播放器Bilibili Mac 客户端SWF 播放器Iframe 播放器HTML5 播放器').click(function() {
- biliHelper.switcher[$(this).attr('type')]();
- }));
- if (biliHelper.redirectUrl) {
- biliHelper.mainBlock.switcherSection.find('a[type="original"]').addClass('hidden');
- }
- if (localStorage.getItem('bilimac_player_type')) {
- biliHelper.mainBlock.switcherSection.find('a[type="bilimac"]').removeClass('hidden');
+ if (!biliHelper.genPage) {
+ var helperBlock = $("哔哩哔哩助手哔哩哔哩助手 " + biliHelper.version + " by
@啾咕咕www "),
+ blockInfo = helperBlock.find('.info');
+ biliHelper.mainBlock = blockInfo.find('.main');
+ biliHelper.mainBlock.infoSection = $('视频信息
aid: ' + biliHelper.avid + 'pg: ' + biliHelper.page + '
');
+ biliHelper.mainBlock.append(biliHelper.mainBlock.infoSection);
+ if (biliHelper.redirectUrl && biliHelper.redirectUrl != "undefined") {
+ biliHelper.mainBlock.redirectSection = $('');
+ biliHelper.mainBlock.append(biliHelper.mainBlock.redirectSection);
+ }
+ biliHelper.mainBlock.switcherSection = $('');
+ biliHelper.mainBlock.switcherSection.find('p').append($('原始播放器Bilibili Mac 客户端SWF 播放器Iframe 播放器HTML5 播放器').click(function() {
+ biliHelper.switcher[$(this).attr('type')]();
+ }));
+ if (biliHelper.redirectUrl) {
+ biliHelper.mainBlock.switcherSection.find('a[type="original"]').addClass('hidden');
+ }
+ if (localStorage.getItem('bilimac_player_type')) {
+ biliHelper.mainBlock.switcherSection.find('a[type="bilimac"]').removeClass('hidden');
+ }
+ biliHelper.mainBlock.append(biliHelper.mainBlock.switcherSection);
+ biliHelper.mainBlock.downloaderSection = $('');
+ biliHelper.mainBlock.append(biliHelper.mainBlock.downloaderSection);
+ biliHelper.mainBlock.querySection = $('');
+ biliHelper.mainBlock.append(biliHelper.mainBlock.querySection);
+ helperBlock.find('.title').click(function() {
+ blockInfo.toggleClass('active');
+ });
+ biliHelper.switcher.set('original');
+ setTimeout(function() {
+ $('.player-wrapper .arc-tool-bar').append(helperBlock);
+ }, 100);
}
- biliHelper.mainBlock.append(biliHelper.mainBlock.switcherSection);
- biliHelper.mainBlock.downloaderSection = $('');
- biliHelper.mainBlock.append(biliHelper.mainBlock.downloaderSection);
- biliHelper.mainBlock.querySection = $('');
- biliHelper.mainBlock.append(biliHelper.mainBlock.querySection);
- helperBlock.find('.title').click(function() {
- blockInfo.toggleClass('active');
- });
- biliHelper.switcher.set('original');
- if (!biliHelper.genPage) $('.player-wrapper .arc-tool-bar').append(helperBlock);
- if (biliHelper.replaceEnabled && localStorage.getItem('bilimac_player_type') != 'force' &&
+ if (!biliHelper.genPage && biliHelper.replaceEnabled && localStorage.getItem('bilimac_player_type') != 'force' &&
(($('#bofqi object').length > 0 && $('#bofqi object').attr('data') != 'http://static.hdslb.com/play.swf' && $('#bofqi object').attr('data') != 'https://static-s.bilibili.com/play.swf' && $('#bofqi object').attr('data') != 'http://static.hdslb.com/letv.swf' && $('#bofqi object').attr('data') != 'http://static.hdslb.com/play_old.swf') ||
($('#bofqi embed').length > 0 && $('#bofqi embed').attr('src') != 'http://static.hdslb.com/play.swf' && $('#bofqi embed').attr('src') != 'https://static-s.bilibili.com/play.swf' && $('#bofqi embed').attr('src') != 'http://static.hdslb.com/letv.swf' && $('#bofqi embed').attr('src') != 'http://static.hdslb.com/play_old.swf') ||
($('#bofqi iframe').length > 0 && ($('#bofqi iframe').attr('src').indexOf('bilibili.com') < 0 || $('#bofqi iframe').attr('src').indexOf('iqiyi') > 0)) || ($('#bofqi object').length + $('#bofqi embed').length + $('#bofqi iframe').length == 0))) {
@@ -494,7 +498,7 @@
} else {
biliHelper.replacePlayer = false;
}
- if (biliHelper.favorHTML5) {
+ if (!biliHelper.genPage && biliHelper.favorHTML5) {
$('#bofqi').html('');
$('#bofqi').find('#player_placeholder').css({
background: 'url(' + biliHelper.videoPic + ') 50% 50% / cover no-repeat',
@@ -503,7 +507,7 @@
visibility: 'visible'
});
}
- if (biliHelper.replacePlayer || biliHelper.favorHTML5 && localStorage.getItem('bilimac_player_type') != 'force') {
+ if (biliHelper.replacePlayer || biliHelper.favorHTML5 && localStorage.getItem('bilimac_player_type') != 'force' && !biliHelper.genPage) {
var replaceNotice = $('正在尝试替换播放器…取消
');
replaceNotice.find('#cancel-replacing').click(function() {
$('#loading-notice').fadeOut(300);
@@ -570,68 +574,70 @@
}
} else {
biliHelper.cid = videoInfo.cid;
- biliHelper.mainBlock.infoSection.find('p').append($('cid: ' + biliHelper.cid + ''));
- biliHelper.mainBlock.commentSection = $('');
- biliHelper.mainBlock.append(biliHelper.mainBlock.commentSection);
- $.get('http://comment.bilibili.com/' + biliHelper.cid + '.xml', function(response) {
- biliHelper.comments = response.getElementsByTagName('d');
- var control = $('');
- control.find('.b-input').keyup(function() {
- var keyword = control.find('input').val(),
- regex = new RegExp(parseSafe(keyword), 'gi');
- control.find('ul.list').html('请选择需要查询的弹幕');
- if (control.find('.b-slt .txt').text() != '请选择需要查询的弹幕' && keyword.trim() != '') control.find('.b-slt .txt').html(parseSafe(control.find('.b-slt .txt').text()).replace(regex, function(kw) {
- return '' + kw + '';
- }));
- if (keyword.trim() != '') {
- control.find('.b-slt .txt').text(control.find('.b-slt .txt').text());
- }
- for (var i = 0; i < biliHelper.comments.length; i++) {
- var node = biliHelper.comments[i],
- text = node.childNodes[0];
- if (text && node && regex.test(text.nodeValue)) {
- text = text.nodeValue;
- var commentData = node.getAttribute('p').split(','),
- sender = commentData[6],
- time = parseTime(parseInt(commentData[0]) * 1000);
- control.find('ul.list').append($('').data('sender', sender).html('[' + time + '] ' + (keyword.trim() == '' ? parseSafe(text) : parseSafe(text).replace(regex, function(kw) {
- return '' + kw + '';
- }))));
+ if (!biliHelper.genPage) {
+ biliHelper.mainBlock.infoSection.find('p').append($('cid: ' + biliHelper.cid + ''));
+ biliHelper.mainBlock.commentSection = $('');
+ biliHelper.mainBlock.append(biliHelper.mainBlock.commentSection);
+ $.get('http://comment.bilibili.com/' + biliHelper.cid + '.xml', function(response) {
+ biliHelper.comments = response.getElementsByTagName('d');
+ var control = $('');
+ control.find('.b-input').keyup(function() {
+ var keyword = control.find('input').val(),
+ regex = new RegExp(parseSafe(keyword), 'gi');
+ control.find('ul.list').html('请选择需要查询的弹幕');
+ if (control.find('.b-slt .txt').text() != '请选择需要查询的弹幕' && keyword.trim() != '') control.find('.b-slt .txt').html(parseSafe(control.find('.b-slt .txt').text()).replace(regex, function(kw) {
+ return '' + kw + '';
+ }));
+ if (keyword.trim() != '') {
+ control.find('.b-slt .txt').text(control.find('.b-slt .txt').text());
}
- }
- });
- control.find('.b-input').keyup();
- SelectModule.bind(control.find('div.b-slt'), {
- onChange: function(item) {
- var sender = $(item[0]).data('sender');
- control.find('.result').text('查询中…');
- if (sender.indexOf('D') == 0) {
- control.find('.result').text('游客弹幕');
- return;
+ for (var i = 0; i < biliHelper.comments.length; i++) {
+ var node = biliHelper.comments[i],
+ text = node.childNodes[0];
+ if (text && node && regex.test(text.nodeValue)) {
+ text = text.nodeValue;
+ var commentData = node.getAttribute('p').split(','),
+ sender = commentData[6],
+ time = parseTime(parseInt(commentData[0]) * 1000);
+ control.find('ul.list').append($('').data('sender', sender).html('[' + time + '] ' + (keyword.trim() == '' ? parseSafe(text) : parseSafe(text).replace(regex, function(kw) {
+ return '' + kw + '';
+ }))));
+ }
}
- $.get('http://biliquery.typcn.com/api/user/hash/' + sender, function(data) {
- if (!data || data.error != 0 || typeof data.data != 'object' || !data.data[0].id) {
- control.find('.result').text('查询失败, 发送用户可能已被管理员删除.');
- } else {
- var uid = parseSafe(data.data[0].id);
- control.find('.result').html('发送者 UID: ' + uid + '');
- $.getJSON('http://api.bilibili.cn/userinfo?mid=' + uid + '&type=json', function(data) {
- if (data.code == 0) {
- control.find('.result').html('发送者: ' + parseSafe(data.name) + '');
- var s = document.createElement('script');
- s.appendChild(document.createTextNode('UserCard.bind($("#bilibili_helper .query .result"));'));
- document.body.appendChild(s);
- s.parentNode.removeChild(s);
- }
- });
+ });
+ control.find('.b-input').keyup();
+ SelectModule.bind(control.find('div.b-slt'), {
+ onChange: function(item) {
+ var sender = $(item[0]).data('sender');
+ control.find('.result').text('查询中…');
+ if (sender.indexOf('D') == 0) {
+ control.find('.result').text('游客弹幕');
+ return;
}
- }, 'json').fail(function() {
- control.find('.result').text('查询失败, 无法连接到服务器 :(');
- });
- }
- });
- biliHelper.mainBlock.querySection.find('p').empty().append(control);
- }, 'xml');
+ $.get('http://biliquery.typcn.com/api/user/hash/' + sender, function(data) {
+ if (!data || data.error != 0 || typeof data.data != 'object' || !data.data[0].id) {
+ control.find('.result').text('查询失败, 发送用户可能已被管理员删除.');
+ } else {
+ var uid = parseSafe(data.data[0].id);
+ control.find('.result').html('发送者 UID: ' + uid + '');
+ $.getJSON('http://api.bilibili.cn/userinfo?mid=' + uid + '&type=json', function(data) {
+ if (data.code == 0) {
+ control.find('.result').html('发送者: ' + parseSafe(data.name) + '');
+ var s = document.createElement('script');
+ s.appendChild(document.createTextNode('UserCard.bind($("#bilibili_helper .query .result"));'));
+ document.body.appendChild(s);
+ s.parentNode.removeChild(s);
+ }
+ });
+ }
+ }, 'json').fail(function() {
+ control.find('.result').text('查询失败, 无法连接到服务器 :(');
+ });
+ }
+ });
+ biliHelper.mainBlock.querySection.find('p').empty().append(control);
+ }, 'xml');
+ }
}
if (biliHelper.genPage) {
tagList = "";
弹幕下载
下载 XML 格式弹幕