Skip to content

Commit

Permalink
Fixed banner and vk search
Browse files Browse the repository at this point in the history
  • Loading branch information
@buger
buger committed Mar 6, 2011
1 parent dfa1160 commit 39c5c6b
Show file tree
Hide file tree
Showing 6 changed files with 99 additions and 118 deletions.
12 changes: 9 additions & 3 deletions background.html
View file
Expand Up @@ -10,10 +10,10 @@
<script src="javascript/cache.js"></script>
<script src="javascript/utils.js?rnd=6"></script>
<script src="javascript/scrobbler.js?rnd=13"></script>
<script src="javascript/vk.js?rnd=16"></script>
<script src="javascript/vk.js?rnd=17"></script>
<script src="javascript/music_manager.js?rnd=20"></script>
<script src="javascript/browser_detect.js?rnd=1"></script>
<script src="javascript/banner.js?rnd=9"></script>
<script src="javascript/banner.js?rnd=15"></script>
<script>
function ease(x) {
return (1-Math.sin(Math.PI/2+x*Math.PI))/2;
Expand Down Expand Up @@ -196,7 +196,13 @@
search_pattern: search_pattern,
external_audio_search: window.localStorage["external_search"]})
})



if (!window.localStorage["show_options_first_time_1"]) {
window.localStorage["show_options_first_time_1"] = true;

chrome.tabs.create({url: chrome.extension.getURL("options.html")});
}
// _gaq.push(['_trackPageview']);
}
</script>
Expand Down
45 changes: 14 additions & 31 deletions javascript/banner.js
View file
Expand Up @@ -63,6 +63,7 @@
window.bannerManager = bannerManager;
}(window))

/*
// Fotocash
bannerManager.addBanner({
country: ["RU","UA"],
Expand Down Expand Up @@ -90,38 +91,7 @@ bannerManager.addBanner({
})
// Barners & Noble
bannerManager.addBanner({
country: ["-RU", "-UA", "*"],
html: '<a target="_blank" href="http://gan.doubleclick.net/gan_click?lid=41000000035057956&pubid=21000000000343434"><img src="http://gan.doubleclick.net/gan_impression?lid=41000000035057956&pubid=21000000000343434"/></a>'
})

bannerManager.addBanner({
country: ["-RU","*"],
html: '<a target="_blank" href="http://gan.doubleclick.net/gan_click?lid=41000000034500805&pubid=21000000000343434"><img src="http://gan.doubleclick.net/gan_impression?lid=41000000034500805&pubid=21000000000343434"/></a>'
})


// Cellhub
bannerManager.addBanner({
country: ["-RU", "-UA", "*"],
html: '<a target="_blank" href="http://gan.doubleclick.net/gan_click?lid=41000000035004521&pubid=21000000000343434"><img src="http://gan.doubleclick.net/gan_impression?lid=41000000035004521&pubid=21000000000343434"/></a>'
})
bannerManager.addBanner({
country: ["US"],
html: '<a target="_blank" href="http://gan.doubleclick.net/gan_click?lid=41000000034989899&pubid=21000000000343434"><img src="http://gan.doubleclick.net/gan_impression?lid=41000000034989899&pubid=21000000000343434"/></a>'
});

bannerManager.addBanner({
country: ["US"],
html: '<a target="_blank" href="http://gan.doubleclick.net/gan_impression?lid=41000000034989899&pubid=21000000000343434"><img src="http://gan.doubleclick.net/gan_impression?lid=41000000034931463&pubid=21000000000343434"/></a>'
});

bannerManager.addBanner({
country: ["US"],
html: '<a target="_blank" href="http://gan.doubleclick.net/gan_impression?lid=41000000034931463&pubid=21000000000343434"><img src="http://gan.doubleclick.net/gan_impression?lid=41000000034716287&pubid=21000000000343434"/></a>'
});
// 7digital
bannerManager.addBanner({
Expand All @@ -133,3 +103,16 @@ bannerManager.addBanner({
country: ["UK", "DE"],
html: "<a target='_blank' href='http://scripts.affiliatefuture.com/AFClick.asp?affiliateID=231381&merchantID=2473&programmeID=6574&mediaID=46651&tracking=&url=http://www.7digital.com/artists/radiohead/'><img border=0 src='http://banners.affiliatefuture.com/2473/46651.jpg'></a>"
});
/*
bannerManager.addBanner({
country: ["RU"],
html: "var RndNum4NoCash = Math.round(Math.random() * 1000000000); var ar_Tail='unknown';"+
"if (document.referrer) ar_Tail = escape(document.referrer);"+
"document.write("+
"'<iframe src=\"http://ad.adriver.ru/cgi-bin/erle.cgi?sid=171169&bn=0&target=blank&bt=1&pz=0&tail256='"+
" + ar_Tail + '&rnd=' + RndNum4NoCash +" +
"'\" frameborder=0 vspace=0 hspace=0 width=468 height=60"+
" marginwidth=0 marginheight=0 scrolling=no></iframe>');"
});
*/
2 changes: 1 addition & 1 deletion javascript/vk.js
View file
Expand Up @@ -170,7 +170,7 @@ var VK = {
console.log(results)

if(results.response){
var vk_tracks
var vk_tracks = []

if(results.response[1]){
vk_tracks.lastIndex = 0
Expand Down
2 changes: 1 addition & 1 deletion manifest.json
View file
@@ -1,6 +1,6 @@
{
"name": "Last.fm free music player",
"version": "2.9.20",
"version": "2.9.30",
"description": "!! Yes it plays music! Browser as a music player? Why not? Free music player for Google Chrome with Last.fm integration.",
"icons": {
"128": "lastfm_128.png"
Expand Down
133 changes: 58 additions & 75 deletions options.html
View file
Expand Up @@ -31,25 +31,12 @@
var search_pattern = window.localStrorage["search_pattern"];
} catch(e){}

if(search_provider)
document.getElementById(search_provider).checked = true;
else
document.getElementById('vkontakte_ru').checked = true;

if(search_provider == 'other' && search_pattern){
document.getElementById('search_pattern').value = search_pattern;
}

if(!window.localStorage['lastfm_session']){
document.getElementById('not_logged').style.display = ''
}


if(window.localStorage["external_search"] == "true"){
toggle_external_search(true, false)
document.getElementById('external_audio_search').checked = true
}

if(window.localStorage["skip_previews"] == "false" || window.localStorage["skip_previews"] == undefined){
document.getElementById('play_previews').checked = true
}
Expand All @@ -58,6 +45,9 @@
document.getElementById('show_notifications').checked = true
}

if(window.localStorage["show_banner"] == "true" || window.localStorage["show_banner"] == undefined){
document.getElementById('toggle_banner').checked = true
}
}

function showError(msg){
Expand All @@ -78,8 +68,6 @@
function onLoad(){
console.log("Token:", window.localStorage['lastfm_tesssion'])

search_settings.style.backgroundImage = "url("+chrome.extension.getURL('external_search.png')+")"

if(scrobbler._username){
document.getElementById("logged").style.display = ''
document.getElementById("username_display").innerHTML = scrobbler._username
Expand All @@ -88,28 +76,6 @@
restore_options()
}

function toggle_external_search(disable, update_storage){
if(update_storage == undefined)
update_storage = true

var elements = document.getElementById('options').querySelectorAll("input")

for(var i=0; i<elements.length; i++){
console.log(elements[i].disabled)

elements[i].disabled = !disable
}

var search_settings = document.getElementById('search_settings')
search_settings.style.color = disable ? "#333" : "#ccc"

document.forms[0].submit.disabled = !disable

console.log("Updating storage:", !disable)

if(update_storage)
window.localStorage["external_search"] = disable
}

function toggle_play_previews(play){
window.localStorage["skip_previews"] = !play
Expand All @@ -119,6 +85,15 @@
window.localStorage["show_notifications"] = show
}

function toggle_banner_func(show){
if (!show && confirm('This banner supports our project and helps us to develop it. Do you still want to disable banner?')) {
window.localStorage["show_banner"] = show
} else {
window.localStorage["show_banner"] = true
document.getElementById('toggle_banner').checked = true
}
}


</script>
<style>
Expand Down Expand Up @@ -167,6 +142,41 @@
background-repeat: no-repeat;
}

.helpus {
font-size: 28px;
color: blue;
}

.helpus a {
display: inline-block;
width: 260px;

font-size: 40px;

color: #333;

text-decoration: none;
}

h2.banner {
font-size: 16px;
font-weight: none;
padding: 0px;
margin: 0px;
color: #333;
padding-bottom: 10px;
}

.helpus h2 {
font-size: 30px;
color: #333;
text-align: center;
}

.helpus a:hover {
text-decoration: underline;
}

</style>
</head>
<body>
Expand Down Expand Up @@ -226,49 +236,22 @@ <h2 style="color:#333;">Last.fm free music player settings</h2>
<label style="font-size: 18px; margin-right: 0px; color: #333;" for="show_notifications">Display notifications:</label>
<input type="checkbox" id="show_notifications" onclick="toggle_notifications(this.checked)"/>
</div>
<div style="margin-bottom: 30px;">
<div style="margin-bottom: 20px;">
<label style="font-size: 18px; margin-right: 0px; color: #333;" for="play_previews">Try to play previews if track not found:</label>
<input type="checkbox" id="play_previews" onclick="toggle_play_previews(this.checked)"/>
</div>
<div>
<label style="font-size: 18px; margin-right: 0px; color: #333;" for="external_audio_search">Use external audio search:</label>
<input type="checkbox" id="external_audio_search" onclick="toggle_external_search(this.checked)"/>
<div style="border: 1px solid #ccc; width: 300px; padding: 5px; border-radius: 5px;">
<h2 class="banner">By showing banner you supporting our project. However you can disable it.</h2>
<label style="font-size: 18px; margin-right: 0px; color: #333;" for="toggle_banner">Show banner:</label>
<input type="checkbox" id="toggle_banner" onclick="toggle_banner_func(this.checked)" />
</div>
<h3>Choose search provider:</h3>
<ul id="options">
<li>
<input type="radio" name="search_provider" id="vkontakte_ru" value="http://vkontakte.ru/gsearch.php?section=audio&q=%s" disabled="disabled"/>
<img src="http://www.vkontakte.ru/favicon.ico" />
<label for="vkontakte_ru">vkontakte.ru</label>
</li>
<li>
<input type="radio" name="search_provider" id="vk_com" value="http://vk.com/gsearch.php?section=audio&q=%s" disabled="disabled"/>
<img src="http://www.vk.com/images/faviconvk.ico" />
<label for="vk_com">vk.com</label>
</li>
<li>
<input type="radio" name="search_provider" id="vpleer_ru" value="http://vpleer.ru/?q=%s" disabled="disabled"/>
<label for="vpleer_ru">vpleer.ru</label>
</li>
<li>
<input type="radio" name="search_provider" id="prostopleer_com" value="http://prostopleer.com/#/search?q=%s" disabled="disabled"/>
<img src="http://prostopleer.com/favicon.ico"/>
<label for="prostopleer_com">prostopleer.com</label>
</li>
<li>
<input type="radio" name="search_provider" id="grooveshark_com" value="http://listen.grooveshark.com/#/search/songs/?query=%s" disabled="disabled"/>
<img src="http://www.grooveshark.com/favicon.ico"/>
<label for="grooveshark_com">grooveshark.com</label>
</li>
<li>
<input type="radio" name="search_provider" id="other" disabled="disabled"/>
<input type="text" disabled="disabled" id="search_pattern" name="search_pattern" style="width: 300px; border: 1px solid #ccc" onfocus="document.getElementById('other').checked = true"/>
<br/>
<span style="margin-left: 25px; color: #666; font-size: 12px">http://mysite.com/search?q=%s</span>
</li>
</ul>
<input type="submit" value="Save" name="submit" onclick="this.value = 'Saving...';" style="width: 100px; padding: 5px;" disabled="disabled"/>
<div style="position: absolute; top: 230px; left: 50px" class="helpus">
<h2>Your support keeps us on the air!</h2>
<div><a target="_blank" href="http://money.yandex.ru/">Yandex.Money</a> 41001903998889</div>
<div><a target="_blank" href="http://www.webmoney.ru/">Webmoney</a> Z466954938255, R296708374313</div>
<div><a target="_blank" href="http://www.moneybookers.com/" title="Moneybrookers">Moneybrookers</a> leonsbox@gmail.com</div>
</div>
</div>
</form>
<div style="clear: both">&nbsp;</div>

Expand Down
23 changes: 16 additions & 7 deletions popup.html
View file
Expand Up @@ -375,13 +375,12 @@

if (track) {
var keywords = track.artist + ' ' + track.song;
keywords = encodeURIComponent(keywords);
keywords = encodeURIComponent(keywords).replace("'",'');

if (banner_manager.country === 'US') {
var url = "http://www.amazon.com/gp/search?ie=UTF8&keywords="+keywords+"&tag=chromus-20&index=digital-music&linkCode=ur2&camp=1789&creative=9325";
} else {
var url = "http://www.7digital.com/search/tracks?search="+keywords+"&searchtype=global&submit=Search&page=1";
url = "http://scripts.affiliatefuture.com/AFClick.asp?affiliateID=231381&merchantID=2473&programmeID=6574&mediaID=0&tracking=&url=" + url;
var url = "http://www.amazon.com/gp/search?ie=UTF8&keywords="+keywords+"&tag=chromus-20&index=music&linkCode=ur2&camp=1789&creative=9325";
}

chrome.tabs.create({url: url});
Expand All @@ -395,10 +394,11 @@
}

function getBanner() {
var banner = banner_manager.getBanner();
var show_banner = window.localStorage["show_banner"] == "true" || window.localStorage["show_banner"] == undefined;

if (banner) {
if (banner.match(/\<script/)) {
var banner = banner_manager.getBanner();
if (show_banner && banner) {
if (banner.match(/\<script/) || banner.match(/document\.write/)) {
var script = document.createElement('script');
script.type = 'text/javascript';
script.innerHTML = banner;
Expand All @@ -408,7 +408,7 @@
}
} else {
$('.banner').remove();
}
}

$('.banner').live('.click', function(){
_gaq.push(['_trackEvent', 'banners', banner]);
Expand Down Expand Up @@ -579,6 +579,15 @@
})();
}
</script>
<script type="text/javascript">
(function(){
var bsa = document.createElement('script');
bsa.type = 'text/javascript';
bsa.async = true;
bsa.src = '//s3.buysellads.com/ac/bsa.js';
(document.getElementsByTagName('head')[0]||document.getElementsByTagName('body')[0]).appendChild(bsa);
})();
</script>
<script>
$(function() {
$("#volume-slider").slider({
Expand Down

0 comments on commit 39c5c6b

Please sign in to comment.