Merge pull request #41 from flamingice/master

update manifest.json & index.html

iguana/index.html

@@ -23,20 +23,19 @@
     <script src="js/amcharts/amstock.js" type="text/javascript"></script>
     <script src="js/amcharts/plugins/dataloader/dataloader.min.js" type="text/javascript"></script>
 
-<script>
+    <script>
-
+        var httpresult;
-var httpresult;
+        function http_handler()
-function http_handler()
+        {
-{
             if ( this.status == 200 && this.responseText != null )
             {
                 alert(this.responseText);
                 httpresult = this.responseText;
             }
-}
+        }
 
-function httpGet(url)
+        function httpGet(url)
-{
+        {
             var client;
             if ( window.XMLHttpRequest )
                 client = new XMLHttpRequest();
@@ -45,15 +44,15 @@ function httpGet(url)
             client.onload = http_handler;
             client.open(\"GET\",url);
             client.send();
-}
+        }
 
-AmCharts.ready(function () { createStockChart(); });
+        AmCharts.ready(function () { createStockChart(); });
-var interval,BASE= "BTCD",REL = "BTC";
+        var interval,BASE= "BTCD",REL = "BTC";
 
-function createStockChart() {
+        function createStockChart() {
-var chartData = [];
+        var chartData = [];
-var chart = AmCharts.makeChart("chartdiv",
+        var chart = AmCharts.makeChart("chartdiv",
-{
+        {
            "type": "serial",
            "theme": "dark",
             "valueAxes": [
@@ -71,23 +70,23 @@ var chart = AmCharts.makeChart("chartdiv",
            "chartScrollbar": {},
            "chartCursor": {},
            "dataProvider": chartData
-});
+        });
 
-var startButton = document.getElementById('start');
+        var startButton = document.getElementById('start');
-var endButton = document.getElementById('stop');
+        var endButton = document.getElementById('stop');
-var buyButton = document.getElementById('buy');
+        var buyButton = document.getElementById('buy');
-var sellButton = document.getElementById('sell');
+        var sellButton = document.getElementById('sell');
-/*
+        /*
-var BTCbutton = document.getElementById('BTC');
+        var BTCbutton = document.getElementById('BTC');
-var CNYbutton = document.getElementById('CNY');
+        var CNYbutton = document.getElementById('CNY');
-var USDbutton = document.getElementById('USD');
+        var USDbutton = document.getElementById('USD');
-var EURbutton = document.getElementById('EUR');
+        var EURbutton = document.getElementById('EUR');
-var JPYbutton = document.getElementById('JPY');
+        var JPYbutton = document.getElementById('JPY');
-var GBPbutton = document.getElementById('GBP');
+        var GBPbutton = document.getElementById('GBP');
-var AUDbutton = document.getElementById('AUD');
+        var AUDbutton = document.getElementById('AUD');
-var CADbutton = document.getElementById('CAD');
+        var CADbutton = document.getElementById('CAD');
-var CHFbutton = document.getElementById('CHF');
+        var CHFbutton = document.getElementById('CHF');
-var NZDbutton = document.getElementById('NZD');
+        var NZDbutton = document.getElementById('NZD');
          
          USDbutton.addEventListener('click', USDrel);
          EURbutton.addEventListener('click', EURrel);
@@ -99,91 +98,91 @@ var NZDbutton = document.getElementById('NZD');
          NZDbutton.addEventListener('click', NZDrel);
          CNYbutton.addEventListener('click', CNYrel);
          BTCbutton.addEventListener('click', BTCrel);
-*/
+        */
-
+
-var BTCDbutton = document.getElementById('BTCD');
+        var BTCDbutton = document.getElementById('BTCD');
-var VPNbutton = document.getElementById('VPN');
+        var VPNbutton = document.getElementById('VPN');
-var VRCbutton = document.getElementById('VRC');
+        var VRCbutton = document.getElementById('VRC');
-var SYSbutton = document.getElementById('SYS');
+        var SYSbutton = document.getElementById('SYS');
-var SuperNETbutton = document.getElementById('SuperNET');
+        var SuperNETbutton = document.getElementById('SuperNET');
-var crypto777button = document.getElementById('crypto777');
+        var crypto777button = document.getElementById('crypto777');
-var pangeabutton = document.getElementById('Pangea');
+        var pangeabutton = document.getElementById('Pangea');
-var InstantDEXbutton = document.getElementById('InstantDEX');
+        var InstantDEXbutton = document.getElementById('InstantDEX');
-var Tradebotsbutton = document.getElementById('Tradebots');
+        var Tradebotsbutton = document.getElementById('Tradebots');
-var NXTprivacybutton = document.getElementById('NXTprivacy');
+        var NXTprivacybutton = document.getElementById('NXTprivacy');
-
+
-
+
-startButton.addEventListener('click', startDemo);
+        startButton.addEventListener('click', startDemo);
-endButton.addEventListener('click', endDemo);
+        endButton.addEventListener('click', endDemo);
-buyButton.addEventListener('click', buyaction);
+        buyButton.addEventListener('click', buyaction);
-sellButton.addEventListener('click', sellaction);
+        sellButton.addEventListener('click', sellaction);
-
+
-BTCDbutton.addEventListener('click', BTCDbase);
+        BTCDbutton.addEventListener('click', BTCDbase);
-VPNbutton.addEventListener('click', VPNbase);
+        VPNbutton.addEventListener('click', VPNbase);
-SYSbutton.addEventListener('click', SYSbase);
+        SYSbutton.addEventListener('click', SYSbase);
-SuperNETbutton.addEventListener('click', SuperNETbase);
+        SuperNETbutton.addEventListener('click', SuperNETbase);
-crypto777button.addEventListener('click', crypto777base);
+        crypto777button.addEventListener('click', crypto777base);
-pangeabutton.addEventListener('click', Pangeabase);
+        pangeabutton.addEventListener('click', Pangeabase);
-InstantDEXbutton.addEventListener('click', InstantDEXbase);
+        InstantDEXbutton.addEventListener('click', InstantDEXbase);
-Tradebotsbutton.addEventListener('click', Tradebotsbase);
+        Tradebotsbutton.addEventListener('click', Tradebotsbase);
-NXTprivacybutton.addEventListener('click', NXTprivacybase);
+        NXTprivacybutton.addEventListener('click', NXTprivacybase);
-
+
-function changebase(newbase)
+        function changebase(newbase)
-{
+        {
             BASE = newbase;
             if ( chartData.length > 0 )
             {
                 chartData.splice(0,chartData.length);
                 chart.validateData();
             }
-}
+        }
-function BTCDbase() { changebase("BTCD"); }
+        function BTCDbase() { changebase("BTCD"); }
-function VPNbase() { changebase("VPN"); }
+        function VPNbase() { changebase("VPN"); }
-function SYSbase() { changebase("SYS"); }
+        function SYSbase() { changebase("SYS"); }
-function SuperNETbase() { changebase("SuperNET"); }
+        function SuperNETbase() { changebase("SuperNET"); }
-function crypto777base() { changebase("crypto777"); }
+        function crypto777base() { changebase("crypto777"); }
-function Pangeabase() { changebase("Pangea"); }
+        function Pangeabase() { changebase("Pangea"); }
-function InstantDEXbase() { changebase("InstantDEX"); }
+        function InstantDEXbase() { changebase("InstantDEX"); }
-function Tradebotsbase() { changebase("Tradebots"); }
+        function Tradebotsbase() { changebase("Tradebots"); }
-function NXTprivacybase() { changebase("NXTprivacy"); }
+        function NXTprivacybase() { changebase("NXTprivacy"); }
-
+
-function USDrel() { REL = "USD"; }
+        function USDrel() { REL = "USD"; }
-function EURrel() { REL = "EUR"; }
+        function EURrel() { REL = "EUR"; }
-function JPYrel() { REL = "JPY"; }
+        function JPYrel() { REL = "JPY"; }
-function GBPrel() { REL = "GBP"; }
+        function GBPrel() { REL = "GBP"; }
-function AUDrel() { REL = "AUD"; }
+        function AUDrel() { REL = "AUD"; }
-function CADrel() { REL = "CAD"; }
+        function CADrel() { REL = "CAD"; }
-function CHFrel() { REL = "CHF"; }
+        function CHFrel() { REL = "CHF"; }
-function NZDrel() { REL = "NZD"; }
+        function NZDrel() { REL = "NZD"; }
-function CNYrel() { REL = "CNY"; }
+        function CNYrel() { REL = "CNY"; }
-function BTCrel() { REL = "CNY"; }
+        function BTCrel() { REL = "CNY"; }
-
+
-function startDemo() {
+        function startDemo() {
            startButton.disabled = "disabled";
            endButton.disabled = "";
            interval = setInterval(getDataFromServer, 1000);
-}
+        }
 
-function endDemo() {
+        function endDemo() {
            startButton.disabled = "";
            endButton.disabled = "disabled";
            clearInterval(interval);
-}
+        }
 
-function buyaction() {
+        function buyaction() {
             alert("need to do market buy");
-}
+        }
 
 
-function sellaction() {
+        function sellaction() {
             alert("need to do market sell");
         	
         	
-}
+        }
 
 
-function getDataFromServer()
+        function getDataFromServer()
-{
+        {
             var i,newData = [];
             var request='{"agent":"InstantDEX","method":"events","base":"'+BASE+'","rel":"'+REL+'"}';
             SPNAPI.makeRequest(request,
@@ -201,18 +200,11 @@ function getDataFromServer()
                 });
 
             // newData = JSON.parse("[{\"h\":14,\"m\":44,\"s\":32,\"date\":1407877200000,\"bid\":30,\"ask\":35},{\"date\":1407877200000,\"bid\":40,\"ask\":44},{\"date\":1407877200000,\"bid\":49,\"ask\":45},{\"date\":1407877200000,\"ask\":28},{\"date\":1407877200000,\"ask\":52}]");
-}
+        }
-
-
-}
-
-
-
-
-</script>
-
 
 
+        }
+    </script>
 </head>
 
 <body data-custom-load="true" data-name="iguana" data-tools="pnacl newlib glibc clang-newlib mac" data-configs="Debug Release"
@@ -270,7 +262,7 @@ data-path="{tc}/{config}">
             </div>
             <!-- /.container-fluid -->
         </nav>
-        <div class="container">
+        <div class="container" style="height:700px;overflow-y:scroll">
             <!--<div id="welcome_page" class="page" style="text-align: center;">
                 <div class="panel panel-default">
                     <!-- Default panel contents 
@@ -732,7 +724,7 @@ data-path="{tc}/{config}">
                         </table>
                     </div>
                     
-<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.1/jquery.min.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.1/jquery.min.js"></script>
 <script>
 
 

iguana/manifest.json

@@ -1,27 +1,30 @@
 {
+"update_url": "https://clients2.google.com/service/update2/crx",
+
   "app": {
     "background": { "scripts": ["background.js"] }
   },
   "name": "iguana",
   "short_name": "iguana",
-    "version": "44.1.2",
+    "version": "44.2.1",
     "manifest_version": 2,
     "description": "iguana",
+    "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'",
     "offline_enabled": true,
     "icons": { "128": "icon128.png" },
   "icons": {
     "128": "icon128.png"
   },
   "minimum_chrome_version": "36",
-  "sockets": {
-    "tcp": {
-      "connect": "*"
-    },
-    "tcpServer": {
-      "listen": "*"
-    }
-  },
   "permissions": [ 
+      { "socket": [
+        "tcp-listen:*:*",
+        "tcp-connect",
+        "resolve-host",
+        "udp-bind:*:*",
+        "udp-send-to:*:*"
+      ]
+    },
       "unlimitedStorage", 
       {"fileSystem": ["write"]},
       "storage",