Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed for new mtgox api. #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ Add the unpacked source by visiting `chrome://extensions/` in Chrome / Chromium.
Or click on the "ADD TO CHROME" link on the webstore page.



119 changes: 10 additions & 109 deletions bg.html
Original file line number Diff line number Diff line change
@@ -1,109 +1,10 @@
<html>
<head>

<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
</head>
<body>
<script>
defaultDisplay = window.localStorage.getItem('default-display');
if (defaultDisplay == null){
defaultDisplay = 'mtgox-buy';
window.localStorage.setItem('default-display', 'mtgox-buy');
}
chrome.browserAction.setBadgeBackgroundColor({color:[0, 0, 0, 150]});
updateTicker();
setTimeout("updateTicker()", 1000);
setInterval("updateTicker()", 60000);

chrome.browserAction.onClicked.addListener(function(tab) {
updateTicker();
});

function updateTicker(){
getMtgox();
getBritcoin();
getTradehill();
getBitomat();
getBitcoin7();
chrome.browserAction.setBadgeText({ text: String(window.localStorage.getItem(window.localStorage.getItem('default-display')))});
}
function getMtgox() {
$.getJSON('https://mtgox.com/code/data/ticker.php', function(data) {
window.localStorage.setItem('mtgox-high',Number(data["ticker"]["high"]));
window.localStorage.setItem('mtgox-low',Number(data["ticker"]["low"]));
window.localStorage.setItem('mtgox-buy',Number(data["ticker"]["buy"]));
window.localStorage.setItem('mtgox-sell',Number(data["ticker"]["sell"]));
});
}

function getBitcoin7() {
$.getJSON('http://bitcoin7.com/api/charts/USD/ticker.json', function(data) {
window.localStorage.setItem('bitcoin7-high',Number(data["ticker"]["high"]));
window.localStorage.setItem('bitcoin7-low',Number(data["ticker"]["low"]));
window.localStorage.setItem('bitcoin7-buy',Number(data["ticker"]["buy"]));
window.localStorage.setItem('bitcoin7-sell',Number(data["ticker"]["sell"]));
});
}

function getBritcoin() {
$.getJSON('https://britcoin.co.uk/api/ticker.php', function(data) {
window.localStorage.setItem('britcoin-buy',Number(data["ticker"]["buy"]));
window.localStorage.setItem('britcoin-sell',Number(data["ticker"]["sell"]));
});
$.getJSON('https://britcoin.co.uk/api/getTrades.php', function(data) {
var bounds = parseTrades(data);
minPrice = bounds[0]
maxPrice = bounds[1]
window.localStorage.setItem('britcoin-high', Number(maxPrice));
window.localStorage.setItem('britcoin-low',Number(minPrice));
});
}

function getTradehill() {
$.getJSON('https://api.tradehill.com/APIv1/USD/Ticker', function(data) {
window.localStorage.setItem('tradehill-buy',Number(data["ticker"]["buy"]));
window.localStorage.setItem('tradehill-sell',Number(data["ticker"]["sell"]));
});
$.getJSON('https://api.tradehill.com/APIv1/USD/Trades', function(data) {
var bounds = parseTrades(data);
minPrice = bounds[0]
maxPrice = bounds[1]
window.localStorage.setItem('tradehill-high', Number(maxPrice));
window.localStorage.setItem('tradehill-low',Number(minPrice));
});
}

function getBitomat() {
$.getJSON('https://bitomat.pl/code/data/ticker.php', function(data) {
window.localStorage.setItem('bitomat-buy',Number(data["ticker"]["buy"]));
window.localStorage.setItem('bitomat-sell',Number(data["ticker"]["sell"]));
});
$.getJSON('https://bitomat.pl/code/data/gettrades.php', function(data) {
var bounds = parseTrades(data);
minPrice = bounds[0]
maxPrice = bounds[1]
window.localStorage.setItem('bitomat-high', Number(maxPrice));
window.localStorage.setItem('bitomat-low',Number(minPrice));
});
}

function parseTrades(data) {
prices = [];
minPrice = Number(data[0]['price']);
maxPrice = Number(data[0]['price']);
for (var x in data){
price = Number(data[x]['price']);
prices.push(price);
if (price < minPrice) {
minPrice = price;
}
if (price > maxPrice) {
maxPrice = price;
}
}
return [minPrice, maxPrice];
}

</script>
</body>
</html>
<html>
<head>

<script type="text/javascript" src="jquery.min.js"></script>
</head>
<body>
<script src='bg.js'></script>

</body>
</html>
42 changes: 42 additions & 0 deletions bg.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
defaultDisplay = window.localStorage.getItem('default-display');
if (defaultDisplay == null){
defaultDisplay = 'mtgox-buy';
window.localStorage.setItem('default-display', 'mtgox-buy');
}
chrome.browserAction.setBadgeBackgroundColor({color:[0, 0, 0, 150]});
updateTicker();
setTimeout(function() {updateTicker();}, 1000);
setInterval(function() {updateTicker();}, 10000);

chrome.browserAction.onClicked.addListener(function(tab) {
updateTicker();
});

function updateTicker(){
getMtgox();
chrome.browserAction.setBadgeText({ text: String(window.localStorage.getItem(window.localStorage.getItem('default-display')))});
}
function getMtgox() {
$.getJSON('https://data.mtgox.com/code/data/ticker.php', function(data) {
window.localStorage.setItem('mtgox-high',Number(data["ticker"]["high"]));
window.localStorage.setItem('mtgox-low',Number(data["ticker"]["low"]));
window.localStorage.setItem('mtgox-buy',Number(data["ticker"]["buy"]));
window.localStorage.setItem('mtgox-sell',Number(data["ticker"]["sell"]));
});
}
function parseTrades(data) {
prices = [];
minPrice = Number(data[0]['price']);
maxPrice = Number(data[0]['price']);
for (var x in data){
price = Number(data[x]['price']);
prices.push(price);
if (price < minPrice) {
minPrice = price;
}
if (price > maxPrice) {
maxPrice = price;
}
}
return [minPrice, maxPrice];
}
18 changes: 18 additions & 0 deletions jquery.min.js

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions manifest.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"background_page": "bg.html",
"background": {
"page": "bg.html"
},
"browser_action": {
"default_icon": "bcicon.png",
"default_title": "Bitcoin Ticker",
"popup": "popup.html"
"default_popup": "popup.html"
},
"content_security_policy": "script-src 'self'; object-src 'self'",
"description": "Keep track of current bitcoin prices",
"name": "Bitcoin Ticker",
"permissions": [
"https://mtgox.com/*",
"https://britcoin.co.uk/*",
"https://api.tradehill.com/*",
"https://bitomat.pl/*",
"http://bitcoin7.com/*"
"https://data.mtgox.com/*"
],
"version": "0.3.2"
"version": "0.3.3",
"manifest_version": 2
}
92 changes: 3 additions & 89 deletions popup.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<link href='http://fonts.googleapis.com/css?family=Maven+Pro' rel='stylesheet' type='text/css'>
</head>
<body onload="startUp()">
<body>

<style>
body {
Expand Down Expand Up @@ -45,7 +45,7 @@
</style>


<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
<script type="text/javascript" src="jquery.min.js"></script>

<img src="bcicon.png"/>

Expand All @@ -57,30 +57,6 @@
<td><span id="mtgox-buy"></span></td>
<td><span id="mtgox-sell"></span></td>
</tr>
<tr><td><a href="#" onclick="chrome.tabs.create({'url': 'https://www.tradehill.com/'})">TradeHill</a></td>
<td><span id="tradehill-high"></span></td>
<td><span id="tradehill-low"></span></td>
<td><span id="tradehill-buy"></span></td>
<td><span id="tradehill-sell"></span></td>
</tr>
<tr><td><a href="#" onclick="chrome.tabs.create({'url': 'https://bitcoin7.com/'})">Bitcoin7</a></td>
<td><span id="bitcoin7-high"></span></td>
<td><span id="bitcoin7-low"></span></td>
<td><span id="bitcoin7-buy"></span></td>
<td><span id="bitcoin7-sell"></span></td>
</tr>
<tr><td><a href="#" onclick="chrome.tabs.create({'url': 'https://bitomat.pl/'})">Bitomat</a></td>
<td><span id="bitomat-high"></span></td>
<td><span id="bitomat-low"></span></td>
<td><span id="bitomat-buy"></span></td>
<td><span id="bitomat-sell"></span></td>
</tr>
<tr><td><a href="#" onclick="chrome.tabs.create({'url': 'https://britcoin.co.uk/'})">BritCoin</a></td>
<td><span id="britcoin-high"></span></td>
<td><span id="britcoin-low"></span></td>
<td><span id="britcoin-buy"></span></td>
<td><span id="britcoin-sell"></span></td>
</tr>
</table>

<p>Default Value :
Expand All @@ -89,74 +65,12 @@
<option value="mtgox-low">MTGox Low</option>
<option value="mtgox-buy">MTGox Buy</option>
<option value="mtgox-sell">MTGox Sell</option>
<option value="tradehill-high">TradeHill High</option>
<option value="tradehill-low">TradeHill Low</option>
<option value="tradehill-buy">TradeHill Buy</option>
<option value="tradehill-sell">TradeHill Sell</option>
<option value="bitcoin7-high">BitCoin7 High</option>
<option value="bitcoin7-low">BitCoin7 Low</option>
<option value="bitcoin7-buy">BitCoin7 Buy</option>
<option value="bitcoin7-sell">BitCoin7 Sell</option>
<option value="bitomat-high">Bitomat High</option>
<option value="bitomat-low">Bitomat Low</option>
<option value="bitomat-buy">Bitomat Buy</option>
<option value="bitomat-sell">Bitomat Sell</option>
<option value="britcoin-high">BritCoin High</option>
<option value="britcoin-low">BritCoin Low</option>
<option value="britcoin-buy">BritCoin Buy</option>
<option value="britcoin-sell">BritCoin Sell</option>
</select>
</p>

<p class="info">Comments/Suggestions <a href="#" onclick="chrome.tabs.create({'url': 'http://twitter.com/MTerzza'})">@MTerzza</a></p>

<script>
function startUp() {
setTimeout('updateValues();', 100);
defaultDisplay = window.localStorage.getItem('default-display');
var sel = document.getElementsByTagName('select')[0]
for (var i=0;i<sel.options.length;i++) {
if (sel.options[i].value == defaultDisplay) {
sel.selectedIndex = i;
}
};
}

function displayChanged() {
var sel = document.getElementsByTagName('select')[0]
newValue = sel.options[sel.selectedIndex].value;
window.localStorage.setItem('default-display', newValue);
chrome.extension.getBackgroundPage().updateTicker();
}

function updateValues(){
chrome.extension.getBackgroundPage().updateTicker();
$('#mtgox-high').html("&#36;&nbsp;"+Number(window.localStorage.getItem('mtgox-high')).toFixed(2));
$('#mtgox-low').html("&#36;&nbsp;"+Number(window.localStorage.getItem('mtgox-low')).toFixed(2));
$('#mtgox-buy').html("&#36;&nbsp;"+Number(window.localStorage.getItem('mtgox-buy')).toFixed(2));
$('#mtgox-sell').html("&#36;&nbsp;"+Number(window.localStorage.getItem('mtgox-sell')).toFixed(2));

$('#britcoin-high').html("&#163;&nbsp;"+Number(window.localStorage.getItem('britcoin-high')).toFixed(2));
$('#britcoin-low').html("&#163;&nbsp;"+Number(window.localStorage.getItem('britcoin-low')).toFixed(2));
$('#britcoin-buy').html("&#163;&nbsp;"+Number(window.localStorage.getItem('britcoin-buy')).toFixed(2));
$('#britcoin-sell').html("&#163;&nbsp;"+Number(window.localStorage.getItem('britcoin-sell')).toFixed(2));

$('#bitcoin7-high').html("&#36;&nbsp;"+Number(window.localStorage.getItem('bitcoin7-high')).toFixed(2));
$('#bitcoin7-low').html("&#36;&nbsp;"+Number(window.localStorage.getItem('bitcoin7-low')).toFixed(2));
$('#bitcoin7-buy').html("&#36;&nbsp;"+Number(window.localStorage.getItem('bitcoin7-buy')).toFixed(2));
$('#bitcoin7-sell').html("&#36;&nbsp;"+Number(window.localStorage.getItem('bitcoin7-sell')).toFixed(2));

$('#tradehill-high').html("&#36;&nbsp;"+Number(window.localStorage.getItem('tradehill-high')).toFixed(2));
$('#tradehill-low').html("&#36;&nbsp;"+Number(window.localStorage.getItem('tradehill-low')).toFixed(2));
$('#tradehill-buy').html("&#36;&nbsp;"+Number(window.localStorage.getItem('tradehill-buy')).toFixed(2));
$('#tradehill-sell').html("&#36;&nbsp;"+Number(window.localStorage.getItem('tradehill-sell')).toFixed(2));

$('#bitomat-high').html("zł&nbsp;"+Number(window.localStorage.getItem('bitomat-high')).toFixed(2));
$('#bitomat-low').html("zł&nbsp;"+Number(window.localStorage.getItem('bitomat-low')).toFixed(2));
$('#bitomat-buy').html("zł&nbsp;"+Number(window.localStorage.getItem('bitomat-buy')).toFixed(2));
$('#bitomat-sell').html("zł&nbsp;"+Number(window.localStorage.getItem('bitomat-sell')).toFixed(2));
}
</script>
<script src='popup.js'></script>

</body>
</html>
29 changes: 29 additions & 0 deletions popup.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
function startUp() {
setTimeout(function() {updateValues();}, 100);
defaultDisplay = window.localStorage.getItem('default-display');
var sel = document.getElementsByTagName('select')[0]
for (var i=0;i<sel.options.length;i++) {
if (sel.options[i].value == defaultDisplay) {
sel.selectedIndex = i;
}
};
}

function displayChanged() {
var sel = document.getElementsByTagName('select')[0]
newValue = sel.options[sel.selectedIndex].value;
window.localStorage.setItem('default-display', newValue);
chrome.extension.getBackgroundPage().updateTicker();
}

function updateValues(){
chrome.extension.getBackgroundPage().updateTicker();
$('#mtgox-high').html("&#36;&nbsp;"+Number(window.localStorage.getItem('mtgox-high')).toFixed(2));
$('#mtgox-low').html("&#36;&nbsp;"+Number(window.localStorage.getItem('mtgox-low')).toFixed(2));
$('#mtgox-buy').html("&#36;&nbsp;"+Number(window.localStorage.getItem('mtgox-buy')).toFixed(2));
$('#mtgox-sell').html("&#36;&nbsp;"+Number(window.localStorage.getItem('mtgox-sell')).toFixed(2));
}

document.addEventListener('DOMContentLoaded', function() {
startUp();
});