Akkariin/listen1_chrome_extension
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Mirror fix"

Browse Source 
This reverts commit 0c77b4ce6c.
This commit is contained in:
Dumeng 2017-12-15 15:42:12 +08:00
parent 0c77b4ce6c
commit 239f018f70
3 changed files with 12 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
css/player.css
View File

@ -2,28 +2,6 @@ a {
cursor: pointer;
}
*::-webkit-scrollbar-track
{
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
border-radius: 10px;
background-color: #F5F5F5;
}
*::-webkit-scrollbar
{
width: 12px;
background-color: #F5F5F5;
border-radius: 10px;
}
*::-webkit-scrollbar-thumb
{
border-radius: 10px;
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3);
background-color: #555;
}
.shadow {
position: fixed;
background: rgba(30,30,30,0.9);
@ -114,20 +92,19 @@ a {
}
.site-wrapper {
width:1000px;
margin:0 auto 0 auto;
width:100%;
overflow:hidden;
top: 0; left: 0; bottom: 0; right: 0;
position: absolute;
position: absolute;
padding-left: 17px;
}
.site-wrapper-innerd {
overflow-y: scroll;
margin: 90px auto 0 auto;
margin-top: 90px;
/* uncomment the line below will hide the scroll bar */
/*padding-right: 17px;*/
box-sizing: content-box;
width: 1000px;
box-sizing:content-box;
width:100%;
background-color: #333;
}
@ -1105,4 +1082,4 @@ li {
.settings-content {
padding: 20px;
}
}

3
js/app.js
View File

@ -333,10 +333,9 @@
'Content-Type': 'application/x-www-form-urlencoded'
}
}).success(function() {
$scope.showPlaylist($scope.list_id);
Notification.success('合并歌单成功');
$scope.closeDialog();
$scope.popWindow();
$scope.showPlaylist($scope.list_id);
});
};

20
js/loweb.js
View File

@ -67,7 +67,7 @@ function($rootScope, $log, $http, $httpParamSerializerJQLike) {
var url = '/playlist?list_id=' + list_id;
return {
success: function(fn) {
provider.get_playlist(url, $http, $httpParamSerializerJQLike).success(function(data){
provider.get_playlist(url, $http, $httpParamSerializerJQLike).success(function(data){
myplaylist.save_myplaylist(data);
fn();
});
@ -146,21 +146,9 @@ function($rootScope, $log, $http, $httpParamSerializerJQLike) {
if (request.url.search('/merge_playlist') != -1) {
var source = getParameterByName('source', url+'?'+request.data);
var target = getParameterByName('target', url+'?'+request.data);
var tarData = (localStorage.getObject(target)).tracks;
var srcData = (localStorage.getObject(source)).tracks;
let isInSourceList = false;
for(var i in tarData){
isInSourceList = false;
for(var j in srcData){
if(tarData[i].id==srcData[j].id){
isInSourceList = true;
console.log(tarData[i]);
break;
}
};
if(!isInSourceList){
myplaylist.add_myplaylist(source, tarData[i]);
};
var data = localStorage.getObject(target);
for(var i in data.tracks){
myplaylist.add_myplaylist(source, data.tracks[i]);
};
return {
success: function(fn) {