Skip to content

Commit

Permalink
open wallet in new window
Browse files Browse the repository at this point in the history
  • Loading branch information
Joe Looney authored and Joe Looney committed Nov 21, 2015
1 parent 9cab87f commit c24dcd5
Show file tree
Hide file tree
Showing 7 changed files with 96 additions and 12 deletions.
Binary file added Chrome Extension/images/expand-icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Chrome Extension/images/network-icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 5 additions & 2 deletions Chrome Extension/main.css
Expand Up @@ -14,6 +14,7 @@ body
width: 320px;
min-height: 420px;
max-height: 700px;
height: 100%;
margin: 5px 2px 5px 2px;
background-color: #fff;
}
Expand Down Expand Up @@ -594,12 +595,14 @@ a {
#footer {

width: 100%;
padding: 0 10px 5px 0;
padding: 5px 10px 5px 0;
text-align: right;
bottom: 0;
height: 25px;
height: 30px;
color: #616161;
font-weight: bold;
position: fixed;
background-color: #fff;

}
#refreshWallet {
Expand Down
21 changes: 17 additions & 4 deletions Chrome Extension/popup.html
Expand Up @@ -353,15 +353,17 @@
-->


<a href="#" id="bvamseedbutton">

<!--
<a href="#" id="openinwindowbutton">
<div class="col-xs-4 toolicon activetool" align="center">
<div style="height: 48px; width: 48px;"><div style="margin: 5px auto;"><img src="images/ninja-icon.png" height="40" width="40"></div></div>
<div id="bvamseedtoggle" style="padding: 0 5px 5px 5px; font-size: 11px;">Webtorrent Control Panel</div>
<div style="padding: 0 5px 5px 5px; font-size: 11px;">Open Wallet in New Window</div>
</div>
</a>
-->


<a id="ninjaButton" href="#IssuePage" data-toggle="tab">
Expand All @@ -373,6 +375,17 @@





<a href="#" id="bvamseedbutton">

<div class="col-xs-4 toolicon activetool" align="center">
<div style="height: 48px; width: 48px;"><div style="margin: 5px auto;"><img src="images/network-icon.png" height="40" width="40"></div></div>
<div id="bvamseedtoggle" style="padding: 0 5px 5px 5px; font-size: 11px;">Webtorrent Control Panel</div>
</div>

</a>



<a id="signApp" href="#signPage" data-toggle="tab">
Expand Down Expand Up @@ -1008,7 +1021,7 @@ <h3>Tokenly Pockets</h3>
</div>



<div style="height: 25px;"></div>
</div>

<div id="footer"><div id="nameversion" style="float: left; padding:1px 0 0 8px;"></div><img id="refreshWallet" src="refresh.png" height="16" width="16"></div>
Expand Down
80 changes: 74 additions & 6 deletions Chrome Extension/ticker.js
Expand Up @@ -24,7 +24,19 @@ $( document ).ready(function() {

setPinBackground();




$(window).resize(function(){


if($("body").data("resizebypass") == "glidera"){
window.resizeTo(382,610);
} else if($("body").data("resizebypass") == "tall"){
window.resizeTo(324,610);
} else {
window.resizeTo(324,400);
}
})

$('#alltransactions').hide();

Expand Down Expand Up @@ -107,7 +119,7 @@ $( document ).ready(function() {
//on open
var manifest = chrome.runtime.getManifest();

var infobutton = "<div style='display: inline-block; padding-left: 5px;'><a id='infoButton' href='#infoPage' data-toggle='tab'><img src='info-icon.png' height='16' width='16'></a><div id='helpButton' style='display: inline-block; cursor: pointer; margin-left: 3px;'><img src='images/help-icon.png' height='16' width='16'></div></div>";
var infobutton = "<div style='display: inline-block; padding-left: 5px;'><a id='infoButton' href='#infoPage' data-toggle='tab'><img src='info-icon.png' height='16' width='16'></a><div id='helpButton' style='display: inline-block; cursor: pointer; margin-left: 3px;'><img src='images/help-icon.png' height='16' width='16'></div><div id='openinwindowbutton' style='display: inline-block; cursor: pointer; margin-left: 3px;'><img src='images/expand-icon.png' height='20' width='20'></div></div>";

$("#nameversion").html("Tokenly Pockets v" + manifest.version + infobutton);

Expand Down Expand Up @@ -444,12 +456,27 @@ $( document ).ready(function() {



$("#btcsendbox").toggle();
$("#btcsendbox").toggle(function(){

if($("#btcsendbox").is(":visible")) {

$("body").data("resizebypass", "tall");
window.resizeTo(324,610);

} else {

$("body").data("resizebypass", "false");
window.resizeTo(324,400);

}

});



if($("#moreBTCinfo").is(":visible")) {
$("#moreBTCinfo").hide();

}


Expand All @@ -466,12 +493,27 @@ $( document ).ready(function() {
{
if($("#btcsendbox").is(":visible")) {
$("#btcsendbox").hide();

}


if ($("#moreBTCinfo").length){

$("#moreBTCinfo").toggle();
$("#moreBTCinfo").toggle(function(){

if($("#moreBTCinfo").is(":visible")) {

$("body").data("resizebypass", "tall");
window.resizeTo(324,610);

} else {

$("body").data("resizebypass", "false");
window.resizeTo(324,400);

}

});



Expand All @@ -487,6 +529,9 @@ $( document ).ready(function() {
colorLight : "#ffffff",
correctLevel : QRCode.CorrectLevel.H
});

$("body").data("resizebypass", "tall");
window.resizeTo(324,610);
}
});

Expand Down Expand Up @@ -699,7 +744,8 @@ $(document).on("click", '.tokenlisting', function (event)
getPrimaryBalance(pubkey);



window.resizeTo(324,400);
$("body").data("resizebypass", "false");

$('#allTabs a:first').tab('show');

Expand Down Expand Up @@ -779,7 +825,8 @@ $(document).on("click", '.tokenlisting', function (event)
$('.bg').animate({
width: "320px"
}, 100 );

window.resizeTo(324,610);
$("body").data("resizebypass", "tall");
var address = $("#xcpaddress").html();

if ($('#assettransactiontoggle').html() == "View Tokens") {
Expand Down Expand Up @@ -890,6 +937,10 @@ $(document).on("click", '.tokenlisting', function (event)

//$('.bg').css({"width":"378px"});

$("body").data("resizebypass", "glidera");

window.resizeTo(382,610);

});


Expand All @@ -899,6 +950,10 @@ $(document).on("click", '.tokenlisting', function (event)
$('.bg').animate({
width: "320px"
}, 100 );


window.resizeTo(324,400);
$("body").data("resizebypass", "false");
$('#buysellTab').css({"margin-left":"12px"});
$("#priceBox").show();
$("#priceBoxBank").hide();
Expand All @@ -912,6 +967,8 @@ $(document).on("click", '.tokenlisting', function (event)
$('.bg').animate({
width: "320px"
}, 100 );
window.resizeTo(324,610);
$("body").data("resizebypass", "tall");
$('#buysellTab').css({"margin-left":"12px"});
$("#priceBox").show();
$("#priceBoxBank").hide();
Expand All @@ -925,6 +982,8 @@ $(document).on('click', '#toolsTab', function () {
$('.bg').animate({
width: "320px"
}, 100 );
window.resizeTo(324,610);
$("body").data("resizebypass", "tall");
$('#buysellTab').css({"margin-left":"12px"});
$("#priceBox").show();
$("#priceBoxBank").hide();
Expand Down Expand Up @@ -1418,6 +1477,15 @@ $(document).on('click', '#toolsTab', function () {

});


$('#openinwindowbutton').click( function ()
{
chrome.windows.create({ url: 'popup.html', type: 'popup', width: 324, height: 380, left: 500, top: 150 }, function(data){

console.log(data);

});
});
//loadSwapbots();

//loadFeatureRequests();
Expand Down
Binary file added media/expand-icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/network-icon-lg.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit c24dcd5

Please sign in to comment.