diff --git a/app/includes/header.tpl b/app/includes/header.tpl index 544387fcc2..5fb4451d1e 100644 --- a/app/includes/header.tpl +++ b/app/includes/header.tpl @@ -43,7 +43,7 @@
Open-Source & Client-Side Ether Wallet - · v3.6.6    + · v3.6.7    diff --git a/app/manifest.json b/app/manifest.json index f6d964754c..7b6d4822e9 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,6 +1,6 @@ { "name": "MyEtherWallet CX", - "version": "3.6.6", + "version": "3.6.7", "manifest_version": 2, "description": "MyEtherWallet Chrome Extension", "homepage_url": "https://www.myetherwallet.com/", diff --git a/app/package.json b/app/package.json index c0cdb96fd9..09d297dd87 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "MyEtherWallet", - "version": "3.6.6", + "version": "3.6.7", "description": "An NPM dist of MyEtherWallet. For easier downloading & updating via CLI.", "author": "MyEtherWallet", "license": "ISC", diff --git a/app/scripts/staticJS/etherwallet-static.min.js b/app/scripts/staticJS/etherwallet-static.min.js index 0ee5724a9c..bfaa446007 100644 --- a/app/scripts/staticJS/etherwallet-static.min.js +++ b/app/scripts/staticJS/etherwallet-static.min.js @@ -1 +1 @@ -!function(){function t(t){for(var e=0;e>19^t^t>>8,(a[3]>>>0)/(1<<31>>>0)}function o(){return"hsl("+Math.floor(360*e())+","+(60*e()+40)+"%,"+25*(e()+e()+e()+e())+"%)"}function r(t){for(var o=t,r=t,i=Math.ceil(o/2),n=o-i,a=[],s=0;sdocument.documentElement.clientHeight,this.scrollbarWidth=this.measureScrollbar()},this.setScrollbar=function(){var t=window.getComputedStyle(document.body),e=parseInt(t.paddingRight,10);this.bodyIsOverflowing&&(document.body.style.paddingRight=e+this.scrollbarWidth+"px")},this.resetScrollbar=function(){document.body.style.paddingRight=""},this.measureScrollbar=function(){var t=document.createElement("div");t.className="modal-scrollbar-measure",document.body.appendChild(t);var e=t.offsetWidth-t.clientWidth;return document.body.removeChild(t),e},this.addClass=function(t,e){t.classList?t.classList.add(e):t.className+=" "+e},this.removeClass=function(t,e){t.classList?t.classList.remove(e):t.className=t.className.replace(e,"").replace(/^\s+|\s+$/g,"")}}};var o=document.querySelectorAll(".modal"),r=o.length,i=0;for(i;io;o++){var i=this.data.charCodeAt(o);i>65536?(e[0]=240|(1835008&i)>>>18,e[1]=128|(258048&i)>>>12,e[2]=128|(4032&i)>>>6,e[3]=128|63&i):i>2048?(e[0]=224|(61440&i)>>>12,e[1]=128|(4032&i)>>>6,e[2]=128|63&i):i>128?(e[0]=192|(1984&i)>>>6,e[1]=128|63&i):e[0]=i,this.parsedData=this.parsedData.concat(e)}this.parsedData.length!=this.data.length&&(this.parsedData.unshift(191),this.parsedData.unshift(187),this.parsedData.unshift(239))}function e(t,e){this.typeNumber=t,this.errorCorrectLevel=e,this.modules=null,this.moduleCount=0,this.dataCache=null,this.dataList=[]}function o(t,e){if(void 0==t.length)throw new Error(t.length+"/"+e);for(var o=0;o=i;i++){var a=0;switch(e){case h.L:a=g[i][0];break;case h.M:a=g[i][1];break;case h.Q:a=g[i][2];break;case h.H:a=g[i][3]}if(a>=r)break;o++}if(o>g.length)throw new Error("Too long data");return o}function s(t){var e=encodeURI(t).toString().replace(/\%[0-9a-fA-F]{2}/g,"a");return e.length+(e.length!=t?3:0)}t.prototype={getLength:function(){return this.parsedData.length},write:function(t){for(var e=0,o=this.parsedData.length;o>e;e++)t.put(this.parsedData[e],8)}},e.prototype={addData:function(e){var o=new t(e);this.dataList.push(o),this.dataCache=null},isDark:function(t,e){if(0>t||this.moduleCount<=t||0>e||this.moduleCount<=e)throw new Error(t+","+e);return this.modules[t][e]},getModuleCount:function(){return this.moduleCount},make:function(){this.makeImpl(!1,this.getBestMaskPattern())},makeImpl:function(t,o){this.moduleCount=4*this.typeNumber+17,this.modules=new Array(this.moduleCount);for(var r=0;r=7&&this.setupTypeNumber(t),null==this.dataCache&&(this.dataCache=e.createData(this.typeNumber,this.errorCorrectLevel,this.dataList)),this.mapData(this.dataCache,o)},setupPositionProbePattern:function(t,e){for(var o=-1;7>=o;o++)if(!(-1>=t+o||this.moduleCount<=t+o))for(var r=-1;7>=r;r++)-1>=e+r||this.moduleCount<=e+r||(this.modules[t+o][e+r]=o>=0&&6>=o&&(0==r||6==r)||r>=0&&6>=r&&(0==o||6==o)||o>=2&&4>=o&&r>=2&&4>=r)},getBestMaskPattern:function(){for(var t=0,e=0,o=0;8>o;o++){this.makeImpl(!0,o);var r=d.getLostPoint(this);(0==o||t>r)&&(t=r,e=o)}return e},createMovieClip:function(t,e,o){var r=t.createEmptyMovieClip(e,o);this.make();for(var i=0;i=n;n++)for(var a=-2;2>=a;a++)this.modules[r+n][i+a]=-2==n||2==n||-2==a||2==a||0==n&&0==a}},setupTypeNumber:function(t){for(var e=d.getBCHTypeNumber(this.typeNumber),o=0;18>o;o++){var r=!t&&1==(1&e>>o);this.modules[Math.floor(o/3)][o%3+this.moduleCount-8-3]=r}for(var o=0;18>o;o++){var r=!t&&1==(1&e>>o);this.modules[o%3+this.moduleCount-8-3][Math.floor(o/3)]=r}},setupTypeInfo:function(t,e){for(var o=this.errorCorrectLevel<<3|e,r=d.getBCHTypeInfo(o),i=0;15>i;i++){var n=!t&&1==(1&r>>i);6>i?this.modules[i][8]=n:8>i?this.modules[i+1][8]=n:this.modules[this.moduleCount-15+i][8]=n}for(var i=0;15>i;i++){var n=!t&&1==(1&r>>i);8>i?this.modules[8][this.moduleCount-i-1]=n:9>i?this.modules[8][15-i-1+1]=n:this.modules[8][15-i-1]=n}this.modules[this.moduleCount-8][8]=!t},mapData:function(t,e){for(var o=-1,r=this.moduleCount-1,i=7,n=0,a=this.moduleCount-1;a>0;a-=2)for(6==a&&a--;;){for(var s=0;2>s;s++)if(null==this.modules[r][a-s]){var l=!1;n>>i));var h=d.getMask(e,r,a-s);h&&(l=!l),this.modules[r][a-s]=l,-1==--i&&(n++,i=7)}if(0>(r+=o)||this.moduleCount<=r){r-=o,o=-o;break}}}},e.PAD0=236,e.PAD1=17,e.createData=function(t,o,n){for(var a=r.getRSBlocks(t,o),s=new i,l=0;l8*u)throw new Error("code length overflow. ("+s.getLengthInBits()+">"+8*u+")");for(s.getLengthInBits()+4<=8*u&&s.put(0,4);0!=s.getLengthInBits()%8;)s.putBit(!1);for(;!(s.getLengthInBits()>=8*u)&&(s.put(e.PAD0,8),!(s.getLengthInBits()>=8*u));)s.put(e.PAD1,8);return e.createBytes(s,a)},e.createBytes=function(t,e){for(var r=0,i=0,n=0,a=new Array(e.length),s=new Array(e.length),l=0;l=0?m.get(p):0}}for(var v=0,c=0;cc;c++)for(var l=0;lc;c++)for(var l=0;l=0;)e^=d.G15<=0;)e^=d.G18<>>=1;return e},getPatternPosition:function(t){return d.PATTERN_POSITION_TABLE[t-1]},getMask:function(t,e,o){switch(t){case u.PATTERN000:return 0==(e+o)%2;case u.PATTERN001:return 0==e%2;case u.PATTERN010:return 0==o%3;case u.PATTERN011:return 0==(e+o)%3;case u.PATTERN100:return 0==(Math.floor(e/2)+Math.floor(o/3))%2;case u.PATTERN101:return 0==e*o%2+e*o%3;case u.PATTERN110:return 0==(e*o%2+e*o%3)%2;case u.PATTERN111:return 0==(e*o%3+(e+o)%2)%2;default:throw new Error("bad maskPattern:"+t)}},getErrorCorrectPolynomial:function(t){for(var e=new o([1],0),r=0;t>r;r++)e=e.multiply(new o([1,c.gexp(r)],0));return e},getLengthInBits:function(t,e){if(e>=1&&10>e)switch(t){case l.MODE_NUMBER:return 10;case l.MODE_ALPHA_NUM:return 9;case l.MODE_8BIT_BYTE:case l.MODE_KANJI:return 8;default:throw new Error("mode:"+t)}else if(27>e)switch(t){case l.MODE_NUMBER:return 12;case l.MODE_ALPHA_NUM:return 11;case l.MODE_8BIT_BYTE:return 16;case l.MODE_KANJI:return 10;default:throw new Error("mode:"+t)}else{if(!(41>e))throw new Error("type:"+e);switch(t){case l.MODE_NUMBER:return 14;case l.MODE_ALPHA_NUM:return 13;case l.MODE_8BIT_BYTE:return 16;case l.MODE_KANJI:return 12;default:throw new Error("mode:"+t)}}},getLostPoint:function(t){for(var e=t.getModuleCount(),o=0,r=0;e>r;r++)for(var i=0;e>i;i++){for(var n=0,a=t.isDark(r,i),s=-1;1>=s;s++)if(!(0>r+s||r+s>=e))for(var l=-1;1>=l;l++)0>i+l||i+l>=e||(0!=s||0!=l)&&a==t.isDark(r+s,i+l)&&n++;n>5&&(o+=3+n-5)}for(var r=0;e-1>r;r++)for(var i=0;e-1>i;i++){var h=0;t.isDark(r,i)&&h++,t.isDark(r+1,i)&&h++,t.isDark(r,i+1)&&h++,t.isDark(r+1,i+1)&&h++,(0==h||4==h)&&(o+=3)}for(var r=0;e>r;r++)for(var i=0;e-6>i;i++)t.isDark(r,i)&&!t.isDark(r,i+1)&&t.isDark(r,i+2)&&t.isDark(r,i+3)&&t.isDark(r,i+4)&&!t.isDark(r,i+5)&&t.isDark(r,i+6)&&(o+=40);for(var i=0;e>i;i++)for(var r=0;e-6>r;r++)t.isDark(r,i)&&!t.isDark(r+1,i)&&t.isDark(r+2,i)&&t.isDark(r+3,i)&&t.isDark(r+4,i)&&!t.isDark(r+5,i)&&t.isDark(r+6,i)&&(o+=40);for(var u=0,i=0;e>i;i++)for(var r=0;e>r;r++)t.isDark(r,i)&&u++;return o+=Math.abs(100*u/e/e-50)/5*10}},c={glog:function(t){if(1>t)throw new Error("glog("+t+")");return c.LOG_TABLE[t]},gexp:function(t){for(;0>t;)t+=255;for(;t>=256;)t-=255;return c.EXP_TABLE[t]},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)},f=0;8>f;f++)c.EXP_TABLE[f]=1<f;f++)c.EXP_TABLE[f]=c.EXP_TABLE[f-4]^c.EXP_TABLE[f-5]^c.EXP_TABLE[f-6]^c.EXP_TABLE[f-8];for(var f=0;255>f;f++)c.LOG_TABLE[c.EXP_TABLE[f]]=f;o.prototype={get:function(t){return this.num[t]},getLength:function(){return this.num.length},multiply:function(t){for(var e=new Array(this.getLength()+t.getLength()-1),r=0;ra;a++)for(var s=o[3*a+0],l=o[3*a+1],h=o[3*a+2],u=0;s>u;u++)n.push(new r(l,h));return n},r.getRsBlockTable=function(t,e){switch(e){case h.L:return r.RS_BLOCK_TABLE[4*(t-1)+0];case h.M:return r.RS_BLOCK_TABLE[4*(t-1)+1];case h.Q:return r.RS_BLOCK_TABLE[4*(t-1)+2];case h.H:return r.RS_BLOCK_TABLE[4*(t-1)+3];default:return}},i.prototype={get:function(t){var e=Math.floor(t/8);return 1==(1&this.buffer[e]>>>7-t%8)},put:function(t,e){for(var o=0;e>o;o++)this.putBit(1==(1&t>>>e-o-1))},getLengthInBits:function(){return this.length},putBit:function(t){var e=Math.floor(this.length/8);this.buffer.length<=e&&this.buffer.push(0),t&&(this.buffer[e]|=128>>>this.length%8),this.length++}};var g=[[17,14,11,7],[32,26,20,14],[53,42,32,24],[78,62,46,34],[106,84,60,44],[134,106,74,58],[154,122,86,64],[192,152,108,84],[230,180,130,98],[271,213,151,119],[321,251,177,137],[367,287,203,155],[425,331,241,177],[458,362,258,194],[520,412,292,220],[586,450,322,250],[644,504,364,280],[718,560,394,310],[792,624,442,338],[858,666,482,382],[929,711,509,403],[1003,779,565,439],[1091,857,611,461],[1171,911,661,511],[1273,997,715,535],[1367,1059,751,593],[1465,1125,805,625],[1528,1190,868,658],[1628,1264,908,698],[1732,1370,982,742],[1840,1452,1030,790],[1952,1538,1112,842],[2068,1628,1168,898],[2188,1722,1228,958],[2303,1809,1283,983],[2431,1911,1351,1051],[2563,1989,1423,1093],[2699,2099,1499,1139],[2809,2213,1579,1219],[2953,2331,1663,1273]],m=function(){var t=function(t,e){this._el=t,this._htOption=e};return t.prototype.draw=function(t){function e(t,e){var o=document.createElementNS("http://www.w3.org/2000/svg",t);for(var r in e)e.hasOwnProperty(r)&&o.setAttribute(r,e[r]);return o}var o=this._htOption,r=this._el,i=t.getModuleCount();Math.floor(o.width/i),Math.floor(o.height/i),this.clear();var n=e("svg",{viewBox:"0 0 "+String(i)+" "+String(i),width:"100%",height:"100%",fill:o.colorLight});n.setAttributeNS("http://www.w3.org/2000/xmlns/","xmlns:xlink","http://www.w3.org/1999/xlink"),r.appendChild(n),n.appendChild(e("rect",{fill:o.colorDark,width:"1",height:"1",id:"template"}));for(var a=0;i>a;a++)for(var s=0;i>s;s++)if(t.isDark(a,s)){var l=e("use",{x:String(a),y:String(s)});l.setAttributeNS("http://www.w3.org/1999/xlink","href","#template"),n.appendChild(l)}},t.prototype.clear=function(){for(;this._el.hasChildNodes();)this._el.removeChild(this._el.lastChild)},t}(),p="svg"===document.documentElement.tagName.toLowerCase(),v=p?m:function(){return"undefined"!=typeof CanvasRenderingContext2D}()?function(){function t(){this._elImage.src=this._elCanvas.toDataURL("image/png"),this._elImage.style.display="block",this._elCanvas.style.display="none"}function e(t,e){var o=this;if(o._fFail=e,o._fSuccess=t,null===o._bSupportDataURI){var r=document.createElement("img"),i=function(){o._bSupportDataURI=!1,o._fFail&&_fFail.call(o)},n=function(){o._bSupportDataURI=!0,o._fSuccess&&o._fSuccess.call(o)};return r.onabort=i,r.onerror=i,r.onload=n,void(r.src="data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==")}o._bSupportDataURI===!0&&o._fSuccess?o._fSuccess.call(o):o._bSupportDataURI===!1&&o._fFail&&o._fFail.call(o)}if(this._android&&this._android<=2.1){var o=1/window.devicePixelRatio,r=CanvasRenderingContext2D.prototype.drawImage;CanvasRenderingContext2D.prototype.drawImage=function(t,e,i,n,a,s,l,h){if("nodeName"in t&&/img/i.test(t.nodeName))for(var u=arguments.length-1;u>=1;u--)arguments[u]=arguments[u]*o;else void 0===h&&(arguments[1]*=o,arguments[2]*=o,arguments[3]*=o,arguments[4]*=o);r.apply(this,arguments)}}var i=function(t,e){this._bIsPainted=!1,this._android=n(),this._htOption=e,this._elCanvas=document.createElement("canvas"),this._elCanvas.width=e.width,this._elCanvas.height=e.height,t.appendChild(this._elCanvas),this._el=t,this._oContext=this._elCanvas.getContext("2d"),this._bIsPainted=!1,this._elImage=document.createElement("img"),this._elImage.style.display="none",this._el.appendChild(this._elImage),this._bSupportDataURI=null};return i.prototype.draw=function(t){var e=this._elImage,o=this._oContext,r=this._htOption,i=t.getModuleCount(),n=r.width/i,a=r.height/i,s=Math.round(n),l=Math.round(a);e.style.display="none",this.clear();for(var h=0;i>h;h++)for(var u=0;i>u;u++){var d=t.isDark(h,u),c=u*n,f=h*a;o.strokeStyle=d?r.colorDark:r.colorLight,o.lineWidth=1,o.fillStyle=d?r.colorDark:r.colorLight,o.fillRect(c,f,n,a),o.strokeRect(Math.floor(c)+.5,Math.floor(f)+.5,s,l),o.strokeRect(Math.ceil(c)-.5,Math.ceil(f)-.5,s,l)}this._bIsPainted=!0},i.prototype.makeImage=function(){this._bIsPainted&&e.call(this,t)},i.prototype.isPainted=function(){return this._bIsPainted},i.prototype.clear=function(){this._oContext.clearRect(0,0,this._elCanvas.width,this._elCanvas.height),this._bIsPainted=!1},i.prototype.round=function(t){return t?Math.floor(1e3*t)/1e3:t},i}():function(){var t=function(t,e){this._el=t,this._htOption=e};return t.prototype.draw=function(t){for(var e=this._htOption,o=this._el,r=t.getModuleCount(),i=Math.floor(e.width/r),n=Math.floor(e.height/r),a=[''],s=0;r>s;s++){a.push("");for(var l=0;r>l;l++)a.push('');a.push("")}a.push("
"),o.innerHTML=a.join("");var h=o.childNodes[0],u=(e.width-h.offsetWidth)/2,d=(e.height-h.offsetHeight)/2;u>0&&d>0&&(h.style.margin=d+"px "+u+"px")},t.prototype.clear=function(){this._el.innerHTML=""},t}();QRCode=function(t,e){if(this._htOption={width:256,height:256,typeNumber:4,colorDark:"#000000",colorLight:"#ffffff",correctLevel:h.H},"string"==typeof e&&(e={text:e}),e)for(var o in e)this._htOption[o]=e[o];"string"==typeof t&&(t=document.getElementById(t)),this._android=n(),this._el=t,this._oQRCode=null,this._oDrawing=new v(this._el,this._htOption),this._htOption.text&&this.makeCode(this._htOption.text)},QRCode.prototype.makeCode=function(t){this._oQRCode=new e(a(t,this._htOption.correctLevel),this._htOption.correctLevel),this._oQRCode.addData(t),this._oQRCode.make(),this._el.title=t,this._oDrawing.draw(this._oQRCode),this.makeImage()},QRCode.prototype.makeImage=function(){"function"==typeof this._oDrawing.makeImage&&(!this._android||this._android>=3)&&this._oDrawing.makeImage()},QRCode.prototype.clear=function(){this._oDrawing.clear()},QRCode.CorrectLevel=h}(); \ No newline at end of file +!function(){function t(t){for(var e=0;e>19^t^t>>8,(a[3]>>>0)/(1<<31>>>0)}function o(){return"hsl("+Math.floor(360*e())+","+(60*e()+40)+"%,"+25*(e()+e()+e()+e())+"%)"}function r(t){for(var o=t,r=t,i=Math.ceil(o/2),n=o-i,a=[],s=0;sdocument.documentElement.clientHeight,this.scrollbarWidth=this.measureScrollbar()},this.setScrollbar=function(){var t=window.getComputedStyle(document.body),e=parseInt(t.paddingRight,10);this.bodyIsOverflowing&&(document.body.style.paddingRight=e+this.scrollbarWidth+"px")},this.resetScrollbar=function(){document.body.style.paddingRight=""},this.measureScrollbar=function(){var t=document.createElement("div");t.className="modal-scrollbar-measure",document.body.appendChild(t);var e=t.offsetWidth-t.clientWidth;return document.body.removeChild(t),e},this.addClass=function(t,e){t.classList?t.classList.add(e):t.className+=" "+e},this.removeClass=function(t,e){t.classList?t.classList.remove(e):t.className=t.className.replace(e,"").replace(/^\s+|\s+$/g,"")}}};var o=document.querySelectorAll(".modal"),r=o.length,i=0;for(i;io;o++){var i=this.data.charCodeAt(o);i>65536?(e[0]=240|(1835008&i)>>>18,e[1]=128|(258048&i)>>>12,e[2]=128|(4032&i)>>>6,e[3]=128|63&i):i>2048?(e[0]=224|(61440&i)>>>12,e[1]=128|(4032&i)>>>6,e[2]=128|63&i):i>128?(e[0]=192|(1984&i)>>>6,e[1]=128|63&i):e[0]=i,this.parsedData=this.parsedData.concat(e)}this.parsedData.length!=this.data.length&&(this.parsedData.unshift(191),this.parsedData.unshift(187),this.parsedData.unshift(239))}function e(t,e){this.typeNumber=t,this.errorCorrectLevel=e,this.modules=null,this.moduleCount=0,this.dataCache=null,this.dataList=[]}function o(t,e){if(void 0==t.length)throw new Error(t.length+"/"+e);for(var o=0;o=i;i++){var a=0;switch(e){case h.L:a=g[i][0];break;case h.M:a=g[i][1];break;case h.Q:a=g[i][2];break;case h.H:a=g[i][3]}if(a>=r)break;o++}if(o>g.length)throw new Error("Too long data");return o}function s(t){var e=encodeURI(t).toString().replace(/\%[0-9a-fA-F]{2}/g,"a");return e.length+(e.length!=t?3:0)}t.prototype={getLength:function(){return this.parsedData.length},write:function(t){for(var e=0,o=this.parsedData.length;o>e;e++)t.put(this.parsedData[e],8)}},e.prototype={addData:function(e){var o=new t(e);this.dataList.push(o),this.dataCache=null},isDark:function(t,e){if(0>t||this.moduleCount<=t||0>e||this.moduleCount<=e)throw new Error(t+","+e);return this.modules[t][e]},getModuleCount:function(){return this.moduleCount},make:function(){this.makeImpl(!1,this.getBestMaskPattern())},makeImpl:function(t,o){this.moduleCount=4*this.typeNumber+17,this.modules=new Array(this.moduleCount);for(var r=0;r=7&&this.setupTypeNumber(t),null==this.dataCache&&(this.dataCache=e.createData(this.typeNumber,this.errorCorrectLevel,this.dataList)),this.mapData(this.dataCache,o)},setupPositionProbePattern:function(t,e){for(var o=-1;7>=o;o++)if(!(-1>=t+o||this.moduleCount<=t+o))for(var r=-1;7>=r;r++)-1>=e+r||this.moduleCount<=e+r||(this.modules[t+o][e+r]=o>=0&&6>=o&&(0==r||6==r)||r>=0&&6>=r&&(0==o||6==o)||o>=2&&4>=o&&r>=2&&4>=r)},getBestMaskPattern:function(){for(var t=0,e=0,o=0;8>o;o++){this.makeImpl(!0,o);var r=d.getLostPoint(this);(0==o||t>r)&&(t=r,e=o)}return e},createMovieClip:function(t,e,o){var r=t.createEmptyMovieClip(e,o);this.make();for(var i=0;i=n;n++)for(var a=-2;2>=a;a++)this.modules[r+n][i+a]=-2==n||2==n||-2==a||2==a||0==n&&0==a}},setupTypeNumber:function(t){for(var e=d.getBCHTypeNumber(this.typeNumber),o=0;18>o;o++){var r=!t&&1==(1&e>>o);this.modules[Math.floor(o/3)][o%3+this.moduleCount-8-3]=r}for(var o=0;18>o;o++){var r=!t&&1==(1&e>>o);this.modules[o%3+this.moduleCount-8-3][Math.floor(o/3)]=r}},setupTypeInfo:function(t,e){for(var o=this.errorCorrectLevel<<3|e,r=d.getBCHTypeInfo(o),i=0;15>i;i++){var n=!t&&1==(1&r>>i);6>i?this.modules[i][8]=n:8>i?this.modules[i+1][8]=n:this.modules[this.moduleCount-15+i][8]=n}for(var i=0;15>i;i++){var n=!t&&1==(1&r>>i);8>i?this.modules[8][this.moduleCount-i-1]=n:9>i?this.modules[8][15-i-1+1]=n:this.modules[8][15-i-1]=n}this.modules[this.moduleCount-8][8]=!t},mapData:function(t,e){for(var o=-1,r=this.moduleCount-1,i=7,n=0,a=this.moduleCount-1;a>0;a-=2)for(6==a&&a--;;){for(var s=0;2>s;s++)if(null==this.modules[r][a-s]){var l=!1;n>>i));var h=d.getMask(e,r,a-s);h&&(l=!l),this.modules[r][a-s]=l,-1==--i&&(n++,i=7)}if(0>(r+=o)||this.moduleCount<=r){r-=o,o=-o;break}}}},e.PAD0=236,e.PAD1=17,e.createData=function(t,o,n){for(var a=r.getRSBlocks(t,o),s=new i,l=0;l8*u)throw new Error("code length overflow. ("+s.getLengthInBits()+">"+8*u+")");for(s.getLengthInBits()+4<=8*u&&s.put(0,4);0!=s.getLengthInBits()%8;)s.putBit(!1);for(;!(s.getLengthInBits()>=8*u)&&(s.put(e.PAD0,8),!(s.getLengthInBits()>=8*u));)s.put(e.PAD1,8);return e.createBytes(s,a)},e.createBytes=function(t,e){for(var r=0,i=0,n=0,a=new Array(e.length),s=new Array(e.length),l=0;l=0?m.get(p):0}}for(var v=0,c=0;cc;c++)for(var l=0;lc;c++)for(var l=0;l=0;)e^=d.G15<=0;)e^=d.G18<>>=1;return e},getPatternPosition:function(t){return d.PATTERN_POSITION_TABLE[t-1]},getMask:function(t,e,o){switch(t){case u.PATTERN000:return 0==(e+o)%2;case u.PATTERN001:return 0==e%2;case u.PATTERN010:return 0==o%3;case u.PATTERN011:return 0==(e+o)%3;case u.PATTERN100:return 0==(Math.floor(e/2)+Math.floor(o/3))%2;case u.PATTERN101:return 0==e*o%2+e*o%3;case u.PATTERN110:return 0==(e*o%2+e*o%3)%2;case u.PATTERN111:return 0==(e*o%3+(e+o)%2)%2;default:throw new Error("bad maskPattern:"+t)}},getErrorCorrectPolynomial:function(t){for(var e=new o([1],0),r=0;t>r;r++)e=e.multiply(new o([1,c.gexp(r)],0));return e},getLengthInBits:function(t,e){if(e>=1&&10>e)switch(t){case l.MODE_NUMBER:return 10;case l.MODE_ALPHA_NUM:return 9;case l.MODE_8BIT_BYTE:case l.MODE_KANJI:return 8;default:throw new Error("mode:"+t)}else if(27>e)switch(t){case l.MODE_NUMBER:return 12;case l.MODE_ALPHA_NUM:return 11;case l.MODE_8BIT_BYTE:return 16;case l.MODE_KANJI:return 10;default:throw new Error("mode:"+t)}else{if(!(41>e))throw new Error("type:"+e);switch(t){case l.MODE_NUMBER:return 14;case l.MODE_ALPHA_NUM:return 13;case l.MODE_8BIT_BYTE:return 16;case l.MODE_KANJI:return 12;default:throw new Error("mode:"+t)}}},getLostPoint:function(t){for(var e=t.getModuleCount(),o=0,r=0;e>r;r++)for(var i=0;e>i;i++){for(var n=0,a=t.isDark(r,i),s=-1;1>=s;s++)if(!(0>r+s||r+s>=e))for(var l=-1;1>=l;l++)0>i+l||i+l>=e||(0!=s||0!=l)&&a==t.isDark(r+s,i+l)&&n++;n>5&&(o+=3+n-5)}for(var r=0;e-1>r;r++)for(var i=0;e-1>i;i++){var h=0;t.isDark(r,i)&&h++,t.isDark(r+1,i)&&h++,t.isDark(r,i+1)&&h++,t.isDark(r+1,i+1)&&h++,(0==h||4==h)&&(o+=3)}for(var r=0;e>r;r++)for(var i=0;e-6>i;i++)t.isDark(r,i)&&!t.isDark(r,i+1)&&t.isDark(r,i+2)&&t.isDark(r,i+3)&&t.isDark(r,i+4)&&!t.isDark(r,i+5)&&t.isDark(r,i+6)&&(o+=40);for(var i=0;e>i;i++)for(var r=0;e-6>r;r++)t.isDark(r,i)&&!t.isDark(r+1,i)&&t.isDark(r+2,i)&&t.isDark(r+3,i)&&t.isDark(r+4,i)&&!t.isDark(r+5,i)&&t.isDark(r+6,i)&&(o+=40);for(var u=0,i=0;e>i;i++)for(var r=0;e>r;r++)t.isDark(r,i)&&u++;return o+=Math.abs(100*u/e/e-50)/5*10}},c={glog:function(t){if(1>t)throw new Error("glog("+t+")");return c.LOG_TABLE[t]},gexp:function(t){for(;0>t;)t+=255;for(;t>=256;)t-=255;return c.EXP_TABLE[t]},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)},f=0;8>f;f++)c.EXP_TABLE[f]=1<f;f++)c.EXP_TABLE[f]=c.EXP_TABLE[f-4]^c.EXP_TABLE[f-5]^c.EXP_TABLE[f-6]^c.EXP_TABLE[f-8];for(var f=0;255>f;f++)c.LOG_TABLE[c.EXP_TABLE[f]]=f;o.prototype={get:function(t){return this.num[t]},getLength:function(){return this.num.length},multiply:function(t){for(var e=new Array(this.getLength()+t.getLength()-1),r=0;ra;a++)for(var s=o[3*a+0],l=o[3*a+1],h=o[3*a+2],u=0;s>u;u++)n.push(new r(l,h));return n},r.getRsBlockTable=function(t,e){switch(e){case h.L:return r.RS_BLOCK_TABLE[4*(t-1)+0];case h.M:return r.RS_BLOCK_TABLE[4*(t-1)+1];case h.Q:return r.RS_BLOCK_TABLE[4*(t-1)+2];case h.H:return r.RS_BLOCK_TABLE[4*(t-1)+3];default:return}},i.prototype={get:function(t){var e=Math.floor(t/8);return 1==(1&this.buffer[e]>>>7-t%8)},put:function(t,e){for(var o=0;e>o;o++)this.putBit(1==(1&t>>>e-o-1))},getLengthInBits:function(){return this.length},putBit:function(t){var e=Math.floor(this.length/8);this.buffer.length<=e&&this.buffer.push(0),t&&(this.buffer[e]|=128>>>this.length%8),this.length++}};var g=[[17,14,11,7],[32,26,20,14],[53,42,32,24],[78,62,46,34],[106,84,60,44],[134,106,74,58],[154,122,86,64],[192,152,108,84],[230,180,130,98],[271,213,151,119],[321,251,177,137],[367,287,203,155],[425,331,241,177],[458,362,258,194],[520,412,292,220],[586,450,322,250],[644,504,364,280],[718,560,394,310],[792,624,442,338],[858,666,482,382],[929,711,509,403],[1003,779,565,439],[1091,857,611,461],[1171,911,661,511],[1273,997,715,535],[1367,1059,751,593],[1465,1125,805,625],[1528,1190,868,658],[1628,1264,908,698],[1732,1370,982,742],[1840,1452,1030,790],[1952,1538,1112,842],[2068,1628,1168,898],[2188,1722,1228,958],[2303,1809,1283,983],[2431,1911,1351,1051],[2563,1989,1423,1093],[2699,2099,1499,1139],[2809,2213,1579,1219],[2953,2331,1663,1273]],m=function(){var t=function(t,e){this._el=t,this._htOption=e};return t.prototype.draw=function(t){function e(t,e){var o=document.createElementNS("http://www.w3.org/2000/svg",t);for(var r in e)e.hasOwnProperty(r)&&o.setAttribute(r,e[r]);return o}var o=this._htOption,r=this._el,i=t.getModuleCount();Math.floor(o.width/i),Math.floor(o.height/i),this.clear();var n=e("svg",{viewBox:"0 0 "+String(i)+" "+String(i),width:"100%",height:"100%",fill:o.colorLight});n.setAttributeNS("http://www.w3.org/2000/xmlns/","xmlns:xlink","http://www.w3.org/1999/xlink"),r.appendChild(n),n.appendChild(e("rect",{fill:o.colorDark,width:"1",height:"1",id:"template"}));for(var a=0;i>a;a++)for(var s=0;i>s;s++)if(t.isDark(a,s)){var l=e("use",{x:String(a),y:String(s)});l.setAttributeNS("http://www.w3.org/1999/xlink","href","#template"),n.appendChild(l)}},t.prototype.clear=function(){for(;this._el.hasChildNodes();)this._el.removeChild(this._el.lastChild)},t}(),p="svg"===document.documentElement.tagName.toLowerCase(),v=p?m:function(){return"undefined"!=typeof CanvasRenderingContext2D}()?function(){function t(){this._elImage.src=this._elCanvas.toDataURL("image/png"),this._elImage.style.display="block",this._elCanvas.style.display="none"}function e(t,e){var o=this;if(o._fFail=e,o._fSuccess=t,null===o._bSupportDataURI){var r=document.createElement("img"),i=function(){o._bSupportDataURI=!1,o._fFail&&_fFail.call(o)},n=function(){o._bSupportDataURI=!0,o._fSuccess&&o._fSuccess.call(o)};return r.onabort=i,r.onerror=i,r.onload=n,void(r.src="data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==")}!0===o._bSupportDataURI&&o._fSuccess?o._fSuccess.call(o):!1===o._bSupportDataURI&&o._fFail&&o._fFail.call(o)}if(this._android&&this._android<=2.1){var o=1/window.devicePixelRatio,r=CanvasRenderingContext2D.prototype.drawImage;CanvasRenderingContext2D.prototype.drawImage=function(t,e,i,n,a,s,l,h){if("nodeName"in t&&/img/i.test(t.nodeName))for(var u=arguments.length-1;u>=1;u--)arguments[u]=arguments[u]*o;else void 0===h&&(arguments[1]*=o,arguments[2]*=o,arguments[3]*=o,arguments[4]*=o);r.apply(this,arguments)}}var i=function(t,e){this._bIsPainted=!1,this._android=n(),this._htOption=e,this._elCanvas=document.createElement("canvas"),this._elCanvas.width=e.width,this._elCanvas.height=e.height,t.appendChild(this._elCanvas),this._el=t,this._oContext=this._elCanvas.getContext("2d"),this._bIsPainted=!1,this._elImage=document.createElement("img"),this._elImage.style.display="none",this._el.appendChild(this._elImage),this._bSupportDataURI=null};return i.prototype.draw=function(t){var e=this._elImage,o=this._oContext,r=this._htOption,i=t.getModuleCount(),n=r.width/i,a=r.height/i,s=Math.round(n),l=Math.round(a);e.style.display="none",this.clear();for(var h=0;i>h;h++)for(var u=0;i>u;u++){var d=t.isDark(h,u),c=u*n,f=h*a;o.strokeStyle=d?r.colorDark:r.colorLight,o.lineWidth=1,o.fillStyle=d?r.colorDark:r.colorLight,o.fillRect(c,f,n,a),o.strokeRect(Math.floor(c)+.5,Math.floor(f)+.5,s,l),o.strokeRect(Math.ceil(c)-.5,Math.ceil(f)-.5,s,l)}this._bIsPainted=!0},i.prototype.makeImage=function(){this._bIsPainted&&e.call(this,t)},i.prototype.isPainted=function(){return this._bIsPainted},i.prototype.clear=function(){this._oContext.clearRect(0,0,this._elCanvas.width,this._elCanvas.height),this._bIsPainted=!1},i.prototype.round=function(t){return t?Math.floor(1e3*t)/1e3:t},i}():function(){var t=function(t,e){this._el=t,this._htOption=e};return t.prototype.draw=function(t){for(var e=this._htOption,o=this._el,r=t.getModuleCount(),i=Math.floor(e.width/r),n=Math.floor(e.height/r),a=[''],s=0;r>s;s++){a.push("");for(var l=0;r>l;l++)a.push('');a.push("")}a.push("
"),o.innerHTML=a.join("");var h=o.childNodes[0],u=(e.width-h.offsetWidth)/2,d=(e.height-h.offsetHeight)/2;u>0&&d>0&&(h.style.margin=d+"px "+u+"px")},t.prototype.clear=function(){this._el.innerHTML=""},t}();QRCode=function(t,e){if(this._htOption={width:256,height:256,typeNumber:4,colorDark:"#000000",colorLight:"#ffffff",correctLevel:h.H},"string"==typeof e&&(e={text:e}),e)for(var o in e)this._htOption[o]=e[o];"string"==typeof t&&(t=document.getElementById(t)),this._android=n(),this._el=t,this._oQRCode=null,this._oDrawing=new v(this._el,this._htOption),this._htOption.text&&this.makeCode(this._htOption.text)},QRCode.prototype.makeCode=function(t){this._oQRCode=new e(a(t,this._htOption.correctLevel),this._htOption.correctLevel),this._oQRCode.addData(t),this._oQRCode.make(),this._el.title=t,this._oDrawing.draw(this._oQRCode),this.makeImage()},QRCode.prototype.makeImage=function(){"function"==typeof this._oDrawing.makeImage&&(!this._android||this._android>=3)&&this._oDrawing.makeImage()},QRCode.prototype.clear=function(){this._oDrawing.clear()},QRCode.CorrectLevel=h}(); \ No newline at end of file diff --git a/chrome-extension/cx-wallet.html b/chrome-extension/cx-wallet.html index 3b5b181d4c..de09b44685 100644 --- a/chrome-extension/cx-wallet.html +++ b/chrome-extension/cx-wallet.html @@ -43,7 +43,7 @@
Open-Source & Client-Side Ether Wallet - · v3.6.6    + · v3.6.7    diff --git a/chrome-extension/js/etherwallet-master.js b/chrome-extension/js/etherwallet-master.js index 6197329807..b20c22c767 100644 --- a/chrome-extension/js/etherwallet-master.js +++ b/chrome-extension/js/etherwallet-master.js @@ -121,7 +121,7 @@ module.exports=[{ },{}],6:[function(require,module,exports){ 'use strict'; -var ajaxReq = function () {}; +var ajaxReq = function ajaxReq() {}; ajaxReq.http = null; ajaxReq.postSerializer = null; ajaxReq.getETHvalue = null; @@ -131,7 +131,7 @@ module.exports = ajaxReq; },{}],7:[function(require,module,exports){ 'use strict'; -var bity = function () {}; +var bity = function bity() {}; bity.SERVERURL = "https://bity.myetherapi.com"; bity.decimals = 6; bity.ethExplorer = 'https://etherscan.io/tx/[[txHash]]'; @@ -202,7 +202,7 @@ module.exports = bity; },{}],8:[function(require,module,exports){ 'use strict'; -var addWalletCtrl = function ($scope, $sce) { +var addWalletCtrl = function addWalletCtrl($scope, $sce) { $scope.showBtnGen = $scope.showBtnUnlock = $scope.showBtnAdd = $scope.showBtnAddWallet = $scope.showAddWallet = $scope.requireFPass = $scope.requirePPass = $scope.showPassTxt = false; $scope.nickNames = []; $scope.filePassword = $scope.fileContent = ""; @@ -405,7 +405,7 @@ module.exports = addWalletCtrl; },{}],9:[function(require,module,exports){ 'use strict'; -var cxDecryptWalletCtrl = function ($scope, $sce, walletService) { +var cxDecryptWalletCtrl = function cxDecryptWalletCtrl($scope, $sce, walletService) { $scope.allWallets = []; $scope.selectedWallet = $scope.password = ""; $scope.setAllWallets = function () { @@ -456,7 +456,7 @@ module.exports = cxDecryptWalletCtrl; },{}],10:[function(require,module,exports){ 'use strict'; -var mainPopCtrl = function ($scope, $sce) { +var mainPopCtrl = function mainPopCtrl($scope, $sce) { $scope.allWallets = []; $scope.allWatchOnly = []; $scope.setAllWallets = function () { @@ -492,7 +492,7 @@ module.exports = mainPopCtrl; },{}],11:[function(require,module,exports){ 'use strict'; -var myWalletsCtrl = function ($scope, $sce, walletService) { +var myWalletsCtrl = function myWalletsCtrl($scope, $sce, walletService) { $scope.editModal = new Modal(document.getElementById('editWallet')); $scope.viewModal = new Modal(document.getElementById('viewWalletDetails')); $scope.removeModal = new Modal(document.getElementById('removeWallet')); @@ -651,7 +651,7 @@ module.exports = myWalletsCtrl; },{}],12:[function(require,module,exports){ 'use strict'; -var quickSendCtrl = function ($scope, $sce) { +var quickSendCtrl = function quickSendCtrl($scope, $sce) { $scope.allWallets = []; $scope.selectedWallet = ""; $scope.showConfirm = false; @@ -750,7 +750,7 @@ module.exports = quickSendCtrl; },{}],13:[function(require,module,exports){ 'use strict'; -var bulkGenCtrl = function ($scope) { +var bulkGenCtrl = function bulkGenCtrl($scope) { $scope.showWallets = false; $scope.genWallets = function () { if ($scope.amount == '' || $scope.amount != parseInt($scope.amount, 10)) alert(globalFuncs.errorMsgs[0]);else { @@ -782,7 +782,7 @@ module.exports = bulkGenCtrl; },{}],14:[function(require,module,exports){ 'use strict'; -var contractsCtrl = function ($scope, $sce, walletService) { +var contractsCtrl = function contractsCtrl($scope, $sce, walletService) { $scope.ajaxReq = ajaxReq; walletService.wallet = null; $scope.visibility = "interactView"; @@ -947,13 +947,14 @@ var contractsCtrl = function ($scope, $sce, walletService) { if (!$scope.Validator.isValidAddress($scope.contract.address)) throw globalFuncs.errorMsgs[5];else if (!$scope.Validator.isJSON($scope.contract.abi)) throw globalFuncs.errorMsgs[26]; $scope.contract.functions = []; var tAbi = JSON.parse($scope.contract.abi); - for (var i in tAbi) if (tAbi[i].type == "function") { - tAbi[i].inputs.map(function (i) { - i.value = ''; - }); - $scope.contract.functions.push(tAbi[i]); - } - $scope.showReadWrite = true; + for (var i in tAbi) { + if (tAbi[i].type == "function") { + tAbi[i].inputs.map(function (i) { + i.value = ''; + }); + $scope.contract.functions.push(tAbi[i]); + } + }$scope.showReadWrite = true; } catch (e) { $scope.notifier.danger(e); } @@ -974,7 +975,7 @@ module.exports = contractsCtrl; (function (Buffer){ 'use strict'; -var decryptWalletCtrl = function ($scope, $sce, walletService) { +var decryptWalletCtrl = function decryptWalletCtrl($scope, $sce, walletService) { $scope.walletType = ""; $scope.requireFPass = $scope.requirePPass = $scope.showFDecrypt = $scope.showPDecrypt = $scope.showAOnly = $scope.showParityDecrypt = false; $scope.filePassword = ""; @@ -1034,7 +1035,9 @@ var decryptWalletCtrl = function ($scope, $sce, walletService) { $scope.HDWallet.dPath = $scope.HDWallet.defaultDPath; } }); - $scope.onHDDPathChange = function (password = '') { + $scope.onHDDPathChange = function () { + var password = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : ''; + $scope.HDWallet.numWallets = 0; if ($scope.walletType == 'pastemnemonic') { $scope.HDWallet.hdk = hd.HDKey.fromMasterSeed(hd.bip39.mnemonicToSeed($scope.manualmnemonic.trim(), password)); @@ -1066,7 +1069,7 @@ var decryptWalletCtrl = function ($scope, $sce, walletService) { $scope.showFDecrypt = $scope.filePassword.length >= 0; }; $scope.onPrivKeyChange = function () { - const manualprivkey = fixPkey($scope.manualprivkey); + var manualprivkey = fixPkey($scope.manualprivkey); $scope.requirePPass = manualprivkey.length == 128 || manualprivkey.length == 132; $scope.showPDecrypt = manualprivkey.length == 64; @@ -1151,10 +1154,10 @@ var decryptWalletCtrl = function ($scope, $sce, walletService) { $scope.wallet = { type: "addressOnly", address: $scope.addressOnly, - getAddressString: function () { + getAddressString: function getAddressString() { return this.address; }, - getChecksumAddressString: function () { + getChecksumAddressString: function getChecksumAddressString() { return ethUtil.toChecksumAddress(this.getAddressString()); }, setBalance: tempWallet.setBalance, @@ -1218,10 +1221,10 @@ var decryptWalletCtrl = function ($scope, $sce, walletService) { module.exports = decryptWalletCtrl; }).call(this,require("buffer").Buffer) -},{"buffer":160}],16:[function(require,module,exports){ +},{"buffer":161}],16:[function(require,module,exports){ 'use strict'; -var footerCtrl = function ($scope, globalService) { +var footerCtrl = function footerCtrl($scope, globalService) { $scope.footerModal = new Modal(document.getElementById('disclaimerModal')); $scope.ethBlockNumber = "loading"; $scope.etcBlockNumber = "loading"; @@ -1242,7 +1245,7 @@ module.exports = footerCtrl; },{}],17:[function(require,module,exports){ 'use strict'; -var offlineTxCtrl = function ($scope, $sce, walletService) { +var offlineTxCtrl = function offlineTxCtrl($scope, $sce, walletService) { $scope.ajaxReq = ajaxReq; walletService.wallet = null; walletService.password = ''; @@ -1329,7 +1332,9 @@ var offlineTxCtrl = function ($scope, $sce, walletService) { $scope.dropdownEnabled = true; } }, true); - $scope.setSendMode = function (index, tokenSymbol = '') { + $scope.setSendMode = function (index) { + var tokenSymbol = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ''; + $scope.tokenTx.id = index; if (index == 'ether') { $scope.unitReadable = ajaxReq.type; @@ -1410,7 +1415,7 @@ module.exports = offlineTxCtrl; },{}],18:[function(require,module,exports){ 'use strict'; -var sendTxCtrl = function ($scope, $sce, walletService) { +var sendTxCtrl = function sendTxCtrl($scope, $sce, walletService) { $scope.ajaxReq = ajaxReq; $scope.unitReadable = ajaxReq.type; $scope.sendTxModal = new Modal(document.getElementById('sendTransaction')); @@ -1439,7 +1444,10 @@ var sendTxCtrl = function ($scope, $sce, walletService) { tokenSymbol: globalFuncs.urlGet('tokenSymbol') == null ? false : globalFuncs.urlGet('tokenSymbol'), readOnly: globalFuncs.urlGet('readOnly') == null ? false : true }; - $scope.setSendMode = function (sendMode, tokenId = '', tokenSymbol = '') { + $scope.setSendMode = function (sendMode) { + var tokenId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ''; + var tokenSymbol = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : ''; + $scope.tx.sendMode = sendMode; $scope.unitReadable = ''; if (sendMode == 'ether') { @@ -1466,7 +1474,7 @@ var sendTxCtrl = function ($scope, $sce, walletService) { } if ($scope.tx.sendMode != 'token') $scope.tokenTx.id = -1; }; - var applyScope = function () { + var applyScope = function applyScope() { if (!$scope.$$phase) $scope.$apply(); }; globalFuncs.urlGet('sendMode') == null ? $scope.setSendMode('ether') : $scope.setSendMode(globalFuncs.urlGet('sendMode')); @@ -1482,7 +1490,7 @@ var sendTxCtrl = function ($scope, $sce, walletService) { $scope.wallet.setBalance(applyScope); $scope.wallet.setTokens(); if ($scope.parentTxConfig) { - var setTxObj = function () { + var setTxObj = function setTxObj() { $scope.tx.to = $scope.parentTxConfig.to; $scope.tx.value = $scope.parentTxConfig.value; $scope.tx.sendMode = $scope.parentTxConfig.sendMode ? $scope.parentTxConfig.sendMode : 'ether'; @@ -1619,7 +1627,7 @@ module.exports = sendTxCtrl; (function (Buffer){ 'use strict'; -var signMsgCtrl = function ($scope, $sce, walletService) { +var signMsgCtrl = function signMsgCtrl($scope, $sce, walletService) { walletService.wallet = null; $scope.visibility = "signView"; $scope.$watch(function () { @@ -1678,10 +1686,10 @@ var signMsgCtrl = function ($scope, $sce, walletService) { module.exports = signMsgCtrl; }).call(this,require("buffer").Buffer) -},{"buffer":160}],20:[function(require,module,exports){ +},{"buffer":161}],20:[function(require,module,exports){ 'use strict'; -var swapCtrl = function ($scope, $sce, walletService) { +var swapCtrl = function swapCtrl($scope, $sce, walletService) { var lStorageKey = "swapOrder"; $scope.ajaxReq = ajaxReq; $scope.Validator = Validator; @@ -1694,7 +1702,7 @@ var swapCtrl = function ($scope, $sce, walletService) { }, 30000); $scope.priceTicker = { ETHBTC: 1, ETHREP: 1, BTCREP: 1, BTCETH: 1, REPBTC: 1, REPETH: 1 }; $scope.availableCoins = ["ETH", "BTC", "REP"]; - var initValues = function () { + var initValues = function initValues() { $scope.showStage1 = true; $scope.showStage2 = $scope.showStage3Eth = $scope.showStage3Btc = false; $scope.orderResult = null; @@ -1718,7 +1726,7 @@ var swapCtrl = function ($scope, $sce, walletService) { greaterThanMax: 2, noErrors: 3 }; - var verify = function () { + var verify = function verify() { if (!$scope.bity.priceLoaded) return errors.priceNotLoaded;else if ($scope.swapOrder.toVal < bity.min || $scope.swapOrder.fromVal < bity.min) return errors.lessThanMin;else if ($scope.swapOrder.toCoin == "BTC" && $scope.swapOrder.toVal > bity.max || $scope.swapOrder.fromCoin == "BTC" && $scope.swapOrder.fromVal > bity.max) return errors.greaterThanMax;else if ($scope.swapOrder.toCoin == "ETH" && $scope.swapOrder.toVal * $scope.bity.curRate['ETHBTC'] > bity.max || $scope.swapOrder.fromCoin == "ETH" && $scope.swapOrder.fromVal * $scope.bity.curRate['ETHBTC'] > bity.max) return errors.greaterThanMax;else if ($scope.swapOrder.toCoin == "REP" && $scope.swapOrder.toVal * $scope.bity.curRate['REPBTC'] > bity.max || $scope.swapOrder.fromCoin == "REP" && $scope.swapOrder.fromVal * $scope.bity.curRate['REPBTC'] > bity.max) return errors.greaterThanMax; return errors.noErrors; }; @@ -1730,11 +1738,12 @@ var swapCtrl = function ($scope, $sce, walletService) { }; $scope.setOrderCoin = function (isFrom, coin) { if (isFrom) $scope.swapOrder.fromCoin = coin;else $scope.swapOrder.toCoin = coin; - if ($scope.swapOrder.fromCoin == $scope.swapOrder.toCoin) for (var i in $scope.availableCoins) if ($scope.availableCoins[i] != $scope.swapOrder.fromCoin) { - $scope.swapOrder.toCoin = $scope.availableCoins[i]; - break; - } - $scope.swapOrder.swapRate = $scope.bity.curRate[$scope.swapOrder.fromCoin + $scope.swapOrder.toCoin]; + if ($scope.swapOrder.fromCoin == $scope.swapOrder.toCoin) for (var i in $scope.availableCoins) { + if ($scope.availableCoins[i] != $scope.swapOrder.fromCoin) { + $scope.swapOrder.toCoin = $scope.availableCoins[i]; + break; + } + }$scope.swapOrder.swapRate = $scope.bity.curRate[$scope.swapOrder.fromCoin + $scope.swapOrder.toCoin]; $scope.swapOrder.swapPair = $scope.swapOrder.fromCoin + "/" + $scope.swapOrder.toCoin; $scope.updateEstimate(isFrom); $scope.dropdownFrom = $scope.dropdownTo = false; @@ -1754,27 +1763,27 @@ var swapCtrl = function ($scope, $sce, walletService) { $scope.notifier.danger(e); } }; - var getProgressBarArr = function (index, len) { + var getProgressBarArr = function getProgressBarArr(index, len) { var tempArr = []; for (var i = 0; i < len; i++) { if (i < index) tempArr.push('progress-true');else if (i == index) tempArr.push('progress-active');else tempArr.push(''); } return tempArr; }; - var isStorageOrderExists = function () { + var isStorageOrderExists = function isStorageOrderExists() { var order = localStorage.getItem(lStorageKey); return order && $scope.Validator.isJSON(order); }; - var setOrderFromStorage = function () { + var setOrderFromStorage = function setOrderFromStorage() { var order = JSON.parse(localStorage.getItem(lStorageKey)); $scope.orderResult = order; $scope.swapOrder = order.swapOrder; processOrder(); }; - var saveOrderToStorage = function (order) { + var saveOrderToStorage = function saveOrderToStorage(order) { localStorage.setItem(lStorageKey, JSON.stringify(order)); }; - var processOrder = function () { + var processOrder = function processOrder() { var orderResult = $scope.orderResult; orderResult.progress = { status: "OPEN", @@ -1887,7 +1896,7 @@ module.exports = swapCtrl; },{}],21:[function(require,module,exports){ 'use strict'; -var tabsCtrl = function ($scope, globalService, $translate, $sce) { +var tabsCtrl = function tabsCtrl($scope, globalService, $translate, $sce) { $scope.gService = globalService; $scope.tabNames = $scope.gService.tabs; $scope.curLang = 'English'; @@ -1932,9 +1941,11 @@ var tabsCtrl = function ($scope, globalService, $translate, $sce) { $scope.dropdownNode = false; Token.popTokens = $scope.curNode.tokenList; ajaxReq['key'] = key; - for (var attrname in $scope.curNode.lib) ajaxReq[attrname] = $scope.curNode.lib[attrname]; - for (var attrname in $scope.curNode) if (attrname != 'name' && attrname != 'tokenList' && attrname != 'lib') ajaxReq[attrname] = $scope.curNode[attrname]; - localStorage.setItem('curNode', JSON.stringify({ + for (var attrname in $scope.curNode.lib) { + ajaxReq[attrname] = $scope.curNode.lib[attrname]; + }for (var attrname in $scope.curNode) { + if (attrname != 'name' && attrname != 'tokenList' && attrname != 'lib') ajaxReq[attrname] = $scope.curNode[attrname]; + }localStorage.setItem('curNode', JSON.stringify({ key: key })); ajaxReq.getCurrentBlock(function (data) { @@ -1982,7 +1993,9 @@ var tabsCtrl = function ($scope, globalService, $translate, $sce) { var localNodes = localStorage.getItem('localNodes'); if (localNodes) { localNodes = JSON.parse(localNodes); - for (var i = 0; i < localNodes.length; i++) $scope.addCustomNodeToList(localNodes[i]); + for (var i = 0; i < localNodes.length; i++) { + $scope.addCustomNodeToList(localNodes[i]); + } } }; $scope.getCustomNodesFromStorage(); @@ -2050,8 +2063,11 @@ var tabsCtrl = function ($scope, globalService, $translate, $sce) { }; $scope.setErrorMsgLanguage = function () { - for (var i = 0; i < globalFuncs.errorMsgs.length; i++) $scope.setLanguageVal('ERROR_' + i, 'errorMsgs', i); - for (var i = 0; i < globalFuncs.successMsgs.length; i++) $scope.setLanguageVal('SUCCESS_' + (i + 1), 'successMsgs', i); + for (var i = 0; i < globalFuncs.errorMsgs.length; i++) { + $scope.setLanguageVal('ERROR_' + i, 'errorMsgs', i); + }for (var i = 0; i < globalFuncs.successMsgs.length; i++) { + $scope.setLanguageVal('SUCCESS_' + (i + 1), 'successMsgs', i); + } }; $scope.setGethErrMsgLanguage = function () { @@ -2139,7 +2155,7 @@ module.exports = tabsCtrl; },{}],22:[function(require,module,exports){ 'use strict'; -var viewCtrl = function ($scope, globalService, $sce) { +var viewCtrl = function viewCtrl($scope, globalService, $sce) { $scope.globalService = globalService; $scope.notifier = uiFuncs.notifier; $scope.notifier.sce = $sce; @@ -2150,7 +2166,7 @@ module.exports = viewCtrl; },{}],23:[function(require,module,exports){ 'use strict'; -var viewWalletCtrl = function ($scope, walletService) { +var viewWalletCtrl = function viewWalletCtrl($scope, walletService) { $scope.usdBalance = "loading"; $scope.eurBalance = "loading"; $scope.btcBalance = "loading"; @@ -2209,7 +2225,7 @@ module.exports = viewWalletCtrl; },{}],24:[function(require,module,exports){ 'use strict'; -var walletBalanceCtrl = function ($scope, $sce) { +var walletBalanceCtrl = function walletBalanceCtrl($scope, $sce) { $scope.ajaxReq = ajaxReq; $scope.localToken = { contractAdd: "", @@ -2261,7 +2277,7 @@ module.exports = walletBalanceCtrl; },{}],25:[function(require,module,exports){ 'use strict'; -var walletGenCtrl = function ($scope) { +var walletGenCtrl = function walletGenCtrl($scope) { $scope.password = ""; $scope.wallet = null; $scope.showWallet = false; @@ -2317,7 +2333,7 @@ module.exports = walletGenCtrl; },{}],26:[function(require,module,exports){ 'use strict'; -var cxFuncs = function () {}; +var cxFuncs = function cxFuncs() {}; cxFuncs.storage = chrome.storage.sync; cxFuncs.getAllNickNames = function (callback) { var nickNames = []; @@ -2405,7 +2421,7 @@ module.exports = cxFuncs; },{}],27:[function(require,module,exports){ 'use strict'; -var QRCodeDrtv = function () { +var QRCodeDrtv = function QRCodeDrtv() { return function (scope, element, attrs) { var watchVar = attrs.watchVar; scope.$watch(watchVar, function () { @@ -2431,15 +2447,15 @@ module.exports = QRCodeDrtv; },{}],28:[function(require,module,exports){ 'use strict'; -var addressFieldDrtv = function ($compile) { +var addressFieldDrtv = function addressFieldDrtv($compile) { return { restrict: "E", - link: function (scope, element, attrs) { + link: function link(scope, element, attrs) { var varName = attrs.varName; var varArr = varName.split('.'); var readOnly = attrs.readOnly ? attrs.readOnly : false; var placeholder = attrs.placeholder; - var setValue = function (value) { + var setValue = function setValue(value) { var temp = scope; for (var i in varArr) { if (i == varArr.length - 1) temp[varArr[i]] = value;else { @@ -2508,7 +2524,7 @@ module.exports = "