We use standard rates for all gas + a itty-bitty bit more to ensure it gets mined quickly. We do not take a transaction fee.
+
A standard transaction using 21000 gas will cost 0.000441 ETH. We use a slightly-above-minimum gas price of 0.000000021 ETH to ensure it gets mined quickly. We do not take a transaction fee.
@@ -604,8 +604,7 @@
"Only ETH
ETH (Standard Transaction): This generates a default transaction directly from one address to another. It has a default gas of 21000. It is likely that any ETH sent via this method will be replayed onto the ETC chain.
Coinbase: Do not send ETC & only send ETH via Standard Transaction. Split your ETC into a separate wallet and then use a standard transaction to send ETH. If you use "Only ETH", you need to manually reach out to Coinbase support to have it processed.
-
ShapeShift: Using the "Only ETH" or "Only ETC" function may lead to delays in processing you need to reach out to them to have it manually processed.
+
Coinbase & ShapeShift: Only send via Standard Transaction. If you send via the "Only" contracts, you will need to reach out to their support staff to manually add your balance or refund you. You can try Shapeshift's "split" tool as well.
We use standard rates for all gas + a itty-bitty bit more to ensure it gets mined quickly. We do not take a transaction fee.
+
A standard transaction using 21000 gas will cost 0.000441 ETH. We use a slightly-above-minimum gas price of 0.000000021 ETH to ensure it gets mined quickly. We do not take a transaction fee.
@@ -463,8 +463,7 @@
"Only ETH
ETH (Standard Transaction): This generates a default transaction directly from one address to another. It has a default gas of 21000. It is likely that any ETH sent via this method will be replayed onto the ETC chain.
Coinbase: Do not send ETC & only send ETH via Standard Transaction. Split your ETC into a separate wallet and then use a standard transaction to send ETH. If you use "Only ETH", you need to manually reach out to Coinbase support to have it processed.
-
ShapeShift: Using the "Only ETH" or "Only ETC" function may lead to delays in processing you need to reach out to them to have it manually processed.
+
Coinbase & ShapeShift: Only send via Standard Transaction. If you send via the "Only" contracts, you will need to reach out to their support staff to manually add your balance or refund you. You can try Shapeshift's "split" tool as well.
'
-}
-globalFuncs.errorMsgs = [
- "Please enter valid amount. ",
- "Your password must be at least 9 characters. Please ensure it is a strong password. ",
- "Sorry! We don't have a clue what type of wallet file this is. ",
- "This is not a valid wallet file. ",
- "This unit doesn\'t exists, please use the one of the following units ",
- "Invalid address. ",
- "Invalid password. ",
- "Invalid amount. ",
- "Invalid gas limit. ",
- "Invalid data value. ",
- "Invalid gas amount. ",
- "Invalid nonce. ",
- "Invalid signed transaction. ",
- "A wallet with this nickname already exists. ",
- "Wallet not found. ",
- "Whoops. It doesnt look like a proposal with this ID exists yet or there is an error reading this proposal. ",
- "A wallet with this address already exists in storage. Please check your wallets page. ",
- "You need to have at some ETH in your account to cover the cost of gas. .01ETH should be more than sufficient for a few sends and votes. ",
- "All gas would be used on this transaction. This means you have already voted on this proposal or the debate period has ended.",
- "Invalid symbol"];
-globalFuncs.successMsgs = ["Valid address", "Wallet successfully decrypted", "Transaction submitted. TX ID: ", "New wallet added: ", "You have successfully voted. Thank you for being an active participant in The DAO."];
-globalFuncs.scrypt = {
- n: 1024
-};
-globalFuncs.postDelay = 300;
-globalFuncs.kdf = "scrypt";
-globalFuncs.defaultTxGasLimit = 21000;
-globalFuncs.digixClaimTxGasLimit = 150000;
-globalFuncs.donateAddress = "0x7cB57B5A97eAbe94205C07890BE4c1aD31E486A8";
-globalFuncs.isNumeric = function(n) {
- return !isNaN(parseFloat(n)) && isFinite(n);
-}
-globalFuncs.urlGet = function(name) {
- if (name = (new RegExp('[?&]' + encodeURIComponent(name) + '=([^&]*)')).exec(location.search)) return this.stripTags(decodeURIComponent(name[1]));
-}
-globalFuncs.stripTags = function(str) {
- var SCRIPT_REGEX = /)<[^<]*)*<\/script>/gi;
- while (SCRIPT_REGEX.test(str)) {
- str = str.replace(SCRIPT_REGEX, "");
- }
- return str;
-}
-globalFuncs.checkAndRedirectHTTPS = function() {
- var host = "myetherwallet.com";
- var githost = "kvhnuke.github.io";
- var githostw = "www.kvhnuke.github.io";
- var hostw = "www.myetherwallet.com";
- if ((host == window.location.host || githost == window.location.host || hostw == window.location.host || githostw == window.location.host) && (window.location.protocol != "https:")) window.location.protocol = "https";
-}
-globalFuncs.isStrongPass = function(password) {
- return password.length > 8;
-}
-globalFuncs.hexToAscii = function(hex) {
- return hex.match(/.{1,2}/g).map(function(v) {
- return String.fromCharCode(parseInt(v, 16));
- }).join('');
-}
-globalFuncs.isAlphaNumeric = function(value){
- return !/[^a-zA-Z0-9]/.test(value);
-}
-module.exports = globalFuncs;
+'use strict';
+var globalFuncs = function() {}
+globalFuncs.getBlockie = function(address) {
+ return blockies.create({
+ seed: address.toLowerCase(),
+ size: 8,
+ scale: 16
+ }).toDataURL();
+}
+globalFuncs.printPaperWallets = function(strJson) {
+ var win = window.open("about:blank", "_blank");
+ var data = "");
+}
+globalFuncs.getBlob = function(mime, str) {
+ var str = (typeof str === 'object') ? JSON.stringify(str) : str;
+ if (str == null) return '';
+ var blob = new Blob([str], {
+ type: mime
+ });
+ return window.URL.createObjectURL(blob);
+}
+globalFuncs.getSuccessText = function(str) {
+ return '
'
+}
+globalFuncs.errorMsgs = [
+ "Please enter valid amount. ",
+ "Your password must be at least 9 characters. Please ensure it is a strong password. ",
+ "Sorry! We don't have a clue what type of wallet file this is. ",
+ "This is not a valid wallet file. ",
+ "This unit doesn\'t exists, please use the one of the following units ",
+ "Invalid address. ",
+ "Invalid password. ",
+ "Invalid amount. ",
+ "Invalid gas limit. ",
+ "Invalid data value. ",
+ "Invalid gas amount. ",
+ "Invalid nonce. ",
+ "Invalid signed transaction. ",
+ "A wallet with this nickname already exists. ",
+ "Wallet not found. ",
+ "Whoops. It doesnt look like a proposal with this ID exists yet or there is an error reading this proposal. ",
+ "A wallet with this address already exists in storage. Please check your wallets page. ",
+ "You need to have at some ETH in your account to cover the cost of gas. .01ETH should be more than sufficient for a few sends and votes. ",
+ "All gas would be used on this transaction. This means you have already voted on this proposal or the debate period has ended.",
+ "Invalid symbol"];
+globalFuncs.successMsgs = ["Valid address", "Wallet successfully decrypted", "Transaction submitted. TX ID: ", "New wallet added: ", "You have successfully voted. Thank you for being an active participant in The DAO."];
+globalFuncs.scrypt = {
+ n: 1024
+};
+globalFuncs.postDelay = 300;
+globalFuncs.kdf = "scrypt";
+globalFuncs.defaultTxGasLimit = 21000;
+globalFuncs.digixClaimTxGasLimit = 150000;
+globalFuncs.donateAddress = "0x7cB57B5A97eAbe94205C07890BE4c1aD31E486A8";
+globalFuncs.isNumeric = function(n) {
+ return !isNaN(parseFloat(n)) && isFinite(n);
+}
+globalFuncs.urlGet = function(name) {
+ if (name = (new RegExp('[?&]' + encodeURIComponent(name) + '=([^&]*)')).exec(location.search)) return this.stripTags(decodeURIComponent(name[1]));
+}
+globalFuncs.stripTags = function(str) {
+ var SCRIPT_REGEX = /)<[^<]*)*<\/script>/gi;
+ while (SCRIPT_REGEX.test(str)) {
+ str = str.replace(SCRIPT_REGEX, "");
+ }
+ return str;
+}
+globalFuncs.checkAndRedirectHTTPS = function() {
+ var host = "myetherwallet.com";
+ var githost = "kvhnuke.github.io";
+ var githostw = "www.kvhnuke.github.io";
+ var hostw = "www.myetherwallet.com";
+ if ((host == window.location.host || githost == window.location.host || hostw == window.location.host || githostw == window.location.host) && (window.location.protocol != "https:")) window.location.protocol = "https";
+}
+globalFuncs.isStrongPass = function(password) {
+ return password.length > 8;
+}
+globalFuncs.hexToAscii = function(hex) {
+ return hex.match(/.{1,2}/g).map(function(v) {
+ return String.fromCharCode(parseInt(v, 16));
+ }).join('');
+}
+globalFuncs.isAlphaNumeric = function(value){
+ return !/[^a-zA-Z0-9]/.test(value);
+}
+module.exports = globalFuncs;
},{}],27:[function(require,module,exports){
-'use strict';
-var IS_CX = false;
-if(typeof chrome != 'undefined')
- IS_CX = chrome.windows === undefined ? false : true;
-require("babel-polyfill");
-var angular = require('angular');
-var angularTranslate = require('angular-translate');
-var angularSanitize = require('angular-sanitize');
-var BigNumber = require('bignumber.js');
-window.BigNumber = BigNumber;
-var marked = require('marked');
-window.marked = marked;
-var ethUtil = require('ethereumjs-util');
-ethUtil.crypto = require('crypto');
-ethUtil.Tx = require('ethereumjs-tx');
-ethUtil.scrypt = require('scryptsy');
-ethUtil.uuid = require('uuid');
-window.ethUtil = ethUtil;
-var Wallet = require('./myetherwallet');
-window.Wallet = Wallet;
-var Token = require('./tokens');
-window.Token = Token;
-var globalFuncs = require('./globalFuncs');
-window.globalFuncs = globalFuncs;
-var uiFuncs = require('./uiFuncs');
-window.uiFuncs = uiFuncs;
-var etherUnits = require('./etherUnits');
-window.etherUnits = etherUnits;
-var ajaxReq = require('./ajaxReq');
-window.ajaxReq = ajaxReq;
-var ethFuncs = require('./ethFuncs');
-window.ethFuncs = ethFuncs;
-var translate = require('./translations/translate.js');
-if(IS_CX){
- var cxFuncs = require('./cxFuncs');
- window.cxFuncs = cxFuncs;
-}
-var tabsCtrl = require('./controllers/tabsCtrl');
-var viewCtrl = require('./controllers/viewCtrl');
-var walletGenCtrl = require('./controllers/walletGenCtrl');
-var bulkGenCtrl = require('./controllers/bulkGenCtrl');
-var decryptWalletCtrl = require('./controllers/decryptWalletCtrl');
-var viewWalletCtrl = require('./controllers/viewWalletCtrl');
-var sendTxCtrl = require('./controllers/sendTxCtrl');
-var digixCtrl = require('./controllers/digixCtrl');
-var theDaoCtrl = require('./controllers/theDaoCtrl');
-var tokenCtrl = require('./controllers/tokenCtrl');
-var sendOfflineTxCtrl = require('./controllers/sendOfflineTxCtrl');
-var globalService = require('./services/globalService');
-var walletService = require('./services/walletService');
-var blockiesDrtv = require('./directives/blockiesDrtv');
-var QRCodeDrtv = require('./directives/QRCodeDrtv');
-var walletDecryptDrtv = require('./directives/walletDecryptDrtv');
-var cxWalletDecryptDrtv = require('./directives/cxWalletDecryptDrtv');
-var fileReaderDrtv = require('./directives/fileReaderDrtv');
-if(IS_CX){
- var addWalletCtrl = require('./controllers/CX/addWalletCtrl');
- var cxDecryptWalletCtrl = require('./controllers/CX/cxDecryptWalletCtrl');
- var myWalletsCtrl = require('./controllers/CX/myWalletsCtrl');
- var mainPopCtrl = require('./controllers/CX/mainPopCtrl');
- var quickSendCtrl = require('./controllers/CX/quickSendCtrl');
-}
-var app = angular.module('mewApp',['pascalprecht.translate','ngSanitize']);
-app.config(['$compileProvider', function($compileProvider) {
- $compileProvider.aHrefSanitizationWhitelist(/^\s*(|blob|https|):/);
-}]);
-app.config(['$translateProvider', function($translateProvider) {
- new translate($translateProvider);
-}]);
-app.factory('globalService', ['$http','$httpParamSerializerJQLike',globalService]);
-app.factory('walletService', walletService);
-app.directive('blockieAddress', blockiesDrtv);
-app.directive('qrCode', QRCodeDrtv);
-app.directive('onReadFile', fileReaderDrtv);
-app.directive('walletDecryptDrtv', walletDecryptDrtv);
-app.directive('cxWalletDecryptDrtv', cxWalletDecryptDrtv);
-app.controller('tabsCtrl', ['$scope', 'globalService', tabsCtrl]);
-app.controller('viewCtrl', ['$scope', 'globalService', viewCtrl]);
-app.controller('walletGenCtrl', ['$scope', walletGenCtrl]);
-app.controller('bulkGenCtrl', ['$scope', bulkGenCtrl]);
-app.controller('decryptWalletCtrl', ['$scope','$sce','walletService', decryptWalletCtrl]);
-app.controller('viewWalletCtrl', ['$scope','walletService', viewWalletCtrl]);
-app.controller('sendTxCtrl', ['$scope','$sce','walletService', sendTxCtrl]);
-app.controller('digixCtrl', ['$scope','$sce','walletService', digixCtrl]);
-app.controller('theDaoCtrl', ['$scope','$sce','walletService', theDaoCtrl]);
-app.controller('tokenCtrl', ['$scope','$sce','walletService', tokenCtrl]);
-app.controller('sendOfflineTxCtrl', ['$scope','$sce','walletService', sendOfflineTxCtrl]);
-if(IS_CX){
- app.controller('addWalletCtrl', ['$scope','$sce', addWalletCtrl]);
- app.controller('myWalletsCtrl', ['$scope','$sce', myWalletsCtrl]);
- app.controller('mainPopCtrl', ['$scope','$sce', mainPopCtrl]);
- app.controller('quickSendCtrl', ['$scope','$sce', quickSendCtrl]);
- app.controller('cxDecryptWalletCtrl', ['$scope','$sce','walletService', cxDecryptWalletCtrl]);
-}
-
-},{"./ajaxReq":1,"./controllers/CX/addWalletCtrl":2,"./controllers/CX/cxDecryptWalletCtrl":3,"./controllers/CX/mainPopCtrl":4,"./controllers/CX/myWalletsCtrl":5,"./controllers/CX/quickSendCtrl":6,"./controllers/bulkGenCtrl":7,"./controllers/decryptWalletCtrl":8,"./controllers/digixCtrl":9,"./controllers/sendOfflineTxCtrl":10,"./controllers/sendTxCtrl":11,"./controllers/tabsCtrl":12,"./controllers/theDaoCtrl":13,"./controllers/tokenCtrl":14,"./controllers/viewCtrl":15,"./controllers/viewWalletCtrl":16,"./controllers/walletGenCtrl":17,"./cxFuncs":18,"./directives/QRCodeDrtv":19,"./directives/blockiesDrtv":20,"./directives/cxWalletDecryptDrtv":21,"./directives/fileReaderDrtv":22,"./directives/walletDecryptDrtv":23,"./ethFuncs":24,"./etherUnits":25,"./globalFuncs":26,"./myetherwallet":28,"./services/globalService":29,"./services/walletService":30,"./tokens":31,"./translations/translate.js":34,"./uiFuncs":35,"angular":40,"angular-sanitize":37,"angular-translate":38,"babel-polyfill":56,"bignumber.js":58,"crypto":392,"ethereumjs-tx":422,"ethereumjs-util":423,"marked":439,"scryptsy":469,"uuid":489}],28:[function(require,module,exports){
+'use strict';
+var IS_CX = false;
+if(typeof chrome != 'undefined')
+ IS_CX = chrome.windows === undefined ? false : true;
+require("babel-polyfill");
+var angular = require('angular');
+var angularTranslate = require('angular-translate');
+var angularSanitize = require('angular-sanitize');
+var BigNumber = require('bignumber.js');
+window.BigNumber = BigNumber;
+var marked = require('marked');
+window.marked = marked;
+var ethUtil = require('ethereumjs-util');
+ethUtil.crypto = require('crypto');
+ethUtil.Tx = require('ethereumjs-tx');
+ethUtil.scrypt = require('scryptsy');
+ethUtil.uuid = require('uuid');
+window.ethUtil = ethUtil;
+var Wallet = require('./myetherwallet');
+window.Wallet = Wallet;
+var Token = require('./tokens');
+window.Token = Token;
+var globalFuncs = require('./globalFuncs');
+window.globalFuncs = globalFuncs;
+var uiFuncs = require('./uiFuncs');
+window.uiFuncs = uiFuncs;
+var etherUnits = require('./etherUnits');
+window.etherUnits = etherUnits;
+var ajaxReq = require('./ajaxReq');
+window.ajaxReq = ajaxReq;
+var ethFuncs = require('./ethFuncs');
+window.ethFuncs = ethFuncs;
+var translate = require('./translations/translate.js');
+if(IS_CX){
+ var cxFuncs = require('./cxFuncs');
+ window.cxFuncs = cxFuncs;
+}
+var tabsCtrl = require('./controllers/tabsCtrl');
+var viewCtrl = require('./controllers/viewCtrl');
+var walletGenCtrl = require('./controllers/walletGenCtrl');
+var bulkGenCtrl = require('./controllers/bulkGenCtrl');
+var decryptWalletCtrl = require('./controllers/decryptWalletCtrl');
+var viewWalletCtrl = require('./controllers/viewWalletCtrl');
+var sendTxCtrl = require('./controllers/sendTxCtrl');
+var digixCtrl = require('./controllers/digixCtrl');
+var theDaoCtrl = require('./controllers/theDaoCtrl');
+var tokenCtrl = require('./controllers/tokenCtrl');
+var sendOfflineTxCtrl = require('./controllers/sendOfflineTxCtrl');
+var globalService = require('./services/globalService');
+var walletService = require('./services/walletService');
+var blockiesDrtv = require('./directives/blockiesDrtv');
+var QRCodeDrtv = require('./directives/QRCodeDrtv');
+var walletDecryptDrtv = require('./directives/walletDecryptDrtv');
+var cxWalletDecryptDrtv = require('./directives/cxWalletDecryptDrtv');
+var fileReaderDrtv = require('./directives/fileReaderDrtv');
+if(IS_CX){
+ var addWalletCtrl = require('./controllers/CX/addWalletCtrl');
+ var cxDecryptWalletCtrl = require('./controllers/CX/cxDecryptWalletCtrl');
+ var myWalletsCtrl = require('./controllers/CX/myWalletsCtrl');
+ var mainPopCtrl = require('./controllers/CX/mainPopCtrl');
+ var quickSendCtrl = require('./controllers/CX/quickSendCtrl');
+}
+var app = angular.module('mewApp',['pascalprecht.translate','ngSanitize']);
+app.config(['$compileProvider', function($compileProvider) {
+ $compileProvider.aHrefSanitizationWhitelist(/^\s*(|blob|https|):/);
+}]);
+app.config(['$translateProvider', function($translateProvider) {
+ new translate($translateProvider);
+}]);
+app.factory('globalService', ['$http','$httpParamSerializerJQLike',globalService]);
+app.factory('walletService', walletService);
+app.directive('blockieAddress', blockiesDrtv);
+app.directive('qrCode', QRCodeDrtv);
+app.directive('onReadFile', fileReaderDrtv);
+app.directive('walletDecryptDrtv', walletDecryptDrtv);
+app.directive('cxWalletDecryptDrtv', cxWalletDecryptDrtv);
+app.controller('tabsCtrl', ['$scope', 'globalService', tabsCtrl]);
+app.controller('viewCtrl', ['$scope', 'globalService', viewCtrl]);
+app.controller('walletGenCtrl', ['$scope', walletGenCtrl]);
+app.controller('bulkGenCtrl', ['$scope', bulkGenCtrl]);
+app.controller('decryptWalletCtrl', ['$scope','$sce','walletService', decryptWalletCtrl]);
+app.controller('viewWalletCtrl', ['$scope','walletService', viewWalletCtrl]);
+app.controller('sendTxCtrl', ['$scope','$sce','walletService', sendTxCtrl]);
+app.controller('digixCtrl', ['$scope','$sce','walletService', digixCtrl]);
+app.controller('theDaoCtrl', ['$scope','$sce','walletService', theDaoCtrl]);
+app.controller('tokenCtrl', ['$scope','$sce','walletService', tokenCtrl]);
+app.controller('sendOfflineTxCtrl', ['$scope','$sce','walletService', sendOfflineTxCtrl]);
+if(IS_CX){
+ app.controller('addWalletCtrl', ['$scope','$sce', addWalletCtrl]);
+ app.controller('myWalletsCtrl', ['$scope','$sce', myWalletsCtrl]);
+ app.controller('mainPopCtrl', ['$scope','$sce', mainPopCtrl]);
+ app.controller('quickSendCtrl', ['$scope','$sce', quickSendCtrl]);
+ app.controller('cxDecryptWalletCtrl', ['$scope','$sce','walletService', cxDecryptWalletCtrl]);
+}
+
+},{"./ajaxReq":1,"./controllers/CX/addWalletCtrl":2,"./controllers/CX/cxDecryptWalletCtrl":3,"./controllers/CX/mainPopCtrl":4,"./controllers/CX/myWalletsCtrl":5,"./controllers/CX/quickSendCtrl":6,"./controllers/bulkGenCtrl":7,"./controllers/decryptWalletCtrl":8,"./controllers/digixCtrl":9,"./controllers/sendOfflineTxCtrl":10,"./controllers/sendTxCtrl":11,"./controllers/tabsCtrl":12,"./controllers/theDaoCtrl":13,"./controllers/tokenCtrl":14,"./controllers/viewCtrl":15,"./controllers/viewWalletCtrl":16,"./controllers/walletGenCtrl":17,"./cxFuncs":18,"./directives/QRCodeDrtv":19,"./directives/blockiesDrtv":20,"./directives/cxWalletDecryptDrtv":21,"./directives/fileReaderDrtv":22,"./directives/walletDecryptDrtv":23,"./ethFuncs":24,"./etherUnits":25,"./globalFuncs":26,"./myetherwallet":28,"./services/globalService":29,"./services/walletService":30,"./tokens":31,"./translations/translate.js":34,"./uiFuncs":35,"angular":40,"angular-sanitize":37,"angular-translate":38,"babel-polyfill":56,"bignumber.js":58,"crypto":393,"ethereumjs-tx":423,"ethereumjs-util":424,"marked":440,"scryptsy":470,"uuid":490}],28:[function(require,module,exports){
(function (Buffer){
-'use strict';
-var Wallet = function(priv) {
- this.privKey = priv.length == 32 ? priv : Buffer(priv, 'hex')
-}
-Wallet.generate = function(icapDirect) {
- if (icapDirect) {
- while (true) {
- var privKey = ethUtil.crypto.randomBytes(32)
- if (ethUtil.privateToAddress(privKey)[0] === 0) {
- return new Wallet(privKey)
- }
- }
- } else {
- return new Wallet(ethUtil.crypto.randomBytes(32))
- }
-}
-Wallet.prototype.getPrivateKey = function() {
- return this.privKey
-}
-Wallet.prototype.getPrivateKeyString = function() {
- return this.getPrivateKey().toString('hex')
-}
-Wallet.prototype.getPublicKey = function() {
- return ethUtil.privateToPublic(this.privKey)
-}
-Wallet.prototype.getPublicKeyString = function() {
- return '0x' + this.getPublicKey().toString('hex')
-}
-Wallet.prototype.getAddress = function() {
- return ethUtil.privateToAddress(this.privKey)
-}
-Wallet.prototype.getAddressString = function() {
- return '0x' + this.getAddress().toString('hex')
-}
-Wallet.prototype.getChecksumAddressString = function() {
- return ethUtil.toChecksumAddress(this.getAddressString())
-}
-Wallet.fromPrivateKey = function(priv) {
- return new Wallet(priv)
-}
-Wallet.prototype.toV3 = function(password, opts) {
- opts = opts || {}
- var salt = opts.salt || ethUtil.crypto.randomBytes(32)
- var iv = opts.iv || ethUtil.crypto.randomBytes(16)
- var derivedKey
- var kdf = opts.kdf || 'scrypt'
- var kdfparams = {
- dklen: opts.dklen || 32,
- salt: salt.toString('hex')
- }
- if (kdf === 'pbkdf2') {
- kdfparams.c = opts.c || 262144
- kdfparams.prf = 'hmac-sha256'
- derivedKey = ethUtil.crypto.pbkdf2Sync(new Buffer(password), salt, kdfparams.c, kdfparams.dklen, 'sha256')
- } else if (kdf === 'scrypt') {
- // FIXME: support progress reporting callback
- kdfparams.n = opts.n || 262144
- kdfparams.r = opts.r || 8
- kdfparams.p = opts.p || 1
- derivedKey = ethUtil.scrypt(new Buffer(password), salt, kdfparams.n, kdfparams.r, kdfparams.p, kdfparams.dklen)
- } else {
- throw new Error('Unsupported kdf')
- }
- var cipher = ethUtil.crypto.createCipheriv(opts.cipher || 'aes-128-ctr', derivedKey.slice(0, 16), iv)
- if (!cipher) {
- throw new Error('Unsupported cipher')
- }
- var ciphertext = Buffer.concat([cipher.update(this.privKey), cipher.final()])
- var mac = ethUtil.sha3(Buffer.concat([derivedKey.slice(16, 32), new Buffer(ciphertext, 'hex')]))
- return {
- version: 3,
- id: ethUtil.uuid.v4({
- random: opts.uuid || ethUtil.crypto.randomBytes(16)
- }),
- address: this.getAddress().toString('hex'),
- Crypto: {
- ciphertext: ciphertext.toString('hex'),
- cipherparams: {
- iv: iv.toString('hex')
- },
- cipher: opts.cipher || 'aes-128-ctr',
- kdf: kdf,
- kdfparams: kdfparams,
- mac: mac.toString('hex')
- }
- }
-}
-Wallet.prototype.toJSON = function() {
- return {
- address: this.getAddressString(),
- checksumAddress: this.getChecksumAddressString(),
- privKey: this.getPrivateKeyString(),
- pubKey: this.getPublicKeyString(),
- publisher:"MyEtherWallet",
- encrypted:false,
- version:2
- }
-}
-Wallet.fromMyEtherWallet = function(input, password) {
- var json = (typeof input === 'object') ? input : JSON.parse(input)
- var privKey
- if (!json.locked) {
- if (json.private.length !== 64) {
- throw new Error('Invalid private key length')
- }
- privKey = new Buffer(json.private, 'hex')
- } else {
- if (typeof password !== 'string') {
- throw new Error('Password required')
- }
- if (password.length < 7) {
- throw new Error('Password must be at least 7 characters')
- }
- var cipher = json.encrypted ? json.private.slice(0, 128) : json.private
- cipher = Wallet.decodeCryptojsSalt(cipher)
- var evp = Wallet.evp_kdf(new Buffer(password), cipher.salt, {
- keysize: 32,
- ivsize: 16
- })
- var decipher = ethUtil.crypto.createDecipheriv('aes-256-cbc', evp.key, evp.iv)
- privKey = Wallet.decipherBuffer(decipher, new Buffer(cipher.ciphertext))
- privKey = new Buffer((privKey.toString()), 'hex')
- }
- var wallet = new Wallet(privKey)
- if (wallet.getAddressString() !== json.address) {
- throw new Error('Invalid private key or address')
- }
- return wallet
-}
-Wallet.fromMyEtherWalletV2 = function (input){
- var json = (typeof input === 'object') ? input : JSON.parse(input);
- if (json.privKey.length !== 64) {
- throw new Error('Invalid private key length');
- };
- var privKey = new Buffer(json.privKey, 'hex');
- return new Wallet(privKey);
-}
-Wallet.fromEthSale = function(input, password) {
- var json = (typeof input === 'object') ? input : JSON.parse(input)
- var encseed = new Buffer(json.encseed, 'hex')
- var derivedKey = ethUtil.crypto.pbkdf2Sync(Buffer(password), Buffer(password), 2000, 32, 'sha256').slice(0, 16)
- var decipher = ethUtil.crypto.createDecipheriv('aes-128-cbc', derivedKey, encseed.slice(0, 16))
- var seed = Wallet.decipherBuffer(decipher, encseed.slice(16))
- var wallet = new Wallet(ethUtil.sha3(seed))
- if (wallet.getAddress().toString('hex') !== json.ethaddr) {
- throw new Error('Decoded key mismatch - possibly wrong passphrase')
- }
- return wallet
-}
-Wallet.fromMyEtherWalletKey = function(input, password) {
- var cipher = input.slice(0, 128)
- cipher = Wallet.decodeCryptojsSalt(cipher)
- var evp = Wallet.evp_kdf(new Buffer(password), cipher.salt, {
- keysize: 32,
- ivsize: 16
- })
- var decipher = ethUtil.crypto.createDecipheriv('aes-256-cbc', evp.key, evp.iv)
- var privKey = Wallet.decipherBuffer(decipher, new Buffer(cipher.ciphertext))
- privKey = new Buffer((privKey.toString()), 'hex')
- return new Wallet(privKey)
-}
-Wallet.fromV3 = function(input, password, nonStrict) {
- var json = (typeof input === 'object') ? input : JSON.parse(nonStrict ? input.toLowerCase() : input)
- if (json.version !== 3) {
- throw new Error('Not a V3 wallet')
- }
- var derivedKey
- var kdfparams
- if (json.crypto.kdf === 'scrypt') {
- kdfparams = json.crypto.kdfparams
- derivedKey = ethUtil.scrypt(new Buffer(password), new Buffer(kdfparams.salt, 'hex'), kdfparams.n, kdfparams.r, kdfparams.p, kdfparams.dklen)
- } else if (json.crypto.kdf === 'pbkdf2') {
- kdfparams = json.crypto.kdfparams
- if (kdfparams.prf !== 'hmac-sha256') {
- throw new Error('Unsupported parameters to PBKDF2')
- }
- derivedKey = ethUtil.crypto.pbkdf2Sync(new Buffer(password), new Buffer(kdfparams.salt, 'hex'), kdfparams.c, kdfparams.dklen, 'sha256')
- } else {
- throw new Error('Unsupported key derivation scheme')
- }
- var ciphertext = new Buffer(json.crypto.ciphertext, 'hex')
- var mac = ethUtil.sha3(Buffer.concat([derivedKey.slice(16, 32), ciphertext]))
- if (mac.toString('hex') !== json.crypto.mac) {
- throw new Error('Key derivation failed - possibly wrong passphrase')
- }
- var decipher = ethUtil.crypto.createDecipheriv(json.crypto.cipher, derivedKey.slice(0, 16), new Buffer(json.crypto.cipherparams.iv, 'hex'))
- var seed = Wallet.decipherBuffer(decipher, ciphertext, 'hex')
- return new Wallet(seed)
-}
-Wallet.prototype.toV3String = function(password, opts) {
- return JSON.stringify(this.toV3(password, opts))
-}
-Wallet.prototype.getV3Filename = function (timestamp) {
- var ts = timestamp ? new Date(timestamp) : new Date()
- return [
- 'UTC--',
- ts.toJSON().replace(/:/g, '-'),
- '--',
- this.getAddress().toString('hex')
- ].join('')
-}
-Wallet.decipherBuffer = function(decipher, data) {
- return Buffer.concat([decipher.update(data), decipher.final()])
-}
-Wallet.decodeCryptojsSalt = function(input) {
- var ciphertext = new Buffer(input, 'base64')
- if (ciphertext.slice(0, 8).toString() === 'Salted__') {
- return {
- salt: ciphertext.slice(8, 16),
- ciphertext: ciphertext.slice(16)
- }
- } else {
- return {
- ciphertext: ciphertext
- }
- }
-}
-Wallet.evp_kdf = function(data, salt, opts) {
- // A single EVP iteration, returns `D_i`, where block equlas to `D_(i-1)`
-
- function iter(block) {
- var hash = ethUtil.crypto.createHash(opts.digest || 'md5')
- hash.update(block)
- hash.update(data)
- hash.update(salt)
- block = hash.digest()
- for (var i = 1; i < (opts.count || 1); i++) {
- hash = ethUtil.crypto.createHash(opts.digest || 'md5')
- hash.update(block)
- block = hash.digest()
- }
- return block
- }
- var keysize = opts.keysize || 16
- var ivsize = opts.ivsize || 16
- var ret = []
- var i = 0
- while (Buffer.concat(ret).length < (keysize + ivsize)) {
- ret[i] = iter((i === 0) ? new Buffer(0) : ret[i - 1])
- i++
- }
- var tmp = Buffer.concat(ret)
- return {
- key: tmp.slice(0, keysize),
- iv: tmp.slice(keysize, keysize + ivsize)
- }
-}
-Wallet.walletRequirePass = function(ethjson) {
- var jsonArr;
- try {
- jsonArr = JSON.parse(ethjson);
- } catch (err) {
- throw globalFuncs.errorMsgs[3];
- }
- if (jsonArr.encseed != null) return true;
- else if (jsonArr.Crypto != null || jsonArr.crypto != null) return true
- else if (jsonArr.hash != null && jsonArr.locked) return true;
- else if (jsonArr.hash != null && !jsonArr.locked) return false;
- else if (jsonArr.publisher == "MyEtherWallet" && !jsonArr.encrypted) return false;
- else
- throw globalFuncs.errorMsgs[2];
-}
-Wallet.getWalletFromPrivKeyFile = function(strjson, password) {
- var jsonArr = JSON.parse(strjson);
- if (jsonArr.encseed != null) return Wallet.fromEthSale(strjson, password);
- else if (jsonArr.Crypto != null || jsonArr.crypto != null) return Wallet.fromV3(strjson, password, true);
- else if (jsonArr.hash != null) return Wallet.fromMyEtherWallet(strjson, password);
- else if (jsonArr.publisher == "MyEtherWallet") return Wallet.fromMyEtherWalletV2(strjson);
- else
- throw globalFuncs.errorMsgs[2];
-}
+'use strict';
+var Wallet = function(priv) {
+ this.privKey = priv.length == 32 ? priv : Buffer(priv, 'hex')
+}
+Wallet.generate = function(icapDirect) {
+ if (icapDirect) {
+ while (true) {
+ var privKey = ethUtil.crypto.randomBytes(32)
+ if (ethUtil.privateToAddress(privKey)[0] === 0) {
+ return new Wallet(privKey)
+ }
+ }
+ } else {
+ return new Wallet(ethUtil.crypto.randomBytes(32))
+ }
+}
+Wallet.prototype.getPrivateKey = function() {
+ return this.privKey
+}
+Wallet.prototype.getPrivateKeyString = function() {
+ return this.getPrivateKey().toString('hex')
+}
+Wallet.prototype.getPublicKey = function() {
+ return ethUtil.privateToPublic(this.privKey)
+}
+Wallet.prototype.getPublicKeyString = function() {
+ return '0x' + this.getPublicKey().toString('hex')
+}
+Wallet.prototype.getAddress = function() {
+ return ethUtil.privateToAddress(this.privKey)
+}
+Wallet.prototype.getAddressString = function() {
+ return '0x' + this.getAddress().toString('hex')
+}
+Wallet.prototype.getChecksumAddressString = function() {
+ return ethUtil.toChecksumAddress(this.getAddressString())
+}
+Wallet.fromPrivateKey = function(priv) {
+ return new Wallet(priv)
+}
+Wallet.prototype.toV3 = function(password, opts) {
+ opts = opts || {}
+ var salt = opts.salt || ethUtil.crypto.randomBytes(32)
+ var iv = opts.iv || ethUtil.crypto.randomBytes(16)
+ var derivedKey
+ var kdf = opts.kdf || 'scrypt'
+ var kdfparams = {
+ dklen: opts.dklen || 32,
+ salt: salt.toString('hex')
+ }
+ if (kdf === 'pbkdf2') {
+ kdfparams.c = opts.c || 262144
+ kdfparams.prf = 'hmac-sha256'
+ derivedKey = ethUtil.crypto.pbkdf2Sync(new Buffer(password), salt, kdfparams.c, kdfparams.dklen, 'sha256')
+ } else if (kdf === 'scrypt') {
+ // FIXME: support progress reporting callback
+ kdfparams.n = opts.n || 262144
+ kdfparams.r = opts.r || 8
+ kdfparams.p = opts.p || 1
+ derivedKey = ethUtil.scrypt(new Buffer(password), salt, kdfparams.n, kdfparams.r, kdfparams.p, kdfparams.dklen)
+ } else {
+ throw new Error('Unsupported kdf')
+ }
+ var cipher = ethUtil.crypto.createCipheriv(opts.cipher || 'aes-128-ctr', derivedKey.slice(0, 16), iv)
+ if (!cipher) {
+ throw new Error('Unsupported cipher')
+ }
+ var ciphertext = Buffer.concat([cipher.update(this.privKey), cipher.final()])
+ var mac = ethUtil.sha3(Buffer.concat([derivedKey.slice(16, 32), new Buffer(ciphertext, 'hex')]))
+ return {
+ version: 3,
+ id: ethUtil.uuid.v4({
+ random: opts.uuid || ethUtil.crypto.randomBytes(16)
+ }),
+ address: this.getAddress().toString('hex'),
+ Crypto: {
+ ciphertext: ciphertext.toString('hex'),
+ cipherparams: {
+ iv: iv.toString('hex')
+ },
+ cipher: opts.cipher || 'aes-128-ctr',
+ kdf: kdf,
+ kdfparams: kdfparams,
+ mac: mac.toString('hex')
+ }
+ }
+}
+Wallet.prototype.toJSON = function() {
+ return {
+ address: this.getAddressString(),
+ checksumAddress: this.getChecksumAddressString(),
+ privKey: this.getPrivateKeyString(),
+ pubKey: this.getPublicKeyString(),
+ publisher:"MyEtherWallet",
+ encrypted:false,
+ version:2
+ }
+}
+Wallet.fromMyEtherWallet = function(input, password) {
+ var json = (typeof input === 'object') ? input : JSON.parse(input)
+ var privKey
+ if (!json.locked) {
+ if (json.private.length !== 64) {
+ throw new Error('Invalid private key length')
+ }
+ privKey = new Buffer(json.private, 'hex')
+ } else {
+ if (typeof password !== 'string') {
+ throw new Error('Password required')
+ }
+ if (password.length < 7) {
+ throw new Error('Password must be at least 7 characters')
+ }
+ var cipher = json.encrypted ? json.private.slice(0, 128) : json.private
+ cipher = Wallet.decodeCryptojsSalt(cipher)
+ var evp = Wallet.evp_kdf(new Buffer(password), cipher.salt, {
+ keysize: 32,
+ ivsize: 16
+ })
+ var decipher = ethUtil.crypto.createDecipheriv('aes-256-cbc', evp.key, evp.iv)
+ privKey = Wallet.decipherBuffer(decipher, new Buffer(cipher.ciphertext))
+ privKey = new Buffer((privKey.toString()), 'hex')
+ }
+ var wallet = new Wallet(privKey)
+ if (wallet.getAddressString() !== json.address) {
+ throw new Error('Invalid private key or address')
+ }
+ return wallet
+}
+Wallet.fromMyEtherWalletV2 = function (input){
+ var json = (typeof input === 'object') ? input : JSON.parse(input);
+ if (json.privKey.length !== 64) {
+ throw new Error('Invalid private key length');
+ };
+ var privKey = new Buffer(json.privKey, 'hex');
+ return new Wallet(privKey);
+}
+Wallet.fromEthSale = function(input, password) {
+ var json = (typeof input === 'object') ? input : JSON.parse(input)
+ var encseed = new Buffer(json.encseed, 'hex')
+ var derivedKey = ethUtil.crypto.pbkdf2Sync(Buffer(password), Buffer(password), 2000, 32, 'sha256').slice(0, 16)
+ var decipher = ethUtil.crypto.createDecipheriv('aes-128-cbc', derivedKey, encseed.slice(0, 16))
+ var seed = Wallet.decipherBuffer(decipher, encseed.slice(16))
+ var wallet = new Wallet(ethUtil.sha3(seed))
+ if (wallet.getAddress().toString('hex') !== json.ethaddr) {
+ throw new Error('Decoded key mismatch - possibly wrong passphrase')
+ }
+ return wallet
+}
+Wallet.fromMyEtherWalletKey = function(input, password) {
+ var cipher = input.slice(0, 128)
+ cipher = Wallet.decodeCryptojsSalt(cipher)
+ var evp = Wallet.evp_kdf(new Buffer(password), cipher.salt, {
+ keysize: 32,
+ ivsize: 16
+ })
+ var decipher = ethUtil.crypto.createDecipheriv('aes-256-cbc', evp.key, evp.iv)
+ var privKey = Wallet.decipherBuffer(decipher, new Buffer(cipher.ciphertext))
+ privKey = new Buffer((privKey.toString()), 'hex')
+ return new Wallet(privKey)
+}
+Wallet.fromV3 = function(input, password, nonStrict) {
+ var json = (typeof input === 'object') ? input : JSON.parse(nonStrict ? input.toLowerCase() : input)
+ if (json.version !== 3) {
+ throw new Error('Not a V3 wallet')
+ }
+ var derivedKey
+ var kdfparams
+ if (json.crypto.kdf === 'scrypt') {
+ kdfparams = json.crypto.kdfparams
+ derivedKey = ethUtil.scrypt(new Buffer(password), new Buffer(kdfparams.salt, 'hex'), kdfparams.n, kdfparams.r, kdfparams.p, kdfparams.dklen)
+ } else if (json.crypto.kdf === 'pbkdf2') {
+ kdfparams = json.crypto.kdfparams
+ if (kdfparams.prf !== 'hmac-sha256') {
+ throw new Error('Unsupported parameters to PBKDF2')
+ }
+ derivedKey = ethUtil.crypto.pbkdf2Sync(new Buffer(password), new Buffer(kdfparams.salt, 'hex'), kdfparams.c, kdfparams.dklen, 'sha256')
+ } else {
+ throw new Error('Unsupported key derivation scheme')
+ }
+ var ciphertext = new Buffer(json.crypto.ciphertext, 'hex')
+ var mac = ethUtil.sha3(Buffer.concat([derivedKey.slice(16, 32), ciphertext]))
+ if (mac.toString('hex') !== json.crypto.mac) {
+ throw new Error('Key derivation failed - possibly wrong passphrase')
+ }
+ var decipher = ethUtil.crypto.createDecipheriv(json.crypto.cipher, derivedKey.slice(0, 16), new Buffer(json.crypto.cipherparams.iv, 'hex'))
+ var seed = Wallet.decipherBuffer(decipher, ciphertext, 'hex')
+ return new Wallet(seed)
+}
+Wallet.prototype.toV3String = function(password, opts) {
+ return JSON.stringify(this.toV3(password, opts))
+}
+Wallet.prototype.getV3Filename = function (timestamp) {
+ var ts = timestamp ? new Date(timestamp) : new Date()
+ return [
+ 'UTC--',
+ ts.toJSON().replace(/:/g, '-'),
+ '--',
+ this.getAddress().toString('hex')
+ ].join('')
+}
+Wallet.decipherBuffer = function(decipher, data) {
+ return Buffer.concat([decipher.update(data), decipher.final()])
+}
+Wallet.decodeCryptojsSalt = function(input) {
+ var ciphertext = new Buffer(input, 'base64')
+ if (ciphertext.slice(0, 8).toString() === 'Salted__') {
+ return {
+ salt: ciphertext.slice(8, 16),
+ ciphertext: ciphertext.slice(16)
+ }
+ } else {
+ return {
+ ciphertext: ciphertext
+ }
+ }
+}
+Wallet.evp_kdf = function(data, salt, opts) {
+ // A single EVP iteration, returns `D_i`, where block equlas to `D_(i-1)`
+
+ function iter(block) {
+ var hash = ethUtil.crypto.createHash(opts.digest || 'md5')
+ hash.update(block)
+ hash.update(data)
+ hash.update(salt)
+ block = hash.digest()
+ for (var i = 1; i < (opts.count || 1); i++) {
+ hash = ethUtil.crypto.createHash(opts.digest || 'md5')
+ hash.update(block)
+ block = hash.digest()
+ }
+ return block
+ }
+ var keysize = opts.keysize || 16
+ var ivsize = opts.ivsize || 16
+ var ret = []
+ var i = 0
+ while (Buffer.concat(ret).length < (keysize + ivsize)) {
+ ret[i] = iter((i === 0) ? new Buffer(0) : ret[i - 1])
+ i++
+ }
+ var tmp = Buffer.concat(ret)
+ return {
+ key: tmp.slice(0, keysize),
+ iv: tmp.slice(keysize, keysize + ivsize)
+ }
+}
+Wallet.walletRequirePass = function(ethjson) {
+ var jsonArr;
+ try {
+ jsonArr = JSON.parse(ethjson);
+ } catch (err) {
+ throw globalFuncs.errorMsgs[3];
+ }
+ if (jsonArr.encseed != null) return true;
+ else if (jsonArr.Crypto != null || jsonArr.crypto != null) return true
+ else if (jsonArr.hash != null && jsonArr.locked) return true;
+ else if (jsonArr.hash != null && !jsonArr.locked) return false;
+ else if (jsonArr.publisher == "MyEtherWallet" && !jsonArr.encrypted) return false;
+ else
+ throw globalFuncs.errorMsgs[2];
+}
+Wallet.getWalletFromPrivKeyFile = function(strjson, password) {
+ var jsonArr = JSON.parse(strjson);
+ if (jsonArr.encseed != null) return Wallet.fromEthSale(strjson, password);
+ else if (jsonArr.Crypto != null || jsonArr.crypto != null) return Wallet.fromV3(strjson, password, true);
+ else if (jsonArr.hash != null) return Wallet.fromMyEtherWallet(strjson, password);
+ else if (jsonArr.publisher == "MyEtherWallet") return Wallet.fromMyEtherWalletV2(strjson);
+ else
+ throw globalFuncs.errorMsgs[2];
+}
module.exports = Wallet;
}).call(this,require("buffer").Buffer)
},{"buffer":90}],29:[function(require,module,exports){
-'use strict';
-var globalService = function($http, $httpParamSerializerJQLike) {
- globalFuncs.checkAndRedirectHTTPS();
- ajaxReq.http = $http;
- ajaxReq.postSerializer = $httpParamSerializerJQLike;
-
- var tabs = {
- generateWallet: {
- id: 0,
- name: "Generate Wallet",
- url: "generate-wallet",
- mew: true,
- cx: false
- },
- bulkGenerate: {
- id: 1,
- name: "Bulk Generate",
- url: "bulk-generate",
- mew: false,
- cx: false
- },
- myWallet: {
- id: 2,
- name: "My Wallets",
- url: "my-wallet",
- mew: false,
- cx: true
- },
- addWallet: {
- id: 3,
- name: "Add Wallet",
- url: "add-wallet",
- mew: false,
- cx: true
- },
- sendTransaction: {
- id: 4,
- name: "Send Ether",
- url: "send-transaction",
- mew: true,
- cx: true
- },
- tokens: {
- id: 5,
- name: "Send Tokens",
- url: "send-tokens",
- mew: true,
- cx: true
- },
- offlineTransaction: {
- id: 6,
- name: "Send Offline",
- url:"offline-transaction",
- mew: true,
- cx: false
- },
- dao: {
- id: 7,
- name: "Withdraw DAO",
- url: "the-dao",
- mew: true,
- cx: true
- },
- digix: {
- id: 8,
- name: "Claim DGD",
- url: "digix",
- mew: true,
- cx: true
- },
- viewWalletInfo: {
- id: 9,
- name: "View Wallet Info",
- url: "view-wallet-info",
- mew: true,
- cx: false
- },
- help: {
- id: 10,
- name: "Help",
- url: "help",
- mew: true,
- cx: true
- }
- };
- var currentTab = 0;
- if(typeof chrome != 'undefined')
- currentTab = chrome.windows === undefined ? 0 : 3;
- return {
- tabs: tabs,
- currentTab: currentTab
- };
-};
-module.exports = globalService;
-
-
+'use strict';
+var globalService = function($http, $httpParamSerializerJQLike) {
+ globalFuncs.checkAndRedirectHTTPS();
+ ajaxReq.http = $http;
+ ajaxReq.postSerializer = $httpParamSerializerJQLike;
+
+ var tabs = {
+ generateWallet: {
+ id: 0,
+ name: "Generate Wallet",
+ url: "generate-wallet",
+ mew: true,
+ cx: false
+ },
+ bulkGenerate: {
+ id: 1,
+ name: "Bulk Generate",
+ url: "bulk-generate",
+ mew: false,
+ cx: false
+ },
+ myWallet: {
+ id: 2,
+ name: "My Wallets",
+ url: "my-wallet",
+ mew: false,
+ cx: true
+ },
+ addWallet: {
+ id: 3,
+ name: "Add Wallet",
+ url: "add-wallet",
+ mew: false,
+ cx: true
+ },
+ sendTransaction: {
+ id: 4,
+ name: "Send Ether",
+ url: "send-transaction",
+ mew: true,
+ cx: true
+ },
+ tokens: {
+ id: 5,
+ name: "Send Tokens",
+ url: "send-tokens",
+ mew: true,
+ cx: true
+ },
+ offlineTransaction: {
+ id: 6,
+ name: "Send Offline",
+ url:"offline-transaction",
+ mew: true,
+ cx: false
+ },
+ dao: {
+ id: 7,
+ name: "Withdraw DAO",
+ url: "the-dao",
+ mew: true,
+ cx: true
+ },
+ digix: {
+ id: 8,
+ name: "Claim DGD",
+ url: "digix",
+ mew: true,
+ cx: true
+ },
+ viewWalletInfo: {
+ id: 9,
+ name: "View Wallet Info",
+ url: "view-wallet-info",
+ mew: true,
+ cx: false
+ },
+ help: {
+ id: 10,
+ name: "Help",
+ url: "help",
+ mew: true,
+ cx: true
+ }
+ };
+ var currentTab = 0;
+ if(typeof chrome != 'undefined')
+ currentTab = chrome.windows === undefined ? 0 : 3;
+ return {
+ tabs: tabs,
+ currentTab: currentTab
+ };
+};
+module.exports = globalService;
+
+
},{}],30:[function(require,module,exports){
-'use strict';
-var walletService = function() {
- return {
- wallet: null,
- password:''
- }
-};
+'use strict';
+var walletService = function() {
+ return {
+ wallet: null,
+ password:''
+ }
+};
module.exports = walletService;
},{}],31:[function(require,module,exports){
-'use strict';
-var Token = function(contractAddress, userAddress, symbol, decimal) {
- this.contractAddress = contractAddress;
- this.userAddress = userAddress
- this.symbol = symbol;;
- this.decimal = decimal;
- this.setBalance();
-}
-Token.balanceHex = "0x70a08231";
-Token.transferHex = "0xa9059cbb";
-Token.popTokens = [{
- "address": "0xbb9bc244d798123fde783fcc1c72d3bb8c189413",
- "symbol": "DAO",
- "decimal": 16
-},
-{
- "address": "0xe0b7927c4af23765cb51314a0e0521a9645f0e2a",
- "symbol": "DGD",
- "decimal": 9
-},
-{
- "address": "0xc66ea802717bfb9833400264dd12c2bceaa34a6d",
- "symbol": "MKR",
- "decimal": 18
-},
-{
- "address": "0x89205A3A3b2A69De6Dbf7f01ED13B2108B2c43e7",
- "symbol": "🦄 Unicorn",
- "decimal": 0
-},
-{
- "address": "0x74c1e4b8cae59269ec1d85d3d4f324396048f4ac",
- "symbol": "🍺 BeerCoin",
- "decimal": 0
-}];
-Token.prototype.getContractAddress = function() {
- return this.contractAddress;
-}
-Token.prototype.getUserAddress = function() {
- return this.userAddress;
-}
-Token.prototype.getSymbol = function() {
- return this.symbol;
-}
-Token.prototype.getDecimal = function() {
- return this.decimal;
-}
-Token.prototype.getBalance = function() {
- return this.balance;
-}
-Token.prototype.getBalanceBN = function() {
- return this.balanceBN;
-}
-Token.prototype.setBalance = function() {
- var balanceCall = ethFuncs.getDataObj(this.contractAddress, Token.balanceHex, [ethFuncs.getNakedAddress(this.userAddress)]);
- var parentObj = this;
- ajaxReq.getEthCall(balanceCall, function(data) {
- if (!data.error) {
- parentObj.balance = new BigNumber(data.data).div(new BigNumber(10).pow(parentObj.getDecimal())).toString();
- parentObj.balanceBN = new BigNumber(data.data).toString();
- }
- });
-}
-Token.prototype.getData = function(toAdd, value) {
- try {
- if (!ethFuncs.validateEtherAddress(toAdd)) throw globalFuncs.errorMsgs[5];
- else if (!globalFuncs.isNumeric(value) || parseFloat(value) < 0) throw globalFuncs.errorMsgs[7];
- var value = ethFuncs.padLeft(new BigNumber(value).times(new BigNumber(10).pow(this.getDecimal())).toString(16), 64);
- var toAdd = ethFuncs.padLeft(ethFuncs.getNakedAddress(toAdd), 64);
- var data = Token.transferHex + toAdd + value;
- return {
- isError: false,
- data: data
- };
- } catch (e) {
- return {
- isError: true,
- error: e
- };
- }
-}
-module.exports = Token;
+'use strict';
+var Token = function(contractAddress, userAddress, symbol, decimal) {
+ this.contractAddress = contractAddress;
+ this.userAddress = userAddress
+ this.symbol = symbol;;
+ this.decimal = decimal;
+ this.setBalance();
+}
+Token.balanceHex = "0x70a08231";
+Token.transferHex = "0xa9059cbb";
+Token.popTokens = [{
+ "address": "0xbb9bc244d798123fde783fcc1c72d3bb8c189413",
+ "symbol": "DAO",
+ "decimal": 16
+},
+{
+ "address": "0xe0b7927c4af23765cb51314a0e0521a9645f0e2a",
+ "symbol": "DGD",
+ "decimal": 9
+},
+{
+ "address": "0xc66ea802717bfb9833400264dd12c2bceaa34a6d",
+ "symbol": "MKR",
+ "decimal": 18
+},
+{
+ "address": "0x89205A3A3b2A69De6Dbf7f01ED13B2108B2c43e7",
+ "symbol": "🦄 Unicorn",
+ "decimal": 0
+},
+{
+ "address": "0x74c1e4b8cae59269ec1d85d3d4f324396048f4ac",
+ "symbol": "🍺 BeerCoin",
+ "decimal": 0
+}];
+Token.prototype.getContractAddress = function() {
+ return this.contractAddress;
+}
+Token.prototype.getUserAddress = function() {
+ return this.userAddress;
+}
+Token.prototype.getSymbol = function() {
+ return this.symbol;
+}
+Token.prototype.getDecimal = function() {
+ return this.decimal;
+}
+Token.prototype.getBalance = function() {
+ return this.balance;
+}
+Token.prototype.getBalanceBN = function() {
+ return this.balanceBN;
+}
+Token.prototype.setBalance = function() {
+ var balanceCall = ethFuncs.getDataObj(this.contractAddress, Token.balanceHex, [ethFuncs.getNakedAddress(this.userAddress)]);
+ var parentObj = this;
+ ajaxReq.getEthCall(balanceCall, function(data) {
+ if (!data.error) {
+ parentObj.balance = new BigNumber(data.data).div(new BigNumber(10).pow(parentObj.getDecimal())).toString();
+ parentObj.balanceBN = new BigNumber(data.data).toString();
+ }
+ });
+}
+Token.prototype.getData = function(toAdd, value) {
+ try {
+ if (!ethFuncs.validateEtherAddress(toAdd)) throw globalFuncs.errorMsgs[5];
+ else if (!globalFuncs.isNumeric(value) || parseFloat(value) < 0) throw globalFuncs.errorMsgs[7];
+ var value = ethFuncs.padLeft(new BigNumber(value).times(new BigNumber(10).pow(this.getDecimal())).toString(16), 64);
+ var toAdd = ethFuncs.padLeft(ethFuncs.getNakedAddress(toAdd), 64);
+ var data = Token.transferHex + toAdd + value;
+ return {
+ isError: false,
+ data: data
+ };
+ } catch (e) {
+ return {
+ isError: true,
+ error: e
+ };
+ }
+}
+module.exports = Token;
},{}],32:[function(require,module,exports){
-'use strict';
-var en = function() {}
-en.code = 'en';
-en.data = {
- /* Do Not Change */
- translate_version: '0.0',
- CX_version: '2.9',
- MEW_vesion: '2.9',
-
- /* Navigation */
- NAV_MyWallets: 'My Wallets',
- NAV_AddWallet: 'Add Wallet',
- NAV_SendEther: 'Send Ether',
- NAV_SendTokens: 'Send Tokens',
- NAV_WithdrawDAO: 'Withdraw DAO',
- NAV_ClaimDGD: 'Claim DGD',
- NAV_Help: 'Withdraw DAO',
- NAV_Contracts: 'Contracts',
- NAV_Contact: 'Contact',
-
- /* General */
- GEN_Download: 'Download',
- GEN_Address: 'Your Address',
- GEN_AddessDesc: 'You may know this as your "Account #" or your "Public Key". It is what you send people so they can send you ETH. That icon is an easy way to recognize your address.',
- GEN_PrivKey: 'Private Key (unencrypted)',
- GEN_PrivKeyDesc: 'This is the unencrypted text version of your private key, meaning no password is necessary. If someone were to find your unencrypted private key, they could access your wallet without a password. For this reason, encrypted versions are typically recommended.',
- GEN_Print: 'Print Paper Wallet',
- GEN_PrintDesc: 'ProTip: Click print and save this as a PDF, even if you do not own a printer!',
- GEN_Keystore: 'Keystore/JSON File (Encrypted · Mist/Geth Format · Recommended)',
- GEN_KeystoreDesc: 'This Keystore / JSON file matches the format used by Mist & Geth so you can easily import it in the future. It is the recommended file to download and back up.',
- GEN_Json: 'JSON File (unencrypted)',
- GEN_JsonDesc: 'This is the unencrypted, JSON format of your private key. This means you do not need the password but anyone who finds your JSON can access your wallet & Ether without the password.',
-
- GEN_Balance: 'Account Balance',
- GEN_Equiv: 'Equivalent Value',
- GEN_TransHistory: 'Transaction History',
-
- /* Header */
- MEW_Warning_1: '',
- CX_Warning_1: 'Make sure you have **external backups** of any wallets you store here. Many things could happen that would cause you to lose the data in this Chrome Extension, including uninstalling and reinstalling the extension. This extension is a way to easily access your wallets, **not** a way to back them up.',
- MEW_Tagline: 'Open Source JavaScript Client-Side Ether Wallet Chrome Extension',
- CX_Tagline: 'Open Source JavaScript Client-Side Ether Wallet Chrome Extension',
-
- /* View Wallet Details */
- VIEWWALLET_Title: 'View Wallet Details',
- VIEWWALLET_Subtitle: 'Download an unencrypted private key, grab your encrypted Mist/Geth Keystore file, or re-print your paper wallet. You may want to do this in order to [import your account into Geth/Mist](http://ethereum.stackexchange.com/questions/465/how-to-import-a-plain-private-key-into-geth/). You can also do this with the [MyEtherWallet CX](https://chrome.google.com/webstore/detail/myetherwallet-cx/nlbmnnijcnlegkjjpcfjclmcfggfefdm/) and save your wallet for easier and quicker access. If you just want to check your balance, we recommend using a blockchain explorer like etherscan.io or live.ether.camp.',
- VIEWWALLET_SuccessMsg: 'Success! Here are your wallet details.',
-
- /* MEW Wallet Decrypt */
-
-};
-module.exports = en;
+'use strict';
+var en = function() {}
+en.code = 'en';
+en.data = {
+ /* Do Not Change */
+ translate_version: '0.0',
+ CX_version: '2.9',
+ MEW_vesion: '2.9',
+
+ /* Navigation */
+ NAV_MyWallets: 'My Wallets',
+ NAV_AddWallet: 'Add Wallet',
+ NAV_SendEther: 'Send Ether',
+ NAV_SendTokens: 'Send Tokens',
+ NAV_WithdrawDAO: 'Withdraw DAO',
+ NAV_ClaimDGD: 'Claim DGD',
+ NAV_Help: 'Withdraw DAO',
+ NAV_Contracts: 'Contracts',
+ NAV_Contact: 'Contact',
+
+ /* General */
+ GEN_Download: 'Download',
+ GEN_Address: 'Your Address',
+ GEN_AddessDesc: 'You may know this as your "Account #" or your "Public Key". It is what you send people so they can send you ETH. That icon is an easy way to recognize your address.',
+ GEN_PrivKey: 'Private Key (unencrypted)',
+ GEN_PrivKeyDesc: 'This is the unencrypted text version of your private key, meaning no password is necessary. If someone were to find your unencrypted private key, they could access your wallet without a password. For this reason, encrypted versions are typically recommended.',
+ GEN_Print: 'Print Paper Wallet',
+ GEN_PrintDesc: 'ProTip: Click print and save this as a PDF, even if you do not own a printer!',
+ GEN_Keystore: 'Keystore/JSON File (Encrypted · Mist/Geth Format · Recommended)',
+ GEN_KeystoreDesc: 'This Keystore / JSON file matches the format used by Mist & Geth so you can easily import it in the future. It is the recommended file to download and back up.',
+ GEN_Json: 'JSON File (unencrypted)',
+ GEN_JsonDesc: 'This is the unencrypted, JSON format of your private key. This means you do not need the password but anyone who finds your JSON can access your wallet & Ether without the password.',
+
+ GEN_Balance: 'Account Balance',
+ GEN_Equiv: 'Equivalent Value',
+ GEN_TransHistory: 'Transaction History',
+
+ /* Header */
+ MEW_Warning_1: '',
+ CX_Warning_1: 'Make sure you have **external backups** of any wallets you store here. Many things could happen that would cause you to lose the data in this Chrome Extension, including uninstalling and reinstalling the extension. This extension is a way to easily access your wallets, **not** a way to back them up.',
+ MEW_Tagline: 'Open Source JavaScript Client-Side Ether Wallet Chrome Extension',
+ CX_Tagline: 'Open Source JavaScript Client-Side Ether Wallet Chrome Extension',
+
+ /* View Wallet Details */
+ VIEWWALLET_Title: 'View Wallet Details',
+ VIEWWALLET_Subtitle: 'Download an unencrypted private key, grab your encrypted Mist/Geth Keystore file, or re-print your paper wallet. You may want to do this in order to [import your account into Geth/Mist](http://ethereum.stackexchange.com/questions/465/how-to-import-a-plain-private-key-into-geth/). You can also do this with the [MyEtherWallet CX](https://chrome.google.com/webstore/detail/myetherwallet-cx/nlbmnnijcnlegkjjpcfjclmcfggfefdm/) and save your wallet for easier and quicker access. If you just want to check your balance, we recommend using a blockchain explorer like etherscan.io or live.ether.camp.',
+ VIEWWALLET_SuccessMsg: 'Success! Here are your wallet details.',
+
+ /* MEW Wallet Decrypt */
+
+};
+module.exports = en;
},{}],33:[function(require,module,exports){
-'use strict';
-var fr = function() {}
-fr.code = 'fr';
-fr.data = {
- TITLE: 'Bonjur',
- FOO: 'This is a paragraph.',
- BUTTON_LANG_EN: 'english',
- BUTTON_LANG_DE: 'german'
-};
+'use strict';
+var fr = function() {}
+fr.code = 'fr';
+fr.data = {
+ TITLE: 'Bonjur',
+ FOO: 'This is a paragraph.',
+ BUTTON_LANG_EN: 'english',
+ BUTTON_LANG_DE: 'german'
+};
module.exports = fr;
},{}],34:[function(require,module,exports){
-'use strict';
-var en = require('./en');
-var fr = require('./fr');
-var translate = function($translateProvider) {
- $translateProvider.translations(en.code, translate.marked(en.data));
- $translateProvider.translations(fr.code, translate.marked(fr.data));
- $translateProvider.preferredLanguage(en.code);
- $translateProvider.useSanitizeValueStrategy(null);
-}
-translate.marked = function(data) {
- var tData = data;
- for (var key in tData) if (tData.hasOwnProperty(key)) tData[key] = marked(tData[key]);
- return tData;
-}
+'use strict';
+var en = require('./en');
+var fr = require('./fr');
+var translate = function($translateProvider) {
+ $translateProvider.translations(en.code, translate.marked(en.data));
+ $translateProvider.translations(fr.code, translate.marked(fr.data));
+ $translateProvider.preferredLanguage(en.code);
+ $translateProvider.useSanitizeValueStrategy(null);
+}
+translate.marked = function(data) {
+ var tData = data;
+ for (var key in tData) if (tData.hasOwnProperty(key)) tData[key] = marked(tData[key]);
+ return tData;
+}
module.exports = translate;
},{"./en":32,"./fr":33}],35:[function(require,module,exports){
(function (Buffer){
-'use strict';
-var uiFuncs = function() {}
-uiFuncs.getTxData = function($scope) {
- return {
- to: $scope.tx.to,
- value: $scope.tx.value,
- unit: $scope.tx.unit,
- gasLimit: $scope.tx.gasLimit,
- data: $scope.tx.data,
- from: $scope.wallet.getAddressString(),
- privKey: $scope.wallet.getPrivateKeyString()
- };
-}
-uiFuncs.generateClassicTx = function(txData, callback) {
- try {
- if (!ethFuncs.validateEtherAddress(txData.to)) throw globalFuncs.errorMsgs[5];
- else if (!globalFuncs.isNumeric(txData.value) || parseFloat(txData.value) < 0) throw globalFuncs.errorMsgs[7];
- else if (!globalFuncs.isNumeric(txData.gasLimit) || parseFloat(txData.gasLimit) <= 0) throw globalFuncs.errorMsgs[8];
- else if (!ethFuncs.validateHexString(txData.data)) throw globalFuncs.errorMsgs[9];
- ajaxReq.getClassicTransactionData(txData.from, function(data) {
- if (data.error) throw data.msg;
- data = data.data;
- var rawTx = {
- nonce: ethFuncs.sanitizeHex(data.nonce),
- gasPrice: ethFuncs.sanitizeHex(ethFuncs.addTinyMoreToGas(data.gasprice)),
- gasLimit: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(txData.gasLimit)),
- to: ethFuncs.sanitizeHex(txData.to),
- value: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(etherUnits.toWei(txData.value, txData.unit))),
- data: ethFuncs.sanitizeHex(txData.data)
- }
- var eTx = new ethUtil.Tx(rawTx);
- eTx.sign(new Buffer(txData.privKey, 'hex'));
- rawTx.rawTx = JSON.stringify(rawTx);
- rawTx.signedTx = '0x' + eTx.serialize().toString('hex');
- rawTx.isError = false;
- if (callback !== undefined) callback(rawTx);
- });
- } catch (e) {
- if (callback !== undefined) callback({
- isError: true,
- error: e
- });
- }
-}
-uiFuncs.sendClassicTx = function(signedTx, callback) {
- ajaxReq.sendClassicRawTx(signedTx, function(data) {
- var resp = {};
- if (data.error) {
- resp = {
- isError: true,
- error: data.msg
- };
- } else {
- resp = {
- isError: false,
- data: data.data
- };
- }
- if (callback !== undefined) callback(resp);
- });
-}
-uiFuncs.generateTx = function(txData, callback) {
- try {
- if (!ethFuncs.validateEtherAddress(txData.to)) throw globalFuncs.errorMsgs[5];
- else if (!globalFuncs.isNumeric(txData.value) || parseFloat(txData.value) < 0) throw globalFuncs.errorMsgs[7];
- else if (!globalFuncs.isNumeric(txData.gasLimit) || parseFloat(txData.gasLimit) <= 0) throw globalFuncs.errorMsgs[8];
- else if (!ethFuncs.validateHexString(txData.data)) throw globalFuncs.errorMsgs[9];
- ajaxReq.getTransactionData(txData.from, function(data) {
- if (data.error) throw data.msg;
- data = data.data;
- var rawTx = {
- nonce: ethFuncs.sanitizeHex(data.nonce),
- gasPrice: ethFuncs.sanitizeHex(ethFuncs.addTinyMoreToGas(data.gasprice)),
- gasLimit: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(txData.gasLimit)),
- to: ethFuncs.sanitizeHex(txData.to),
- value: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(etherUnits.toWei(txData.value, txData.unit))),
- data: ethFuncs.sanitizeHex(txData.data)
- }
- var eTx = new ethUtil.Tx(rawTx);
- eTx.sign(new Buffer(txData.privKey, 'hex'));
- rawTx.rawTx = JSON.stringify(rawTx);
- rawTx.signedTx = '0x' + eTx.serialize().toString('hex');
- rawTx.isError = false;
- if (callback !== undefined) callback(rawTx);
- });
- } catch (e) {
- if (callback !== undefined) callback({
- isError: true,
- error: e
- });
- }
-}
-uiFuncs.sendTx = function(signedTx, callback) {
- ajaxReq.sendRawTx(signedTx, function(data) {
- var resp = {};
- if (data.error) {
- resp = {
- isError: true,
- error: data.msg
- };
- } else {
- resp = {
- isError: false,
- data: data.data
- };
- }
- if (callback !== undefined) callback(resp);
- });
-}
-uiFuncs.transferAllBalance = function(fromAdd, gasLimit, callback) {
- try {
- ajaxReq.getTransactionData(fromAdd, function(data) {
- if (data.error) throw data.msg;
- data = data.data;
- var gasPrice = new BigNumber(ethFuncs.sanitizeHex(ethFuncs.addTinyMoreToGas(data.gasprice))).times(gasLimit);
- var maxVal = new BigNumber(data.balance).minus(gasPrice);
- maxVal = etherUnits.toEther(maxVal, 'wei') < 0 ? 0 : etherUnits.toEther(maxVal, 'wei');
- if (callback !== undefined) callback({
- isError: false,
- unit: "ether",
- value: maxVal
- });
- });
- } catch (e) {
- if (callback !== undefined) callback({
- isError: true,
- error: e
- });
- }
-}
+'use strict';
+var uiFuncs = function() {}
+uiFuncs.getTxData = function($scope) {
+ return {
+ to: $scope.tx.to,
+ value: $scope.tx.value,
+ unit: $scope.tx.unit,
+ gasLimit: $scope.tx.gasLimit,
+ data: $scope.tx.data,
+ from: $scope.wallet.getAddressString(),
+ privKey: $scope.wallet.getPrivateKeyString()
+ };
+}
+uiFuncs.generateClassicTx = function(txData, callback) {
+ try {
+ if (!ethFuncs.validateEtherAddress(txData.to)) throw globalFuncs.errorMsgs[5];
+ else if (!globalFuncs.isNumeric(txData.value) || parseFloat(txData.value) < 0) throw globalFuncs.errorMsgs[7];
+ else if (!globalFuncs.isNumeric(txData.gasLimit) || parseFloat(txData.gasLimit) <= 0) throw globalFuncs.errorMsgs[8];
+ else if (!ethFuncs.validateHexString(txData.data)) throw globalFuncs.errorMsgs[9];
+ ajaxReq.getClassicTransactionData(txData.from, function(data) {
+ if (data.error) throw data.msg;
+ data = data.data;
+ var rawTx = {
+ nonce: ethFuncs.sanitizeHex(data.nonce),
+ gasPrice: ethFuncs.sanitizeHex(ethFuncs.addTinyMoreToGas(data.gasprice)),
+ gasLimit: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(txData.gasLimit)),
+ to: ethFuncs.sanitizeHex(txData.to),
+ value: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(etherUnits.toWei(txData.value, txData.unit))),
+ data: ethFuncs.sanitizeHex(txData.data)
+ }
+ var eTx = new ethUtil.Tx(rawTx);
+ eTx.sign(new Buffer(txData.privKey, 'hex'));
+ rawTx.rawTx = JSON.stringify(rawTx);
+ rawTx.signedTx = '0x' + eTx.serialize().toString('hex');
+ rawTx.isError = false;
+ if (callback !== undefined) callback(rawTx);
+ });
+ } catch (e) {
+ if (callback !== undefined) callback({
+ isError: true,
+ error: e
+ });
+ }
+}
+uiFuncs.sendClassicTx = function(signedTx, callback) {
+ ajaxReq.sendClassicRawTx(signedTx, function(data) {
+ var resp = {};
+ if (data.error) {
+ resp = {
+ isError: true,
+ error: data.msg
+ };
+ } else {
+ resp = {
+ isError: false,
+ data: data.data
+ };
+ }
+ if (callback !== undefined) callback(resp);
+ });
+}
+uiFuncs.generateTx = function(txData, callback) {
+ try {
+ if (!ethFuncs.validateEtherAddress(txData.to)) throw globalFuncs.errorMsgs[5];
+ else if (!globalFuncs.isNumeric(txData.value) || parseFloat(txData.value) < 0) throw globalFuncs.errorMsgs[7];
+ else if (!globalFuncs.isNumeric(txData.gasLimit) || parseFloat(txData.gasLimit) <= 0) throw globalFuncs.errorMsgs[8];
+ else if (!ethFuncs.validateHexString(txData.data)) throw globalFuncs.errorMsgs[9];
+ ajaxReq.getTransactionData(txData.from, function(data) {
+ if (data.error) throw data.msg;
+ data = data.data;
+ var rawTx = {
+ nonce: ethFuncs.sanitizeHex(data.nonce),
+ gasPrice: ethFuncs.sanitizeHex(ethFuncs.addTinyMoreToGas(data.gasprice)),
+ gasLimit: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(txData.gasLimit)),
+ to: ethFuncs.sanitizeHex(txData.to),
+ value: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(etherUnits.toWei(txData.value, txData.unit))),
+ data: ethFuncs.sanitizeHex(txData.data)
+ }
+ var eTx = new ethUtil.Tx(rawTx);
+ eTx.sign(new Buffer(txData.privKey, 'hex'));
+ rawTx.rawTx = JSON.stringify(rawTx);
+ rawTx.signedTx = '0x' + eTx.serialize().toString('hex');
+ rawTx.isError = false;
+ if (callback !== undefined) callback(rawTx);
+ });
+ } catch (e) {
+ if (callback !== undefined) callback({
+ isError: true,
+ error: e
+ });
+ }
+}
+uiFuncs.sendTx = function(signedTx, callback) {
+ ajaxReq.sendRawTx(signedTx, function(data) {
+ var resp = {};
+ if (data.error) {
+ resp = {
+ isError: true,
+ error: data.msg
+ };
+ } else {
+ resp = {
+ isError: false,
+ data: data.data
+ };
+ }
+ if (callback !== undefined) callback(resp);
+ });
+}
+uiFuncs.transferAllBalance = function(fromAdd, gasLimit, callback) {
+ try {
+ ajaxReq.getTransactionData(fromAdd, function(data) {
+ if (data.error) throw data.msg;
+ data = data.data;
+ var gasPrice = new BigNumber(ethFuncs.sanitizeHex(ethFuncs.addTinyMoreToGas(data.gasprice))).times(gasLimit);
+ var maxVal = new BigNumber(data.balance).minus(gasPrice);
+ maxVal = etherUnits.toEther(maxVal, 'wei') < 0 ? 0 : etherUnits.toEther(maxVal, 'wei');
+ if (callback !== undefined) callback({
+ isError: false,
+ unit: "ether",
+ value: maxVal
+ });
+ });
+ } catch (e) {
+ if (callback !== undefined) callback({
+ isError: true,
+ error: e
+ });
+ }
+}
module.exports = uiFuncs;
}).call(this,require("buffer").Buffer)
},{"buffer":90}],36:[function(require,module,exports){
@@ -6810,7 +6810,7 @@ return 'pascalprecht.translate';
},{}],39:[function(require,module,exports){
/**
- * @license AngularJS v1.5.8
+ * @license AngularJS v1.5.6
* (c) 2010-2016 Google, Inc. http://angularjs.org
* License: MIT
*/
@@ -6868,7 +6868,7 @@ function minErr(module, ErrorConstructor) {
return match;
});
- message += '\nhttp://errors.angularjs.org/1.5.8/' +
+ message += '\nhttp://errors.angularjs.org/1.5.6/' +
(module ? module + '/' : '') + code;
for (i = SKIP_INDEXES, paramPrefix = '?'; i < templateArgs.length; i++, paramPrefix = '&') {
@@ -6937,6 +6937,7 @@ function minErr(module, ErrorConstructor) {
includes: true,
arrayRemove: true,
copy: true,
+ shallowCopy: true,
equals: true,
csp: true,
jq: true,
@@ -7632,13 +7633,7 @@ function arrayRemove(array, value) {
* * If a destination is provided, all of its elements (for arrays) or properties (for objects)
* are deleted and then all elements/properties from the source are copied to it.
* * If `source` is not an object or array (inc. `null` and `undefined`), `source` is returned.
- * * If `source` is identical to `destination` an exception will be thrown.
- *
- *
- *
- * Only enumerable properties are taken into account. Non-enumerable properties (both on `source`
- * and on `destination`) will be ignored.
- *
+ * * If `source` is identical to 'destination' an exception will be thrown.
*
* @param {*} source The source that will be used to make a copy.
* Can be any type, including primitives, `null`, and `undefined`.
@@ -7647,42 +7642,41 @@ function arrayRemove(array, value) {
* @returns {*} The copy or updated `destination`, if `destination` was specified.
*
* @example
-
-
-
+
+
+
+
*/
function copy(source, destination) {
var stackSource = [];
@@ -7789,7 +7783,7 @@ function copy(source, destination) {
case '[object Uint8ClampedArray]':
case '[object Uint16Array]':
case '[object Uint32Array]':
- return new source.constructor(copyElement(source.buffer), source.byteOffset, source.length);
+ return new source.constructor(copyElement(source.buffer));
case '[object ArrayBuffer]':
//Support: IE10
@@ -7821,6 +7815,31 @@ function copy(source, destination) {
}
}
+/**
+ * Creates a shallow copy of an object, an array or a primitive.
+ *
+ * Assumes that there are no proto properties for objects.
+ */
+function shallowCopy(src, dst) {
+ if (isArray(src)) {
+ dst = dst || [];
+
+ for (var i = 0, ii = src.length; i < ii; i++) {
+ dst[i] = src[i];
+ }
+ } else if (isObject(src)) {
+ dst = dst || {};
+
+ for (var key in src) {
+ if (!(key.charAt(0) === '$' && key.charAt(1) === '$')) {
+ dst[key] = src[key];
+ }
+ }
+ }
+
+ return dst || src;
+}
+
/**
* @ngdoc function
@@ -9161,34 +9180,7 @@ function setupModuleLoader(window) {
}
-/* global shallowCopy: true */
-
-/**
- * Creates a shallow copy of an object, an array or a primitive.
- *
- * Assumes that there are no proto properties for objects.
- */
-function shallowCopy(src, dst) {
- if (isArray(src)) {
- dst = dst || [];
-
- for (var i = 0, ii = src.length; i < ii; i++) {
- dst[i] = src[i];
- }
- } else if (isObject(src)) {
- dst = dst || {};
-
- for (var key in src) {
- if (!(key.charAt(0) === '$' && key.charAt(1) === '$')) {
- dst[key] = src[key];
- }
- }
- }
-
- return dst || src;
-}
-
-/* global toDebugString: true */
+/* global: toDebugString: true */
function serializeObject(obj) {
var seen = [];
@@ -9292,7 +9284,6 @@ function toDebugString(obj) {
$HttpParamSerializerJQLikeProvider,
$HttpBackendProvider,
$xhrFactoryProvider,
- $jsonpCallbacksProvider,
$LocationProvider,
$LogProvider,
$ParseProvider,
@@ -9330,11 +9321,11 @@ function toDebugString(obj) {
* - `codeName` – `{string}` – Code name of the release, such as "jiggling-armfat".
*/
var version = {
- full: '1.5.8', // all of these placeholder strings will be replaced by grunt's
+ full: '1.5.6', // all of these placeholder strings will be replaced by grunt's
major: 1, // package task
minor: 5,
- dot: 8,
- codeName: 'arbitrary-fallbacks'
+ dot: 6,
+ codeName: 'arrow-stringification'
};
@@ -9365,7 +9356,7 @@ function publishExternalAPI(angular) {
'isDate': isDate,
'lowercase': lowercase,
'uppercase': uppercase,
- 'callbacks': {$$counter: 0},
+ 'callbacks': {counter: 0},
'getTestability': getTestability,
'$$minErr': minErr,
'$$csp': csp,
@@ -9454,7 +9445,6 @@ function publishExternalAPI(angular) {
$httpParamSerializerJQLike: $HttpParamSerializerJQLikeProvider,
$httpBackend: $HttpBackendProvider,
$xhrFactory: $xhrFactoryProvider,
- $jsonpCallbacks: $jsonpCallbacksProvider,
$location: $LocationProvider,
$log: $LogProvider,
$parse: $ParseProvider,
@@ -9531,7 +9521,7 @@ function publishExternalAPI(angular) {
* ## Angular's jqLite
* jqLite provides only the following jQuery methods:
*
- * - [`addClass()`](http://api.jquery.com/addClass/) - Does not support a function as first argument
+ * - [`addClass()`](http://api.jquery.com/addClass/)
* - [`after()`](http://api.jquery.com/after/)
* - [`append()`](http://api.jquery.com/append/)
* - [`attr()`](http://api.jquery.com/attr/) - Does not support functions as parameters
@@ -9558,7 +9548,7 @@ function publishExternalAPI(angular) {
* - [`ready()`](http://api.jquery.com/ready/)
* - [`remove()`](http://api.jquery.com/remove/)
* - [`removeAttr()`](http://api.jquery.com/removeAttr/)
- * - [`removeClass()`](http://api.jquery.com/removeClass/) - Does not support a function as first argument
+ * - [`removeClass()`](http://api.jquery.com/removeClass/)
* - [`removeData()`](http://api.jquery.com/removeData/)
* - [`replaceWith()`](http://api.jquery.com/replaceWith/)
* - [`text()`](http://api.jquery.com/text/)
@@ -9693,7 +9683,7 @@ function jqLiteBuildFragment(html, context) {
nodes.push(context.createTextNode(html));
} else {
// Convert html into DOM nodes
- tmp = fragment.appendChild(context.createElement("div"));
+ tmp = tmp || fragment.appendChild(context.createElement("div"));
tag = (TAG_NAME_REGEXP.exec(html) || ["", ""])[1].toLowerCase();
wrap = wrapMap[tag] || wrapMap._default;
tmp.innerHTML = wrap[1] + html.replace(XHTML_TAG_REGEXP, "<$1>") + wrap[2];
@@ -11506,10 +11496,10 @@ function createInjector(modulesToLoad, strictDi) {
if (msie <= 11) {
return false;
}
- // Support: Edge 12-13 only
- // See: https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/6156135/
+ // Workaround for MS Edge.
+ // Check https://connect.microsoft.com/IE/Feedback/Details/2211653
return typeof func === 'function'
- && /^(?:class\b|constructor\()/.test(stringifyFn(func));
+ && /^(?:class\s|constructor\()/.test(stringifyFn(func));
}
function invoke(fn, self, locals, serviceName) {
@@ -12250,13 +12240,7 @@ var $AnimateProvider = ['$provide', function($provide) {
* @param {DOMElement} parent the parent element which will append the element as
* a child (so long as the after element is not present)
* @param {DOMElement=} after the sibling element after which the element will be appended
- * @param {object=} options an optional collection of options/styles that will be applied to the element.
- * The object can have the following properties:
- *
- * - **addClass** - `{string}` - space-separated CSS classes to add to element
- * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
- * - **removeClass** - `{string}` - space-separated CSS classes to remove from element
- * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+ * @param {object=} options an optional collection of options/styles that will be applied to the element
*
* @return {Promise} the animation callback promise
*/
@@ -12282,13 +12266,7 @@ var $AnimateProvider = ['$provide', function($provide) {
* @param {DOMElement} parent the parent element which will append the element as
* a child (so long as the after element is not present)
* @param {DOMElement=} after the sibling element after which the element will be appended
- * @param {object=} options an optional collection of options/styles that will be applied to the element.
- * The object can have the following properties:
- *
- * - **addClass** - `{string}` - space-separated CSS classes to add to element
- * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
- * - **removeClass** - `{string}` - space-separated CSS classes to remove from element
- * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+ * @param {object=} options an optional collection of options/styles that will be applied to the element
*
* @return {Promise} the animation callback promise
*/
@@ -12309,13 +12287,7 @@ var $AnimateProvider = ['$provide', function($provide) {
* digest once the animation has completed.
*
* @param {DOMElement} element the element which will be removed from the DOM
- * @param {object=} options an optional collection of options/styles that will be applied to the element.
- * The object can have the following properties:
- *
- * - **addClass** - `{string}` - space-separated CSS classes to add to element
- * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
- * - **removeClass** - `{string}` - space-separated CSS classes to remove from element
- * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+ * @param {object=} options an optional collection of options/styles that will be applied to the element
*
* @return {Promise} the animation callback promise
*/
@@ -12339,13 +12311,7 @@ var $AnimateProvider = ['$provide', function($provide) {
*
* @param {DOMElement} element the element which the CSS classes will be applied to
* @param {string} className the CSS class(es) that will be added (multiple classes are separated via spaces)
- * @param {object=} options an optional collection of options/styles that will be applied to the element.
- * The object can have the following properties:
- *
- * - **addClass** - `{string}` - space-separated CSS classes to add to element
- * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
- * - **removeClass** - `{string}` - space-separated CSS classes to remove from element
- * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+ * @param {object=} options an optional collection of options/styles that will be applied to the element
*
* @return {Promise} the animation callback promise
*/
@@ -12369,13 +12335,7 @@ var $AnimateProvider = ['$provide', function($provide) {
*
* @param {DOMElement} element the element which the CSS classes will be applied to
* @param {string} className the CSS class(es) that will be removed (multiple classes are separated via spaces)
- * @param {object=} options an optional collection of options/styles that will be applied to the element.
- * The object can have the following properties:
- *
- * - **addClass** - `{string}` - space-separated CSS classes to add to element
- * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
- * - **removeClass** - `{string}` - space-separated CSS classes to remove from element
- * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+ * @param {object=} options an optional collection of options/styles that will be applied to the element
*
* @return {Promise} the animation callback promise
*/
@@ -12400,13 +12360,7 @@ var $AnimateProvider = ['$provide', function($provide) {
* @param {DOMElement} element the element which the CSS classes will be applied to
* @param {string} add the CSS class(es) that will be added (multiple classes are separated via spaces)
* @param {string} remove the CSS class(es) that will be removed (multiple classes are separated via spaces)
- * @param {object=} options an optional collection of options/styles that will be applied to the element.
- * The object can have the following properties:
- *
- * - **addClass** - `{string}` - space-separated CSS classes to add to element
- * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
- * - **removeClass** - `{string}` - space-separated CSS classes to remove from element
- * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+ * @param {object=} options an optional collection of options/styles that will be applied to the element
*
* @return {Promise} the animation callback promise
*/
@@ -12447,13 +12401,7 @@ var $AnimateProvider = ['$provide', function($provide) {
* @param {string=} className an optional CSS class that will be applied to the element for the duration of the animation. If
* this value is left as empty then a CSS class of `ng-inline-animate` will be applied to the element.
* (Note that if no animation is detected then this value will not be applied to the element.)
- * @param {object=} options an optional collection of options/styles that will be applied to the element.
- * The object can have the following properties:
- *
- * - **addClass** - `{string}` - space-separated CSS classes to add to element
- * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
- * - **removeClass** - `{string}` - space-separated CSS classes to remove from element
- * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+ * @param {object=} options an optional collection of options/styles that will be applied to the element
*
* @return {Promise} the animation callback promise
*/
@@ -13541,9 +13489,8 @@ function $TemplateCacheProvider() {
* There are many different options for a directive.
*
* The difference resides in the return value of the factory function.
- * You can either return a {@link $compile#directive-definition-object Directive Definition Object (see below)}
- * that defines the directive properties, or just the `postLink` function (all other properties will have
- * the default values).
+ * You can either return a "Directive Definition Object" (see below) that defines the directive properties,
+ * or just the `postLink` function (all other properties will have the default values).
*
*
* **Best Practice:** It's recommended to use the "directive definition object" form.
@@ -13607,125 +13554,6 @@ function $TemplateCacheProvider() {
* });
* ```
*
- * ### Life-cycle hooks
- * Directive controllers can provide the following methods that are called by Angular at points in the life-cycle of the
- * directive:
- * * `$onInit()` - Called on each controller after all the controllers on an element have been constructed and
- * had their bindings initialized (and before the pre & post linking functions for the directives on
- * this element). This is a good place to put initialization code for your controller.
- * * `$onChanges(changesObj)` - Called whenever one-way (`<`) or interpolation (`@`) bindings are updated. The
- * `changesObj` is a hash whose keys are the names of the bound properties that have changed, and the values are an
- * object of the form `{ currentValue, previousValue, isFirstChange() }`. Use this hook to trigger updates within a
- * component such as cloning the bound value to prevent accidental mutation of the outer value.
- * * `$doCheck()` - Called on each turn of the digest cycle. Provides an opportunity to detect and act on
- * changes. Any actions that you wish to take in response to the changes that you detect must be
- * invoked from this hook; implementing this has no effect on when `$onChanges` is called. For example, this hook
- * could be useful if you wish to perform a deep equality check, or to check a Date object, changes to which would not
- * be detected by Angular's change detector and thus not trigger `$onChanges`. This hook is invoked with no arguments;
- * if detecting changes, you must store the previous value(s) for comparison to the current values.
- * * `$onDestroy()` - Called on a controller when its containing scope is destroyed. Use this hook for releasing
- * external resources, watches and event handlers. Note that components have their `$onDestroy()` hooks called in
- * the same order as the `$scope.$broadcast` events are triggered, which is top down. This means that parent
- * components will have their `$onDestroy()` hook called before child components.
- * * `$postLink()` - Called after this controller's element and its children have been linked. Similar to the post-link
- * function this hook can be used to set up DOM event handlers and do direct DOM manipulation.
- * Note that child elements that contain `templateUrl` directives will not have been compiled and linked since
- * they are waiting for their template to load asynchronously and their own compilation and linking has been
- * suspended until that occurs.
- *
- * #### Comparison with Angular 2 life-cycle hooks
- * Angular 2 also uses life-cycle hooks for its components. While the Angular 1 life-cycle hooks are similar there are
- * some differences that you should be aware of, especially when it comes to moving your code from Angular 1 to Angular 2:
- *
- * * Angular 1 hooks are prefixed with `$`, such as `$onInit`. Angular 2 hooks are prefixed with `ng`, such as `ngOnInit`.
- * * Angular 1 hooks can be defined on the controller prototype or added to the controller inside its constructor.
- * In Angular 2 you can only define hooks on the prototype of the Component class.
- * * Due to the differences in change-detection, you may get many more calls to `$doCheck` in Angular 1 than you would to
- * `ngDoCheck` in Angular 2
- * * Changes to the model inside `$doCheck` will trigger new turns of the digest loop, which will cause the changes to be
- * propagated throughout the application.
- * Angular 2 does not allow the `ngDoCheck` hook to trigger a change outside of the component. It will either throw an
- * error or do nothing depending upon the state of `enableProdMode()`.
- *
- * #### Life-cycle hook examples
- *
- * This example shows how you can check for mutations to a Date object even though the identity of the object
- * has not changed.
- *
- *
- *
- * angular.module('do-check-module', [])
- * .component('app', {
- * template:
- * 'Month: ' +
- * 'Date: {{ $ctrl.date }}' +
- * '',
- * controller: function() {
- * this.date = new Date();
- * this.month = this.date.getMonth();
- * this.updateDate = function() {
- * this.date.setMonth(this.month);
- * };
- * }
- * })
- * .component('test', {
- * bindings: { date: '<' },
- * template:
- * '
{{ $ctrl.log | json }}
',
- * controller: function() {
- * var previousValue;
- * this.log = [];
- * this.$doCheck = function() {
- * var currentValue = this.date && this.date.valueOf();
- * if (previousValue !== currentValue) {
- * this.log.push('doCheck: date mutated: ' + this.date);
- * previousValue = currentValue;
- * }
- * };
- * }
- * });
- *
- *
- *
- *
- *
- *
- * This example show how you might use `$doCheck` to trigger changes in your component's inputs even if the
- * actual identity of the component doesn't change. (Be aware that cloning and deep equality checks on large
- * arrays or objects can have a negative impact on your application performance)
- *
- *
- *
- *
',
- * controller: function() {
- * this.log = [];
- *
- * this.$doCheck = function() {
- * if (this.items_ref !== this.items) {
- * this.log.push('doCheck: items changed');
- * this.items_ref = this.items;
- * }
- * if (!angular.equals(this.items_clone, this.items)) {
- * this.log.push('doCheck: items mutated');
- * this.items_clone = angular.copy(this.items);
- * }
- * };
- * }
- * });
- *
- *
*
*
* ### Directive Definition Object
@@ -13901,6 +13729,25 @@ function $TemplateCacheProvider() {
* The `$transclude` function also has a method on it, `$transclude.isSlotFilled(slotName)`, which returns
* `true` if the specified slot contains content (i.e. one or more DOM nodes).
*
+ * The controller can provide the following methods that act as life-cycle hooks:
+ * * `$onInit()` - Called on each controller after all the controllers on an element have been constructed and
+ * had their bindings initialized (and before the pre & post linking functions for the directives on
+ * this element). This is a good place to put initialization code for your controller.
+ * * `$onChanges(changesObj)` - Called whenever one-way (`<`) or interpolation (`@`) bindings are updated. The
+ * `changesObj` is a hash whose keys are the names of the bound properties that have changed, and the values are an
+ * object of the form `{ currentValue, previousValue, isFirstChange() }`. Use this hook to trigger updates within a
+ * component such as cloning the bound value to prevent accidental mutation of the outer value.
+ * * `$onDestroy()` - Called on a controller when its containing scope is destroyed. Use this hook for releasing
+ * external resources, watches and event handlers. Note that components have their `$onDestroy()` hooks called in
+ * the same order as the `$scope.$broadcast` events are triggered, which is top down. This means that parent
+ * components will have their `$onDestroy()` hook called before child components.
+ * * `$postLink()` - Called after this controller's element and its children have been linked. Similar to the post-link
+ * function this hook can be used to set up DOM event handlers and do direct DOM manipulation.
+ * Note that child elements that contain `templateUrl` directives will not have been compiled and linked since
+ * they are waiting for their template to load asynchronously and their own compilation and linking has been
+ * suspended until that occurs.
+ *
+ *
* #### `require`
* Require another directive and inject its controller as the fourth argument to the linking function. The
* `require` property can be a string, an array or an object:
@@ -14098,8 +13945,8 @@ function $TemplateCacheProvider() {
* any other controller.
*
* * `transcludeFn` - A transclude linking function pre-bound to the correct transclusion scope.
- * This is the same as the `$transclude` parameter of directive controllers,
- * see {@link ng.$compile#-controller- the controller section for details}.
+ * This is the same as the `$transclude`
+ * parameter of directive controllers, see there for details.
* `function([scope], cloneLinkingFn, futureParentElement)`.
*
* #### Pre-linking function
@@ -14901,19 +14748,11 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
}
// We must run this hook in an apply since the $$postDigest runs outside apply
$rootScope.$apply(function() {
- var errors = [];
for (var i = 0, ii = onChangesQueue.length; i < ii; ++i) {
- try {
- onChangesQueue[i]();
- } catch (e) {
- errors.push(e);
- }
+ onChangesQueue[i]();
}
// Reset the queue to trigger a new schedule next time there is a change
onChangesQueue = undefined;
- if (errors.length) {
- throw errors;
- }
});
} finally {
onChangesTtl++;
@@ -15554,7 +15393,19 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
addTextInterpolateDirective(directives, node.nodeValue);
break;
case NODE_TYPE_COMMENT: /* Comment */
- collectCommentDirectives(node, directives, attrs, maxPriority, ignoreDirective);
+ try {
+ match = COMMENT_DIRECTIVE_REGEXP.exec(node.nodeValue);
+ if (match) {
+ nName = directiveNormalize(match[1]);
+ if (addDirective(directives, nName, 'M', maxPriority, ignoreDirective)) {
+ attrs[nName] = trim(match[2]);
+ }
+ }
+ } catch (e) {
+ // turns out that under some circumstances IE9 throws errors when one attempts to read
+ // comment's node value.
+ // Just ignore it and continue. (Can't seem to reproduce in test case.)
+ }
break;
}
@@ -15562,24 +15413,6 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
return directives;
}
- function collectCommentDirectives(node, directives, attrs, maxPriority, ignoreDirective) {
- // function created because of performance, try/catch disables
- // the optimization of the whole function #14848
- try {
- var match = COMMENT_DIRECTIVE_REGEXP.exec(node.nodeValue);
- if (match) {
- var nName = directiveNormalize(match[1]);
- if (addDirective(directives, nName, 'M', maxPriority, ignoreDirective)) {
- attrs[nName] = trim(match[2]);
- }
- }
- } catch (e) {
- // turns out that under some circumstances IE9 throws errors when one attempts to read
- // comment's node value.
- // Just ignore it and continue. (Can't seem to reproduce in test case.)
- }
- }
-
/**
* Given a node with an directive-start it collects all of the siblings until it finds
* directive-end.
@@ -16095,22 +15928,10 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
forEach(elementControllers, function(controller) {
var controllerInstance = controller.instance;
if (isFunction(controllerInstance.$onChanges)) {
- try {
- controllerInstance.$onChanges(controller.bindingInfo.initialChanges);
- } catch (e) {
- $exceptionHandler(e);
- }
+ controllerInstance.$onChanges(controller.bindingInfo.initialChanges);
}
if (isFunction(controllerInstance.$onInit)) {
- try {
- controllerInstance.$onInit();
- } catch (e) {
- $exceptionHandler(e);
- }
- }
- if (isFunction(controllerInstance.$doCheck)) {
- controllerScope.$watch(function() { controllerInstance.$doCheck(); });
- controllerInstance.$doCheck();
+ controllerInstance.$onInit();
}
if (isFunction(controllerInstance.$onDestroy)) {
controllerScope.$on('$destroy', function callOnDestroyHook() {
@@ -16374,16 +16195,18 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
// copy the new attributes on the old attrs object
forEach(src, function(value, key) {
- // Check if we already set this attribute in the loop above.
- // `dst` will never contain hasOwnProperty as DOM parser won't let it.
- // You will get an "InvalidCharacterError: DOM Exception 5" error if you
- // have an attribute like "has-own-property" or "data-has-own-property", etc.
- if (!dst.hasOwnProperty(key) && key.charAt(0) !== '$') {
+ if (key == 'class') {
+ safeAddClass($element, value);
+ dst['class'] = (dst['class'] ? dst['class'] + ' ' : '') + value;
+ } else if (key == 'style') {
+ $element.attr('style', $element.attr('style') + ';' + value);
+ dst['style'] = (dst['style'] ? dst['style'] + ';' : '') + value;
+ // `dst` will never contain hasOwnProperty as DOM parser won't let it.
+ // You will get an "InvalidCharacterError: DOM Exception 5" error if you
+ // have an attribute like "has-own-property" or "data-has-own-property", etc.
+ } else if (key.charAt(0) != '$' && !dst.hasOwnProperty(key)) {
dst[key] = value;
-
- if (key !== 'class' && key !== 'style') {
- dstAttr[key] = srcAttr[key];
- }
+ dstAttr[key] = srcAttr[key];
}
});
}
@@ -16758,7 +16581,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
forEach(bindings, function initializeBinding(definition, scopeName) {
var attrName = definition.attrName,
optional = definition.optional,
- mode = definition.mode, // @, =, <, or &
+ mode = definition.mode, // @, =, or &
lastValue,
parentGet, parentSet, compare, removeWatch;
@@ -17244,21 +17067,18 @@ function $DocumentProvider() {
*
* ## Example:
*
- * The example below will overwrite the default `$exceptionHandler` in order to (a) log uncaught
- * errors to the backend for later inspection by the developers and (b) to use `$log.warn()` instead
- * of `$log.error()`.
- *
* ```js
- * angular.
- * module('exceptionOverwrite', []).
- * factory('$exceptionHandler', ['$log', 'logErrorsToBackend', function($log, logErrorsToBackend) {
- * return function myExceptionHandler(exception, cause) {
- * logErrorsToBackend(exception, cause);
- * $log.warn(exception, cause);
- * };
- * }]);
+ * angular.module('exceptionOverride', []).factory('$exceptionHandler', function() {
+ * return function(exception, cause) {
+ * exception.message += ' (caused by "' + cause + '")';
+ * throw exception;
+ * };
+ * });
* ```
*
+ * This example will override the normal action of `$exceptionHandler`, to make angular
+ * exceptions fail hard when they happen, instead of just logging to the console.
+ *
*
* Note, that code executed in event-listeners (even those registered using jqLite's `on`/`bind`
* methods) does not delegate exceptions to the {@link ng.$exceptionHandler $exceptionHandler}
@@ -17268,7 +17088,7 @@ function $DocumentProvider() {
* `try { ... } catch(e) { $exceptionHandler(e); }`
*
* @param {Error} exception Exception associated with the error.
- * @param {string=} cause Optional information about the context in which
+ * @param {string=} cause optional information about the context in which
* the error was thrown.
*
*/
@@ -17338,7 +17158,7 @@ function $HttpParamSerializerProvider() {
* * `{'foo': 'bar'}` results in `foo=bar`
* * `{'foo': Date.now()}` results in `foo=2015-04-01T09%3A50%3A49.262Z` (`toISOString()` and encoded representation of a Date object)
* * `{'foo': ['bar', 'baz']}` results in `foo=bar&foo=baz` (repeated key for each array element)
- * * `{'foo': {'bar':'baz'}}` results in `foo=%7B%22bar%22%3A%22baz%22%7D` (stringified and encoded representation of an object)
+ * * `{'foo': {'bar':'baz'}}` results in `foo=%7B%22bar%22%3A%22baz%22%7D"` (stringified and encoded representation of an object)
*
* Note that serializer will sort the request parameters alphabetically.
* */
@@ -17889,7 +17709,7 @@ function $HttpProvider() {
*
* ### Overriding the Default Transformations Per Request
*
- * If you wish to override the request/response transformations only for a single request then provide
+ * If you wish override the request/response transformations only for a single request then provide
* `transformRequest` and/or `transformResponse` properties on the configuration object passed
* into `$http`.
*
@@ -17932,7 +17752,7 @@ function $HttpProvider() {
* * cache a specific response - set config.cache value to TRUE or to a cache object
*
* If caching is enabled, but neither the default cache nor config.cache are set to a cache object,
- * then the default `$cacheFactory("$http")` object is used.
+ * then the default `$cacheFactory($http)` object is used.
*
* The default cache value can be set by updating the
* {@link ng.$http#defaults `$http.defaults.cache`} property or the
@@ -18260,25 +18080,48 @@ function $HttpProvider() {
config.headers = mergeHeaders(requestConfig);
config.method = uppercase(config.method);
config.paramSerializer = isString(config.paramSerializer) ?
- $injector.get(config.paramSerializer) : config.paramSerializer;
+ $injector.get(config.paramSerializer) : config.paramSerializer;
+
+ var serverRequest = function(config) {
+ var headers = config.headers;
+ var reqData = transformData(config.data, headersGetter(headers), undefined, config.transformRequest);
- var requestInterceptors = [];
- var responseInterceptors = [];
+ // strip content-type if data is undefined
+ if (isUndefined(reqData)) {
+ forEach(headers, function(value, header) {
+ if (lowercase(header) === 'content-type') {
+ delete headers[header];
+ }
+ });
+ }
+
+ if (isUndefined(config.withCredentials) && !isUndefined(defaults.withCredentials)) {
+ config.withCredentials = defaults.withCredentials;
+ }
+
+ // send request
+ return sendReq(config, reqData).then(transformResponse, transformResponse);
+ };
+
+ var chain = [serverRequest, undefined];
var promise = $q.when(config);
// apply interceptors
forEach(reversedInterceptors, function(interceptor) {
if (interceptor.request || interceptor.requestError) {
- requestInterceptors.unshift(interceptor.request, interceptor.requestError);
+ chain.unshift(interceptor.request, interceptor.requestError);
}
if (interceptor.response || interceptor.responseError) {
- responseInterceptors.push(interceptor.response, interceptor.responseError);
+ chain.push(interceptor.response, interceptor.responseError);
}
});
- promise = chainInterceptors(promise, requestInterceptors);
- promise = promise.then(serverRequest);
- promise = chainInterceptors(promise, responseInterceptors);
+ while (chain.length) {
+ var thenFn = chain.shift();
+ var rejectFn = chain.shift();
+
+ promise = promise.then(thenFn, rejectFn);
+ }
if (useLegacyPromise) {
promise.success = function(fn) {
@@ -18305,18 +18148,14 @@ function $HttpProvider() {
return promise;
-
- function chainInterceptors(promise, interceptors) {
- for (var i = 0, ii = interceptors.length; i < ii;) {
- var thenFn = interceptors[i++];
- var rejectFn = interceptors[i++];
-
- promise = promise.then(thenFn, rejectFn);
- }
-
- interceptors.length = 0;
-
- return promise;
+ function transformResponse(response) {
+ // make a copy since the response must be cacheable
+ var resp = extend({}, response);
+ resp.data = transformData(response.data, response.headers, response.status,
+ config.transformResponse);
+ return (isSuccess(response.status))
+ ? resp
+ : $q.reject(resp);
}
function executeHeaderFns(headers, config) {
@@ -18360,37 +18199,6 @@ function $HttpProvider() {
// execute if header value is a function for merged headers
return executeHeaderFns(reqHeaders, shallowCopy(config));
}
-
- function serverRequest(config) {
- var headers = config.headers;
- var reqData = transformData(config.data, headersGetter(headers), undefined, config.transformRequest);
-
- // strip content-type if data is undefined
- if (isUndefined(reqData)) {
- forEach(headers, function(value, header) {
- if (lowercase(header) === 'content-type') {
- delete headers[header];
- }
- });
- }
-
- if (isUndefined(config.withCredentials) && !isUndefined(defaults.withCredentials)) {
- config.withCredentials = defaults.withCredentials;
- }
-
- // send request
- return sendReq(config, reqData).then(transformResponse, transformResponse);
- }
-
- function transformResponse(response) {
- // make a copy since the response must be cacheable
- var resp = extend({}, response);
- resp.data = transformData(response.data, response.headers, response.status,
- config.transformResponse);
- return (isSuccess(response.status))
- ? resp
- : $q.reject(resp);
- }
}
$http.pendingRequests = [];
@@ -18437,8 +18245,6 @@ function $HttpProvider() {
*
* @description
* Shortcut method to perform `JSONP` request.
- * If you would like to customise where and how the callbacks are stored then try overriding
- * or decorating the {@link $jsonpCallbacks} service.
*
* @param {string} url Relative or absolute URL specifying the destination of the request.
* The name of the callback should be the string `JSON_CALLBACK`.
@@ -18712,7 +18518,7 @@ function $xhrFactoryProvider() {
/**
* @ngdoc service
* @name $httpBackend
- * @requires $jsonpCallbacks
+ * @requires $window
* @requires $document
* @requires $xhrFactory
*
@@ -18727,8 +18533,8 @@ function $xhrFactoryProvider() {
* $httpBackend} which can be trained with responses.
*/
function $HttpBackendProvider() {
- this.$get = ['$browser', '$jsonpCallbacks', '$document', '$xhrFactory', function($browser, $jsonpCallbacks, $document, $xhrFactory) {
- return createHttpBackend($browser, $xhrFactory, $browser.defer, $jsonpCallbacks, $document[0]);
+ this.$get = ['$browser', '$window', '$document', '$xhrFactory', function($browser, $window, $document, $xhrFactory) {
+ return createHttpBackend($browser, $xhrFactory, $browser.defer, $window.angular.callbacks, $document[0]);
}];
}
@@ -18738,13 +18544,17 @@ function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDoc
$browser.$$incOutstandingRequestCount();
url = url || $browser.url();
- if (lowercase(method) === 'jsonp') {
- var callbackPath = callbacks.createCallback(url);
- var jsonpDone = jsonpReq(url, callbackPath, function(status, text) {
- // jsonpReq only ever sets status to 200 (OK), 404 (ERROR) or -1 (WAITING)
- var response = (status === 200) && callbacks.getResponse(callbackPath);
- completeRequest(callback, status, response, "", text);
- callbacks.removeCallback(callbackPath);
+ if (lowercase(method) == 'jsonp') {
+ var callbackId = '_' + (callbacks.counter++).toString(36);
+ callbacks[callbackId] = function(data) {
+ callbacks[callbackId].data = data;
+ callbacks[callbackId].called = true;
+ };
+
+ var jsonpDone = jsonpReq(url.replace('JSON_CALLBACK', 'angular.callbacks.' + callbackId),
+ callbackId, function(status, text) {
+ completeRequest(callback, status, callbacks[callbackId].data, "", text);
+ callbacks[callbackId] = noop;
});
} else {
@@ -18846,8 +18656,7 @@ function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDoc
}
};
- function jsonpReq(url, callbackPath, done) {
- url = url.replace('JSON_CALLBACK', callbackPath);
+ function jsonpReq(url, callbackId, done) {
// we can't use jQuery/jqLite here because jQuery does crazy stuff with script elements, e.g.:
// - fetches local scripts via XHR and evals them
// - adds and immediately removes script elements from the document
@@ -18865,7 +18674,7 @@ function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDoc
var text = "unknown";
if (event) {
- if (event.type === "load" && !callbacks.wasCalled(callbackPath)) {
+ if (event.type === "load" && !callbacks[callbackId].called) {
event = { type: "error" };
}
text = event.type;
@@ -19064,7 +18873,7 @@ function $InterpolateProvider() {
*
* `allOrNothing` is useful for interpolating URLs. `ngSrc` and `ngSrcset` use this behavior.
*
- * #### Escaped Interpolation
+ * ####Escaped Interpolation
* $interpolate provides a mechanism for escaping interpolation markers. Start and end markers
* can be escaped by preceding each of their characters with a REVERSE SOLIDUS U+005C (backslash).
* It will be rendered as a regular start/end marker, and will not be interpreted as an expression
@@ -19487,87 +19296,6 @@ function $IntervalProvider() {
}];
}
-/**
- * @ngdoc service
- * @name $jsonpCallbacks
- * @requires $window
- * @description
- * This service handles the lifecycle of callbacks to handle JSONP requests.
- * Override this service if you wish to customise where the callbacks are stored and
- * how they vary compared to the requested url.
- */
-var $jsonpCallbacksProvider = function() {
- this.$get = ['$window', function($window) {
- var callbacks = $window.angular.callbacks;
- var callbackMap = {};
-
- function createCallback(callbackId) {
- var callback = function(data) {
- callback.data = data;
- callback.called = true;
- };
- callback.id = callbackId;
- return callback;
- }
-
- return {
- /**
- * @ngdoc method
- * @name $jsonpCallbacks#createCallback
- * @param {string} url the url of the JSONP request
- * @returns {string} the callback path to send to the server as part of the JSONP request
- * @description
- * {@link $httpBackend} calls this method to create a callback and get hold of the path to the callback
- * to pass to the server, which will be used to call the callback with its payload in the JSONP response.
- */
- createCallback: function(url) {
- var callbackId = '_' + (callbacks.$$counter++).toString(36);
- var callbackPath = 'angular.callbacks.' + callbackId;
- var callback = createCallback(callbackId);
- callbackMap[callbackPath] = callbacks[callbackId] = callback;
- return callbackPath;
- },
- /**
- * @ngdoc method
- * @name $jsonpCallbacks#wasCalled
- * @param {string} callbackPath the path to the callback that was sent in the JSONP request
- * @returns {boolean} whether the callback has been called, as a result of the JSONP response
- * @description
- * {@link $httpBackend} calls this method to find out whether the JSONP response actually called the
- * callback that was passed in the request.
- */
- wasCalled: function(callbackPath) {
- return callbackMap[callbackPath].called;
- },
- /**
- * @ngdoc method
- * @name $jsonpCallbacks#getResponse
- * @param {string} callbackPath the path to the callback that was sent in the JSONP request
- * @returns {*} the data received from the response via the registered callback
- * @description
- * {@link $httpBackend} calls this method to get hold of the data that was provided to the callback
- * in the JSONP response.
- */
- getResponse: function(callbackPath) {
- return callbackMap[callbackPath].data;
- },
- /**
- * @ngdoc method
- * @name $jsonpCallbacks#removeCallback
- * @param {string} callbackPath the path to the callback that was sent in the JSONP request
- * @description
- * {@link $httpBackend} calls this method to remove the callback after the JSONP request has
- * completed or timed-out.
- */
- removeCallback: function(callbackPath) {
- var callback = callbackMap[callbackPath];
- delete callbacks[callback.id];
- delete callbackMap[callbackPath];
- }
- };
- }];
-};
-
/**
* @ngdoc service
* @name $locale
@@ -19907,12 +19635,6 @@ function LocationHashbangInHtml5Url(appBase, appBaseNoFile, hashPrefix) {
var locationPrototype = {
- /**
- * Ensure absolute url is initialized.
- * @private
- */
- $$absUrl:'',
-
/**
* Are we in html5 mode?
* @private
@@ -21286,7 +21008,7 @@ AST.prototype = {
var args = [];
if (this.peekToken().text !== ')') {
do {
- args.push(this.filterChain());
+ args.push(this.expression());
} while (this.expect(','));
}
return args;
@@ -23013,7 +22735,7 @@ function $ParseProvider() {
*
* **Methods**
*
- * - `then(successCallback, [errorCallback], [notifyCallback])` – regardless of when the promise was or
+ * - `then(successCallback, errorCallback, notifyCallback)` – regardless of when the promise was or
* will be resolved or rejected, `then` calls one of the success or error callbacks asynchronously
* as soon as the result is available. The callbacks are called with a single argument: the result
* or rejection reason. Additionally, the notify callback may be called zero or more times to
@@ -23024,8 +22746,7 @@ function $ParseProvider() {
* with the value which is resolved in that promise using
* [promise chaining](http://www.html5rocks.com/en/tutorials/es6/promises/#toc-promises-queues)).
* It also notifies via the return value of the `notifyCallback` method. The promise cannot be
- * resolved or rejected from the notifyCallback method. The errorCallback and notifyCallback
- * arguments are optional.
+ * resolved or rejected from the notifyCallback method.
*
* - `catch(errorCallback)` – shorthand for `promise.then(null, errorCallback)`
*
@@ -23440,30 +23161,6 @@ function qFactory(nextTick, exceptionHandler) {
return deferred.promise;
}
- /**
- * @ngdoc method
- * @name $q#race
- * @kind function
- *
- * @description
- * Returns a promise that resolves or rejects as soon as one of those promises
- * resolves or rejects, with the value or reason from that promise.
- *
- * @param {Array.|Object.} promises An array or hash of promises.
- * @returns {Promise} a promise that resolves or rejects as soon as one of the `promises`
- * resolves or rejects, with the value or reason from that promise.
- */
-
- function race(promises) {
- var deferred = defer();
-
- forEach(promises, function(promise) {
- when(promise).then(deferred.resolve, deferred.reject);
- });
-
- return deferred.promise;
- }
-
var $Q = function Q(resolver) {
if (!isFunction(resolver)) {
throw $qMinErr('norslvr', "Expected resolverFn, got '{0}'", resolver);
@@ -23493,7 +23190,6 @@ function qFactory(nextTick, exceptionHandler) {
$Q.when = when;
$Q.resolve = resolve;
$Q.all = all;
- $Q.race = race;
return $Q;
}
@@ -26845,11 +26541,10 @@ function $FilterProvider($provide) {
* - `Object`: A pattern object can be used to filter specific properties on objects contained
* by `array`. For example `{name:"M", phone:"1"}` predicate will return an array of items
* which have property `name` containing "M" and property `phone` containing "1". A special
- * property name (`$` by default) can be used (e.g. as in `{$: "text"}`) to accept a match
- * against any property of the object or its nested object properties. That's equivalent to the
- * simple substring match with a `string` as described above. The special property name can be
- * overwritten, using the `anyPropertyKey` parameter.
- * The predicate can be negated by prefixing the string with `!`.
+ * property name `$` can be used (as in `{$:"text"}`) to accept a match against any
+ * property of the object or its nested object properties. That's equivalent to the simple
+ * substring match with a `string` as described above. The predicate can be negated by prefixing
+ * the string with `!`.
* For example `{name: "!M"}` predicate will return an array of items which have property `name`
* not containing "M".
*
@@ -26883,9 +26578,6 @@ function $FilterProvider($provide) {
* Primitive values are converted to strings. Objects are not compared against primitives,
* unless they have a custom `toString` method (e.g. `Date` objects).
*
- * @param {string=} anyPropertyKey The special property name that matches against any property.
- * By default `$`.
- *
* @example
@@ -26954,9 +26646,8 @@ function $FilterProvider($provide) {
*/
-
function filterFilter() {
- return function(array, expression, comparator, anyPropertyKey) {
+ return function(array, expression, comparator) {
if (!isArrayLike(array)) {
if (array == null) {
return array;
@@ -26965,7 +26656,6 @@ function filterFilter() {
}
}
- anyPropertyKey = anyPropertyKey || '$';
var expressionType = getTypeForFilter(expression);
var predicateFn;
var matchAgainstAnyProp;
@@ -26982,7 +26672,7 @@ function filterFilter() {
//jshint -W086
case 'object':
//jshint +W086
- predicateFn = createPredicateFn(expression, comparator, anyPropertyKey, matchAgainstAnyProp);
+ predicateFn = createPredicateFn(expression, comparator, matchAgainstAnyProp);
break;
default:
return array;
@@ -26993,8 +26683,8 @@ function filterFilter() {
}
// Helper functions for `filterFilter`
-function createPredicateFn(expression, comparator, anyPropertyKey, matchAgainstAnyProp) {
- var shouldMatchPrimitives = isObject(expression) && (anyPropertyKey in expression);
+function createPredicateFn(expression, comparator, matchAgainstAnyProp) {
+ var shouldMatchPrimitives = isObject(expression) && ('$' in expression);
var predicateFn;
if (comparator === true) {
@@ -27022,25 +26712,25 @@ function createPredicateFn(expression, comparator, anyPropertyKey, matchAgainstA
predicateFn = function(item) {
if (shouldMatchPrimitives && !isObject(item)) {
- return deepCompare(item, expression[anyPropertyKey], comparator, anyPropertyKey, false);
+ return deepCompare(item, expression.$, comparator, false);
}
- return deepCompare(item, expression, comparator, anyPropertyKey, matchAgainstAnyProp);
+ return deepCompare(item, expression, comparator, matchAgainstAnyProp);
};
return predicateFn;
}
-function deepCompare(actual, expected, comparator, anyPropertyKey, matchAgainstAnyProp, dontMatchWholeObject) {
+function deepCompare(actual, expected, comparator, matchAgainstAnyProp, dontMatchWholeObject) {
var actualType = getTypeForFilter(actual);
var expectedType = getTypeForFilter(expected);
if ((expectedType === 'string') && (expected.charAt(0) === '!')) {
- return !deepCompare(actual, expected.substring(1), comparator, anyPropertyKey, matchAgainstAnyProp);
+ return !deepCompare(actual, expected.substring(1), comparator, matchAgainstAnyProp);
} else if (isArray(actual)) {
// In case `actual` is an array, consider it a match
// if ANY of it's items matches `expected`
return actual.some(function(item) {
- return deepCompare(item, expected, comparator, anyPropertyKey, matchAgainstAnyProp);
+ return deepCompare(item, expected, comparator, matchAgainstAnyProp);
});
}
@@ -27049,11 +26739,11 @@ function deepCompare(actual, expected, comparator, anyPropertyKey, matchAgainstA
var key;
if (matchAgainstAnyProp) {
for (key in actual) {
- if ((key.charAt(0) !== '$') && deepCompare(actual[key], expected, comparator, anyPropertyKey, true)) {
+ if ((key.charAt(0) !== '$') && deepCompare(actual[key], expected, comparator, true)) {
return true;
}
}
- return dontMatchWholeObject ? false : deepCompare(actual, expected, comparator, anyPropertyKey, false);
+ return dontMatchWholeObject ? false : deepCompare(actual, expected, comparator, false);
} else if (expectedType === 'object') {
for (key in expected) {
var expectedVal = expected[key];
@@ -27061,9 +26751,9 @@ function deepCompare(actual, expected, comparator, anyPropertyKey, matchAgainstA
continue;
}
- var matchAnyProperty = key === anyPropertyKey;
+ var matchAnyProperty = key === '$';
var actualVal = matchAnyProperty ? actual : actual[key];
- if (!deepCompare(actualVal, expectedVal, comparator, anyPropertyKey, matchAnyProperty, matchAnyProperty)) {
+ if (!deepCompare(actualVal, expectedVal, comparator, matchAnyProperty, matchAnyProperty)) {
return false;
}
}
@@ -27801,22 +27491,21 @@ var uppercaseFilter = valueFn(uppercase);
* @kind function
*
* @description
- * Creates a new array or string containing only a specified number of elements. The elements are
- * taken from either the beginning or the end of the source array, string or number, as specified by
- * the value and sign (positive or negative) of `limit`. Other array-like objects are also supported
- * (e.g. array subclasses, NodeLists, jqLite/jQuery collections etc). If a number is used as input,
- * it is converted to a string.
- *
- * @param {Array|ArrayLike|string|number} input - Array/array-like, string or number to be limited.
- * @param {string|number} limit - The length of the returned array or string. If the `limit` number
+ * Creates a new array or string containing only a specified number of elements. The elements
+ * are taken from either the beginning or the end of the source array, string or number, as specified by
+ * the value and sign (positive or negative) of `limit`. If a number is used as input, it is
+ * converted to a string.
+ *
+ * @param {Array|string|number} input Source array, string or number to be limited.
+ * @param {string|number} limit The length of the returned array or string. If the `limit` number
* is positive, `limit` number of items from the beginning of the source array/string are copied.
* If the number is negative, `limit` number of items from the end of the source array/string
* are copied. The `limit` will be trimmed if it exceeds `array.length`. If `limit` is undefined,
* the input will be returned unchanged.
- * @param {(string|number)=} begin - Index at which to begin limitation. As a negative index,
- * `begin` indicates an offset from the end of `input`. Defaults to `0`.
- * @returns {Array|string} A new sub-array or substring of length `limit` or less if the input had
- * less than `limit` elements.
+ * @param {(string|number)=} begin Index at which to begin limitation. As a negative index, `begin`
+ * indicates an offset from the end of `input`. Defaults to `0`.
+ * @returns {Array|string} A new sub-array or substring of length `limit` or less if input array
+ * had less than `limit` elements.
*
* @example
@@ -27904,157 +27593,67 @@ function limitToFilter() {
if (isNaN(limit)) return input;
if (isNumber(input)) input = input.toString();
- if (!isArrayLike(input)) return input;
+ if (!isArray(input) && !isString(input)) return input;
begin = (!begin || isNaN(begin)) ? 0 : toInt(begin);
begin = (begin < 0) ? Math.max(0, input.length + begin) : begin;
if (limit >= 0) {
- return sliceFn(input, begin, begin + limit);
+ return input.slice(begin, begin + limit);
} else {
if (begin === 0) {
- return sliceFn(input, limit, input.length);
+ return input.slice(limit, input.length);
} else {
- return sliceFn(input, Math.max(0, begin + limit), begin);
+ return input.slice(Math.max(0, begin + limit), begin);
}
}
};
}
-function sliceFn(input, begin, end) {
- if (isString(input)) return input.slice(begin, end);
-
- return slice.call(input, begin, end);
-}
-
/**
* @ngdoc filter
* @name orderBy
* @kind function
*
* @description
- * Returns an array containing the items from the specified `collection`, ordered by a `comparator`
- * function based on the values computed using the `expression` predicate.
- *
- * For example, `[{id: 'foo'}, {id: 'bar'}] | orderBy:'id'` would result in
- * `[{id: 'bar'}, {id: 'foo'}]`.
+ * Orders a specified `array` by the `expression` predicate. It is ordered alphabetically
+ * for strings and numerically for numbers. Note: if you notice numbers are not being sorted
+ * as expected, make sure they are actually being saved as numbers and not strings.
+ * Array-like values (e.g. NodeLists, jQuery objects, TypedArrays, Strings, etc) are also supported.
*
- * The `collection` can be an Array or array-like object (e.g. NodeList, jQuery object, TypedArray,
- * String, etc).
- *
- * The `expression` can be a single predicate, or a list of predicates each serving as a tie-breaker
- * for the preceeding one. The `expression` is evaluated against each item and the output is used
- * for comparing with other items.
- *
- * You can change the sorting order by setting `reverse` to `true`. By default, items are sorted in
- * ascending order.
- *
- * The comparison is done using the `comparator` function. If none is specified, a default, built-in
- * comparator is used (see below for details - in a nutshell, it compares numbers numerically and
- * strings alphabetically).
- *
- * ### Under the hood
- *
- * Ordering the specified `collection` happens in two phases:
- *
- * 1. All items are passed through the predicate (or predicates), and the returned values are saved
- * along with their type (`string`, `number` etc). For example, an item `{label: 'foo'}`, passed
- * through a predicate that extracts the value of the `label` property, would be transformed to:
- * ```
- * {
- * value: 'foo',
- * type: 'string',
- * index: ...
- * }
- * ```
- * 2. The comparator function is used to sort the items, based on the derived values, types and
- * indices.
- *
- * If you use a custom comparator, it will be called with pairs of objects of the form
- * `{value: ..., type: '...', index: ...}` and is expected to return `0` if the objects are equal
- * (as far as the comparator is concerned), `-1` if the 1st one should be ranked higher than the
- * second, or `1` otherwise.
- *
- * In order to ensure that the sorting will be deterministic across platforms, if none of the
- * specified predicates can distinguish between two items, `orderBy` will automatically introduce a
- * dummy predicate that returns the item's index as `value`.
- * (If you are using a custom comparator, make sure it can handle this predicate as well.)
- *
- * Finally, in an attempt to simplify things, if a predicate returns an object as the extracted
- * value for an item, `orderBy` will try to convert that object to a primitive value, before passing
- * it to the comparator. The following rules govern the conversion:
- *
- * 1. If the object has a `valueOf()` method that returns a primitive, its return value will be
- * used instead.
- * (If the object has a `valueOf()` method that returns another object, then the returned object
- * will be used in subsequent steps.)
- * 2. If the object has a custom `toString()` method (i.e. not the one inherited from `Object`) that
- * returns a primitive, its return value will be used instead.
- * (If the object has a `toString()` method that returns another object, then the returned object
- * will be used in subsequent steps.)
- * 3. No conversion; the object itself is used.
- *
- * ### The default comparator
- *
- * The default, built-in comparator should be sufficient for most usecases. In short, it compares
- * numbers numerically, strings alphabetically (and case-insensitively), for objects falls back to
- * using their index in the original collection, and sorts values of different types by type.
- *
- * More specifically, it follows these steps to determine the relative order of items:
- *
- * 1. If the compared values are of different types, compare the types themselves alphabetically.
- * 2. If both values are of type `string`, compare them alphabetically in a case- and
- * locale-insensitive way.
- * 3. If both values are objects, compare their indices instead.
- * 4. Otherwise, return:
- * - `0`, if the values are equal (by strict equality comparison, i.e. using `===`).
- * - `-1`, if the 1st value is "less than" the 2nd value (compared using the `<` operator).
- * - `1`, otherwise.
- *
- * **Note:** If you notice numbers not being sorted as expected, make sure they are actually being
- * saved as numbers and not strings.
- *
- * @param {Array|ArrayLike} collection - The collection (array or array-like object) to sort.
- * @param {(Function|string|Array.)=} expression - A predicate (or list of
- * predicates) to be used by the comparator to determine the order of elements.
+ * @param {Array} array The array (or array-like object) to sort.
+ * @param {function(*)|string|Array.<(function(*)|string)>=} expression A predicate to be
+ * used by the comparator to determine the order of elements.
*
* Can be one of:
*
- * - `Function`: A getter function. This function will be called with each item as argument and
- * the return value will be used for sorting.
- * - `string`: An Angular expression. This expression will be evaluated against each item and the
- * result will be used for sorting. For example, use `'label'` to sort by a property called
- * `label` or `'label.substring(0, 3)'` to sort by the first 3 characters of the `label`
- * property.
- * (The result of a constant expression is interpreted as a property name to be used for
- * comparison. For example, use `'"special name"'` (note the extra pair of quotes) to sort by a
- * property called `special name`.)
- * An expression can be optionally prefixed with `+` or `-` to control the sorting direction,
- * ascending or descending. For example, `'+label'` or `'-label'`. If no property is provided,
- * (e.g. `'+'` or `'-'`), the collection element itself is used in comparisons.
- * - `Array`: An array of function and/or string predicates. If a predicate cannot determine the
- * relative order of two items, the next predicate is used as a tie-breaker.
- *
- * **Note:** If the predicate is missing or empty then it defaults to `'+'`.
+ * - `function`: Getter function. The result of this function will be sorted using the
+ * `<`, `===`, `>` operator.
+ * - `string`: An Angular expression. The result of this expression is used to compare elements
+ * (for example `name` to sort by a property called `name` or `name.substr(0, 3)` to sort by
+ * 3 first characters of a property called `name`). The result of a constant expression
+ * is interpreted as a property name to be used in comparisons (for example `"special name"`
+ * to sort object by the value of their `special name` property). An expression can be
+ * optionally prefixed with `+` or `-` to control ascending or descending sort order
+ * (for example, `+name` or `-name`). If no property is provided, (e.g. `'+'`) then the array
+ * element itself is used to compare where sorting.
+ * - `Array`: An array of function or string predicates. The first predicate in the array
+ * is used for sorting, but when two items are equivalent, the next predicate is used.
*
- * @param {boolean=} reverse - If `true`, reverse the sorting order.
- * @param {(Function)=} comparator - The comparator function used to determine the relative order of
- * value pairs. If omitted, the built-in comparator will be used.
+ * If the predicate is missing or empty then it defaults to `'+'`.
*
- * @returns {Array} - The sorted array.
+ * @param {boolean=} reverse Reverse the order of the array.
+ * @returns {Array} Sorted copy of the source array.
*
*
* @example
- * ### Ordering a table with `ngRepeat`
- *
- * The example below demonstrates a simple {@link ngRepeat ngRepeat}, where the data is sorted by
- * age in descending order (expression is set to `'-age'`). The `comparator` is not set, which means
- * it defaults to the built-in comparator.
- *
-
+ * The example below demonstrates a simple ngRepeat, where the data is sorted
+ * by age in descending order (predicate is set to `'-age'`).
+ * `reverse` is not set, which means it defaults to `false`.
+
-
+
Name
Phone Number
@@ -28069,77 +27668,43 @@ function sliceFn(input, begin, end) {
- angular.module('orderByExample1', [])
+ angular.module('orderByExample', [])
.controller('ExampleController', ['$scope', function($scope) {
- $scope.friends = [
- {name: 'John', phone: '555-1212', age: 10},
- {name: 'Mary', phone: '555-9876', age: 19},
- {name: 'Mike', phone: '555-4321', age: 21},
- {name: 'Adam', phone: '555-5678', age: 35},
- {name: 'Julie', phone: '555-8765', age: 29}
- ];
+ $scope.friends =
+ [{name:'John', phone:'555-1212', age:10},
+ {name:'Mary', phone:'555-9876', age:19},
+ {name:'Mike', phone:'555-4321', age:21},
+ {name:'Adam', phone:'555-5678', age:35},
+ {name:'Julie', phone:'555-8765', age:29}];
}]);
-
- .friends {
- border-collapse: collapse;
- }
-
- .friends th {
- border-bottom: 1px solid;
- }
- .friends td, .friends th {
- border-left: 1px solid;
- padding: 5px 10px;
- }
- .friends td:first-child, .friends th:first-child {
- border-left: none;
- }
-
-
- // Element locators
- var names = element.all(by.repeater('friends').column('friend.name'));
-
- it('should sort friends by age in reverse order', function() {
- expect(names.get(0).getText()).toBe('Adam');
- expect(names.get(1).getText()).toBe('Julie');
- expect(names.get(2).getText()).toBe('Mike');
- expect(names.get(3).getText()).toBe('Mary');
- expect(names.get(4).getText()).toBe('John');
- });
-
- *
*
+ * The predicate and reverse parameters can be controlled dynamically through scope properties,
+ * as shown in the next example.
* @example
- * ### Changing parameters dynamically
- *
- * All parameters can be changed dynamically. The next example shows how you can make the columns of
- * a table sortable, by binding the `expression` and `reverse` parameters to scope properties.
- *
-
+
+
- .friends th {
- border-bottom: 1px solid;
- }
- .friends td, .friends th {
- border-left: 1px solid;
- padding: 5px 10px;
- }
- .friends td:first-child, .friends th:first-child {
- border-left: none;
- }
+
+ angular.module('orderByExample', [])
+ .controller('ExampleController', ['$scope', '$filter', function($scope, $filter) {
+ var orderBy = $filter('orderBy');
+ $scope.friends = [
+ { name: 'John', phone: '555-1212', age: 10 },
+ { name: 'Mary', phone: '555-9876', age: 19 },
+ { name: 'Mike', phone: '555-4321', age: 21 },
+ { name: 'Adam', phone: '555-5678', age: 35 },
+ { name: 'Julie', phone: '555-8765', age: 29 }
+ ];
+ $scope.order = function(predicate) {
+ $scope.predicate = predicate;
+ $scope.reverse = ($scope.predicate === predicate) ? !$scope.reverse : false;
+ $scope.friends = orderBy($scope.friends, predicate, $scope.reverse);
+ };
+ $scope.order('age', true);
+ }]);
+
+
.sortorder:after {
- content: '\25b2'; // BLACK UP-POINTING TRIANGLE
+ content: '\25b2';
}
.sortorder.reverse:after {
- content: '\25bc'; // BLACK DOWN-POINTING TRIANGLE
- }
-
-
- // Element locators
- var unsortButton = element(by.partialButtonText('unsorted'));
- var nameHeader = element(by.partialButtonText('Name'));
- var phoneHeader = element(by.partialButtonText('Phone'));
- var ageHeader = element(by.partialButtonText('Age'));
- var firstName = element(by.repeater('friends').column('friend.name').row(0));
- var lastName = element(by.repeater('friends').column('friend.name').row(4));
-
- it('should sort friends by some property, when clicking on the column header', function() {
- expect(firstName.getText()).toBe('Adam');
- expect(lastName.getText()).toBe('John');
-
- phoneHeader.click();
- expect(firstName.getText()).toBe('John');
- expect(lastName.getText()).toBe('Mary');
-
- nameHeader.click();
- expect(firstName.getText()).toBe('Adam');
- expect(lastName.getText()).toBe('Mike');
-
- ageHeader.click();
- expect(firstName.getText()).toBe('John');
- expect(lastName.getText()).toBe('Adam');
- });
-
- it('should sort friends in reverse order, when clicking on the same column', function() {
- expect(firstName.getText()).toBe('Adam');
- expect(lastName.getText()).toBe('John');
-
- ageHeader.click();
- expect(firstName.getText()).toBe('John');
- expect(lastName.getText()).toBe('Adam');
-
- ageHeader.click();
- expect(firstName.getText()).toBe('Adam');
- expect(lastName.getText()).toBe('John');
- });
-
- it('should restore the original order, when clicking "Set to unsorted"', function() {
- expect(firstName.getText()).toBe('Adam');
- expect(lastName.getText()).toBe('John');
-
- unsortButton.click();
- expect(firstName.getText()).toBe('John');
- expect(lastName.getText()).toBe('Julie');
- });
-
-
- *
- *
- * @example
- * ### Using a custom comparator
- *
- * If you have very specific requirements about the way items are sorted, you can pass your own
- * comparator function. For example, you might need to compare some strings in a locale-sensitive
- * way. (When specifying a custom comparator, you also need to pass a value for the `reverse`
- * argument - passing `false` retains the default sorting order, i.e. ascending.)
- *
-
-
-
-
-
Locale-sensitive Comparator
-
-
-
Name
-
Favorite Letter
-
-
-
{{friend.name}}
-
{{friend.favoriteLetter}}
-
-
-
-
-
Default Comparator
-
-
-
Name
-
Favorite Letter
-
-
-
{{friend.name}}
-
{{friend.favoriteLetter}}
-
-
-
-
-
-
- angular.module('orderByExample4', [])
- .controller('ExampleController', ['$scope', function($scope) {
- $scope.friends = [
- {name: 'John', favoriteLetter: 'Ä'},
- {name: 'Mary', favoriteLetter: 'Ü'},
- {name: 'Mike', favoriteLetter: 'Ö'},
- {name: 'Adam', favoriteLetter: 'H'},
- {name: 'Julie', favoriteLetter: 'Z'}
- ];
-
- $scope.localeSensitiveComparator = function(v1, v2) {
- // If we don't get strings, just compare by index
- if (v1.type !== 'string' || v2.type !== 'string') {
- return (v1.index < v2.index) ? -1 : 1;
- }
-
- // Compare strings alphabetically, taking locale into account
- return v1.value.localeCompare(v2.value);
- };
- }]);
-
-
- .friends-container {
- display: inline-block;
- margin: 0 30px;
- }
-
- .friends {
- border-collapse: collapse;
+ content: '\25bc';
}
-
- .friends th {
- border-bottom: 1px solid;
- }
- .friends td, .friends th {
- border-left: 1px solid;
- padding: 5px 10px;
- }
- .friends td:first-child, .friends th:first-child {
- border-left: none;
- }
-
-
- // Element locators
- var container = element(by.css('.custom-comparator'));
- var names = container.all(by.repeater('friends').column('friend.name'));
-
- it('should sort friends by favorite letter (in correct alphabetical order)', function() {
- expect(names.get(0).getText()).toBe('John');
- expect(names.get(1).getText()).toBe('Adam');
- expect(names.get(2).getText()).toBe('Mike');
- expect(names.get(3).getText()).toBe('Mary');
- expect(names.get(4).getText()).toBe('Julie');
- });
-
-
- *
+
+
*/
orderByFilter.$inject = ['$parse'];
function orderByFilter($parse) {
- return function(array, sortPredicate, reverseOrder, compareFn) {
+ return function(array, sortPredicate, reverseOrder) {
if (array == null) return array;
if (!isArrayLike(array)) {
@@ -28486,12 +27816,11 @@ function orderByFilter($parse) {
if (!isArray(sortPredicate)) { sortPredicate = [sortPredicate]; }
if (sortPredicate.length === 0) { sortPredicate = ['+']; }
- var predicates = processPredicates(sortPredicate);
-
- var descending = reverseOrder ? -1 : 1;
-
- // Define the `compare()` function. Use a default comparator if none is specified.
- var compare = isFunction(compareFn) ? compareFn : defaultCompare;
+ var predicates = processPredicates(sortPredicate, reverseOrder);
+ // Add a predicate at the end that evaluates to the element index. This makes the
+ // sort stable as it works as a tie-breaker when all the input predicates cannot
+ // distinguish between two elements.
+ predicates.push({ get: function() { return {}; }, descending: reverseOrder ? -1 : 1});
// The next three lines are a version of a Swartzian Transform idiom from Perl
// (sometimes called the Decorate-Sort-Undecorate idiom)
@@ -28503,12 +27832,8 @@ function orderByFilter($parse) {
return array;
function getComparisonObject(value, index) {
- // NOTE: We are adding an extra `tieBreaker` value based on the element's index.
- // This will be used to keep the sort stable when none of the input predicates can
- // distinguish between two elements.
return {
value: value,
- tieBreaker: {value: index, type: 'number', index: index},
predicateValues: predicates.map(function(predicate) {
return getPredicateValue(predicate.get(value), index);
})
@@ -28516,19 +27841,18 @@ function orderByFilter($parse) {
}
function doComparison(v1, v2) {
- for (var i = 0, ii = predicates.length; i < ii; i++) {
- var result = compare(v1.predicateValues[i], v2.predicateValues[i]);
- if (result) {
- return result * predicates[i].descending * descending;
- }
+ var result = 0;
+ for (var index=0, length = predicates.length; index < length; ++index) {
+ result = compare(v1.predicateValues[index], v2.predicateValues[index]) * predicates[index].descending;
+ if (result) break;
}
-
- return compare(v1.tieBreaker, v2.tieBreaker) * descending;
+ return result;
}
};
- function processPredicates(sortPredicates) {
- return sortPredicates.map(function(predicate) {
+ function processPredicates(sortPredicate, reverseOrder) {
+ reverseOrder = reverseOrder ? -1 : 1;
+ return sortPredicate.map(function(predicate) {
var descending = 1, get = identity;
if (isFunction(predicate)) {
@@ -28546,7 +27870,7 @@ function orderByFilter($parse) {
}
}
}
- return {get: get, descending: descending};
+ return { get: get, descending: descending * reverseOrder };
});
}
@@ -28561,9 +27885,9 @@ function orderByFilter($parse) {
}
}
- function objectValue(value) {
+ function objectValue(value, index) {
// If `valueOf` is a valid function use that
- if (isFunction(value.valueOf)) {
+ if (typeof value.valueOf === 'function') {
value = value.valueOf();
if (isPrimitive(value)) return value;
}
@@ -28572,8 +27896,8 @@ function orderByFilter($parse) {
value = value.toString();
if (isPrimitive(value)) return value;
}
-
- return value;
+ // We have a basic object so we use the position of the object in the collection
+ return index;
}
function getPredicateValue(value, index) {
@@ -28581,39 +27905,23 @@ function orderByFilter($parse) {
if (value === null) {
type = 'string';
value = 'null';
+ } else if (type === 'string') {
+ value = value.toLowerCase();
} else if (type === 'object') {
- value = objectValue(value);
+ value = objectValue(value, index);
}
- return {value: value, type: type, index: index};
+ return { value: value, type: type };
}
- function defaultCompare(v1, v2) {
+ function compare(v1, v2) {
var result = 0;
- var type1 = v1.type;
- var type2 = v2.type;
-
- if (type1 === type2) {
- var value1 = v1.value;
- var value2 = v2.value;
-
- if (type1 === 'string') {
- // Compare strings case-insensitively
- value1 = value1.toLowerCase();
- value2 = value2.toLowerCase();
- } else if (type1 === 'object') {
- // For basic objects, use the position of the object
- // in the collection instead of the value
- if (isObject(value1)) value1 = v1.index;
- if (isObject(value2)) value2 = v2.index;
- }
-
- if (value1 !== value2) {
- result = value1 < value2 ? -1 : 1;
+ if (v1.type === v2.type) {
+ if (v1.value !== v2.value) {
+ result = v1.value < v2.value ? -1 : 1;
}
} else {
- result = type1 < type2 ? -1 : 1;
+ result = v1.type < v2.type ? -1 : 1;
}
-
return result;
}
}
@@ -28893,11 +28201,9 @@ var htmlAnchorDirective = valueFn({
*
* @description
*
- * Sets the `readonly` attribute on the element, if the expression inside `ngReadonly` is truthy.
- * Note that `readonly` applies only to `input` elements with specific types. [See the input docs on
- * MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#attr-readonly) for more information.
+ * Sets the `readOnly` attribute on the element, if the expression inside `ngReadonly` is truthy.
*
- * A special directive is necessary because we cannot use interpolation inside the `readonly`
+ * A special directive is necessary because we cannot use interpolation inside the `readOnly`
* attribute. See the {@link guide/interpolation interpolation guide} for more info.
*
* @example
@@ -28934,13 +28240,6 @@ var htmlAnchorDirective = valueFn({
* A special directive is necessary because we cannot use interpolation inside the `selected`
* attribute. See the {@link guide/interpolation interpolation guide} for more info.
*
- *
- * **Note:** `ngSelected` does not interact with the `select` and `ngModel` directives, it only
- * sets the `selected` attribute on the element. If you are using `ngModel` on the select, you
- * should not use `ngSelected` on the options, as `ngModel` will set the select value and
- * selected options.
- *
- *
* @example
@@ -28977,11 +28276,6 @@ var htmlAnchorDirective = valueFn({
* A special directive is necessary because we cannot use interpolation inside the `open`
* attribute. See the {@link guide/interpolation interpolation guide} for more info.
*
- * ## A note about browser compatibility
- *
- * Edge, Firefox, and Internet Explorer do not support the `details` element, it is
- * recommended to use {@link ng.ngShow} and {@link ng.ngHide} instead.
- *
* @example
@@ -29672,9 +28966,7 @@ var ISO_DATE_REGEXP = /^\d{4,}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+(?:[+-
// 9. Fragment
// 1111111111111111 222 333333 44444 555555555555555555555555 666 77777777 8888888 999
var URL_REGEXP = /^[a-z][a-z\d.+-]*:\/*(?:[^:@]+(?::[^@]+)?@)?(?:[^\s:/?#]+|\[[a-f\d:]+\])(?::\d+)?(?:\/[^?#]*)?(?:\?[^#]*)?(?:#.*)?$/i;
-/* jshint maxlen:220 */
-var EMAIL_REGEXP = /^(?=.{1,254}$)(?=.{1,64}@)[-!#$%&'*+\/0-9=?A-Z^_`a-z{|}~]+(\.[-!#$%&'*+\/0-9=?A-Z^_`a-z{|}~]+)*@[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?(\.[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?)*$/;
-/* jshint maxlen:200 */
+var EMAIL_REGEXP = /^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i;
var NUMBER_REGEXP = /^\s*(\-|\+)?(\d+|(\d*(\.\d*)))([eE][+-]?\d+)?\s*$/;
var DATE_REGEXP = /^(\d{4,})-(\d{2})-(\d{2})$/;
var DATETIMELOCAL_REGEXP = /^(\d{4,})-(\d\d)-(\d\d)T(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/;
@@ -31059,7 +30351,7 @@ function numberInputType(scope, element, attr, ctrl, $sniffer, $browser) {
attr.$observe('min', function(val) {
if (isDefined(val) && !isNumber(val)) {
- val = parseFloat(val);
+ val = parseFloat(val, 10);
}
minVal = isNumber(val) && !isNaN(val) ? val : undefined;
// TODO(matsko): implement validateLater to reduce number of validations
@@ -31075,7 +30367,7 @@ function numberInputType(scope, element, attr, ctrl, $sniffer, $browser) {
attr.$observe('max', function(val) {
if (isDefined(val) && !isNumber(val)) {
- val = parseFloat(val);
+ val = parseFloat(val, 10);
}
maxVal = isNumber(val) && !isNaN(val) ? val : undefined;
// TODO(matsko): implement validateLater to reduce number of validations
@@ -31882,11 +31174,6 @@ function classDirective(name, selector) {
* When the expression changes, the previously added classes are removed and only then are the
* new classes added.
*
- * @knownIssue
- * You should not use {@link guide/interpolation interpolation} in the value of the `class`
- * attribute, when using the `ngClass` directive on the same element.
- * See {@link guide/interpolation#known-issues here} for more info.
- *
* @animations
* | Animation | Occurs |
* |----------------------------------|-------------------------------------|
@@ -35832,7 +35119,7 @@ var ngOptionsDirective = ['$compile', '$document', '$parse', function($compile,
for (var i = options.items.length - 1; i >= 0; i--) {
var option = options.items[i];
- if (isDefined(option.group)) {
+ if (option.group) {
jqLiteRemove(option.element.parentNode);
} else {
jqLiteRemove(option.element);
@@ -35864,8 +35151,7 @@ var ngOptionsDirective = ['$compile', '$document', '$parse', function($compile,
listFragment.appendChild(groupElement);
// Update the label on the group element
- // "null" is special cased because of Safari
- groupElement.label = option.group === null ? 'null' : option.group;
+ groupElement.label = option.group;
// Store it for use later
groupElementMap[option.group] = groupElement;
@@ -36201,7 +35487,7 @@ var ngPluralizeDirective = ['$locale', '$interpolate', '$log', function($locale,
* it's a prefix used by Angular for public (`$`) and private (`$$`) properties.
*
* - The built-in filters {@link ng.orderBy orderBy} and {@link ng.filter filter} do not work with
- * objects, and will throw an error if used with one.
+ * objects, and will throw if used with one.
*
* If you are hitting any of these limitations, the recommended workaround is to convert your object into an array
* that is sorted into the order that you prefer before providing it to `ngRepeat`. You could
@@ -37050,11 +36336,6 @@ var ngHideDirective = ['$animate', function($animate) {
* @description
* The `ngStyle` directive allows you to set CSS style on an HTML element conditionally.
*
- * @knownIssue
- * You should not use {@link guide/interpolation interpolation} in the value of the `style`
- * attribute, when using the `ngStyle` directive on the same element.
- * See {@link guide/interpolation#known-issues here} for more info.
- *
* @element ANY
* @param {expression} ngStyle
*
@@ -37466,63 +36747,37 @@ var ngSwitchDefaultDirective = ngDirective({
*
*/
var ngTranscludeMinErr = minErr('ngTransclude');
-var ngTranscludeDirective = ['$compile', function($compile) {
- return {
- restrict: 'EAC',
- terminal: true,
- compile: function ngTranscludeCompile(tElement) {
+var ngTranscludeDirective = ngDirective({
+ restrict: 'EAC',
+ link: function($scope, $element, $attrs, controller, $transclude) {
- // Remove and cache any original content to act as a fallback
- var fallbackLinkFn = $compile(tElement.contents());
- tElement.empty();
-
- return function ngTranscludePostLink($scope, $element, $attrs, controller, $transclude) {
-
- if (!$transclude) {
- throw ngTranscludeMinErr('orphan',
- 'Illegal use of ngTransclude directive in the template! ' +
- 'No parent directive that requires a transclusion found. ' +
- 'Element: {0}',
- startingTag($element));
- }
-
-
- // If the attribute is of the form: `ng-transclude="ng-transclude"` then treat it like the default
- if ($attrs.ngTransclude === $attrs.$attr.ngTransclude) {
- $attrs.ngTransclude = '';
- }
- var slotName = $attrs.ngTransclude || $attrs.ngTranscludeSlot;
-
- // If the slot is required and no transclusion content is provided then this call will throw an error
- $transclude(ngTranscludeCloneAttachFn, null, slotName);
-
- // If the slot is optional and no transclusion content is provided then use the fallback content
- if (slotName && !$transclude.isSlotFilled(slotName)) {
- useFallbackContent();
- }
+ if ($attrs.ngTransclude === $attrs.$attr.ngTransclude) {
+ // If the attribute is of the form: `ng-transclude="ng-transclude"`
+ // then treat it like the default
+ $attrs.ngTransclude = '';
+ }
- function ngTranscludeCloneAttachFn(clone, transcludedScope) {
- if (clone.length) {
- $element.append(clone);
- } else {
- useFallbackContent();
- // There is nothing linked against the transcluded scope since no content was available,
- // so it should be safe to clean up the generated scope.
- transcludedScope.$destroy();
- }
- }
+ function ngTranscludeCloneAttachFn(clone) {
+ if (clone.length) {
+ $element.empty();
+ $element.append(clone);
+ }
+ }
- function useFallbackContent() {
- // Since this is the fallback content rather than the transcluded content,
- // we link against the scope of this directive rather than the transcluded scope
- fallbackLinkFn($scope, function(clone) {
- $element.append(clone);
- });
- }
- };
+ if (!$transclude) {
+ throw ngTranscludeMinErr('orphan',
+ 'Illegal use of ngTransclude directive in the template! ' +
+ 'No parent directive that requires a transclusion found. ' +
+ 'Element: {0}',
+ startingTag($element));
}
- };
-}];
+
+ // If there is no slot name defined or the slot name is not optional
+ // then transclude the slot
+ var slotName = $attrs.ngTransclude || $attrs.ngTranscludeSlot;
+ $transclude(ngTranscludeCloneAttachFn, null, slotName);
+ }
+});
/**
* @ngdoc directive
@@ -38655,7 +37910,7 @@ Entity.prototype.encode = function encode(data, enc, /* internal */ reporter) {
return this._getEncoder(enc).encode(data, reporter);
};
-},{"../asn1":41,"inherits":434,"vm":490}],43:[function(require,module,exports){
+},{"../asn1":41,"inherits":435,"vm":491}],43:[function(require,module,exports){
var inherits = require('inherits');
var Reporter = require('../base').Reporter;
var Buffer = require('buffer').Buffer;
@@ -38773,7 +38028,7 @@ EncoderBuffer.prototype.join = function join(out, offset) {
return out;
};
-},{"../base":44,"buffer":90,"inherits":434}],44:[function(require,module,exports){
+},{"../base":44,"buffer":90,"inherits":435}],44:[function(require,module,exports){
var base = exports;
base.Reporter = require('./reporter').Reporter;
@@ -38847,7 +38102,7 @@ module.exports = Node;
var stateProps = [
'enc', 'parent', 'children', 'tag', 'args', 'reverseArgs', 'choice',
'optional', 'any', 'obj', 'use', 'alteredUse', 'key', 'default', 'explicit',
- 'implicit', 'contains'
+ 'implicit'
];
Node.prototype.clone = function clone() {
@@ -39052,17 +38307,17 @@ Node.prototype.contains = function contains(item) {
// Decoding
//
-Node.prototype._decode = function decode(input, options) {
+Node.prototype._decode = function decode(input) {
var state = this._baseState;
// Decode root node
if (state.parent === null)
- return input.wrapResult(state.children[0]._decode(input, options));
+ return input.wrapResult(state.children[0]._decode(input));
var result = state['default'];
var present = true;
- var prevKey = null;
+ var prevKey;
if (state.key !== null)
prevKey = input.enterKey(state.key);
@@ -39081,9 +38336,9 @@ Node.prototype._decode = function decode(input, options) {
var save = input.save();
try {
if (state.choice === null)
- this._decodeGeneric(state.tag, input, options);
+ this._decodeGeneric(state.tag, input);
else
- this._decodeChoice(input, options);
+ this._decodeChoice(input);
present = true;
} catch (e) {
present = false;
@@ -39111,8 +38366,6 @@ Node.prototype._decode = function decode(input, options) {
input = explicit;
}
- var start = input.offset;
-
// Unwrap implicit and normal values
if (state.use === null && state.choice === null) {
if (state.any)
@@ -39131,19 +38384,13 @@ Node.prototype._decode = function decode(input, options) {
input = body;
}
- if (options && options.track && state.tag !== null)
- options.track(input.path(), start, input.length, 'tagged');
-
- if (options && options.track && state.tag !== null)
- options.track(input.path(), input.offset, input.length, 'content');
-
// Select proper method for tag
if (state.any)
result = result;
else if (state.choice === null)
- result = this._decodeGeneric(state.tag, input, options);
+ result = this._decodeGeneric(state.tag, input);
else
- result = this._decodeChoice(input, options);
+ result = this._decodeChoice(input);
if (input.isError(result))
return result;
@@ -39153,15 +38400,14 @@ Node.prototype._decode = function decode(input, options) {
state.children.forEach(function decodeChildren(child) {
// NOTE: We are ignoring errors here, to let parser continue with other
// parts of encoded data
- child._decode(input, options);
+ child._decode(input);
});
}
// Decode contained/encoded by schema, only in bit or octet strings
if (state.contains && (state.tag === 'octstr' || state.tag === 'bitstr')) {
var data = new DecoderBuffer(result);
- result = this._getUse(state.contains, input._reporterState.obj)
- ._decode(data, options);
+ result = this._getUse(state.contains, input._reporterState.obj)._decode(data);
}
}
@@ -39172,40 +38418,35 @@ Node.prototype._decode = function decode(input, options) {
// Set key
if (state.key !== null && (result !== null || present === true))
input.leaveKey(prevKey, state.key, result);
- else if (prevKey !== null)
- input.exitKey(prevKey);
return result;
};
-Node.prototype._decodeGeneric = function decodeGeneric(tag, input, options) {
+Node.prototype._decodeGeneric = function decodeGeneric(tag, input) {
var state = this._baseState;
if (tag === 'seq' || tag === 'set')
return null;
if (tag === 'seqof' || tag === 'setof')
- return this._decodeList(input, tag, state.args[0], options);
+ return this._decodeList(input, tag, state.args[0]);
else if (/str$/.test(tag))
- return this._decodeStr(input, tag, options);
+ return this._decodeStr(input, tag);
else if (tag === 'objid' && state.args)
- return this._decodeObjid(input, state.args[0], state.args[1], options);
+ return this._decodeObjid(input, state.args[0], state.args[1]);
else if (tag === 'objid')
- return this._decodeObjid(input, null, null, options);
+ return this._decodeObjid(input, null, null);
else if (tag === 'gentime' || tag === 'utctime')
- return this._decodeTime(input, tag, options);
+ return this._decodeTime(input, tag);
else if (tag === 'null_')
- return this._decodeNull(input, options);
+ return this._decodeNull(input);
else if (tag === 'bool')
- return this._decodeBool(input, options);
+ return this._decodeBool(input);
else if (tag === 'int' || tag === 'enum')
- return this._decodeInt(input, state.args && state.args[0], options);
-
- if (state.use !== null) {
- return this._getUse(state.use, input._reporterState.obj)
- ._decode(input, options);
- } else {
+ return this._decodeInt(input, state.args && state.args[0]);
+ else if (state.use !== null)
+ return this._getUse(state.use, input._reporterState.obj)._decode(input);
+ else
return input.error('unknown tag: ' + tag);
- }
};
Node.prototype._getUse = function _getUse(entity, obj) {
@@ -39222,7 +38463,7 @@ Node.prototype._getUse = function _getUse(entity, obj) {
return state.useDecoder;
};
-Node.prototype._decodeChoice = function decodeChoice(input, options) {
+Node.prototype._decodeChoice = function decodeChoice(input) {
var state = this._baseState;
var result = null;
var match = false;
@@ -39231,7 +38472,7 @@ Node.prototype._decodeChoice = function decodeChoice(input, options) {
var save = input.save();
var node = state.choice[key];
try {
- var value = node._decode(input, options);
+ var value = node._decode(input);
if (input.isError(value))
return false;
@@ -39412,7 +38653,7 @@ Node.prototype._isPrintstr = function isPrintstr(str) {
return /^[A-Za-z0-9 '\(\)\+,\-\.\/:=\?]*$/.test(str);
};
-},{"../base":44,"minimalistic-assert":441}],46:[function(require,module,exports){
+},{"../base":44,"minimalistic-assert":442}],46:[function(require,module,exports){
var inherits = require('inherits');
function Reporter(options) {
@@ -39446,24 +38687,14 @@ Reporter.prototype.enterKey = function enterKey(key) {
return this._reporterState.path.push(key);
};
-Reporter.prototype.exitKey = function exitKey(index) {
- var state = this._reporterState;
-
- state.path = state.path.slice(0, index - 1);
-};
-
Reporter.prototype.leaveKey = function leaveKey(index, key, value) {
var state = this._reporterState;
- this.exitKey(index);
+ state.path = state.path.slice(0, index - 1);
if (state.obj !== null)
state.obj[key] = value;
};
-Reporter.prototype.path = function path() {
- return this._reporterState.path.join('/');
-};
-
Reporter.prototype.enterObject = function enterObject() {
var state = this._reporterState;
@@ -39535,7 +38766,7 @@ ReporterError.prototype.rethrow = function rethrow(msg) {
return this;
};
-},{"inherits":434}],47:[function(require,module,exports){
+},{"inherits":435}],47:[function(require,module,exports){
var constants = require('../constants');
exports.tagClass = {
@@ -39711,15 +38942,14 @@ DERNode.prototype._skipUntilEnd = function skipUntilEnd(buffer, fail) {
}
};
-DERNode.prototype._decodeList = function decodeList(buffer, tag, decoder,
- options) {
+DERNode.prototype._decodeList = function decodeList(buffer, tag, decoder) {
var result = [];
while (!buffer.isEmpty()) {
var possibleEnd = this._peekTag(buffer, 'end');
if (buffer.isError(possibleEnd))
return possibleEnd;
- var res = decoder.decode(buffer, 'der', options);
+ var res = decoder.decode(buffer, 'der');
if (buffer.isError(res) && possibleEnd)
break;
result.push(res);
@@ -39924,7 +39154,7 @@ function derDecodeLen(buf, primitive, fail) {
return len;
}
-},{"../../asn1":41,"inherits":434}],50:[function(require,module,exports){
+},{"../../asn1":41,"inherits":435}],50:[function(require,module,exports){
var decoders = exports;
decoders.der = require('./der');
@@ -39981,7 +39211,7 @@ PEMDecoder.prototype.decode = function decode(data, options) {
return DERDecoder.prototype.decode.call(this, input, options);
};
-},{"./der":49,"buffer":90,"inherits":434}],52:[function(require,module,exports){
+},{"./der":49,"buffer":90,"inherits":435}],52:[function(require,module,exports){
var inherits = require('inherits');
var Buffer = require('buffer').Buffer;
@@ -40276,7 +39506,7 @@ function encodeTag(tag, primitive, cls, reporter) {
return res;
}
-},{"../../asn1":41,"buffer":90,"inherits":434}],53:[function(require,module,exports){
+},{"../../asn1":41,"buffer":90,"inherits":435}],53:[function(require,module,exports){
var encoders = exports;
encoders.der = require('./der');
@@ -40305,7 +39535,7 @@ PEMEncoder.prototype.encode = function encode(data, options) {
return out.join('\n');
};
-},{"./der":52,"inherits":434}],55:[function(require,module,exports){
+},{"./der":52,"inherits":435}],55:[function(require,module,exports){
// http://wiki.commonjs.org/wiki/Unit_Testing/1.0
//
// THIS IS NOT TESTED NOR LIKELY TO WORK OUTSIDE V8!
@@ -40666,7 +39896,7 @@ var objectKeys = Object.keys || function (obj) {
return keys;
};
-},{"util/":487}],56:[function(require,module,exports){
+},{"util/":488}],56:[function(require,module,exports){
(function (global){
"use strict";
@@ -40701,7 +39931,7 @@ define(String.prototype, "padRight", "".padEnd);
[][key] && define(Array, key, Function.call.bind([][key]));
});
}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-},{"core-js/fn/regexp/escape":92,"core-js/shim":385,"regenerator-runtime/runtime":466}],57:[function(require,module,exports){
+},{"core-js/fn/regexp/escape":92,"core-js/shim":386,"regenerator-runtime/runtime":467}],57:[function(require,module,exports){
'use strict'
exports.toByteArray = toByteArray
@@ -40813,13 +40043,13 @@ function fromByteArray (uint8) {
}
},{}],58:[function(require,module,exports){
-/*! bignumber.js v2.4.0 https://github.com/MikeMcl/bignumber.js/LICENCE */
+/*! bignumber.js v2.3.0 https://github.com/MikeMcl/bignumber.js/LICENCE */
;(function (globalObj) {
'use strict';
/*
- bignumber.js v2.4.0
+ bignumber.js v2.3.0
A JavaScript library for arbitrary-precision arithmetic.
https://github.com/MikeMcl/bignumber.js
Copyright (c) 2016 Michael Mclaughlin
@@ -40827,7 +40057,7 @@ function fromByteArray (uint8) {
*/
- var BigNumber, cryptoObj, parseNumeric,
+ var cryptoObj, parseNumeric,
isNumeric = /^-?(\d+(\.\d*)?|\.\d+)(e[+-]?\d+)?$/i,
mathceil = Math.ceil,
mathfloor = Math.floor,
@@ -43529,17 +42759,13 @@ function fromByteArray (uint8) {
// EXPORT
- BigNumber = constructorFactory();
- BigNumber.default = BigNumber.BigNumber = BigNumber;
-
-
- // AMD.
+ // AMD.
if ( typeof define == 'function' && define.amd ) {
- define( function () { return BigNumber; } );
+ define( function () { return constructorFactory(); } );
// Node.js and other environments that support module.exports.
} else if ( typeof module != 'undefined' && module.exports ) {
- module.exports = BigNumber;
+ module.exports = constructorFactory();
// Split string stops browserify adding crypto shim.
if ( !cryptoObj ) try { cryptoObj = require('cry' + 'pto'); } catch (e) {}
@@ -43547,7 +42773,7 @@ function fromByteArray (uint8) {
// Browser.
} else {
if ( !globalObj ) globalObj = typeof self != 'undefined' ? self : Function('return this')();
- globalObj.BigNumber = BigNumber;
+ globalObj.BigNumber = constructorFactory();
}
})(this);
@@ -43724,12 +42950,8 @@ module.exports = {
}
BN.isBN = function isBN (num) {
- if (num instanceof BN) {
- return true;
- }
-
return num !== null && typeof num === 'object' &&
- num.constructor.wordSize === BN.wordSize && Array.isArray(num.words);
+ num.constructor.name === 'BN' && Array.isArray(num.words);
};
BN.max = function max (left, right) {
@@ -45770,10 +44992,6 @@ module.exports = {
assert(this.negative === 0, 'imaskn works only with positive numbers');
- if (this.length <= s) {
- return this;
- }
-
if (r !== 0) {
s++;
}
@@ -47438,7 +46656,7 @@ function xorTest (a, b) {
}
}).call(this,require("buffer").Buffer)
-},{"./aes":63,"./ghash":68,"buffer":90,"buffer-xor":89,"cipher-base":91,"inherits":434}],65:[function(require,module,exports){
+},{"./aes":63,"./ghash":68,"buffer":90,"buffer-xor":89,"cipher-base":91,"inherits":435}],65:[function(require,module,exports){
var ciphers = require('./encrypter')
exports.createCipher = exports.Cipher = ciphers.createCipher
exports.createCipheriv = exports.Cipheriv = ciphers.createCipheriv
@@ -47592,7 +46810,7 @@ exports.createDecipher = createDecipher
exports.createDecipheriv = createDecipheriv
}).call(this,require("buffer").Buffer)
-},{"./aes":63,"./authCipher":64,"./modes":69,"./modes/cbc":70,"./modes/cfb":71,"./modes/cfb1":72,"./modes/cfb8":73,"./modes/ctr":74,"./modes/ecb":75,"./modes/ofb":76,"./streamCipher":77,"buffer":90,"cipher-base":91,"evp_bytestokey":425,"inherits":434}],67:[function(require,module,exports){
+},{"./aes":63,"./authCipher":64,"./modes":69,"./modes/cbc":70,"./modes/cfb":71,"./modes/cfb1":72,"./modes/cfb8":73,"./modes/ctr":74,"./modes/ecb":75,"./modes/ofb":76,"./streamCipher":77,"buffer":90,"cipher-base":91,"evp_bytestokey":426,"inherits":435}],67:[function(require,module,exports){
(function (Buffer){
var aes = require('./aes')
var Transform = require('cipher-base')
@@ -47718,7 +46936,7 @@ exports.createCipheriv = createCipheriv
exports.createCipher = createCipher
}).call(this,require("buffer").Buffer)
-},{"./aes":63,"./authCipher":64,"./modes":69,"./modes/cbc":70,"./modes/cfb":71,"./modes/cfb1":72,"./modes/cfb8":73,"./modes/ctr":74,"./modes/ecb":75,"./modes/ofb":76,"./streamCipher":77,"buffer":90,"cipher-base":91,"evp_bytestokey":425,"inherits":434}],68:[function(require,module,exports){
+},{"./aes":63,"./authCipher":64,"./modes":69,"./modes/cbc":70,"./modes/cfb":71,"./modes/cfb1":72,"./modes/cfb8":73,"./modes/ctr":74,"./modes/ecb":75,"./modes/ofb":76,"./streamCipher":77,"buffer":90,"cipher-base":91,"evp_bytestokey":426,"inherits":435}],68:[function(require,module,exports){
(function (Buffer){
var zeros = new Buffer(16)
zeros.fill(0)
@@ -48196,7 +47414,7 @@ StreamCipher.prototype._final = function () {
}
}).call(this,require("buffer").Buffer)
-},{"./aes":63,"buffer":90,"cipher-base":91,"inherits":434}],78:[function(require,module,exports){
+},{"./aes":63,"buffer":90,"cipher-base":91,"inherits":435}],78:[function(require,module,exports){
var ebtk = require('evp_bytestokey')
var aes = require('browserify-aes/browser')
var DES = require('browserify-des')
@@ -48271,7 +47489,7 @@ function getCiphers () {
}
exports.listCiphers = exports.getCiphers = getCiphers
-},{"browserify-aes/browser":65,"browserify-aes/modes":69,"browserify-des":79,"browserify-des/modes":80,"evp_bytestokey":425}],79:[function(require,module,exports){
+},{"browserify-aes/browser":65,"browserify-aes/modes":69,"browserify-des":79,"browserify-des/modes":80,"evp_bytestokey":426}],79:[function(require,module,exports){
(function (Buffer){
var CipherBase = require('cipher-base')
var des = require('des.js')
@@ -48318,7 +47536,7 @@ DES.prototype._final = function () {
}
}).call(this,require("buffer").Buffer)
-},{"buffer":90,"cipher-base":91,"des.js":393,"inherits":434}],80:[function(require,module,exports){
+},{"buffer":90,"cipher-base":91,"des.js":394,"inherits":435}],80:[function(require,module,exports){
exports['des-ecb'] = {
key: 8,
iv: 0
@@ -48388,7 +47606,7 @@ function getr(priv) {
}
}).call(this,require("buffer").Buffer)
-},{"bn.js":60,"buffer":90,"randombytes":455}],82:[function(require,module,exports){
+},{"bn.js":60,"buffer":90,"randombytes":456}],82:[function(require,module,exports){
(function (Buffer){
const Sha3 = require('js-sha3')
@@ -48426,7 +47644,7 @@ module.exports = {
}
}).call(this,require("buffer").Buffer)
-},{"buffer":90,"js-sha3":437}],83:[function(require,module,exports){
+},{"buffer":90,"js-sha3":438}],83:[function(require,module,exports){
(function (Buffer){
'use strict'
exports['RSA-SHA224'] = exports.sha224WithRSAEncryption = {
@@ -48609,7 +47827,7 @@ module.exports = {
}
}).call(this,require("buffer").Buffer)
-},{"./algos":83,"./sign":86,"./verify":87,"buffer":90,"create-hash":388,"inherits":434,"stream":483}],85:[function(require,module,exports){
+},{"./algos":83,"./sign":86,"./verify":87,"buffer":90,"create-hash":389,"inherits":435,"stream":484}],85:[function(require,module,exports){
'use strict'
exports['1.3.132.0.10'] = 'secp256k1'
@@ -48812,7 +48030,7 @@ module.exports.getKey = getKey
module.exports.makeKey = makeKey
}).call(this,require("buffer").Buffer)
-},{"./curves":85,"bn.js":60,"browserify-rsa":81,"buffer":90,"create-hmac":391,"elliptic":403,"parse-asn1":445}],87:[function(require,module,exports){
+},{"./curves":85,"bn.js":60,"browserify-rsa":81,"buffer":90,"create-hmac":392,"elliptic":404,"parse-asn1":446}],87:[function(require,module,exports){
(function (Buffer){
// much of this based on https://github.com/indutny/self-signed/blob/gh-pages/lib/rsa.js
var curves = require('./curves')
@@ -48919,7 +48137,7 @@ function checkValue (b, q) {
module.exports = verify
}).call(this,require("buffer").Buffer)
-},{"./curves":85,"bn.js":60,"buffer":90,"elliptic":403,"parse-asn1":445}],88:[function(require,module,exports){
+},{"./curves":85,"bn.js":60,"buffer":90,"elliptic":404,"parse-asn1":446}],88:[function(require,module,exports){
(function (global){
'use strict';
@@ -49101,7 +48319,7 @@ exports.kMaxLength = kMaxLength()
function typedArraySupport () {
try {
var arr = new Uint8Array(1)
- arr.__proto__ = {__proto__: Uint8Array.prototype, foo: function () { return 42 }}
+ arr.foo = function () { return 42 }
return arr.foo() === 42 && // typed array instances can be augmented
typeof arr.subarray === 'function' && // chrome 9-10 lack `subarray`
arr.subarray(1, 1).byteLength === 0 // ie10 has broken `subarray`
@@ -49245,7 +48463,7 @@ function allocUnsafe (that, size) {
assertSize(size)
that = createBuffer(that, size < 0 ? 0 : checked(size) | 0)
if (!Buffer.TYPED_ARRAY_SUPPORT) {
- for (var i = 0; i < size; ++i) {
+ for (var i = 0; i < size; i++) {
that[i] = 0
}
}
@@ -49301,9 +48519,7 @@ function fromArrayBuffer (that, array, byteOffset, length) {
throw new RangeError('\'length\' is out of bounds')
}
- if (byteOffset === undefined && length === undefined) {
- array = new Uint8Array(array)
- } else if (length === undefined) {
+ if (length === undefined) {
array = new Uint8Array(array, byteOffset)
} else {
array = new Uint8Array(array, byteOffset, length)
@@ -49425,14 +48641,14 @@ Buffer.concat = function concat (list, length) {
var i
if (length === undefined) {
length = 0
- for (i = 0; i < list.length; ++i) {
+ for (i = 0; i < list.length; i++) {
length += list[i].length
}
}
var buffer = Buffer.allocUnsafe(length)
var pos = 0
- for (i = 0; i < list.length; ++i) {
+ for (i = 0; i < list.length; i++) {
var buf = list[i]
if (!Buffer.isBuffer(buf)) {
throw new TypeError('"list" argument must be an Array of Buffers')
@@ -49464,6 +48680,7 @@ function byteLength (string, encoding) {
switch (encoding) {
case 'ascii':
case 'binary':
+ // Deprecated
case 'raw':
case 'raws':
return len
@@ -49701,16 +48918,15 @@ function arrayIndexOf (arr, val, byteOffset, encoding) {
}
var foundIndex = -1
- for (var i = byteOffset; i < arrLength; ++i) {
- if (read(arr, i) === read(val, foundIndex === -1 ? 0 : i - foundIndex)) {
+ for (var i = 0; byteOffset + i < arrLength; i++) {
+ if (read(arr, byteOffset + i) === read(val, foundIndex === -1 ? 0 : i - foundIndex)) {
if (foundIndex === -1) foundIndex = i
- if (i - foundIndex + 1 === valLength) return foundIndex * indexSize
+ if (i - foundIndex + 1 === valLength) return (byteOffset + foundIndex) * indexSize
} else {
if (foundIndex !== -1) i -= i - foundIndex
foundIndex = -1
}
}
-
return -1
}
@@ -49775,7 +48991,7 @@ function hexWrite (buf, string, offset, length) {
if (length > strLen / 2) {
length = strLen / 2
}
- for (var i = 0; i < length; ++i) {
+ for (var i = 0; i < length; i++) {
var parsed = parseInt(string.substr(i * 2, 2), 16)
if (isNaN(parsed)) return i
buf[offset + i] = parsed
@@ -49989,7 +49205,7 @@ function asciiSlice (buf, start, end) {
var ret = ''
end = Math.min(buf.length, end)
- for (var i = start; i < end; ++i) {
+ for (var i = start; i < end; i++) {
ret += String.fromCharCode(buf[i] & 0x7F)
}
return ret
@@ -49999,7 +49215,7 @@ function binarySlice (buf, start, end) {
var ret = ''
end = Math.min(buf.length, end)
- for (var i = start; i < end; ++i) {
+ for (var i = start; i < end; i++) {
ret += String.fromCharCode(buf[i])
}
return ret
@@ -50012,7 +49228,7 @@ function hexSlice (buf, start, end) {
if (!end || end < 0 || end > len) end = len
var out = ''
- for (var i = start; i < end; ++i) {
+ for (var i = start; i < end; i++) {
out += toHex(buf[i])
}
return out
@@ -50055,7 +49271,7 @@ Buffer.prototype.slice = function slice (start, end) {
} else {
var sliceLen = end - start
newBuf = new Buffer(sliceLen, undefined)
- for (var i = 0; i < sliceLen; ++i) {
+ for (var i = 0; i < sliceLen; i++) {
newBuf[i] = this[i + start]
}
}
@@ -50282,7 +49498,7 @@ Buffer.prototype.writeUInt8 = function writeUInt8 (value, offset, noAssert) {
function objectWriteUInt16 (buf, value, offset, littleEndian) {
if (value < 0) value = 0xffff + value + 1
- for (var i = 0, j = Math.min(buf.length - offset, 2); i < j; ++i) {
+ for (var i = 0, j = Math.min(buf.length - offset, 2); i < j; i++) {
buf[offset + i] = (value & (0xff << (8 * (littleEndian ? i : 1 - i)))) >>>
(littleEndian ? i : 1 - i) * 8
}
@@ -50316,7 +49532,7 @@ Buffer.prototype.writeUInt16BE = function writeUInt16BE (value, offset, noAssert
function objectWriteUInt32 (buf, value, offset, littleEndian) {
if (value < 0) value = 0xffffffff + value + 1
- for (var i = 0, j = Math.min(buf.length - offset, 4); i < j; ++i) {
+ for (var i = 0, j = Math.min(buf.length - offset, 4); i < j; i++) {
buf[offset + i] = (value >>> (littleEndian ? i : 3 - i) * 8) & 0xff
}
}
@@ -50531,12 +49747,12 @@ Buffer.prototype.copy = function copy (target, targetStart, start, end) {
if (this === target && start < targetStart && targetStart < end) {
// descending copy from end
- for (i = len - 1; i >= 0; --i) {
+ for (i = len - 1; i >= 0; i--) {
target[i + targetStart] = this[i + start]
}
} else if (len < 1000 || !Buffer.TYPED_ARRAY_SUPPORT) {
// ascending copy from start
- for (i = 0; i < len; ++i) {
+ for (i = 0; i < len; i++) {
target[i + targetStart] = this[i + start]
}
} else {
@@ -50597,7 +49813,7 @@ Buffer.prototype.fill = function fill (val, start, end, encoding) {
var i
if (typeof val === 'number') {
- for (i = start; i < end; ++i) {
+ for (i = start; i < end; i++) {
this[i] = val
}
} else {
@@ -50605,7 +49821,7 @@ Buffer.prototype.fill = function fill (val, start, end, encoding) {
? val
: utf8ToBytes(new Buffer(val, encoding).toString())
var len = bytes.length
- for (i = 0; i < end - start; ++i) {
+ for (i = 0; i < end - start; i++) {
this[i + start] = bytes[i % len]
}
}
@@ -50647,7 +49863,7 @@ function utf8ToBytes (string, units) {
var leadSurrogate = null
var bytes = []
- for (var i = 0; i < length; ++i) {
+ for (var i = 0; i < length; i++) {
codePoint = string.charCodeAt(i)
// is surrogate component
@@ -50722,7 +49938,7 @@ function utf8ToBytes (string, units) {
function asciiToBytes (str) {
var byteArray = []
- for (var i = 0; i < str.length; ++i) {
+ for (var i = 0; i < str.length; i++) {
// Node's code seems to be doing this and not & 0x7F..
byteArray.push(str.charCodeAt(i) & 0xFF)
}
@@ -50732,7 +49948,7 @@ function asciiToBytes (str) {
function utf16leToBytes (str, units) {
var c, hi, lo
var byteArray = []
- for (var i = 0; i < str.length; ++i) {
+ for (var i = 0; i < str.length; i++) {
if ((units -= 2) < 0) break
c = str.charCodeAt(i)
@@ -50750,7 +49966,7 @@ function base64ToBytes (str) {
}
function blitBuffer (src, dst, offset, length) {
- for (var i = 0; i < length; ++i) {
+ for (var i = 0; i < length; i++) {
if ((i + offset >= dst.length) || (i >= src.length)) break
dst[i + offset] = src[i]
}
@@ -50762,7 +49978,7 @@ function isnan (val) {
}
}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-},{"base64-js":57,"ieee754":432,"isarray":436}],91:[function(require,module,exports){
+},{"base64-js":57,"ieee754":433,"isarray":437}],91:[function(require,module,exports){
(function (Buffer){
var Transform = require('stream').Transform
var inherits = require('inherits')
@@ -50856,19 +50072,19 @@ CipherBase.prototype._toString = function (value, enc, final) {
}
}).call(this,require("buffer").Buffer)
-},{"buffer":90,"inherits":434,"stream":483,"string_decoder":484}],92:[function(require,module,exports){
+},{"buffer":90,"inherits":435,"stream":484,"string_decoder":485}],92:[function(require,module,exports){
require('../../modules/core.regexp.escape');
module.exports = require('../../modules/_core').RegExp.escape;
-},{"../../modules/_core":113,"../../modules/core.regexp.escape":209}],93:[function(require,module,exports){
+},{"../../modules/_core":113,"../../modules/core.regexp.escape":210}],93:[function(require,module,exports){
module.exports = function(it){
if(typeof it != 'function')throw TypeError(it + ' is not a function!');
return it;
};
},{}],94:[function(require,module,exports){
-var cof = require('./_cof');
-module.exports = function(it, msg){
- if(typeof it != 'number' && cof(it) != 'Number')throw TypeError(msg);
- return +it;
+var cof = require('./_cof');
+module.exports = function(it, msg){
+ if(typeof it != 'number' && cof(it) != 'Number')throw TypeError(msg);
+ return +it;
};
},{"./_cof":108}],95:[function(require,module,exports){
// 22.1.3.31 Array.prototype[@@unscopables]
@@ -51010,50 +50226,50 @@ module.exports = function(TYPE, $create){
};
};
},{"./_array-species-create":105,"./_ctx":115,"./_iobject":135,"./_to-length":198,"./_to-object":199}],103:[function(require,module,exports){
-var aFunction = require('./_a-function')
- , toObject = require('./_to-object')
- , IObject = require('./_iobject')
- , toLength = require('./_to-length');
-
-module.exports = function(that, callbackfn, aLen, memo, isRight){
- aFunction(callbackfn);
- var O = toObject(that)
- , self = IObject(O)
- , length = toLength(O.length)
- , index = isRight ? length - 1 : 0
- , i = isRight ? -1 : 1;
- if(aLen < 2)for(;;){
- if(index in self){
- memo = self[index];
- index += i;
- break;
- }
- index += i;
- if(isRight ? index < 0 : length <= index){
- throw TypeError('Reduce of empty array with no initial value');
- }
- }
- for(;isRight ? index >= 0 : length > index; index += i)if(index in self){
- memo = callbackfn(memo, self[index], index, O);
- }
- return memo;
+var aFunction = require('./_a-function')
+ , toObject = require('./_to-object')
+ , IObject = require('./_iobject')
+ , toLength = require('./_to-length');
+
+module.exports = function(that, callbackfn, aLen, memo, isRight){
+ aFunction(callbackfn);
+ var O = toObject(that)
+ , self = IObject(O)
+ , length = toLength(O.length)
+ , index = isRight ? length - 1 : 0
+ , i = isRight ? -1 : 1;
+ if(aLen < 2)for(;;){
+ if(index in self){
+ memo = self[index];
+ index += i;
+ break;
+ }
+ index += i;
+ if(isRight ? index < 0 : length <= index){
+ throw TypeError('Reduce of empty array with no initial value');
+ }
+ }
+ for(;isRight ? index >= 0 : length > index; index += i)if(index in self){
+ memo = callbackfn(memo, self[index], index, O);
+ }
+ return memo;
};
},{"./_a-function":93,"./_iobject":135,"./_to-length":198,"./_to-object":199}],104:[function(require,module,exports){
-var isObject = require('./_is-object')
- , isArray = require('./_is-array')
- , SPECIES = require('./_wks')('species');
-
-module.exports = function(original){
- var C;
- if(isArray(original)){
- C = original.constructor;
- // cross-realm fallback
- if(typeof C == 'function' && (C === Array || isArray(C.prototype)))C = undefined;
- if(isObject(C)){
- C = C[SPECIES];
- if(C === null)C = undefined;
- }
- } return C === undefined ? Array : C;
+var isObject = require('./_is-object')
+ , isArray = require('./_is-array')
+ , SPECIES = require('./_wks')('species');
+
+module.exports = function(original){
+ var C;
+ if(isArray(original)){
+ C = original.constructor;
+ // cross-realm fallback
+ if(typeof C == 'function' && (C === Array || isArray(C.prototype)))C = undefined;
+ if(isObject(C)){
+ C = C[SPECIES];
+ if(C === null)C = undefined;
+ }
+ } return C === undefined ? Array : C;
};
},{"./_is-array":137,"./_is-object":139,"./_wks":207}],105:[function(require,module,exports){
// 9.4.2.3 ArraySpeciesCreate(originalArray, length)
@@ -51121,6 +50337,7 @@ module.exports = function(it){
'use strict';
var dP = require('./_object-dp').f
, create = require('./_object-create')
+ , hide = require('./_hide')
, redefineAll = require('./_redefine-all')
, ctx = require('./_ctx')
, anInstance = require('./_an-instance')
@@ -51260,7 +50477,7 @@ module.exports = {
setSpecies(NAME);
}
};
-},{"./_an-instance":96,"./_ctx":115,"./_defined":117,"./_descriptors":118,"./_for-of":127,"./_iter-define":143,"./_iter-step":145,"./_meta":152,"./_object-create":156,"./_object-dp":157,"./_redefine-all":176,"./_set-species":181}],110:[function(require,module,exports){
+},{"./_an-instance":96,"./_ctx":115,"./_defined":117,"./_descriptors":118,"./_for-of":127,"./_hide":130,"./_iter-define":143,"./_iter-step":145,"./_meta":152,"./_object-create":156,"./_object-dp":157,"./_redefine-all":176,"./_set-species":181}],110:[function(require,module,exports){
// https://github.com/DavidBruant/Map-Set.prototype.toJSON
var classof = require('./_classof')
, from = require('./_array-from-iterable');
@@ -51444,13 +50661,13 @@ module.exports = function(NAME, wrapper, methods, common, IS_MAP, IS_WEAK){
var core = module.exports = {version: '2.4.0'};
if(typeof __e == 'number')__e = core; // eslint-disable-line no-undef
},{}],114:[function(require,module,exports){
-'use strict';
-var $defineProperty = require('./_object-dp')
- , createDesc = require('./_property-desc');
-
-module.exports = function(object, index, value){
- if(index in object)$defineProperty.f(object, index, createDesc(0, value));
- else object[index] = value;
+'use strict';
+var $defineProperty = require('./_object-dp')
+ , createDesc = require('./_property-desc');
+
+module.exports = function(object, index, value){
+ if(index in object)$defineProperty.f(object, index, createDesc(0, value));
+ else object[index] = value;
};
},{"./_object-dp":157,"./_property-desc":175}],115:[function(require,module,exports){
// optional / simple context binding
@@ -51474,14 +50691,14 @@ module.exports = function(fn, that, length){
};
};
},{"./_a-function":93}],116:[function(require,module,exports){
-'use strict';
-var anObject = require('./_an-object')
- , toPrimitive = require('./_to-primitive')
- , NUMBER = 'number';
-
-module.exports = function(hint){
- if(hint !== 'string' && hint !== NUMBER && hint !== 'default')throw TypeError('Incorrect hint');
- return toPrimitive(anObject(this), hint != NUMBER);
+'use strict';
+var anObject = require('./_an-object')
+ , toPrimitive = require('./_to-primitive')
+ , NUMBER = 'number';
+
+module.exports = function(hint){
+ if(hint !== 'string' && hint !== NUMBER && hint !== 'default')throw TypeError('Incorrect hint');
+ return toPrimitive(anObject(this), hint != NUMBER);
};
},{"./_an-object":97,"./_to-primitive":200}],117:[function(require,module,exports){
// 7.2.1 RequireObjectCoercible(argument)
@@ -51503,9 +50720,9 @@ module.exports = function(it){
return is ? document.createElement(it) : {};
};
},{"./_global":128,"./_is-object":139}],120:[function(require,module,exports){
-// IE 8- don't enum bug keys
-module.exports = (
- 'constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf'
+// IE 8- don't enum bug keys
+module.exports = (
+ 'constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf'
).split(',');
},{}],121:[function(require,module,exports){
// all enumerable object keys, includes symbols
@@ -51679,17 +50896,17 @@ module.exports = require('./_descriptors') ? function(object, key, value){
},{"./_descriptors":118,"./_object-dp":157,"./_property-desc":175}],131:[function(require,module,exports){
module.exports = require('./_global').document && document.documentElement;
},{"./_global":128}],132:[function(require,module,exports){
-module.exports = !require('./_descriptors') && !require('./_fails')(function(){
- return Object.defineProperty(require('./_dom-create')('div'), 'a', {get: function(){ return 7; }}).a != 7;
+module.exports = !require('./_descriptors') && !require('./_fails')(function(){
+ return Object.defineProperty(require('./_dom-create')('div'), 'a', {get: function(){ return 7; }}).a != 7;
});
},{"./_descriptors":118,"./_dom-create":119,"./_fails":124}],133:[function(require,module,exports){
-var isObject = require('./_is-object')
- , setPrototypeOf = require('./_set-proto').set;
-module.exports = function(that, target, C){
- var P, S = target.constructor;
- if(S !== C && typeof S == 'function' && (P = S.prototype) !== C.prototype && isObject(P) && setPrototypeOf){
- setPrototypeOf(that, P);
- } return that;
+var isObject = require('./_is-object')
+ , setPrototypeOf = require('./_set-proto').set;
+module.exports = function(that, target, C){
+ var P, S = target.constructor;
+ if(S !== C && typeof S == 'function' && (P = S.prototype) !== C.prototype && isObject(P) && setPrototypeOf){
+ setPrototypeOf(that, P);
+ } return that;
};
},{"./_is-object":139,"./_set-proto":180}],134:[function(require,module,exports){
// fast apply, http://jsperf.lnkit.com/fast-apply/5
@@ -52015,7 +51232,7 @@ module.exports = {
key: toMetaKey,
exp: exp
};
-},{"./_export":122,"./_shared":184,"./es6.map":239,"./es6.weak-map":345}],154:[function(require,module,exports){
+},{"./_export":122,"./_shared":184,"./es6.map":240,"./es6.weak-map":346}],154:[function(require,module,exports){
var global = require('./_global')
, macrotask = require('./_task').set
, Observer = global.MutationObserver || global.WebKitMutationObserver
@@ -52119,48 +51336,46 @@ module.exports = !$assign || require('./_fails')(function(){
} return T;
} : $assign;
},{"./_fails":124,"./_iobject":135,"./_object-gops":163,"./_object-keys":166,"./_object-pie":167,"./_to-object":199}],156:[function(require,module,exports){
-// 19.1.2.2 / 15.2.3.5 Object.create(O [, Properties])
-var anObject = require('./_an-object')
- , dPs = require('./_object-dps')
- , enumBugKeys = require('./_enum-bug-keys')
- , IE_PROTO = require('./_shared-key')('IE_PROTO')
- , Empty = function(){ /* empty */ }
- , PROTOTYPE = 'prototype';
-
-// Create object with fake `null` prototype: use iframe Object with cleared prototype
-var createDict = function(){
- // Thrash, waste and sodomy: IE GC bug
- var iframe = require('./_dom-create')('iframe')
- , i = enumBugKeys.length
- , lt = '<'
- , gt = '>'
- , iframeDocument;
- iframe.style.display = 'none';
- require('./_html').appendChild(iframe);
- iframe.src = 'javascript:'; // eslint-disable-line no-script-url
- // createDict = iframe.contentWindow.Object;
- // html.removeChild(iframe);
- iframeDocument = iframe.contentWindow.document;
- iframeDocument.open();
- iframeDocument.write(lt + 'script' + gt + 'document.F=Object' + lt + '/script' + gt);
- iframeDocument.close();
- createDict = iframeDocument.F;
- while(i--)delete createDict[PROTOTYPE][enumBugKeys[i]];
- return createDict();
-};
-
-module.exports = Object.create || function create(O, Properties){
- var result;
- if(O !== null){
- Empty[PROTOTYPE] = anObject(O);
- result = new Empty;
- Empty[PROTOTYPE] = null;
- // add "__proto__" for Object.getPrototypeOf polyfill
- result[IE_PROTO] = O;
- } else result = createDict();
- return Properties === undefined ? result : dPs(result, Properties);
+// 19.1.2.2 / 15.2.3.5 Object.create(O [, Properties])
+var anObject = require('./_an-object')
+ , dPs = require('./_object-dps')
+ , enumBugKeys = require('./_enum-bug-keys')
+ , IE_PROTO = require('./_shared-key')('IE_PROTO')
+ , Empty = function(){ /* empty */ }
+ , PROTOTYPE = 'prototype';
+
+// Create object with fake `null` prototype: use iframe Object with cleared prototype
+var createDict = function(){
+ // Thrash, waste and sodomy: IE GC bug
+ var iframe = require('./_dom-create')('iframe')
+ , i = enumBugKeys.length
+ , gt = '>'
+ , iframeDocument;
+ iframe.style.display = 'none';
+ require('./_html').appendChild(iframe);
+ iframe.src = 'javascript:'; // eslint-disable-line no-script-url
+ // createDict = iframe.contentWindow.Object;
+ // html.removeChild(iframe);
+ iframeDocument = iframe.contentWindow.document;
+ iframeDocument.open();
+ iframeDocument.write('");
-}
-globalFuncs.getBlob = function(mime, str) {
- var str = (typeof str === 'object') ? JSON.stringify(str) : str;
- if (str == null) return '';
- var blob = new Blob([str], {
- type: mime
- });
- return window.URL.createObjectURL(blob);
-}
-globalFuncs.getSuccessText = function(str) {
- return '
'
-}
-globalFuncs.errorMsgs = [
- "Please enter valid amount. ",
- "Your password must be at least 9 characters. Please ensure it is a strong password. ",
- "Sorry! We don't have a clue what type of wallet file this is. ",
- "This is not a valid wallet file. ",
- "This unit doesn\'t exists, please use the one of the following units ",
- "Invalid address. ",
- "Invalid password. ",
- "Invalid amount. ",
- "Invalid gas limit. ",
- "Invalid data value. ",
- "Invalid gas amount. ",
- "Invalid nonce. ",
- "Invalid signed transaction. ",
- "A wallet with this nickname already exists. ",
- "Wallet not found. ",
- "Whoops. It doesnt look like a proposal with this ID exists yet or there is an error reading this proposal. ",
- "A wallet with this address already exists in storage. Please check your wallets page. ",
- "You need to have at some ETH in your account to cover the cost of gas. .01ETH should be more than sufficient for a few sends and votes. ",
- "All gas would be used on this transaction. This means you have already voted on this proposal or the debate period has ended.",
- "Invalid symbol"];
-globalFuncs.successMsgs = ["Valid address", "Wallet successfully decrypted", "Transaction submitted. TX ID: ", "New wallet added: ", "You have successfully voted. Thank you for being an active participant in The DAO."];
-globalFuncs.scrypt = {
- n: 1024
-};
-globalFuncs.postDelay = 300;
-globalFuncs.kdf = "scrypt";
-globalFuncs.defaultTxGasLimit = 21000;
-globalFuncs.digixClaimTxGasLimit = 150000;
-globalFuncs.donateAddress = "0x7cB57B5A97eAbe94205C07890BE4c1aD31E486A8";
-globalFuncs.isNumeric = function(n) {
- return !isNaN(parseFloat(n)) && isFinite(n);
-}
-globalFuncs.urlGet = function(name) {
- if (name = (new RegExp('[?&]' + encodeURIComponent(name) + '=([^&]*)')).exec(location.search)) return this.stripTags(decodeURIComponent(name[1]));
-}
-globalFuncs.stripTags = function(str) {
- var SCRIPT_REGEX = /)<[^<]*)*<\/script>/gi;
- while (SCRIPT_REGEX.test(str)) {
- str = str.replace(SCRIPT_REGEX, "");
- }
- return str;
-}
-globalFuncs.checkAndRedirectHTTPS = function() {
- var host = "myetherwallet.com";
- var githost = "kvhnuke.github.io";
- var githostw = "www.kvhnuke.github.io";
- var hostw = "www.myetherwallet.com";
- if ((host == window.location.host || githost == window.location.host || hostw == window.location.host || githostw == window.location.host) && (window.location.protocol != "https:")) window.location.protocol = "https";
-}
-globalFuncs.isStrongPass = function(password) {
- return password.length > 8;
-}
-globalFuncs.hexToAscii = function(hex) {
- return hex.match(/.{1,2}/g).map(function(v) {
- return String.fromCharCode(parseInt(v, 16));
- }).join('');
-}
-globalFuncs.isAlphaNumeric = function(value){
- return !/[^a-zA-Z0-9]/.test(value);
-}
-module.exports = globalFuncs;
+'use strict';
+var globalFuncs = function() {}
+globalFuncs.getBlockie = function(address) {
+ return blockies.create({
+ seed: address.toLowerCase(),
+ size: 8,
+ scale: 16
+ }).toDataURL();
+}
+globalFuncs.printPaperWallets = function(strJson) {
+ var win = window.open("about:blank", "_blank");
+ var data = "");
+}
+globalFuncs.getBlob = function(mime, str) {
+ var str = (typeof str === 'object') ? JSON.stringify(str) : str;
+ if (str == null) return '';
+ var blob = new Blob([str], {
+ type: mime
+ });
+ return window.URL.createObjectURL(blob);
+}
+globalFuncs.getSuccessText = function(str) {
+ return '
'
+}
+globalFuncs.errorMsgs = [
+ "Please enter valid amount. ",
+ "Your password must be at least 9 characters. Please ensure it is a strong password. ",
+ "Sorry! We don't have a clue what type of wallet file this is. ",
+ "This is not a valid wallet file. ",
+ "This unit doesn\'t exists, please use the one of the following units ",
+ "Invalid address. ",
+ "Invalid password. ",
+ "Invalid amount. ",
+ "Invalid gas limit. ",
+ "Invalid data value. ",
+ "Invalid gas amount. ",
+ "Invalid nonce. ",
+ "Invalid signed transaction. ",
+ "A wallet with this nickname already exists. ",
+ "Wallet not found. ",
+ "Whoops. It doesnt look like a proposal with this ID exists yet or there is an error reading this proposal. ",
+ "A wallet with this address already exists in storage. Please check your wallets page. ",
+ "You need to have at some ETH in your account to cover the cost of gas. .01ETH should be more than sufficient for a few sends and votes. ",
+ "All gas would be used on this transaction. This means you have already voted on this proposal or the debate period has ended.",
+ "Invalid symbol"];
+globalFuncs.successMsgs = ["Valid address", "Wallet successfully decrypted", "Transaction submitted. TX ID: ", "New wallet added: ", "You have successfully voted. Thank you for being an active participant in The DAO."];
+globalFuncs.scrypt = {
+ n: 1024
+};
+globalFuncs.postDelay = 300;
+globalFuncs.kdf = "scrypt";
+globalFuncs.defaultTxGasLimit = 21000;
+globalFuncs.digixClaimTxGasLimit = 150000;
+globalFuncs.donateAddress = "0x7cB57B5A97eAbe94205C07890BE4c1aD31E486A8";
+globalFuncs.isNumeric = function(n) {
+ return !isNaN(parseFloat(n)) && isFinite(n);
+}
+globalFuncs.urlGet = function(name) {
+ if (name = (new RegExp('[?&]' + encodeURIComponent(name) + '=([^&]*)')).exec(location.search)) return this.stripTags(decodeURIComponent(name[1]));
+}
+globalFuncs.stripTags = function(str) {
+ var SCRIPT_REGEX = /)<[^<]*)*<\/script>/gi;
+ while (SCRIPT_REGEX.test(str)) {
+ str = str.replace(SCRIPT_REGEX, "");
+ }
+ return str;
+}
+globalFuncs.checkAndRedirectHTTPS = function() {
+ var host = "myetherwallet.com";
+ var githost = "kvhnuke.github.io";
+ var githostw = "www.kvhnuke.github.io";
+ var hostw = "www.myetherwallet.com";
+ if ((host == window.location.host || githost == window.location.host || hostw == window.location.host || githostw == window.location.host) && (window.location.protocol != "https:")) window.location.protocol = "https";
+}
+globalFuncs.isStrongPass = function(password) {
+ return password.length > 8;
+}
+globalFuncs.hexToAscii = function(hex) {
+ return hex.match(/.{1,2}/g).map(function(v) {
+ return String.fromCharCode(parseInt(v, 16));
+ }).join('');
+}
+globalFuncs.isAlphaNumeric = function(value){
+ return !/[^a-zA-Z0-9]/.test(value);
+}
+module.exports = globalFuncs;
},{}],27:[function(require,module,exports){
-'use strict';
-var IS_CX = false;
-if(typeof chrome != 'undefined')
- IS_CX = chrome.windows === undefined ? false : true;
-require("babel-polyfill");
-var angular = require('angular');
-var angularTranslate = require('angular-translate');
-var angularSanitize = require('angular-sanitize');
-var BigNumber = require('bignumber.js');
-window.BigNumber = BigNumber;
-var marked = require('marked');
-window.marked = marked;
-var ethUtil = require('ethereumjs-util');
-ethUtil.crypto = require('crypto');
-ethUtil.Tx = require('ethereumjs-tx');
-ethUtil.scrypt = require('scryptsy');
-ethUtil.uuid = require('uuid');
-window.ethUtil = ethUtil;
-var Wallet = require('./myetherwallet');
-window.Wallet = Wallet;
-var Token = require('./tokens');
-window.Token = Token;
-var globalFuncs = require('./globalFuncs');
-window.globalFuncs = globalFuncs;
-var uiFuncs = require('./uiFuncs');
-window.uiFuncs = uiFuncs;
-var etherUnits = require('./etherUnits');
-window.etherUnits = etherUnits;
-var ajaxReq = require('./ajaxReq');
-window.ajaxReq = ajaxReq;
-var ethFuncs = require('./ethFuncs');
-window.ethFuncs = ethFuncs;
-var translate = require('./translations/translate.js');
-if(IS_CX){
- var cxFuncs = require('./cxFuncs');
- window.cxFuncs = cxFuncs;
-}
-var tabsCtrl = require('./controllers/tabsCtrl');
-var viewCtrl = require('./controllers/viewCtrl');
-var walletGenCtrl = require('./controllers/walletGenCtrl');
-var bulkGenCtrl = require('./controllers/bulkGenCtrl');
-var decryptWalletCtrl = require('./controllers/decryptWalletCtrl');
-var viewWalletCtrl = require('./controllers/viewWalletCtrl');
-var sendTxCtrl = require('./controllers/sendTxCtrl');
-var digixCtrl = require('./controllers/digixCtrl');
-var theDaoCtrl = require('./controllers/theDaoCtrl');
-var tokenCtrl = require('./controllers/tokenCtrl');
-var sendOfflineTxCtrl = require('./controllers/sendOfflineTxCtrl');
-var globalService = require('./services/globalService');
-var walletService = require('./services/walletService');
-var blockiesDrtv = require('./directives/blockiesDrtv');
-var QRCodeDrtv = require('./directives/QRCodeDrtv');
-var walletDecryptDrtv = require('./directives/walletDecryptDrtv');
-var cxWalletDecryptDrtv = require('./directives/cxWalletDecryptDrtv');
-var fileReaderDrtv = require('./directives/fileReaderDrtv');
-if(IS_CX){
- var addWalletCtrl = require('./controllers/CX/addWalletCtrl');
- var cxDecryptWalletCtrl = require('./controllers/CX/cxDecryptWalletCtrl');
- var myWalletsCtrl = require('./controllers/CX/myWalletsCtrl');
- var mainPopCtrl = require('./controllers/CX/mainPopCtrl');
- var quickSendCtrl = require('./controllers/CX/quickSendCtrl');
-}
-var app = angular.module('mewApp',['pascalprecht.translate','ngSanitize']);
-app.config(['$compileProvider', function($compileProvider) {
- $compileProvider.aHrefSanitizationWhitelist(/^\s*(|blob|https|):/);
-}]);
-app.config(['$translateProvider', function($translateProvider) {
- new translate($translateProvider);
-}]);
-app.factory('globalService', ['$http','$httpParamSerializerJQLike',globalService]);
-app.factory('walletService', walletService);
-app.directive('blockieAddress', blockiesDrtv);
-app.directive('qrCode', QRCodeDrtv);
-app.directive('onReadFile', fileReaderDrtv);
-app.directive('walletDecryptDrtv', walletDecryptDrtv);
-app.directive('cxWalletDecryptDrtv', cxWalletDecryptDrtv);
-app.controller('tabsCtrl', ['$scope', 'globalService', tabsCtrl]);
-app.controller('viewCtrl', ['$scope', 'globalService', viewCtrl]);
-app.controller('walletGenCtrl', ['$scope', walletGenCtrl]);
-app.controller('bulkGenCtrl', ['$scope', bulkGenCtrl]);
-app.controller('decryptWalletCtrl', ['$scope','$sce','walletService', decryptWalletCtrl]);
-app.controller('viewWalletCtrl', ['$scope','walletService', viewWalletCtrl]);
-app.controller('sendTxCtrl', ['$scope','$sce','walletService', sendTxCtrl]);
-app.controller('digixCtrl', ['$scope','$sce','walletService', digixCtrl]);
-app.controller('theDaoCtrl', ['$scope','$sce','walletService', theDaoCtrl]);
-app.controller('tokenCtrl', ['$scope','$sce','walletService', tokenCtrl]);
-app.controller('sendOfflineTxCtrl', ['$scope','$sce','walletService', sendOfflineTxCtrl]);
-if(IS_CX){
- app.controller('addWalletCtrl', ['$scope','$sce', addWalletCtrl]);
- app.controller('myWalletsCtrl', ['$scope','$sce', myWalletsCtrl]);
- app.controller('mainPopCtrl', ['$scope','$sce', mainPopCtrl]);
- app.controller('quickSendCtrl', ['$scope','$sce', quickSendCtrl]);
- app.controller('cxDecryptWalletCtrl', ['$scope','$sce','walletService', cxDecryptWalletCtrl]);
-}
-
-},{"./ajaxReq":1,"./controllers/CX/addWalletCtrl":2,"./controllers/CX/cxDecryptWalletCtrl":3,"./controllers/CX/mainPopCtrl":4,"./controllers/CX/myWalletsCtrl":5,"./controllers/CX/quickSendCtrl":6,"./controllers/bulkGenCtrl":7,"./controllers/decryptWalletCtrl":8,"./controllers/digixCtrl":9,"./controllers/sendOfflineTxCtrl":10,"./controllers/sendTxCtrl":11,"./controllers/tabsCtrl":12,"./controllers/theDaoCtrl":13,"./controllers/tokenCtrl":14,"./controllers/viewCtrl":15,"./controllers/viewWalletCtrl":16,"./controllers/walletGenCtrl":17,"./cxFuncs":18,"./directives/QRCodeDrtv":19,"./directives/blockiesDrtv":20,"./directives/cxWalletDecryptDrtv":21,"./directives/fileReaderDrtv":22,"./directives/walletDecryptDrtv":23,"./ethFuncs":24,"./etherUnits":25,"./globalFuncs":26,"./myetherwallet":28,"./services/globalService":29,"./services/walletService":30,"./tokens":31,"./translations/translate.js":34,"./uiFuncs":35,"angular":40,"angular-sanitize":37,"angular-translate":38,"babel-polyfill":56,"bignumber.js":58,"crypto":392,"ethereumjs-tx":422,"ethereumjs-util":423,"marked":439,"scryptsy":469,"uuid":489}],28:[function(require,module,exports){
+'use strict';
+var IS_CX = false;
+if(typeof chrome != 'undefined')
+ IS_CX = chrome.windows === undefined ? false : true;
+require("babel-polyfill");
+var angular = require('angular');
+var angularTranslate = require('angular-translate');
+var angularSanitize = require('angular-sanitize');
+var BigNumber = require('bignumber.js');
+window.BigNumber = BigNumber;
+var marked = require('marked');
+window.marked = marked;
+var ethUtil = require('ethereumjs-util');
+ethUtil.crypto = require('crypto');
+ethUtil.Tx = require('ethereumjs-tx');
+ethUtil.scrypt = require('scryptsy');
+ethUtil.uuid = require('uuid');
+window.ethUtil = ethUtil;
+var Wallet = require('./myetherwallet');
+window.Wallet = Wallet;
+var Token = require('./tokens');
+window.Token = Token;
+var globalFuncs = require('./globalFuncs');
+window.globalFuncs = globalFuncs;
+var uiFuncs = require('./uiFuncs');
+window.uiFuncs = uiFuncs;
+var etherUnits = require('./etherUnits');
+window.etherUnits = etherUnits;
+var ajaxReq = require('./ajaxReq');
+window.ajaxReq = ajaxReq;
+var ethFuncs = require('./ethFuncs');
+window.ethFuncs = ethFuncs;
+var translate = require('./translations/translate.js');
+if(IS_CX){
+ var cxFuncs = require('./cxFuncs');
+ window.cxFuncs = cxFuncs;
+}
+var tabsCtrl = require('./controllers/tabsCtrl');
+var viewCtrl = require('./controllers/viewCtrl');
+var walletGenCtrl = require('./controllers/walletGenCtrl');
+var bulkGenCtrl = require('./controllers/bulkGenCtrl');
+var decryptWalletCtrl = require('./controllers/decryptWalletCtrl');
+var viewWalletCtrl = require('./controllers/viewWalletCtrl');
+var sendTxCtrl = require('./controllers/sendTxCtrl');
+var digixCtrl = require('./controllers/digixCtrl');
+var theDaoCtrl = require('./controllers/theDaoCtrl');
+var tokenCtrl = require('./controllers/tokenCtrl');
+var sendOfflineTxCtrl = require('./controllers/sendOfflineTxCtrl');
+var globalService = require('./services/globalService');
+var walletService = require('./services/walletService');
+var blockiesDrtv = require('./directives/blockiesDrtv');
+var QRCodeDrtv = require('./directives/QRCodeDrtv');
+var walletDecryptDrtv = require('./directives/walletDecryptDrtv');
+var cxWalletDecryptDrtv = require('./directives/cxWalletDecryptDrtv');
+var fileReaderDrtv = require('./directives/fileReaderDrtv');
+if(IS_CX){
+ var addWalletCtrl = require('./controllers/CX/addWalletCtrl');
+ var cxDecryptWalletCtrl = require('./controllers/CX/cxDecryptWalletCtrl');
+ var myWalletsCtrl = require('./controllers/CX/myWalletsCtrl');
+ var mainPopCtrl = require('./controllers/CX/mainPopCtrl');
+ var quickSendCtrl = require('./controllers/CX/quickSendCtrl');
+}
+var app = angular.module('mewApp',['pascalprecht.translate','ngSanitize']);
+app.config(['$compileProvider', function($compileProvider) {
+ $compileProvider.aHrefSanitizationWhitelist(/^\s*(|blob|https|):/);
+}]);
+app.config(['$translateProvider', function($translateProvider) {
+ new translate($translateProvider);
+}]);
+app.factory('globalService', ['$http','$httpParamSerializerJQLike',globalService]);
+app.factory('walletService', walletService);
+app.directive('blockieAddress', blockiesDrtv);
+app.directive('qrCode', QRCodeDrtv);
+app.directive('onReadFile', fileReaderDrtv);
+app.directive('walletDecryptDrtv', walletDecryptDrtv);
+app.directive('cxWalletDecryptDrtv', cxWalletDecryptDrtv);
+app.controller('tabsCtrl', ['$scope', 'globalService', tabsCtrl]);
+app.controller('viewCtrl', ['$scope', 'globalService', viewCtrl]);
+app.controller('walletGenCtrl', ['$scope', walletGenCtrl]);
+app.controller('bulkGenCtrl', ['$scope', bulkGenCtrl]);
+app.controller('decryptWalletCtrl', ['$scope','$sce','walletService', decryptWalletCtrl]);
+app.controller('viewWalletCtrl', ['$scope','walletService', viewWalletCtrl]);
+app.controller('sendTxCtrl', ['$scope','$sce','walletService', sendTxCtrl]);
+app.controller('digixCtrl', ['$scope','$sce','walletService', digixCtrl]);
+app.controller('theDaoCtrl', ['$scope','$sce','walletService', theDaoCtrl]);
+app.controller('tokenCtrl', ['$scope','$sce','walletService', tokenCtrl]);
+app.controller('sendOfflineTxCtrl', ['$scope','$sce','walletService', sendOfflineTxCtrl]);
+if(IS_CX){
+ app.controller('addWalletCtrl', ['$scope','$sce', addWalletCtrl]);
+ app.controller('myWalletsCtrl', ['$scope','$sce', myWalletsCtrl]);
+ app.controller('mainPopCtrl', ['$scope','$sce', mainPopCtrl]);
+ app.controller('quickSendCtrl', ['$scope','$sce', quickSendCtrl]);
+ app.controller('cxDecryptWalletCtrl', ['$scope','$sce','walletService', cxDecryptWalletCtrl]);
+}
+
+},{"./ajaxReq":1,"./controllers/CX/addWalletCtrl":2,"./controllers/CX/cxDecryptWalletCtrl":3,"./controllers/CX/mainPopCtrl":4,"./controllers/CX/myWalletsCtrl":5,"./controllers/CX/quickSendCtrl":6,"./controllers/bulkGenCtrl":7,"./controllers/decryptWalletCtrl":8,"./controllers/digixCtrl":9,"./controllers/sendOfflineTxCtrl":10,"./controllers/sendTxCtrl":11,"./controllers/tabsCtrl":12,"./controllers/theDaoCtrl":13,"./controllers/tokenCtrl":14,"./controllers/viewCtrl":15,"./controllers/viewWalletCtrl":16,"./controllers/walletGenCtrl":17,"./cxFuncs":18,"./directives/QRCodeDrtv":19,"./directives/blockiesDrtv":20,"./directives/cxWalletDecryptDrtv":21,"./directives/fileReaderDrtv":22,"./directives/walletDecryptDrtv":23,"./ethFuncs":24,"./etherUnits":25,"./globalFuncs":26,"./myetherwallet":28,"./services/globalService":29,"./services/walletService":30,"./tokens":31,"./translations/translate.js":34,"./uiFuncs":35,"angular":40,"angular-sanitize":37,"angular-translate":38,"babel-polyfill":56,"bignumber.js":58,"crypto":393,"ethereumjs-tx":423,"ethereumjs-util":424,"marked":440,"scryptsy":470,"uuid":490}],28:[function(require,module,exports){
(function (Buffer){
-'use strict';
-var Wallet = function(priv) {
- this.privKey = priv.length == 32 ? priv : Buffer(priv, 'hex')
-}
-Wallet.generate = function(icapDirect) {
- if (icapDirect) {
- while (true) {
- var privKey = ethUtil.crypto.randomBytes(32)
- if (ethUtil.privateToAddress(privKey)[0] === 0) {
- return new Wallet(privKey)
- }
- }
- } else {
- return new Wallet(ethUtil.crypto.randomBytes(32))
- }
-}
-Wallet.prototype.getPrivateKey = function() {
- return this.privKey
-}
-Wallet.prototype.getPrivateKeyString = function() {
- return this.getPrivateKey().toString('hex')
-}
-Wallet.prototype.getPublicKey = function() {
- return ethUtil.privateToPublic(this.privKey)
-}
-Wallet.prototype.getPublicKeyString = function() {
- return '0x' + this.getPublicKey().toString('hex')
-}
-Wallet.prototype.getAddress = function() {
- return ethUtil.privateToAddress(this.privKey)
-}
-Wallet.prototype.getAddressString = function() {
- return '0x' + this.getAddress().toString('hex')
-}
-Wallet.prototype.getChecksumAddressString = function() {
- return ethUtil.toChecksumAddress(this.getAddressString())
-}
-Wallet.fromPrivateKey = function(priv) {
- return new Wallet(priv)
-}
-Wallet.prototype.toV3 = function(password, opts) {
- opts = opts || {}
- var salt = opts.salt || ethUtil.crypto.randomBytes(32)
- var iv = opts.iv || ethUtil.crypto.randomBytes(16)
- var derivedKey
- var kdf = opts.kdf || 'scrypt'
- var kdfparams = {
- dklen: opts.dklen || 32,
- salt: salt.toString('hex')
- }
- if (kdf === 'pbkdf2') {
- kdfparams.c = opts.c || 262144
- kdfparams.prf = 'hmac-sha256'
- derivedKey = ethUtil.crypto.pbkdf2Sync(new Buffer(password), salt, kdfparams.c, kdfparams.dklen, 'sha256')
- } else if (kdf === 'scrypt') {
- // FIXME: support progress reporting callback
- kdfparams.n = opts.n || 262144
- kdfparams.r = opts.r || 8
- kdfparams.p = opts.p || 1
- derivedKey = ethUtil.scrypt(new Buffer(password), salt, kdfparams.n, kdfparams.r, kdfparams.p, kdfparams.dklen)
- } else {
- throw new Error('Unsupported kdf')
- }
- var cipher = ethUtil.crypto.createCipheriv(opts.cipher || 'aes-128-ctr', derivedKey.slice(0, 16), iv)
- if (!cipher) {
- throw new Error('Unsupported cipher')
- }
- var ciphertext = Buffer.concat([cipher.update(this.privKey), cipher.final()])
- var mac = ethUtil.sha3(Buffer.concat([derivedKey.slice(16, 32), new Buffer(ciphertext, 'hex')]))
- return {
- version: 3,
- id: ethUtil.uuid.v4({
- random: opts.uuid || ethUtil.crypto.randomBytes(16)
- }),
- address: this.getAddress().toString('hex'),
- Crypto: {
- ciphertext: ciphertext.toString('hex'),
- cipherparams: {
- iv: iv.toString('hex')
- },
- cipher: opts.cipher || 'aes-128-ctr',
- kdf: kdf,
- kdfparams: kdfparams,
- mac: mac.toString('hex')
- }
- }
-}
-Wallet.prototype.toJSON = function() {
- return {
- address: this.getAddressString(),
- checksumAddress: this.getChecksumAddressString(),
- privKey: this.getPrivateKeyString(),
- pubKey: this.getPublicKeyString(),
- publisher:"MyEtherWallet",
- encrypted:false,
- version:2
- }
-}
-Wallet.fromMyEtherWallet = function(input, password) {
- var json = (typeof input === 'object') ? input : JSON.parse(input)
- var privKey
- if (!json.locked) {
- if (json.private.length !== 64) {
- throw new Error('Invalid private key length')
- }
- privKey = new Buffer(json.private, 'hex')
- } else {
- if (typeof password !== 'string') {
- throw new Error('Password required')
- }
- if (password.length < 7) {
- throw new Error('Password must be at least 7 characters')
- }
- var cipher = json.encrypted ? json.private.slice(0, 128) : json.private
- cipher = Wallet.decodeCryptojsSalt(cipher)
- var evp = Wallet.evp_kdf(new Buffer(password), cipher.salt, {
- keysize: 32,
- ivsize: 16
- })
- var decipher = ethUtil.crypto.createDecipheriv('aes-256-cbc', evp.key, evp.iv)
- privKey = Wallet.decipherBuffer(decipher, new Buffer(cipher.ciphertext))
- privKey = new Buffer((privKey.toString()), 'hex')
- }
- var wallet = new Wallet(privKey)
- if (wallet.getAddressString() !== json.address) {
- throw new Error('Invalid private key or address')
- }
- return wallet
-}
-Wallet.fromMyEtherWalletV2 = function (input){
- var json = (typeof input === 'object') ? input : JSON.parse(input);
- if (json.privKey.length !== 64) {
- throw new Error('Invalid private key length');
- };
- var privKey = new Buffer(json.privKey, 'hex');
- return new Wallet(privKey);
-}
-Wallet.fromEthSale = function(input, password) {
- var json = (typeof input === 'object') ? input : JSON.parse(input)
- var encseed = new Buffer(json.encseed, 'hex')
- var derivedKey = ethUtil.crypto.pbkdf2Sync(Buffer(password), Buffer(password), 2000, 32, 'sha256').slice(0, 16)
- var decipher = ethUtil.crypto.createDecipheriv('aes-128-cbc', derivedKey, encseed.slice(0, 16))
- var seed = Wallet.decipherBuffer(decipher, encseed.slice(16))
- var wallet = new Wallet(ethUtil.sha3(seed))
- if (wallet.getAddress().toString('hex') !== json.ethaddr) {
- throw new Error('Decoded key mismatch - possibly wrong passphrase')
- }
- return wallet
-}
-Wallet.fromMyEtherWalletKey = function(input, password) {
- var cipher = input.slice(0, 128)
- cipher = Wallet.decodeCryptojsSalt(cipher)
- var evp = Wallet.evp_kdf(new Buffer(password), cipher.salt, {
- keysize: 32,
- ivsize: 16
- })
- var decipher = ethUtil.crypto.createDecipheriv('aes-256-cbc', evp.key, evp.iv)
- var privKey = Wallet.decipherBuffer(decipher, new Buffer(cipher.ciphertext))
- privKey = new Buffer((privKey.toString()), 'hex')
- return new Wallet(privKey)
-}
-Wallet.fromV3 = function(input, password, nonStrict) {
- var json = (typeof input === 'object') ? input : JSON.parse(nonStrict ? input.toLowerCase() : input)
- if (json.version !== 3) {
- throw new Error('Not a V3 wallet')
- }
- var derivedKey
- var kdfparams
- if (json.crypto.kdf === 'scrypt') {
- kdfparams = json.crypto.kdfparams
- derivedKey = ethUtil.scrypt(new Buffer(password), new Buffer(kdfparams.salt, 'hex'), kdfparams.n, kdfparams.r, kdfparams.p, kdfparams.dklen)
- } else if (json.crypto.kdf === 'pbkdf2') {
- kdfparams = json.crypto.kdfparams
- if (kdfparams.prf !== 'hmac-sha256') {
- throw new Error('Unsupported parameters to PBKDF2')
- }
- derivedKey = ethUtil.crypto.pbkdf2Sync(new Buffer(password), new Buffer(kdfparams.salt, 'hex'), kdfparams.c, kdfparams.dklen, 'sha256')
- } else {
- throw new Error('Unsupported key derivation scheme')
- }
- var ciphertext = new Buffer(json.crypto.ciphertext, 'hex')
- var mac = ethUtil.sha3(Buffer.concat([derivedKey.slice(16, 32), ciphertext]))
- if (mac.toString('hex') !== json.crypto.mac) {
- throw new Error('Key derivation failed - possibly wrong passphrase')
- }
- var decipher = ethUtil.crypto.createDecipheriv(json.crypto.cipher, derivedKey.slice(0, 16), new Buffer(json.crypto.cipherparams.iv, 'hex'))
- var seed = Wallet.decipherBuffer(decipher, ciphertext, 'hex')
- return new Wallet(seed)
-}
-Wallet.prototype.toV3String = function(password, opts) {
- return JSON.stringify(this.toV3(password, opts))
-}
-Wallet.prototype.getV3Filename = function (timestamp) {
- var ts = timestamp ? new Date(timestamp) : new Date()
- return [
- 'UTC--',
- ts.toJSON().replace(/:/g, '-'),
- '--',
- this.getAddress().toString('hex')
- ].join('')
-}
-Wallet.decipherBuffer = function(decipher, data) {
- return Buffer.concat([decipher.update(data), decipher.final()])
-}
-Wallet.decodeCryptojsSalt = function(input) {
- var ciphertext = new Buffer(input, 'base64')
- if (ciphertext.slice(0, 8).toString() === 'Salted__') {
- return {
- salt: ciphertext.slice(8, 16),
- ciphertext: ciphertext.slice(16)
- }
- } else {
- return {
- ciphertext: ciphertext
- }
- }
-}
-Wallet.evp_kdf = function(data, salt, opts) {
- // A single EVP iteration, returns `D_i`, where block equlas to `D_(i-1)`
-
- function iter(block) {
- var hash = ethUtil.crypto.createHash(opts.digest || 'md5')
- hash.update(block)
- hash.update(data)
- hash.update(salt)
- block = hash.digest()
- for (var i = 1; i < (opts.count || 1); i++) {
- hash = ethUtil.crypto.createHash(opts.digest || 'md5')
- hash.update(block)
- block = hash.digest()
- }
- return block
- }
- var keysize = opts.keysize || 16
- var ivsize = opts.ivsize || 16
- var ret = []
- var i = 0
- while (Buffer.concat(ret).length < (keysize + ivsize)) {
- ret[i] = iter((i === 0) ? new Buffer(0) : ret[i - 1])
- i++
- }
- var tmp = Buffer.concat(ret)
- return {
- key: tmp.slice(0, keysize),
- iv: tmp.slice(keysize, keysize + ivsize)
- }
-}
-Wallet.walletRequirePass = function(ethjson) {
- var jsonArr;
- try {
- jsonArr = JSON.parse(ethjson);
- } catch (err) {
- throw globalFuncs.errorMsgs[3];
- }
- if (jsonArr.encseed != null) return true;
- else if (jsonArr.Crypto != null || jsonArr.crypto != null) return true
- else if (jsonArr.hash != null && jsonArr.locked) return true;
- else if (jsonArr.hash != null && !jsonArr.locked) return false;
- else if (jsonArr.publisher == "MyEtherWallet" && !jsonArr.encrypted) return false;
- else
- throw globalFuncs.errorMsgs[2];
-}
-Wallet.getWalletFromPrivKeyFile = function(strjson, password) {
- var jsonArr = JSON.parse(strjson);
- if (jsonArr.encseed != null) return Wallet.fromEthSale(strjson, password);
- else if (jsonArr.Crypto != null || jsonArr.crypto != null) return Wallet.fromV3(strjson, password, true);
- else if (jsonArr.hash != null) return Wallet.fromMyEtherWallet(strjson, password);
- else if (jsonArr.publisher == "MyEtherWallet") return Wallet.fromMyEtherWalletV2(strjson);
- else
- throw globalFuncs.errorMsgs[2];
-}
+'use strict';
+var Wallet = function(priv) {
+ this.privKey = priv.length == 32 ? priv : Buffer(priv, 'hex')
+}
+Wallet.generate = function(icapDirect) {
+ if (icapDirect) {
+ while (true) {
+ var privKey = ethUtil.crypto.randomBytes(32)
+ if (ethUtil.privateToAddress(privKey)[0] === 0) {
+ return new Wallet(privKey)
+ }
+ }
+ } else {
+ return new Wallet(ethUtil.crypto.randomBytes(32))
+ }
+}
+Wallet.prototype.getPrivateKey = function() {
+ return this.privKey
+}
+Wallet.prototype.getPrivateKeyString = function() {
+ return this.getPrivateKey().toString('hex')
+}
+Wallet.prototype.getPublicKey = function() {
+ return ethUtil.privateToPublic(this.privKey)
+}
+Wallet.prototype.getPublicKeyString = function() {
+ return '0x' + this.getPublicKey().toString('hex')
+}
+Wallet.prototype.getAddress = function() {
+ return ethUtil.privateToAddress(this.privKey)
+}
+Wallet.prototype.getAddressString = function() {
+ return '0x' + this.getAddress().toString('hex')
+}
+Wallet.prototype.getChecksumAddressString = function() {
+ return ethUtil.toChecksumAddress(this.getAddressString())
+}
+Wallet.fromPrivateKey = function(priv) {
+ return new Wallet(priv)
+}
+Wallet.prototype.toV3 = function(password, opts) {
+ opts = opts || {}
+ var salt = opts.salt || ethUtil.crypto.randomBytes(32)
+ var iv = opts.iv || ethUtil.crypto.randomBytes(16)
+ var derivedKey
+ var kdf = opts.kdf || 'scrypt'
+ var kdfparams = {
+ dklen: opts.dklen || 32,
+ salt: salt.toString('hex')
+ }
+ if (kdf === 'pbkdf2') {
+ kdfparams.c = opts.c || 262144
+ kdfparams.prf = 'hmac-sha256'
+ derivedKey = ethUtil.crypto.pbkdf2Sync(new Buffer(password), salt, kdfparams.c, kdfparams.dklen, 'sha256')
+ } else if (kdf === 'scrypt') {
+ // FIXME: support progress reporting callback
+ kdfparams.n = opts.n || 262144
+ kdfparams.r = opts.r || 8
+ kdfparams.p = opts.p || 1
+ derivedKey = ethUtil.scrypt(new Buffer(password), salt, kdfparams.n, kdfparams.r, kdfparams.p, kdfparams.dklen)
+ } else {
+ throw new Error('Unsupported kdf')
+ }
+ var cipher = ethUtil.crypto.createCipheriv(opts.cipher || 'aes-128-ctr', derivedKey.slice(0, 16), iv)
+ if (!cipher) {
+ throw new Error('Unsupported cipher')
+ }
+ var ciphertext = Buffer.concat([cipher.update(this.privKey), cipher.final()])
+ var mac = ethUtil.sha3(Buffer.concat([derivedKey.slice(16, 32), new Buffer(ciphertext, 'hex')]))
+ return {
+ version: 3,
+ id: ethUtil.uuid.v4({
+ random: opts.uuid || ethUtil.crypto.randomBytes(16)
+ }),
+ address: this.getAddress().toString('hex'),
+ Crypto: {
+ ciphertext: ciphertext.toString('hex'),
+ cipherparams: {
+ iv: iv.toString('hex')
+ },
+ cipher: opts.cipher || 'aes-128-ctr',
+ kdf: kdf,
+ kdfparams: kdfparams,
+ mac: mac.toString('hex')
+ }
+ }
+}
+Wallet.prototype.toJSON = function() {
+ return {
+ address: this.getAddressString(),
+ checksumAddress: this.getChecksumAddressString(),
+ privKey: this.getPrivateKeyString(),
+ pubKey: this.getPublicKeyString(),
+ publisher:"MyEtherWallet",
+ encrypted:false,
+ version:2
+ }
+}
+Wallet.fromMyEtherWallet = function(input, password) {
+ var json = (typeof input === 'object') ? input : JSON.parse(input)
+ var privKey
+ if (!json.locked) {
+ if (json.private.length !== 64) {
+ throw new Error('Invalid private key length')
+ }
+ privKey = new Buffer(json.private, 'hex')
+ } else {
+ if (typeof password !== 'string') {
+ throw new Error('Password required')
+ }
+ if (password.length < 7) {
+ throw new Error('Password must be at least 7 characters')
+ }
+ var cipher = json.encrypted ? json.private.slice(0, 128) : json.private
+ cipher = Wallet.decodeCryptojsSalt(cipher)
+ var evp = Wallet.evp_kdf(new Buffer(password), cipher.salt, {
+ keysize: 32,
+ ivsize: 16
+ })
+ var decipher = ethUtil.crypto.createDecipheriv('aes-256-cbc', evp.key, evp.iv)
+ privKey = Wallet.decipherBuffer(decipher, new Buffer(cipher.ciphertext))
+ privKey = new Buffer((privKey.toString()), 'hex')
+ }
+ var wallet = new Wallet(privKey)
+ if (wallet.getAddressString() !== json.address) {
+ throw new Error('Invalid private key or address')
+ }
+ return wallet
+}
+Wallet.fromMyEtherWalletV2 = function (input){
+ var json = (typeof input === 'object') ? input : JSON.parse(input);
+ if (json.privKey.length !== 64) {
+ throw new Error('Invalid private key length');
+ };
+ var privKey = new Buffer(json.privKey, 'hex');
+ return new Wallet(privKey);
+}
+Wallet.fromEthSale = function(input, password) {
+ var json = (typeof input === 'object') ? input : JSON.parse(input)
+ var encseed = new Buffer(json.encseed, 'hex')
+ var derivedKey = ethUtil.crypto.pbkdf2Sync(Buffer(password), Buffer(password), 2000, 32, 'sha256').slice(0, 16)
+ var decipher = ethUtil.crypto.createDecipheriv('aes-128-cbc', derivedKey, encseed.slice(0, 16))
+ var seed = Wallet.decipherBuffer(decipher, encseed.slice(16))
+ var wallet = new Wallet(ethUtil.sha3(seed))
+ if (wallet.getAddress().toString('hex') !== json.ethaddr) {
+ throw new Error('Decoded key mismatch - possibly wrong passphrase')
+ }
+ return wallet
+}
+Wallet.fromMyEtherWalletKey = function(input, password) {
+ var cipher = input.slice(0, 128)
+ cipher = Wallet.decodeCryptojsSalt(cipher)
+ var evp = Wallet.evp_kdf(new Buffer(password), cipher.salt, {
+ keysize: 32,
+ ivsize: 16
+ })
+ var decipher = ethUtil.crypto.createDecipheriv('aes-256-cbc', evp.key, evp.iv)
+ var privKey = Wallet.decipherBuffer(decipher, new Buffer(cipher.ciphertext))
+ privKey = new Buffer((privKey.toString()), 'hex')
+ return new Wallet(privKey)
+}
+Wallet.fromV3 = function(input, password, nonStrict) {
+ var json = (typeof input === 'object') ? input : JSON.parse(nonStrict ? input.toLowerCase() : input)
+ if (json.version !== 3) {
+ throw new Error('Not a V3 wallet')
+ }
+ var derivedKey
+ var kdfparams
+ if (json.crypto.kdf === 'scrypt') {
+ kdfparams = json.crypto.kdfparams
+ derivedKey = ethUtil.scrypt(new Buffer(password), new Buffer(kdfparams.salt, 'hex'), kdfparams.n, kdfparams.r, kdfparams.p, kdfparams.dklen)
+ } else if (json.crypto.kdf === 'pbkdf2') {
+ kdfparams = json.crypto.kdfparams
+ if (kdfparams.prf !== 'hmac-sha256') {
+ throw new Error('Unsupported parameters to PBKDF2')
+ }
+ derivedKey = ethUtil.crypto.pbkdf2Sync(new Buffer(password), new Buffer(kdfparams.salt, 'hex'), kdfparams.c, kdfparams.dklen, 'sha256')
+ } else {
+ throw new Error('Unsupported key derivation scheme')
+ }
+ var ciphertext = new Buffer(json.crypto.ciphertext, 'hex')
+ var mac = ethUtil.sha3(Buffer.concat([derivedKey.slice(16, 32), ciphertext]))
+ if (mac.toString('hex') !== json.crypto.mac) {
+ throw new Error('Key derivation failed - possibly wrong passphrase')
+ }
+ var decipher = ethUtil.crypto.createDecipheriv(json.crypto.cipher, derivedKey.slice(0, 16), new Buffer(json.crypto.cipherparams.iv, 'hex'))
+ var seed = Wallet.decipherBuffer(decipher, ciphertext, 'hex')
+ return new Wallet(seed)
+}
+Wallet.prototype.toV3String = function(password, opts) {
+ return JSON.stringify(this.toV3(password, opts))
+}
+Wallet.prototype.getV3Filename = function (timestamp) {
+ var ts = timestamp ? new Date(timestamp) : new Date()
+ return [
+ 'UTC--',
+ ts.toJSON().replace(/:/g, '-'),
+ '--',
+ this.getAddress().toString('hex')
+ ].join('')
+}
+Wallet.decipherBuffer = function(decipher, data) {
+ return Buffer.concat([decipher.update(data), decipher.final()])
+}
+Wallet.decodeCryptojsSalt = function(input) {
+ var ciphertext = new Buffer(input, 'base64')
+ if (ciphertext.slice(0, 8).toString() === 'Salted__') {
+ return {
+ salt: ciphertext.slice(8, 16),
+ ciphertext: ciphertext.slice(16)
+ }
+ } else {
+ return {
+ ciphertext: ciphertext
+ }
+ }
+}
+Wallet.evp_kdf = function(data, salt, opts) {
+ // A single EVP iteration, returns `D_i`, where block equlas to `D_(i-1)`
+
+ function iter(block) {
+ var hash = ethUtil.crypto.createHash(opts.digest || 'md5')
+ hash.update(block)
+ hash.update(data)
+ hash.update(salt)
+ block = hash.digest()
+ for (var i = 1; i < (opts.count || 1); i++) {
+ hash = ethUtil.crypto.createHash(opts.digest || 'md5')
+ hash.update(block)
+ block = hash.digest()
+ }
+ return block
+ }
+ var keysize = opts.keysize || 16
+ var ivsize = opts.ivsize || 16
+ var ret = []
+ var i = 0
+ while (Buffer.concat(ret).length < (keysize + ivsize)) {
+ ret[i] = iter((i === 0) ? new Buffer(0) : ret[i - 1])
+ i++
+ }
+ var tmp = Buffer.concat(ret)
+ return {
+ key: tmp.slice(0, keysize),
+ iv: tmp.slice(keysize, keysize + ivsize)
+ }
+}
+Wallet.walletRequirePass = function(ethjson) {
+ var jsonArr;
+ try {
+ jsonArr = JSON.parse(ethjson);
+ } catch (err) {
+ throw globalFuncs.errorMsgs[3];
+ }
+ if (jsonArr.encseed != null) return true;
+ else if (jsonArr.Crypto != null || jsonArr.crypto != null) return true
+ else if (jsonArr.hash != null && jsonArr.locked) return true;
+ else if (jsonArr.hash != null && !jsonArr.locked) return false;
+ else if (jsonArr.publisher == "MyEtherWallet" && !jsonArr.encrypted) return false;
+ else
+ throw globalFuncs.errorMsgs[2];
+}
+Wallet.getWalletFromPrivKeyFile = function(strjson, password) {
+ var jsonArr = JSON.parse(strjson);
+ if (jsonArr.encseed != null) return Wallet.fromEthSale(strjson, password);
+ else if (jsonArr.Crypto != null || jsonArr.crypto != null) return Wallet.fromV3(strjson, password, true);
+ else if (jsonArr.hash != null) return Wallet.fromMyEtherWallet(strjson, password);
+ else if (jsonArr.publisher == "MyEtherWallet") return Wallet.fromMyEtherWalletV2(strjson);
+ else
+ throw globalFuncs.errorMsgs[2];
+}
module.exports = Wallet;
}).call(this,require("buffer").Buffer)
},{"buffer":90}],29:[function(require,module,exports){
-'use strict';
-var globalService = function($http, $httpParamSerializerJQLike) {
- globalFuncs.checkAndRedirectHTTPS();
- ajaxReq.http = $http;
- ajaxReq.postSerializer = $httpParamSerializerJQLike;
-
- var tabs = {
- generateWallet: {
- id: 0,
- name: "Generate Wallet",
- url: "generate-wallet",
- mew: true,
- cx: false
- },
- bulkGenerate: {
- id: 1,
- name: "Bulk Generate",
- url: "bulk-generate",
- mew: false,
- cx: false
- },
- myWallet: {
- id: 2,
- name: "My Wallets",
- url: "my-wallet",
- mew: false,
- cx: true
- },
- addWallet: {
- id: 3,
- name: "Add Wallet",
- url: "add-wallet",
- mew: false,
- cx: true
- },
- sendTransaction: {
- id: 4,
- name: "Send Ether",
- url: "send-transaction",
- mew: true,
- cx: true
- },
- tokens: {
- id: 5,
- name: "Send Tokens",
- url: "send-tokens",
- mew: true,
- cx: true
- },
- offlineTransaction: {
- id: 6,
- name: "Send Offline",
- url:"offline-transaction",
- mew: true,
- cx: false
- },
- dao: {
- id: 7,
- name: "Withdraw DAO",
- url: "the-dao",
- mew: true,
- cx: true
- },
- digix: {
- id: 8,
- name: "Claim DGD",
- url: "digix",
- mew: true,
- cx: true
- },
- viewWalletInfo: {
- id: 9,
- name: "View Wallet Info",
- url: "view-wallet-info",
- mew: true,
- cx: false
- },
- help: {
- id: 10,
- name: "Help",
- url: "help",
- mew: true,
- cx: true
- }
- };
- var currentTab = 0;
- if(typeof chrome != 'undefined')
- currentTab = chrome.windows === undefined ? 0 : 3;
- return {
- tabs: tabs,
- currentTab: currentTab
- };
-};
-module.exports = globalService;
-
-
+'use strict';
+var globalService = function($http, $httpParamSerializerJQLike) {
+ globalFuncs.checkAndRedirectHTTPS();
+ ajaxReq.http = $http;
+ ajaxReq.postSerializer = $httpParamSerializerJQLike;
+
+ var tabs = {
+ generateWallet: {
+ id: 0,
+ name: "Generate Wallet",
+ url: "generate-wallet",
+ mew: true,
+ cx: false
+ },
+ bulkGenerate: {
+ id: 1,
+ name: "Bulk Generate",
+ url: "bulk-generate",
+ mew: false,
+ cx: false
+ },
+ myWallet: {
+ id: 2,
+ name: "My Wallets",
+ url: "my-wallet",
+ mew: false,
+ cx: true
+ },
+ addWallet: {
+ id: 3,
+ name: "Add Wallet",
+ url: "add-wallet",
+ mew: false,
+ cx: true
+ },
+ sendTransaction: {
+ id: 4,
+ name: "Send Ether",
+ url: "send-transaction",
+ mew: true,
+ cx: true
+ },
+ tokens: {
+ id: 5,
+ name: "Send Tokens",
+ url: "send-tokens",
+ mew: true,
+ cx: true
+ },
+ offlineTransaction: {
+ id: 6,
+ name: "Send Offline",
+ url:"offline-transaction",
+ mew: true,
+ cx: false
+ },
+ dao: {
+ id: 7,
+ name: "Withdraw DAO",
+ url: "the-dao",
+ mew: true,
+ cx: true
+ },
+ digix: {
+ id: 8,
+ name: "Claim DGD",
+ url: "digix",
+ mew: true,
+ cx: true
+ },
+ viewWalletInfo: {
+ id: 9,
+ name: "View Wallet Info",
+ url: "view-wallet-info",
+ mew: true,
+ cx: false
+ },
+ help: {
+ id: 10,
+ name: "Help",
+ url: "help",
+ mew: true,
+ cx: true
+ }
+ };
+ var currentTab = 0;
+ if(typeof chrome != 'undefined')
+ currentTab = chrome.windows === undefined ? 0 : 3;
+ return {
+ tabs: tabs,
+ currentTab: currentTab
+ };
+};
+module.exports = globalService;
+
+
},{}],30:[function(require,module,exports){
-'use strict';
-var walletService = function() {
- return {
- wallet: null,
- password:''
- }
-};
+'use strict';
+var walletService = function() {
+ return {
+ wallet: null,
+ password:''
+ }
+};
module.exports = walletService;
},{}],31:[function(require,module,exports){
-'use strict';
-var Token = function(contractAddress, userAddress, symbol, decimal) {
- this.contractAddress = contractAddress;
- this.userAddress = userAddress
- this.symbol = symbol;;
- this.decimal = decimal;
- this.setBalance();
-}
-Token.balanceHex = "0x70a08231";
-Token.transferHex = "0xa9059cbb";
-Token.popTokens = [{
- "address": "0xbb9bc244d798123fde783fcc1c72d3bb8c189413",
- "symbol": "DAO",
- "decimal": 16
-},
-{
- "address": "0xe0b7927c4af23765cb51314a0e0521a9645f0e2a",
- "symbol": "DGD",
- "decimal": 9
-},
-{
- "address": "0xc66ea802717bfb9833400264dd12c2bceaa34a6d",
- "symbol": "MKR",
- "decimal": 18
-},
-{
- "address": "0x89205A3A3b2A69De6Dbf7f01ED13B2108B2c43e7",
- "symbol": "🦄 Unicorn",
- "decimal": 0
-},
-{
- "address": "0x74c1e4b8cae59269ec1d85d3d4f324396048f4ac",
- "symbol": "🍺 BeerCoin",
- "decimal": 0
-}];
-Token.prototype.getContractAddress = function() {
- return this.contractAddress;
-}
-Token.prototype.getUserAddress = function() {
- return this.userAddress;
-}
-Token.prototype.getSymbol = function() {
- return this.symbol;
-}
-Token.prototype.getDecimal = function() {
- return this.decimal;
-}
-Token.prototype.getBalance = function() {
- return this.balance;
-}
-Token.prototype.getBalanceBN = function() {
- return this.balanceBN;
-}
-Token.prototype.setBalance = function() {
- var balanceCall = ethFuncs.getDataObj(this.contractAddress, Token.balanceHex, [ethFuncs.getNakedAddress(this.userAddress)]);
- var parentObj = this;
- ajaxReq.getEthCall(balanceCall, function(data) {
- if (!data.error) {
- parentObj.balance = new BigNumber(data.data).div(new BigNumber(10).pow(parentObj.getDecimal())).toString();
- parentObj.balanceBN = new BigNumber(data.data).toString();
- }
- });
-}
-Token.prototype.getData = function(toAdd, value) {
- try {
- if (!ethFuncs.validateEtherAddress(toAdd)) throw globalFuncs.errorMsgs[5];
- else if (!globalFuncs.isNumeric(value) || parseFloat(value) < 0) throw globalFuncs.errorMsgs[7];
- var value = ethFuncs.padLeft(new BigNumber(value).times(new BigNumber(10).pow(this.getDecimal())).toString(16), 64);
- var toAdd = ethFuncs.padLeft(ethFuncs.getNakedAddress(toAdd), 64);
- var data = Token.transferHex + toAdd + value;
- return {
- isError: false,
- data: data
- };
- } catch (e) {
- return {
- isError: true,
- error: e
- };
- }
-}
-module.exports = Token;
+'use strict';
+var Token = function(contractAddress, userAddress, symbol, decimal) {
+ this.contractAddress = contractAddress;
+ this.userAddress = userAddress
+ this.symbol = symbol;;
+ this.decimal = decimal;
+ this.setBalance();
+}
+Token.balanceHex = "0x70a08231";
+Token.transferHex = "0xa9059cbb";
+Token.popTokens = [{
+ "address": "0xbb9bc244d798123fde783fcc1c72d3bb8c189413",
+ "symbol": "DAO",
+ "decimal": 16
+},
+{
+ "address": "0xe0b7927c4af23765cb51314a0e0521a9645f0e2a",
+ "symbol": "DGD",
+ "decimal": 9
+},
+{
+ "address": "0xc66ea802717bfb9833400264dd12c2bceaa34a6d",
+ "symbol": "MKR",
+ "decimal": 18
+},
+{
+ "address": "0x89205A3A3b2A69De6Dbf7f01ED13B2108B2c43e7",
+ "symbol": "🦄 Unicorn",
+ "decimal": 0
+},
+{
+ "address": "0x74c1e4b8cae59269ec1d85d3d4f324396048f4ac",
+ "symbol": "🍺 BeerCoin",
+ "decimal": 0
+}];
+Token.prototype.getContractAddress = function() {
+ return this.contractAddress;
+}
+Token.prototype.getUserAddress = function() {
+ return this.userAddress;
+}
+Token.prototype.getSymbol = function() {
+ return this.symbol;
+}
+Token.prototype.getDecimal = function() {
+ return this.decimal;
+}
+Token.prototype.getBalance = function() {
+ return this.balance;
+}
+Token.prototype.getBalanceBN = function() {
+ return this.balanceBN;
+}
+Token.prototype.setBalance = function() {
+ var balanceCall = ethFuncs.getDataObj(this.contractAddress, Token.balanceHex, [ethFuncs.getNakedAddress(this.userAddress)]);
+ var parentObj = this;
+ ajaxReq.getEthCall(balanceCall, function(data) {
+ if (!data.error) {
+ parentObj.balance = new BigNumber(data.data).div(new BigNumber(10).pow(parentObj.getDecimal())).toString();
+ parentObj.balanceBN = new BigNumber(data.data).toString();
+ }
+ });
+}
+Token.prototype.getData = function(toAdd, value) {
+ try {
+ if (!ethFuncs.validateEtherAddress(toAdd)) throw globalFuncs.errorMsgs[5];
+ else if (!globalFuncs.isNumeric(value) || parseFloat(value) < 0) throw globalFuncs.errorMsgs[7];
+ var value = ethFuncs.padLeft(new BigNumber(value).times(new BigNumber(10).pow(this.getDecimal())).toString(16), 64);
+ var toAdd = ethFuncs.padLeft(ethFuncs.getNakedAddress(toAdd), 64);
+ var data = Token.transferHex + toAdd + value;
+ return {
+ isError: false,
+ data: data
+ };
+ } catch (e) {
+ return {
+ isError: true,
+ error: e
+ };
+ }
+}
+module.exports = Token;
},{}],32:[function(require,module,exports){
-'use strict';
-var en = function() {}
-en.code = 'en';
-en.data = {
- /* Do Not Change */
- translate_version: '0.0',
- CX_version: '2.9',
- MEW_vesion: '2.9',
-
- /* Navigation */
- NAV_MyWallets: 'My Wallets',
- NAV_AddWallet: 'Add Wallet',
- NAV_SendEther: 'Send Ether',
- NAV_SendTokens: 'Send Tokens',
- NAV_WithdrawDAO: 'Withdraw DAO',
- NAV_ClaimDGD: 'Claim DGD',
- NAV_Help: 'Withdraw DAO',
- NAV_Contracts: 'Contracts',
- NAV_Contact: 'Contact',
-
- /* General */
- GEN_Download: 'Download',
- GEN_Address: 'Your Address',
- GEN_AddessDesc: 'You may know this as your "Account #" or your "Public Key". It is what you send people so they can send you ETH. That icon is an easy way to recognize your address.',
- GEN_PrivKey: 'Private Key (unencrypted)',
- GEN_PrivKeyDesc: 'This is the unencrypted text version of your private key, meaning no password is necessary. If someone were to find your unencrypted private key, they could access your wallet without a password. For this reason, encrypted versions are typically recommended.',
- GEN_Print: 'Print Paper Wallet',
- GEN_PrintDesc: 'ProTip: Click print and save this as a PDF, even if you do not own a printer!',
- GEN_Keystore: 'Keystore/JSON File (Encrypted · Mist/Geth Format · Recommended)',
- GEN_KeystoreDesc: 'This Keystore / JSON file matches the format used by Mist & Geth so you can easily import it in the future. It is the recommended file to download and back up.',
- GEN_Json: 'JSON File (unencrypted)',
- GEN_JsonDesc: 'This is the unencrypted, JSON format of your private key. This means you do not need the password but anyone who finds your JSON can access your wallet & Ether without the password.',
-
- GEN_Balance: 'Account Balance',
- GEN_Equiv: 'Equivalent Value',
- GEN_TransHistory: 'Transaction History',
-
- /* Header */
- MEW_Warning_1: '',
- CX_Warning_1: 'Make sure you have **external backups** of any wallets you store here. Many things could happen that would cause you to lose the data in this Chrome Extension, including uninstalling and reinstalling the extension. This extension is a way to easily access your wallets, **not** a way to back them up.',
- MEW_Tagline: 'Open Source JavaScript Client-Side Ether Wallet Chrome Extension',
- CX_Tagline: 'Open Source JavaScript Client-Side Ether Wallet Chrome Extension',
-
- /* View Wallet Details */
- VIEWWALLET_Title: 'View Wallet Details',
- VIEWWALLET_Subtitle: 'Download an unencrypted private key, grab your encrypted Mist/Geth Keystore file, or re-print your paper wallet. You may want to do this in order to [import your account into Geth/Mist](http://ethereum.stackexchange.com/questions/465/how-to-import-a-plain-private-key-into-geth/). You can also do this with the [MyEtherWallet CX](https://chrome.google.com/webstore/detail/myetherwallet-cx/nlbmnnijcnlegkjjpcfjclmcfggfefdm/) and save your wallet for easier and quicker access. If you just want to check your balance, we recommend using a blockchain explorer like etherscan.io or live.ether.camp.',
- VIEWWALLET_SuccessMsg: 'Success! Here are your wallet details.',
-
- /* MEW Wallet Decrypt */
-
-};
-module.exports = en;
+'use strict';
+var en = function() {}
+en.code = 'en';
+en.data = {
+ /* Do Not Change */
+ translate_version: '0.0',
+ CX_version: '2.9',
+ MEW_vesion: '2.9',
+
+ /* Navigation */
+ NAV_MyWallets: 'My Wallets',
+ NAV_AddWallet: 'Add Wallet',
+ NAV_SendEther: 'Send Ether',
+ NAV_SendTokens: 'Send Tokens',
+ NAV_WithdrawDAO: 'Withdraw DAO',
+ NAV_ClaimDGD: 'Claim DGD',
+ NAV_Help: 'Withdraw DAO',
+ NAV_Contracts: 'Contracts',
+ NAV_Contact: 'Contact',
+
+ /* General */
+ GEN_Download: 'Download',
+ GEN_Address: 'Your Address',
+ GEN_AddessDesc: 'You may know this as your "Account #" or your "Public Key". It is what you send people so they can send you ETH. That icon is an easy way to recognize your address.',
+ GEN_PrivKey: 'Private Key (unencrypted)',
+ GEN_PrivKeyDesc: 'This is the unencrypted text version of your private key, meaning no password is necessary. If someone were to find your unencrypted private key, they could access your wallet without a password. For this reason, encrypted versions are typically recommended.',
+ GEN_Print: 'Print Paper Wallet',
+ GEN_PrintDesc: 'ProTip: Click print and save this as a PDF, even if you do not own a printer!',
+ GEN_Keystore: 'Keystore/JSON File (Encrypted · Mist/Geth Format · Recommended)',
+ GEN_KeystoreDesc: 'This Keystore / JSON file matches the format used by Mist & Geth so you can easily import it in the future. It is the recommended file to download and back up.',
+ GEN_Json: 'JSON File (unencrypted)',
+ GEN_JsonDesc: 'This is the unencrypted, JSON format of your private key. This means you do not need the password but anyone who finds your JSON can access your wallet & Ether without the password.',
+
+ GEN_Balance: 'Account Balance',
+ GEN_Equiv: 'Equivalent Value',
+ GEN_TransHistory: 'Transaction History',
+
+ /* Header */
+ MEW_Warning_1: '',
+ CX_Warning_1: 'Make sure you have **external backups** of any wallets you store here. Many things could happen that would cause you to lose the data in this Chrome Extension, including uninstalling and reinstalling the extension. This extension is a way to easily access your wallets, **not** a way to back them up.',
+ MEW_Tagline: 'Open Source JavaScript Client-Side Ether Wallet Chrome Extension',
+ CX_Tagline: 'Open Source JavaScript Client-Side Ether Wallet Chrome Extension',
+
+ /* View Wallet Details */
+ VIEWWALLET_Title: 'View Wallet Details',
+ VIEWWALLET_Subtitle: 'Download an unencrypted private key, grab your encrypted Mist/Geth Keystore file, or re-print your paper wallet. You may want to do this in order to [import your account into Geth/Mist](http://ethereum.stackexchange.com/questions/465/how-to-import-a-plain-private-key-into-geth/). You can also do this with the [MyEtherWallet CX](https://chrome.google.com/webstore/detail/myetherwallet-cx/nlbmnnijcnlegkjjpcfjclmcfggfefdm/) and save your wallet for easier and quicker access. If you just want to check your balance, we recommend using a blockchain explorer like etherscan.io or live.ether.camp.',
+ VIEWWALLET_SuccessMsg: 'Success! Here are your wallet details.',
+
+ /* MEW Wallet Decrypt */
+
+};
+module.exports = en;
},{}],33:[function(require,module,exports){
-'use strict';
-var fr = function() {}
-fr.code = 'fr';
-fr.data = {
- TITLE: 'Bonjur',
- FOO: 'This is a paragraph.',
- BUTTON_LANG_EN: 'english',
- BUTTON_LANG_DE: 'german'
-};
+'use strict';
+var fr = function() {}
+fr.code = 'fr';
+fr.data = {
+ TITLE: 'Bonjur',
+ FOO: 'This is a paragraph.',
+ BUTTON_LANG_EN: 'english',
+ BUTTON_LANG_DE: 'german'
+};
module.exports = fr;
},{}],34:[function(require,module,exports){
-'use strict';
-var en = require('./en');
-var fr = require('./fr');
-var translate = function($translateProvider) {
- $translateProvider.translations(en.code, translate.marked(en.data));
- $translateProvider.translations(fr.code, translate.marked(fr.data));
- $translateProvider.preferredLanguage(en.code);
- $translateProvider.useSanitizeValueStrategy(null);
-}
-translate.marked = function(data) {
- var tData = data;
- for (var key in tData) if (tData.hasOwnProperty(key)) tData[key] = marked(tData[key]);
- return tData;
-}
+'use strict';
+var en = require('./en');
+var fr = require('./fr');
+var translate = function($translateProvider) {
+ $translateProvider.translations(en.code, translate.marked(en.data));
+ $translateProvider.translations(fr.code, translate.marked(fr.data));
+ $translateProvider.preferredLanguage(en.code);
+ $translateProvider.useSanitizeValueStrategy(null);
+}
+translate.marked = function(data) {
+ var tData = data;
+ for (var key in tData) if (tData.hasOwnProperty(key)) tData[key] = marked(tData[key]);
+ return tData;
+}
module.exports = translate;
},{"./en":32,"./fr":33}],35:[function(require,module,exports){
(function (Buffer){
-'use strict';
-var uiFuncs = function() {}
-uiFuncs.getTxData = function($scope) {
- return {
- to: $scope.tx.to,
- value: $scope.tx.value,
- unit: $scope.tx.unit,
- gasLimit: $scope.tx.gasLimit,
- data: $scope.tx.data,
- from: $scope.wallet.getAddressString(),
- privKey: $scope.wallet.getPrivateKeyString()
- };
-}
-uiFuncs.generateClassicTx = function(txData, callback) {
- try {
- if (!ethFuncs.validateEtherAddress(txData.to)) throw globalFuncs.errorMsgs[5];
- else if (!globalFuncs.isNumeric(txData.value) || parseFloat(txData.value) < 0) throw globalFuncs.errorMsgs[7];
- else if (!globalFuncs.isNumeric(txData.gasLimit) || parseFloat(txData.gasLimit) <= 0) throw globalFuncs.errorMsgs[8];
- else if (!ethFuncs.validateHexString(txData.data)) throw globalFuncs.errorMsgs[9];
- ajaxReq.getClassicTransactionData(txData.from, function(data) {
- if (data.error) throw data.msg;
- data = data.data;
- var rawTx = {
- nonce: ethFuncs.sanitizeHex(data.nonce),
- gasPrice: ethFuncs.sanitizeHex(ethFuncs.addTinyMoreToGas(data.gasprice)),
- gasLimit: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(txData.gasLimit)),
- to: ethFuncs.sanitizeHex(txData.to),
- value: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(etherUnits.toWei(txData.value, txData.unit))),
- data: ethFuncs.sanitizeHex(txData.data)
- }
- var eTx = new ethUtil.Tx(rawTx);
- eTx.sign(new Buffer(txData.privKey, 'hex'));
- rawTx.rawTx = JSON.stringify(rawTx);
- rawTx.signedTx = '0x' + eTx.serialize().toString('hex');
- rawTx.isError = false;
- if (callback !== undefined) callback(rawTx);
- });
- } catch (e) {
- if (callback !== undefined) callback({
- isError: true,
- error: e
- });
- }
-}
-uiFuncs.sendClassicTx = function(signedTx, callback) {
- ajaxReq.sendClassicRawTx(signedTx, function(data) {
- var resp = {};
- if (data.error) {
- resp = {
- isError: true,
- error: data.msg
- };
- } else {
- resp = {
- isError: false,
- data: data.data
- };
- }
- if (callback !== undefined) callback(resp);
- });
-}
-uiFuncs.generateTx = function(txData, callback) {
- try {
- if (!ethFuncs.validateEtherAddress(txData.to)) throw globalFuncs.errorMsgs[5];
- else if (!globalFuncs.isNumeric(txData.value) || parseFloat(txData.value) < 0) throw globalFuncs.errorMsgs[7];
- else if (!globalFuncs.isNumeric(txData.gasLimit) || parseFloat(txData.gasLimit) <= 0) throw globalFuncs.errorMsgs[8];
- else if (!ethFuncs.validateHexString(txData.data)) throw globalFuncs.errorMsgs[9];
- ajaxReq.getTransactionData(txData.from, function(data) {
- if (data.error) throw data.msg;
- data = data.data;
- var rawTx = {
- nonce: ethFuncs.sanitizeHex(data.nonce),
- gasPrice: ethFuncs.sanitizeHex(ethFuncs.addTinyMoreToGas(data.gasprice)),
- gasLimit: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(txData.gasLimit)),
- to: ethFuncs.sanitizeHex(txData.to),
- value: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(etherUnits.toWei(txData.value, txData.unit))),
- data: ethFuncs.sanitizeHex(txData.data)
- }
- var eTx = new ethUtil.Tx(rawTx);
- eTx.sign(new Buffer(txData.privKey, 'hex'));
- rawTx.rawTx = JSON.stringify(rawTx);
- rawTx.signedTx = '0x' + eTx.serialize().toString('hex');
- rawTx.isError = false;
- if (callback !== undefined) callback(rawTx);
- });
- } catch (e) {
- if (callback !== undefined) callback({
- isError: true,
- error: e
- });
- }
-}
-uiFuncs.sendTx = function(signedTx, callback) {
- ajaxReq.sendRawTx(signedTx, function(data) {
- var resp = {};
- if (data.error) {
- resp = {
- isError: true,
- error: data.msg
- };
- } else {
- resp = {
- isError: false,
- data: data.data
- };
- }
- if (callback !== undefined) callback(resp);
- });
-}
-uiFuncs.transferAllBalance = function(fromAdd, gasLimit, callback) {
- try {
- ajaxReq.getTransactionData(fromAdd, function(data) {
- if (data.error) throw data.msg;
- data = data.data;
- var gasPrice = new BigNumber(ethFuncs.sanitizeHex(ethFuncs.addTinyMoreToGas(data.gasprice))).times(gasLimit);
- var maxVal = new BigNumber(data.balance).minus(gasPrice);
- maxVal = etherUnits.toEther(maxVal, 'wei') < 0 ? 0 : etherUnits.toEther(maxVal, 'wei');
- if (callback !== undefined) callback({
- isError: false,
- unit: "ether",
- value: maxVal
- });
- });
- } catch (e) {
- if (callback !== undefined) callback({
- isError: true,
- error: e
- });
- }
-}
+'use strict';
+var uiFuncs = function() {}
+uiFuncs.getTxData = function($scope) {
+ return {
+ to: $scope.tx.to,
+ value: $scope.tx.value,
+ unit: $scope.tx.unit,
+ gasLimit: $scope.tx.gasLimit,
+ data: $scope.tx.data,
+ from: $scope.wallet.getAddressString(),
+ privKey: $scope.wallet.getPrivateKeyString()
+ };
+}
+uiFuncs.generateClassicTx = function(txData, callback) {
+ try {
+ if (!ethFuncs.validateEtherAddress(txData.to)) throw globalFuncs.errorMsgs[5];
+ else if (!globalFuncs.isNumeric(txData.value) || parseFloat(txData.value) < 0) throw globalFuncs.errorMsgs[7];
+ else if (!globalFuncs.isNumeric(txData.gasLimit) || parseFloat(txData.gasLimit) <= 0) throw globalFuncs.errorMsgs[8];
+ else if (!ethFuncs.validateHexString(txData.data)) throw globalFuncs.errorMsgs[9];
+ ajaxReq.getClassicTransactionData(txData.from, function(data) {
+ if (data.error) throw data.msg;
+ data = data.data;
+ var rawTx = {
+ nonce: ethFuncs.sanitizeHex(data.nonce),
+ gasPrice: ethFuncs.sanitizeHex(ethFuncs.addTinyMoreToGas(data.gasprice)),
+ gasLimit: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(txData.gasLimit)),
+ to: ethFuncs.sanitizeHex(txData.to),
+ value: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(etherUnits.toWei(txData.value, txData.unit))),
+ data: ethFuncs.sanitizeHex(txData.data)
+ }
+ var eTx = new ethUtil.Tx(rawTx);
+ eTx.sign(new Buffer(txData.privKey, 'hex'));
+ rawTx.rawTx = JSON.stringify(rawTx);
+ rawTx.signedTx = '0x' + eTx.serialize().toString('hex');
+ rawTx.isError = false;
+ if (callback !== undefined) callback(rawTx);
+ });
+ } catch (e) {
+ if (callback !== undefined) callback({
+ isError: true,
+ error: e
+ });
+ }
+}
+uiFuncs.sendClassicTx = function(signedTx, callback) {
+ ajaxReq.sendClassicRawTx(signedTx, function(data) {
+ var resp = {};
+ if (data.error) {
+ resp = {
+ isError: true,
+ error: data.msg
+ };
+ } else {
+ resp = {
+ isError: false,
+ data: data.data
+ };
+ }
+ if (callback !== undefined) callback(resp);
+ });
+}
+uiFuncs.generateTx = function(txData, callback) {
+ try {
+ if (!ethFuncs.validateEtherAddress(txData.to)) throw globalFuncs.errorMsgs[5];
+ else if (!globalFuncs.isNumeric(txData.value) || parseFloat(txData.value) < 0) throw globalFuncs.errorMsgs[7];
+ else if (!globalFuncs.isNumeric(txData.gasLimit) || parseFloat(txData.gasLimit) <= 0) throw globalFuncs.errorMsgs[8];
+ else if (!ethFuncs.validateHexString(txData.data)) throw globalFuncs.errorMsgs[9];
+ ajaxReq.getTransactionData(txData.from, function(data) {
+ if (data.error) throw data.msg;
+ data = data.data;
+ var rawTx = {
+ nonce: ethFuncs.sanitizeHex(data.nonce),
+ gasPrice: ethFuncs.sanitizeHex(ethFuncs.addTinyMoreToGas(data.gasprice)),
+ gasLimit: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(txData.gasLimit)),
+ to: ethFuncs.sanitizeHex(txData.to),
+ value: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(etherUnits.toWei(txData.value, txData.unit))),
+ data: ethFuncs.sanitizeHex(txData.data)
+ }
+ var eTx = new ethUtil.Tx(rawTx);
+ eTx.sign(new Buffer(txData.privKey, 'hex'));
+ rawTx.rawTx = JSON.stringify(rawTx);
+ rawTx.signedTx = '0x' + eTx.serialize().toString('hex');
+ rawTx.isError = false;
+ if (callback !== undefined) callback(rawTx);
+ });
+ } catch (e) {
+ if (callback !== undefined) callback({
+ isError: true,
+ error: e
+ });
+ }
+}
+uiFuncs.sendTx = function(signedTx, callback) {
+ ajaxReq.sendRawTx(signedTx, function(data) {
+ var resp = {};
+ if (data.error) {
+ resp = {
+ isError: true,
+ error: data.msg
+ };
+ } else {
+ resp = {
+ isError: false,
+ data: data.data
+ };
+ }
+ if (callback !== undefined) callback(resp);
+ });
+}
+uiFuncs.transferAllBalance = function(fromAdd, gasLimit, callback) {
+ try {
+ ajaxReq.getTransactionData(fromAdd, function(data) {
+ if (data.error) throw data.msg;
+ data = data.data;
+ var gasPrice = new BigNumber(ethFuncs.sanitizeHex(ethFuncs.addTinyMoreToGas(data.gasprice))).times(gasLimit);
+ var maxVal = new BigNumber(data.balance).minus(gasPrice);
+ maxVal = etherUnits.toEther(maxVal, 'wei') < 0 ? 0 : etherUnits.toEther(maxVal, 'wei');
+ if (callback !== undefined) callback({
+ isError: false,
+ unit: "ether",
+ value: maxVal
+ });
+ });
+ } catch (e) {
+ if (callback !== undefined) callback({
+ isError: true,
+ error: e
+ });
+ }
+}
module.exports = uiFuncs;
}).call(this,require("buffer").Buffer)
},{"buffer":90}],36:[function(require,module,exports){
@@ -6810,7 +6810,7 @@ return 'pascalprecht.translate';
},{}],39:[function(require,module,exports){
/**
- * @license AngularJS v1.5.8
+ * @license AngularJS v1.5.6
* (c) 2010-2016 Google, Inc. http://angularjs.org
* License: MIT
*/
@@ -6868,7 +6868,7 @@ function minErr(module, ErrorConstructor) {
return match;
});
- message += '\nhttp://errors.angularjs.org/1.5.8/' +
+ message += '\nhttp://errors.angularjs.org/1.5.6/' +
(module ? module + '/' : '') + code;
for (i = SKIP_INDEXES, paramPrefix = '?'; i < templateArgs.length; i++, paramPrefix = '&') {
@@ -6937,6 +6937,7 @@ function minErr(module, ErrorConstructor) {
includes: true,
arrayRemove: true,
copy: true,
+ shallowCopy: true,
equals: true,
csp: true,
jq: true,
@@ -7632,13 +7633,7 @@ function arrayRemove(array, value) {
* * If a destination is provided, all of its elements (for arrays) or properties (for objects)
* are deleted and then all elements/properties from the source are copied to it.
* * If `source` is not an object or array (inc. `null` and `undefined`), `source` is returned.
- * * If `source` is identical to `destination` an exception will be thrown.
- *
- *
- *
- * Only enumerable properties are taken into account. Non-enumerable properties (both on `source`
- * and on `destination`) will be ignored.
- *
+ * * If `source` is identical to 'destination' an exception will be thrown.
*
* @param {*} source The source that will be used to make a copy.
* Can be any type, including primitives, `null`, and `undefined`.
@@ -7647,42 +7642,41 @@ function arrayRemove(array, value) {
* @returns {*} The copy or updated `destination`, if `destination` was specified.
*
* @example
-
-
-
+
+
+
+
*/
function copy(source, destination) {
var stackSource = [];
@@ -7789,7 +7783,7 @@ function copy(source, destination) {
case '[object Uint8ClampedArray]':
case '[object Uint16Array]':
case '[object Uint32Array]':
- return new source.constructor(copyElement(source.buffer), source.byteOffset, source.length);
+ return new source.constructor(copyElement(source.buffer));
case '[object ArrayBuffer]':
//Support: IE10
@@ -7821,6 +7815,31 @@ function copy(source, destination) {
}
}
+/**
+ * Creates a shallow copy of an object, an array or a primitive.
+ *
+ * Assumes that there are no proto properties for objects.
+ */
+function shallowCopy(src, dst) {
+ if (isArray(src)) {
+ dst = dst || [];
+
+ for (var i = 0, ii = src.length; i < ii; i++) {
+ dst[i] = src[i];
+ }
+ } else if (isObject(src)) {
+ dst = dst || {};
+
+ for (var key in src) {
+ if (!(key.charAt(0) === '$' && key.charAt(1) === '$')) {
+ dst[key] = src[key];
+ }
+ }
+ }
+
+ return dst || src;
+}
+
/**
* @ngdoc function
@@ -9161,34 +9180,7 @@ function setupModuleLoader(window) {
}
-/* global shallowCopy: true */
-
-/**
- * Creates a shallow copy of an object, an array or a primitive.
- *
- * Assumes that there are no proto properties for objects.
- */
-function shallowCopy(src, dst) {
- if (isArray(src)) {
- dst = dst || [];
-
- for (var i = 0, ii = src.length; i < ii; i++) {
- dst[i] = src[i];
- }
- } else if (isObject(src)) {
- dst = dst || {};
-
- for (var key in src) {
- if (!(key.charAt(0) === '$' && key.charAt(1) === '$')) {
- dst[key] = src[key];
- }
- }
- }
-
- return dst || src;
-}
-
-/* global toDebugString: true */
+/* global: toDebugString: true */
function serializeObject(obj) {
var seen = [];
@@ -9292,7 +9284,6 @@ function toDebugString(obj) {
$HttpParamSerializerJQLikeProvider,
$HttpBackendProvider,
$xhrFactoryProvider,
- $jsonpCallbacksProvider,
$LocationProvider,
$LogProvider,
$ParseProvider,
@@ -9330,11 +9321,11 @@ function toDebugString(obj) {
* - `codeName` – `{string}` – Code name of the release, such as "jiggling-armfat".
*/
var version = {
- full: '1.5.8', // all of these placeholder strings will be replaced by grunt's
+ full: '1.5.6', // all of these placeholder strings will be replaced by grunt's
major: 1, // package task
minor: 5,
- dot: 8,
- codeName: 'arbitrary-fallbacks'
+ dot: 6,
+ codeName: 'arrow-stringification'
};
@@ -9365,7 +9356,7 @@ function publishExternalAPI(angular) {
'isDate': isDate,
'lowercase': lowercase,
'uppercase': uppercase,
- 'callbacks': {$$counter: 0},
+ 'callbacks': {counter: 0},
'getTestability': getTestability,
'$$minErr': minErr,
'$$csp': csp,
@@ -9454,7 +9445,6 @@ function publishExternalAPI(angular) {
$httpParamSerializerJQLike: $HttpParamSerializerJQLikeProvider,
$httpBackend: $HttpBackendProvider,
$xhrFactory: $xhrFactoryProvider,
- $jsonpCallbacks: $jsonpCallbacksProvider,
$location: $LocationProvider,
$log: $LogProvider,
$parse: $ParseProvider,
@@ -9531,7 +9521,7 @@ function publishExternalAPI(angular) {
* ## Angular's jqLite
* jqLite provides only the following jQuery methods:
*
- * - [`addClass()`](http://api.jquery.com/addClass/) - Does not support a function as first argument
+ * - [`addClass()`](http://api.jquery.com/addClass/)
* - [`after()`](http://api.jquery.com/after/)
* - [`append()`](http://api.jquery.com/append/)
* - [`attr()`](http://api.jquery.com/attr/) - Does not support functions as parameters
@@ -9558,7 +9548,7 @@ function publishExternalAPI(angular) {
* - [`ready()`](http://api.jquery.com/ready/)
* - [`remove()`](http://api.jquery.com/remove/)
* - [`removeAttr()`](http://api.jquery.com/removeAttr/)
- * - [`removeClass()`](http://api.jquery.com/removeClass/) - Does not support a function as first argument
+ * - [`removeClass()`](http://api.jquery.com/removeClass/)
* - [`removeData()`](http://api.jquery.com/removeData/)
* - [`replaceWith()`](http://api.jquery.com/replaceWith/)
* - [`text()`](http://api.jquery.com/text/)
@@ -9693,7 +9683,7 @@ function jqLiteBuildFragment(html, context) {
nodes.push(context.createTextNode(html));
} else {
// Convert html into DOM nodes
- tmp = fragment.appendChild(context.createElement("div"));
+ tmp = tmp || fragment.appendChild(context.createElement("div"));
tag = (TAG_NAME_REGEXP.exec(html) || ["", ""])[1].toLowerCase();
wrap = wrapMap[tag] || wrapMap._default;
tmp.innerHTML = wrap[1] + html.replace(XHTML_TAG_REGEXP, "<$1>") + wrap[2];
@@ -11506,10 +11496,10 @@ function createInjector(modulesToLoad, strictDi) {
if (msie <= 11) {
return false;
}
- // Support: Edge 12-13 only
- // See: https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/6156135/
+ // Workaround for MS Edge.
+ // Check https://connect.microsoft.com/IE/Feedback/Details/2211653
return typeof func === 'function'
- && /^(?:class\b|constructor\()/.test(stringifyFn(func));
+ && /^(?:class\s|constructor\()/.test(stringifyFn(func));
}
function invoke(fn, self, locals, serviceName) {
@@ -12250,13 +12240,7 @@ var $AnimateProvider = ['$provide', function($provide) {
* @param {DOMElement} parent the parent element which will append the element as
* a child (so long as the after element is not present)
* @param {DOMElement=} after the sibling element after which the element will be appended
- * @param {object=} options an optional collection of options/styles that will be applied to the element.
- * The object can have the following properties:
- *
- * - **addClass** - `{string}` - space-separated CSS classes to add to element
- * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
- * - **removeClass** - `{string}` - space-separated CSS classes to remove from element
- * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+ * @param {object=} options an optional collection of options/styles that will be applied to the element
*
* @return {Promise} the animation callback promise
*/
@@ -12282,13 +12266,7 @@ var $AnimateProvider = ['$provide', function($provide) {
* @param {DOMElement} parent the parent element which will append the element as
* a child (so long as the after element is not present)
* @param {DOMElement=} after the sibling element after which the element will be appended
- * @param {object=} options an optional collection of options/styles that will be applied to the element.
- * The object can have the following properties:
- *
- * - **addClass** - `{string}` - space-separated CSS classes to add to element
- * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
- * - **removeClass** - `{string}` - space-separated CSS classes to remove from element
- * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+ * @param {object=} options an optional collection of options/styles that will be applied to the element
*
* @return {Promise} the animation callback promise
*/
@@ -12309,13 +12287,7 @@ var $AnimateProvider = ['$provide', function($provide) {
* digest once the animation has completed.
*
* @param {DOMElement} element the element which will be removed from the DOM
- * @param {object=} options an optional collection of options/styles that will be applied to the element.
- * The object can have the following properties:
- *
- * - **addClass** - `{string}` - space-separated CSS classes to add to element
- * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
- * - **removeClass** - `{string}` - space-separated CSS classes to remove from element
- * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+ * @param {object=} options an optional collection of options/styles that will be applied to the element
*
* @return {Promise} the animation callback promise
*/
@@ -12339,13 +12311,7 @@ var $AnimateProvider = ['$provide', function($provide) {
*
* @param {DOMElement} element the element which the CSS classes will be applied to
* @param {string} className the CSS class(es) that will be added (multiple classes are separated via spaces)
- * @param {object=} options an optional collection of options/styles that will be applied to the element.
- * The object can have the following properties:
- *
- * - **addClass** - `{string}` - space-separated CSS classes to add to element
- * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
- * - **removeClass** - `{string}` - space-separated CSS classes to remove from element
- * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+ * @param {object=} options an optional collection of options/styles that will be applied to the element
*
* @return {Promise} the animation callback promise
*/
@@ -12369,13 +12335,7 @@ var $AnimateProvider = ['$provide', function($provide) {
*
* @param {DOMElement} element the element which the CSS classes will be applied to
* @param {string} className the CSS class(es) that will be removed (multiple classes are separated via spaces)
- * @param {object=} options an optional collection of options/styles that will be applied to the element.
- * The object can have the following properties:
- *
- * - **addClass** - `{string}` - space-separated CSS classes to add to element
- * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
- * - **removeClass** - `{string}` - space-separated CSS classes to remove from element
- * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+ * @param {object=} options an optional collection of options/styles that will be applied to the element
*
* @return {Promise} the animation callback promise
*/
@@ -12400,13 +12360,7 @@ var $AnimateProvider = ['$provide', function($provide) {
* @param {DOMElement} element the element which the CSS classes will be applied to
* @param {string} add the CSS class(es) that will be added (multiple classes are separated via spaces)
* @param {string} remove the CSS class(es) that will be removed (multiple classes are separated via spaces)
- * @param {object=} options an optional collection of options/styles that will be applied to the element.
- * The object can have the following properties:
- *
- * - **addClass** - `{string}` - space-separated CSS classes to add to element
- * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
- * - **removeClass** - `{string}` - space-separated CSS classes to remove from element
- * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+ * @param {object=} options an optional collection of options/styles that will be applied to the element
*
* @return {Promise} the animation callback promise
*/
@@ -12447,13 +12401,7 @@ var $AnimateProvider = ['$provide', function($provide) {
* @param {string=} className an optional CSS class that will be applied to the element for the duration of the animation. If
* this value is left as empty then a CSS class of `ng-inline-animate` will be applied to the element.
* (Note that if no animation is detected then this value will not be applied to the element.)
- * @param {object=} options an optional collection of options/styles that will be applied to the element.
- * The object can have the following properties:
- *
- * - **addClass** - `{string}` - space-separated CSS classes to add to element
- * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
- * - **removeClass** - `{string}` - space-separated CSS classes to remove from element
- * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+ * @param {object=} options an optional collection of options/styles that will be applied to the element
*
* @return {Promise} the animation callback promise
*/
@@ -13541,9 +13489,8 @@ function $TemplateCacheProvider() {
* There are many different options for a directive.
*
* The difference resides in the return value of the factory function.
- * You can either return a {@link $compile#directive-definition-object Directive Definition Object (see below)}
- * that defines the directive properties, or just the `postLink` function (all other properties will have
- * the default values).
+ * You can either return a "Directive Definition Object" (see below) that defines the directive properties,
+ * or just the `postLink` function (all other properties will have the default values).
*
*
* **Best Practice:** It's recommended to use the "directive definition object" form.
@@ -13607,125 +13554,6 @@ function $TemplateCacheProvider() {
* });
* ```
*
- * ### Life-cycle hooks
- * Directive controllers can provide the following methods that are called by Angular at points in the life-cycle of the
- * directive:
- * * `$onInit()` - Called on each controller after all the controllers on an element have been constructed and
- * had their bindings initialized (and before the pre & post linking functions for the directives on
- * this element). This is a good place to put initialization code for your controller.
- * * `$onChanges(changesObj)` - Called whenever one-way (`<`) or interpolation (`@`) bindings are updated. The
- * `changesObj` is a hash whose keys are the names of the bound properties that have changed, and the values are an
- * object of the form `{ currentValue, previousValue, isFirstChange() }`. Use this hook to trigger updates within a
- * component such as cloning the bound value to prevent accidental mutation of the outer value.
- * * `$doCheck()` - Called on each turn of the digest cycle. Provides an opportunity to detect and act on
- * changes. Any actions that you wish to take in response to the changes that you detect must be
- * invoked from this hook; implementing this has no effect on when `$onChanges` is called. For example, this hook
- * could be useful if you wish to perform a deep equality check, or to check a Date object, changes to which would not
- * be detected by Angular's change detector and thus not trigger `$onChanges`. This hook is invoked with no arguments;
- * if detecting changes, you must store the previous value(s) for comparison to the current values.
- * * `$onDestroy()` - Called on a controller when its containing scope is destroyed. Use this hook for releasing
- * external resources, watches and event handlers. Note that components have their `$onDestroy()` hooks called in
- * the same order as the `$scope.$broadcast` events are triggered, which is top down. This means that parent
- * components will have their `$onDestroy()` hook called before child components.
- * * `$postLink()` - Called after this controller's element and its children have been linked. Similar to the post-link
- * function this hook can be used to set up DOM event handlers and do direct DOM manipulation.
- * Note that child elements that contain `templateUrl` directives will not have been compiled and linked since
- * they are waiting for their template to load asynchronously and their own compilation and linking has been
- * suspended until that occurs.
- *
- * #### Comparison with Angular 2 life-cycle hooks
- * Angular 2 also uses life-cycle hooks for its components. While the Angular 1 life-cycle hooks are similar there are
- * some differences that you should be aware of, especially when it comes to moving your code from Angular 1 to Angular 2:
- *
- * * Angular 1 hooks are prefixed with `$`, such as `$onInit`. Angular 2 hooks are prefixed with `ng`, such as `ngOnInit`.
- * * Angular 1 hooks can be defined on the controller prototype or added to the controller inside its constructor.
- * In Angular 2 you can only define hooks on the prototype of the Component class.
- * * Due to the differences in change-detection, you may get many more calls to `$doCheck` in Angular 1 than you would to
- * `ngDoCheck` in Angular 2
- * * Changes to the model inside `$doCheck` will trigger new turns of the digest loop, which will cause the changes to be
- * propagated throughout the application.
- * Angular 2 does not allow the `ngDoCheck` hook to trigger a change outside of the component. It will either throw an
- * error or do nothing depending upon the state of `enableProdMode()`.
- *
- * #### Life-cycle hook examples
- *
- * This example shows how you can check for mutations to a Date object even though the identity of the object
- * has not changed.
- *
- *
- *
- * angular.module('do-check-module', [])
- * .component('app', {
- * template:
- * 'Month: ' +
- * 'Date: {{ $ctrl.date }}' +
- * '',
- * controller: function() {
- * this.date = new Date();
- * this.month = this.date.getMonth();
- * this.updateDate = function() {
- * this.date.setMonth(this.month);
- * };
- * }
- * })
- * .component('test', {
- * bindings: { date: '<' },
- * template:
- * '
{{ $ctrl.log | json }}
',
- * controller: function() {
- * var previousValue;
- * this.log = [];
- * this.$doCheck = function() {
- * var currentValue = this.date && this.date.valueOf();
- * if (previousValue !== currentValue) {
- * this.log.push('doCheck: date mutated: ' + this.date);
- * previousValue = currentValue;
- * }
- * };
- * }
- * });
- *
- *
- *
- *
- *
- *
- * This example show how you might use `$doCheck` to trigger changes in your component's inputs even if the
- * actual identity of the component doesn't change. (Be aware that cloning and deep equality checks on large
- * arrays or objects can have a negative impact on your application performance)
- *
- *
- *
- *
',
- * controller: function() {
- * this.log = [];
- *
- * this.$doCheck = function() {
- * if (this.items_ref !== this.items) {
- * this.log.push('doCheck: items changed');
- * this.items_ref = this.items;
- * }
- * if (!angular.equals(this.items_clone, this.items)) {
- * this.log.push('doCheck: items mutated');
- * this.items_clone = angular.copy(this.items);
- * }
- * };
- * }
- * });
- *
- *
*
*
* ### Directive Definition Object
@@ -13901,6 +13729,25 @@ function $TemplateCacheProvider() {
* The `$transclude` function also has a method on it, `$transclude.isSlotFilled(slotName)`, which returns
* `true` if the specified slot contains content (i.e. one or more DOM nodes).
*
+ * The controller can provide the following methods that act as life-cycle hooks:
+ * * `$onInit()` - Called on each controller after all the controllers on an element have been constructed and
+ * had their bindings initialized (and before the pre & post linking functions for the directives on
+ * this element). This is a good place to put initialization code for your controller.
+ * * `$onChanges(changesObj)` - Called whenever one-way (`<`) or interpolation (`@`) bindings are updated. The
+ * `changesObj` is a hash whose keys are the names of the bound properties that have changed, and the values are an
+ * object of the form `{ currentValue, previousValue, isFirstChange() }`. Use this hook to trigger updates within a
+ * component such as cloning the bound value to prevent accidental mutation of the outer value.
+ * * `$onDestroy()` - Called on a controller when its containing scope is destroyed. Use this hook for releasing
+ * external resources, watches and event handlers. Note that components have their `$onDestroy()` hooks called in
+ * the same order as the `$scope.$broadcast` events are triggered, which is top down. This means that parent
+ * components will have their `$onDestroy()` hook called before child components.
+ * * `$postLink()` - Called after this controller's element and its children have been linked. Similar to the post-link
+ * function this hook can be used to set up DOM event handlers and do direct DOM manipulation.
+ * Note that child elements that contain `templateUrl` directives will not have been compiled and linked since
+ * they are waiting for their template to load asynchronously and their own compilation and linking has been
+ * suspended until that occurs.
+ *
+ *
* #### `require`
* Require another directive and inject its controller as the fourth argument to the linking function. The
* `require` property can be a string, an array or an object:
@@ -14098,8 +13945,8 @@ function $TemplateCacheProvider() {
* any other controller.
*
* * `transcludeFn` - A transclude linking function pre-bound to the correct transclusion scope.
- * This is the same as the `$transclude` parameter of directive controllers,
- * see {@link ng.$compile#-controller- the controller section for details}.
+ * This is the same as the `$transclude`
+ * parameter of directive controllers, see there for details.
* `function([scope], cloneLinkingFn, futureParentElement)`.
*
* #### Pre-linking function
@@ -14901,19 +14748,11 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
}
// We must run this hook in an apply since the $$postDigest runs outside apply
$rootScope.$apply(function() {
- var errors = [];
for (var i = 0, ii = onChangesQueue.length; i < ii; ++i) {
- try {
- onChangesQueue[i]();
- } catch (e) {
- errors.push(e);
- }
+ onChangesQueue[i]();
}
// Reset the queue to trigger a new schedule next time there is a change
onChangesQueue = undefined;
- if (errors.length) {
- throw errors;
- }
});
} finally {
onChangesTtl++;
@@ -15554,7 +15393,19 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
addTextInterpolateDirective(directives, node.nodeValue);
break;
case NODE_TYPE_COMMENT: /* Comment */
- collectCommentDirectives(node, directives, attrs, maxPriority, ignoreDirective);
+ try {
+ match = COMMENT_DIRECTIVE_REGEXP.exec(node.nodeValue);
+ if (match) {
+ nName = directiveNormalize(match[1]);
+ if (addDirective(directives, nName, 'M', maxPriority, ignoreDirective)) {
+ attrs[nName] = trim(match[2]);
+ }
+ }
+ } catch (e) {
+ // turns out that under some circumstances IE9 throws errors when one attempts to read
+ // comment's node value.
+ // Just ignore it and continue. (Can't seem to reproduce in test case.)
+ }
break;
}
@@ -15562,24 +15413,6 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
return directives;
}
- function collectCommentDirectives(node, directives, attrs, maxPriority, ignoreDirective) {
- // function created because of performance, try/catch disables
- // the optimization of the whole function #14848
- try {
- var match = COMMENT_DIRECTIVE_REGEXP.exec(node.nodeValue);
- if (match) {
- var nName = directiveNormalize(match[1]);
- if (addDirective(directives, nName, 'M', maxPriority, ignoreDirective)) {
- attrs[nName] = trim(match[2]);
- }
- }
- } catch (e) {
- // turns out that under some circumstances IE9 throws errors when one attempts to read
- // comment's node value.
- // Just ignore it and continue. (Can't seem to reproduce in test case.)
- }
- }
-
/**
* Given a node with an directive-start it collects all of the siblings until it finds
* directive-end.
@@ -16095,22 +15928,10 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
forEach(elementControllers, function(controller) {
var controllerInstance = controller.instance;
if (isFunction(controllerInstance.$onChanges)) {
- try {
- controllerInstance.$onChanges(controller.bindingInfo.initialChanges);
- } catch (e) {
- $exceptionHandler(e);
- }
+ controllerInstance.$onChanges(controller.bindingInfo.initialChanges);
}
if (isFunction(controllerInstance.$onInit)) {
- try {
- controllerInstance.$onInit();
- } catch (e) {
- $exceptionHandler(e);
- }
- }
- if (isFunction(controllerInstance.$doCheck)) {
- controllerScope.$watch(function() { controllerInstance.$doCheck(); });
- controllerInstance.$doCheck();
+ controllerInstance.$onInit();
}
if (isFunction(controllerInstance.$onDestroy)) {
controllerScope.$on('$destroy', function callOnDestroyHook() {
@@ -16374,16 +16195,18 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
// copy the new attributes on the old attrs object
forEach(src, function(value, key) {
- // Check if we already set this attribute in the loop above.
- // `dst` will never contain hasOwnProperty as DOM parser won't let it.
- // You will get an "InvalidCharacterError: DOM Exception 5" error if you
- // have an attribute like "has-own-property" or "data-has-own-property", etc.
- if (!dst.hasOwnProperty(key) && key.charAt(0) !== '$') {
+ if (key == 'class') {
+ safeAddClass($element, value);
+ dst['class'] = (dst['class'] ? dst['class'] + ' ' : '') + value;
+ } else if (key == 'style') {
+ $element.attr('style', $element.attr('style') + ';' + value);
+ dst['style'] = (dst['style'] ? dst['style'] + ';' : '') + value;
+ // `dst` will never contain hasOwnProperty as DOM parser won't let it.
+ // You will get an "InvalidCharacterError: DOM Exception 5" error if you
+ // have an attribute like "has-own-property" or "data-has-own-property", etc.
+ } else if (key.charAt(0) != '$' && !dst.hasOwnProperty(key)) {
dst[key] = value;
-
- if (key !== 'class' && key !== 'style') {
- dstAttr[key] = srcAttr[key];
- }
+ dstAttr[key] = srcAttr[key];
}
});
}
@@ -16758,7 +16581,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
forEach(bindings, function initializeBinding(definition, scopeName) {
var attrName = definition.attrName,
optional = definition.optional,
- mode = definition.mode, // @, =, <, or &
+ mode = definition.mode, // @, =, or &
lastValue,
parentGet, parentSet, compare, removeWatch;
@@ -17244,21 +17067,18 @@ function $DocumentProvider() {
*
* ## Example:
*
- * The example below will overwrite the default `$exceptionHandler` in order to (a) log uncaught
- * errors to the backend for later inspection by the developers and (b) to use `$log.warn()` instead
- * of `$log.error()`.
- *
* ```js
- * angular.
- * module('exceptionOverwrite', []).
- * factory('$exceptionHandler', ['$log', 'logErrorsToBackend', function($log, logErrorsToBackend) {
- * return function myExceptionHandler(exception, cause) {
- * logErrorsToBackend(exception, cause);
- * $log.warn(exception, cause);
- * };
- * }]);
+ * angular.module('exceptionOverride', []).factory('$exceptionHandler', function() {
+ * return function(exception, cause) {
+ * exception.message += ' (caused by "' + cause + '")';
+ * throw exception;
+ * };
+ * });
* ```
*
+ * This example will override the normal action of `$exceptionHandler`, to make angular
+ * exceptions fail hard when they happen, instead of just logging to the console.
+ *
*
* Note, that code executed in event-listeners (even those registered using jqLite's `on`/`bind`
* methods) does not delegate exceptions to the {@link ng.$exceptionHandler $exceptionHandler}
@@ -17268,7 +17088,7 @@ function $DocumentProvider() {
* `try { ... } catch(e) { $exceptionHandler(e); }`
*
* @param {Error} exception Exception associated with the error.
- * @param {string=} cause Optional information about the context in which
+ * @param {string=} cause optional information about the context in which
* the error was thrown.
*
*/
@@ -17338,7 +17158,7 @@ function $HttpParamSerializerProvider() {
* * `{'foo': 'bar'}` results in `foo=bar`
* * `{'foo': Date.now()}` results in `foo=2015-04-01T09%3A50%3A49.262Z` (`toISOString()` and encoded representation of a Date object)
* * `{'foo': ['bar', 'baz']}` results in `foo=bar&foo=baz` (repeated key for each array element)
- * * `{'foo': {'bar':'baz'}}` results in `foo=%7B%22bar%22%3A%22baz%22%7D` (stringified and encoded representation of an object)
+ * * `{'foo': {'bar':'baz'}}` results in `foo=%7B%22bar%22%3A%22baz%22%7D"` (stringified and encoded representation of an object)
*
* Note that serializer will sort the request parameters alphabetically.
* */
@@ -17889,7 +17709,7 @@ function $HttpProvider() {
*
* ### Overriding the Default Transformations Per Request
*
- * If you wish to override the request/response transformations only for a single request then provide
+ * If you wish override the request/response transformations only for a single request then provide
* `transformRequest` and/or `transformResponse` properties on the configuration object passed
* into `$http`.
*
@@ -17932,7 +17752,7 @@ function $HttpProvider() {
* * cache a specific response - set config.cache value to TRUE or to a cache object
*
* If caching is enabled, but neither the default cache nor config.cache are set to a cache object,
- * then the default `$cacheFactory("$http")` object is used.
+ * then the default `$cacheFactory($http)` object is used.
*
* The default cache value can be set by updating the
* {@link ng.$http#defaults `$http.defaults.cache`} property or the
@@ -18260,25 +18080,48 @@ function $HttpProvider() {
config.headers = mergeHeaders(requestConfig);
config.method = uppercase(config.method);
config.paramSerializer = isString(config.paramSerializer) ?
- $injector.get(config.paramSerializer) : config.paramSerializer;
+ $injector.get(config.paramSerializer) : config.paramSerializer;
+
+ var serverRequest = function(config) {
+ var headers = config.headers;
+ var reqData = transformData(config.data, headersGetter(headers), undefined, config.transformRequest);
- var requestInterceptors = [];
- var responseInterceptors = [];
+ // strip content-type if data is undefined
+ if (isUndefined(reqData)) {
+ forEach(headers, function(value, header) {
+ if (lowercase(header) === 'content-type') {
+ delete headers[header];
+ }
+ });
+ }
+
+ if (isUndefined(config.withCredentials) && !isUndefined(defaults.withCredentials)) {
+ config.withCredentials = defaults.withCredentials;
+ }
+
+ // send request
+ return sendReq(config, reqData).then(transformResponse, transformResponse);
+ };
+
+ var chain = [serverRequest, undefined];
var promise = $q.when(config);
// apply interceptors
forEach(reversedInterceptors, function(interceptor) {
if (interceptor.request || interceptor.requestError) {
- requestInterceptors.unshift(interceptor.request, interceptor.requestError);
+ chain.unshift(interceptor.request, interceptor.requestError);
}
if (interceptor.response || interceptor.responseError) {
- responseInterceptors.push(interceptor.response, interceptor.responseError);
+ chain.push(interceptor.response, interceptor.responseError);
}
});
- promise = chainInterceptors(promise, requestInterceptors);
- promise = promise.then(serverRequest);
- promise = chainInterceptors(promise, responseInterceptors);
+ while (chain.length) {
+ var thenFn = chain.shift();
+ var rejectFn = chain.shift();
+
+ promise = promise.then(thenFn, rejectFn);
+ }
if (useLegacyPromise) {
promise.success = function(fn) {
@@ -18305,18 +18148,14 @@ function $HttpProvider() {
return promise;
-
- function chainInterceptors(promise, interceptors) {
- for (var i = 0, ii = interceptors.length; i < ii;) {
- var thenFn = interceptors[i++];
- var rejectFn = interceptors[i++];
-
- promise = promise.then(thenFn, rejectFn);
- }
-
- interceptors.length = 0;
-
- return promise;
+ function transformResponse(response) {
+ // make a copy since the response must be cacheable
+ var resp = extend({}, response);
+ resp.data = transformData(response.data, response.headers, response.status,
+ config.transformResponse);
+ return (isSuccess(response.status))
+ ? resp
+ : $q.reject(resp);
}
function executeHeaderFns(headers, config) {
@@ -18360,37 +18199,6 @@ function $HttpProvider() {
// execute if header value is a function for merged headers
return executeHeaderFns(reqHeaders, shallowCopy(config));
}
-
- function serverRequest(config) {
- var headers = config.headers;
- var reqData = transformData(config.data, headersGetter(headers), undefined, config.transformRequest);
-
- // strip content-type if data is undefined
- if (isUndefined(reqData)) {
- forEach(headers, function(value, header) {
- if (lowercase(header) === 'content-type') {
- delete headers[header];
- }
- });
- }
-
- if (isUndefined(config.withCredentials) && !isUndefined(defaults.withCredentials)) {
- config.withCredentials = defaults.withCredentials;
- }
-
- // send request
- return sendReq(config, reqData).then(transformResponse, transformResponse);
- }
-
- function transformResponse(response) {
- // make a copy since the response must be cacheable
- var resp = extend({}, response);
- resp.data = transformData(response.data, response.headers, response.status,
- config.transformResponse);
- return (isSuccess(response.status))
- ? resp
- : $q.reject(resp);
- }
}
$http.pendingRequests = [];
@@ -18437,8 +18245,6 @@ function $HttpProvider() {
*
* @description
* Shortcut method to perform `JSONP` request.
- * If you would like to customise where and how the callbacks are stored then try overriding
- * or decorating the {@link $jsonpCallbacks} service.
*
* @param {string} url Relative or absolute URL specifying the destination of the request.
* The name of the callback should be the string `JSON_CALLBACK`.
@@ -18712,7 +18518,7 @@ function $xhrFactoryProvider() {
/**
* @ngdoc service
* @name $httpBackend
- * @requires $jsonpCallbacks
+ * @requires $window
* @requires $document
* @requires $xhrFactory
*
@@ -18727,8 +18533,8 @@ function $xhrFactoryProvider() {
* $httpBackend} which can be trained with responses.
*/
function $HttpBackendProvider() {
- this.$get = ['$browser', '$jsonpCallbacks', '$document', '$xhrFactory', function($browser, $jsonpCallbacks, $document, $xhrFactory) {
- return createHttpBackend($browser, $xhrFactory, $browser.defer, $jsonpCallbacks, $document[0]);
+ this.$get = ['$browser', '$window', '$document', '$xhrFactory', function($browser, $window, $document, $xhrFactory) {
+ return createHttpBackend($browser, $xhrFactory, $browser.defer, $window.angular.callbacks, $document[0]);
}];
}
@@ -18738,13 +18544,17 @@ function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDoc
$browser.$$incOutstandingRequestCount();
url = url || $browser.url();
- if (lowercase(method) === 'jsonp') {
- var callbackPath = callbacks.createCallback(url);
- var jsonpDone = jsonpReq(url, callbackPath, function(status, text) {
- // jsonpReq only ever sets status to 200 (OK), 404 (ERROR) or -1 (WAITING)
- var response = (status === 200) && callbacks.getResponse(callbackPath);
- completeRequest(callback, status, response, "", text);
- callbacks.removeCallback(callbackPath);
+ if (lowercase(method) == 'jsonp') {
+ var callbackId = '_' + (callbacks.counter++).toString(36);
+ callbacks[callbackId] = function(data) {
+ callbacks[callbackId].data = data;
+ callbacks[callbackId].called = true;
+ };
+
+ var jsonpDone = jsonpReq(url.replace('JSON_CALLBACK', 'angular.callbacks.' + callbackId),
+ callbackId, function(status, text) {
+ completeRequest(callback, status, callbacks[callbackId].data, "", text);
+ callbacks[callbackId] = noop;
});
} else {
@@ -18846,8 +18656,7 @@ function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDoc
}
};
- function jsonpReq(url, callbackPath, done) {
- url = url.replace('JSON_CALLBACK', callbackPath);
+ function jsonpReq(url, callbackId, done) {
// we can't use jQuery/jqLite here because jQuery does crazy stuff with script elements, e.g.:
// - fetches local scripts via XHR and evals them
// - adds and immediately removes script elements from the document
@@ -18865,7 +18674,7 @@ function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDoc
var text = "unknown";
if (event) {
- if (event.type === "load" && !callbacks.wasCalled(callbackPath)) {
+ if (event.type === "load" && !callbacks[callbackId].called) {
event = { type: "error" };
}
text = event.type;
@@ -19064,7 +18873,7 @@ function $InterpolateProvider() {
*
* `allOrNothing` is useful for interpolating URLs. `ngSrc` and `ngSrcset` use this behavior.
*
- * #### Escaped Interpolation
+ * ####Escaped Interpolation
* $interpolate provides a mechanism for escaping interpolation markers. Start and end markers
* can be escaped by preceding each of their characters with a REVERSE SOLIDUS U+005C (backslash).
* It will be rendered as a regular start/end marker, and will not be interpreted as an expression
@@ -19487,87 +19296,6 @@ function $IntervalProvider() {
}];
}
-/**
- * @ngdoc service
- * @name $jsonpCallbacks
- * @requires $window
- * @description
- * This service handles the lifecycle of callbacks to handle JSONP requests.
- * Override this service if you wish to customise where the callbacks are stored and
- * how they vary compared to the requested url.
- */
-var $jsonpCallbacksProvider = function() {
- this.$get = ['$window', function($window) {
- var callbacks = $window.angular.callbacks;
- var callbackMap = {};
-
- function createCallback(callbackId) {
- var callback = function(data) {
- callback.data = data;
- callback.called = true;
- };
- callback.id = callbackId;
- return callback;
- }
-
- return {
- /**
- * @ngdoc method
- * @name $jsonpCallbacks#createCallback
- * @param {string} url the url of the JSONP request
- * @returns {string} the callback path to send to the server as part of the JSONP request
- * @description
- * {@link $httpBackend} calls this method to create a callback and get hold of the path to the callback
- * to pass to the server, which will be used to call the callback with its payload in the JSONP response.
- */
- createCallback: function(url) {
- var callbackId = '_' + (callbacks.$$counter++).toString(36);
- var callbackPath = 'angular.callbacks.' + callbackId;
- var callback = createCallback(callbackId);
- callbackMap[callbackPath] = callbacks[callbackId] = callback;
- return callbackPath;
- },
- /**
- * @ngdoc method
- * @name $jsonpCallbacks#wasCalled
- * @param {string} callbackPath the path to the callback that was sent in the JSONP request
- * @returns {boolean} whether the callback has been called, as a result of the JSONP response
- * @description
- * {@link $httpBackend} calls this method to find out whether the JSONP response actually called the
- * callback that was passed in the request.
- */
- wasCalled: function(callbackPath) {
- return callbackMap[callbackPath].called;
- },
- /**
- * @ngdoc method
- * @name $jsonpCallbacks#getResponse
- * @param {string} callbackPath the path to the callback that was sent in the JSONP request
- * @returns {*} the data received from the response via the registered callback
- * @description
- * {@link $httpBackend} calls this method to get hold of the data that was provided to the callback
- * in the JSONP response.
- */
- getResponse: function(callbackPath) {
- return callbackMap[callbackPath].data;
- },
- /**
- * @ngdoc method
- * @name $jsonpCallbacks#removeCallback
- * @param {string} callbackPath the path to the callback that was sent in the JSONP request
- * @description
- * {@link $httpBackend} calls this method to remove the callback after the JSONP request has
- * completed or timed-out.
- */
- removeCallback: function(callbackPath) {
- var callback = callbackMap[callbackPath];
- delete callbacks[callback.id];
- delete callbackMap[callbackPath];
- }
- };
- }];
-};
-
/**
* @ngdoc service
* @name $locale
@@ -19907,12 +19635,6 @@ function LocationHashbangInHtml5Url(appBase, appBaseNoFile, hashPrefix) {
var locationPrototype = {
- /**
- * Ensure absolute url is initialized.
- * @private
- */
- $$absUrl:'',
-
/**
* Are we in html5 mode?
* @private
@@ -21286,7 +21008,7 @@ AST.prototype = {
var args = [];
if (this.peekToken().text !== ')') {
do {
- args.push(this.filterChain());
+ args.push(this.expression());
} while (this.expect(','));
}
return args;
@@ -23013,7 +22735,7 @@ function $ParseProvider() {
*
* **Methods**
*
- * - `then(successCallback, [errorCallback], [notifyCallback])` – regardless of when the promise was or
+ * - `then(successCallback, errorCallback, notifyCallback)` – regardless of when the promise was or
* will be resolved or rejected, `then` calls one of the success or error callbacks asynchronously
* as soon as the result is available. The callbacks are called with a single argument: the result
* or rejection reason. Additionally, the notify callback may be called zero or more times to
@@ -23024,8 +22746,7 @@ function $ParseProvider() {
* with the value which is resolved in that promise using
* [promise chaining](http://www.html5rocks.com/en/tutorials/es6/promises/#toc-promises-queues)).
* It also notifies via the return value of the `notifyCallback` method. The promise cannot be
- * resolved or rejected from the notifyCallback method. The errorCallback and notifyCallback
- * arguments are optional.
+ * resolved or rejected from the notifyCallback method.
*
* - `catch(errorCallback)` – shorthand for `promise.then(null, errorCallback)`
*
@@ -23440,30 +23161,6 @@ function qFactory(nextTick, exceptionHandler) {
return deferred.promise;
}
- /**
- * @ngdoc method
- * @name $q#race
- * @kind function
- *
- * @description
- * Returns a promise that resolves or rejects as soon as one of those promises
- * resolves or rejects, with the value or reason from that promise.
- *
- * @param {Array.|Object.} promises An array or hash of promises.
- * @returns {Promise} a promise that resolves or rejects as soon as one of the `promises`
- * resolves or rejects, with the value or reason from that promise.
- */
-
- function race(promises) {
- var deferred = defer();
-
- forEach(promises, function(promise) {
- when(promise).then(deferred.resolve, deferred.reject);
- });
-
- return deferred.promise;
- }
-
var $Q = function Q(resolver) {
if (!isFunction(resolver)) {
throw $qMinErr('norslvr', "Expected resolverFn, got '{0}'", resolver);
@@ -23493,7 +23190,6 @@ function qFactory(nextTick, exceptionHandler) {
$Q.when = when;
$Q.resolve = resolve;
$Q.all = all;
- $Q.race = race;
return $Q;
}
@@ -26845,11 +26541,10 @@ function $FilterProvider($provide) {
* - `Object`: A pattern object can be used to filter specific properties on objects contained
* by `array`. For example `{name:"M", phone:"1"}` predicate will return an array of items
* which have property `name` containing "M" and property `phone` containing "1". A special
- * property name (`$` by default) can be used (e.g. as in `{$: "text"}`) to accept a match
- * against any property of the object or its nested object properties. That's equivalent to the
- * simple substring match with a `string` as described above. The special property name can be
- * overwritten, using the `anyPropertyKey` parameter.
- * The predicate can be negated by prefixing the string with `!`.
+ * property name `$` can be used (as in `{$:"text"}`) to accept a match against any
+ * property of the object or its nested object properties. That's equivalent to the simple
+ * substring match with a `string` as described above. The predicate can be negated by prefixing
+ * the string with `!`.
* For example `{name: "!M"}` predicate will return an array of items which have property `name`
* not containing "M".
*
@@ -26883,9 +26578,6 @@ function $FilterProvider($provide) {
* Primitive values are converted to strings. Objects are not compared against primitives,
* unless they have a custom `toString` method (e.g. `Date` objects).
*
- * @param {string=} anyPropertyKey The special property name that matches against any property.
- * By default `$`.
- *
* @example
@@ -26954,9 +26646,8 @@ function $FilterProvider($provide) {
*/
-
function filterFilter() {
- return function(array, expression, comparator, anyPropertyKey) {
+ return function(array, expression, comparator) {
if (!isArrayLike(array)) {
if (array == null) {
return array;
@@ -26965,7 +26656,6 @@ function filterFilter() {
}
}
- anyPropertyKey = anyPropertyKey || '$';
var expressionType = getTypeForFilter(expression);
var predicateFn;
var matchAgainstAnyProp;
@@ -26982,7 +26672,7 @@ function filterFilter() {
//jshint -W086
case 'object':
//jshint +W086
- predicateFn = createPredicateFn(expression, comparator, anyPropertyKey, matchAgainstAnyProp);
+ predicateFn = createPredicateFn(expression, comparator, matchAgainstAnyProp);
break;
default:
return array;
@@ -26993,8 +26683,8 @@ function filterFilter() {
}
// Helper functions for `filterFilter`
-function createPredicateFn(expression, comparator, anyPropertyKey, matchAgainstAnyProp) {
- var shouldMatchPrimitives = isObject(expression) && (anyPropertyKey in expression);
+function createPredicateFn(expression, comparator, matchAgainstAnyProp) {
+ var shouldMatchPrimitives = isObject(expression) && ('$' in expression);
var predicateFn;
if (comparator === true) {
@@ -27022,25 +26712,25 @@ function createPredicateFn(expression, comparator, anyPropertyKey, matchAgainstA
predicateFn = function(item) {
if (shouldMatchPrimitives && !isObject(item)) {
- return deepCompare(item, expression[anyPropertyKey], comparator, anyPropertyKey, false);
+ return deepCompare(item, expression.$, comparator, false);
}
- return deepCompare(item, expression, comparator, anyPropertyKey, matchAgainstAnyProp);
+ return deepCompare(item, expression, comparator, matchAgainstAnyProp);
};
return predicateFn;
}
-function deepCompare(actual, expected, comparator, anyPropertyKey, matchAgainstAnyProp, dontMatchWholeObject) {
+function deepCompare(actual, expected, comparator, matchAgainstAnyProp, dontMatchWholeObject) {
var actualType = getTypeForFilter(actual);
var expectedType = getTypeForFilter(expected);
if ((expectedType === 'string') && (expected.charAt(0) === '!')) {
- return !deepCompare(actual, expected.substring(1), comparator, anyPropertyKey, matchAgainstAnyProp);
+ return !deepCompare(actual, expected.substring(1), comparator, matchAgainstAnyProp);
} else if (isArray(actual)) {
// In case `actual` is an array, consider it a match
// if ANY of it's items matches `expected`
return actual.some(function(item) {
- return deepCompare(item, expected, comparator, anyPropertyKey, matchAgainstAnyProp);
+ return deepCompare(item, expected, comparator, matchAgainstAnyProp);
});
}
@@ -27049,11 +26739,11 @@ function deepCompare(actual, expected, comparator, anyPropertyKey, matchAgainstA
var key;
if (matchAgainstAnyProp) {
for (key in actual) {
- if ((key.charAt(0) !== '$') && deepCompare(actual[key], expected, comparator, anyPropertyKey, true)) {
+ if ((key.charAt(0) !== '$') && deepCompare(actual[key], expected, comparator, true)) {
return true;
}
}
- return dontMatchWholeObject ? false : deepCompare(actual, expected, comparator, anyPropertyKey, false);
+ return dontMatchWholeObject ? false : deepCompare(actual, expected, comparator, false);
} else if (expectedType === 'object') {
for (key in expected) {
var expectedVal = expected[key];
@@ -27061,9 +26751,9 @@ function deepCompare(actual, expected, comparator, anyPropertyKey, matchAgainstA
continue;
}
- var matchAnyProperty = key === anyPropertyKey;
+ var matchAnyProperty = key === '$';
var actualVal = matchAnyProperty ? actual : actual[key];
- if (!deepCompare(actualVal, expectedVal, comparator, anyPropertyKey, matchAnyProperty, matchAnyProperty)) {
+ if (!deepCompare(actualVal, expectedVal, comparator, matchAnyProperty, matchAnyProperty)) {
return false;
}
}
@@ -27801,22 +27491,21 @@ var uppercaseFilter = valueFn(uppercase);
* @kind function
*
* @description
- * Creates a new array or string containing only a specified number of elements. The elements are
- * taken from either the beginning or the end of the source array, string or number, as specified by
- * the value and sign (positive or negative) of `limit`. Other array-like objects are also supported
- * (e.g. array subclasses, NodeLists, jqLite/jQuery collections etc). If a number is used as input,
- * it is converted to a string.
- *
- * @param {Array|ArrayLike|string|number} input - Array/array-like, string or number to be limited.
- * @param {string|number} limit - The length of the returned array or string. If the `limit` number
+ * Creates a new array or string containing only a specified number of elements. The elements
+ * are taken from either the beginning or the end of the source array, string or number, as specified by
+ * the value and sign (positive or negative) of `limit`. If a number is used as input, it is
+ * converted to a string.
+ *
+ * @param {Array|string|number} input Source array, string or number to be limited.
+ * @param {string|number} limit The length of the returned array or string. If the `limit` number
* is positive, `limit` number of items from the beginning of the source array/string are copied.
* If the number is negative, `limit` number of items from the end of the source array/string
* are copied. The `limit` will be trimmed if it exceeds `array.length`. If `limit` is undefined,
* the input will be returned unchanged.
- * @param {(string|number)=} begin - Index at which to begin limitation. As a negative index,
- * `begin` indicates an offset from the end of `input`. Defaults to `0`.
- * @returns {Array|string} A new sub-array or substring of length `limit` or less if the input had
- * less than `limit` elements.
+ * @param {(string|number)=} begin Index at which to begin limitation. As a negative index, `begin`
+ * indicates an offset from the end of `input`. Defaults to `0`.
+ * @returns {Array|string} A new sub-array or substring of length `limit` or less if input array
+ * had less than `limit` elements.
*
* @example
@@ -27904,157 +27593,67 @@ function limitToFilter() {
if (isNaN(limit)) return input;
if (isNumber(input)) input = input.toString();
- if (!isArrayLike(input)) return input;
+ if (!isArray(input) && !isString(input)) return input;
begin = (!begin || isNaN(begin)) ? 0 : toInt(begin);
begin = (begin < 0) ? Math.max(0, input.length + begin) : begin;
if (limit >= 0) {
- return sliceFn(input, begin, begin + limit);
+ return input.slice(begin, begin + limit);
} else {
if (begin === 0) {
- return sliceFn(input, limit, input.length);
+ return input.slice(limit, input.length);
} else {
- return sliceFn(input, Math.max(0, begin + limit), begin);
+ return input.slice(Math.max(0, begin + limit), begin);
}
}
};
}
-function sliceFn(input, begin, end) {
- if (isString(input)) return input.slice(begin, end);
-
- return slice.call(input, begin, end);
-}
-
/**
* @ngdoc filter
* @name orderBy
* @kind function
*
* @description
- * Returns an array containing the items from the specified `collection`, ordered by a `comparator`
- * function based on the values computed using the `expression` predicate.
- *
- * For example, `[{id: 'foo'}, {id: 'bar'}] | orderBy:'id'` would result in
- * `[{id: 'bar'}, {id: 'foo'}]`.
+ * Orders a specified `array` by the `expression` predicate. It is ordered alphabetically
+ * for strings and numerically for numbers. Note: if you notice numbers are not being sorted
+ * as expected, make sure they are actually being saved as numbers and not strings.
+ * Array-like values (e.g. NodeLists, jQuery objects, TypedArrays, Strings, etc) are also supported.
*
- * The `collection` can be an Array or array-like object (e.g. NodeList, jQuery object, TypedArray,
- * String, etc).
- *
- * The `expression` can be a single predicate, or a list of predicates each serving as a tie-breaker
- * for the preceeding one. The `expression` is evaluated against each item and the output is used
- * for comparing with other items.
- *
- * You can change the sorting order by setting `reverse` to `true`. By default, items are sorted in
- * ascending order.
- *
- * The comparison is done using the `comparator` function. If none is specified, a default, built-in
- * comparator is used (see below for details - in a nutshell, it compares numbers numerically and
- * strings alphabetically).
- *
- * ### Under the hood
- *
- * Ordering the specified `collection` happens in two phases:
- *
- * 1. All items are passed through the predicate (or predicates), and the returned values are saved
- * along with their type (`string`, `number` etc). For example, an item `{label: 'foo'}`, passed
- * through a predicate that extracts the value of the `label` property, would be transformed to:
- * ```
- * {
- * value: 'foo',
- * type: 'string',
- * index: ...
- * }
- * ```
- * 2. The comparator function is used to sort the items, based on the derived values, types and
- * indices.
- *
- * If you use a custom comparator, it will be called with pairs of objects of the form
- * `{value: ..., type: '...', index: ...}` and is expected to return `0` if the objects are equal
- * (as far as the comparator is concerned), `-1` if the 1st one should be ranked higher than the
- * second, or `1` otherwise.
- *
- * In order to ensure that the sorting will be deterministic across platforms, if none of the
- * specified predicates can distinguish between two items, `orderBy` will automatically introduce a
- * dummy predicate that returns the item's index as `value`.
- * (If you are using a custom comparator, make sure it can handle this predicate as well.)
- *
- * Finally, in an attempt to simplify things, if a predicate returns an object as the extracted
- * value for an item, `orderBy` will try to convert that object to a primitive value, before passing
- * it to the comparator. The following rules govern the conversion:
- *
- * 1. If the object has a `valueOf()` method that returns a primitive, its return value will be
- * used instead.
- * (If the object has a `valueOf()` method that returns another object, then the returned object
- * will be used in subsequent steps.)
- * 2. If the object has a custom `toString()` method (i.e. not the one inherited from `Object`) that
- * returns a primitive, its return value will be used instead.
- * (If the object has a `toString()` method that returns another object, then the returned object
- * will be used in subsequent steps.)
- * 3. No conversion; the object itself is used.
- *
- * ### The default comparator
- *
- * The default, built-in comparator should be sufficient for most usecases. In short, it compares
- * numbers numerically, strings alphabetically (and case-insensitively), for objects falls back to
- * using their index in the original collection, and sorts values of different types by type.
- *
- * More specifically, it follows these steps to determine the relative order of items:
- *
- * 1. If the compared values are of different types, compare the types themselves alphabetically.
- * 2. If both values are of type `string`, compare them alphabetically in a case- and
- * locale-insensitive way.
- * 3. If both values are objects, compare their indices instead.
- * 4. Otherwise, return:
- * - `0`, if the values are equal (by strict equality comparison, i.e. using `===`).
- * - `-1`, if the 1st value is "less than" the 2nd value (compared using the `<` operator).
- * - `1`, otherwise.
- *
- * **Note:** If you notice numbers not being sorted as expected, make sure they are actually being
- * saved as numbers and not strings.
- *
- * @param {Array|ArrayLike} collection - The collection (array or array-like object) to sort.
- * @param {(Function|string|Array.)=} expression - A predicate (or list of
- * predicates) to be used by the comparator to determine the order of elements.
+ * @param {Array} array The array (or array-like object) to sort.
+ * @param {function(*)|string|Array.<(function(*)|string)>=} expression A predicate to be
+ * used by the comparator to determine the order of elements.
*
* Can be one of:
*
- * - `Function`: A getter function. This function will be called with each item as argument and
- * the return value will be used for sorting.
- * - `string`: An Angular expression. This expression will be evaluated against each item and the
- * result will be used for sorting. For example, use `'label'` to sort by a property called
- * `label` or `'label.substring(0, 3)'` to sort by the first 3 characters of the `label`
- * property.
- * (The result of a constant expression is interpreted as a property name to be used for
- * comparison. For example, use `'"special name"'` (note the extra pair of quotes) to sort by a
- * property called `special name`.)
- * An expression can be optionally prefixed with `+` or `-` to control the sorting direction,
- * ascending or descending. For example, `'+label'` or `'-label'`. If no property is provided,
- * (e.g. `'+'` or `'-'`), the collection element itself is used in comparisons.
- * - `Array`: An array of function and/or string predicates. If a predicate cannot determine the
- * relative order of two items, the next predicate is used as a tie-breaker.
- *
- * **Note:** If the predicate is missing or empty then it defaults to `'+'`.
+ * - `function`: Getter function. The result of this function will be sorted using the
+ * `<`, `===`, `>` operator.
+ * - `string`: An Angular expression. The result of this expression is used to compare elements
+ * (for example `name` to sort by a property called `name` or `name.substr(0, 3)` to sort by
+ * 3 first characters of a property called `name`). The result of a constant expression
+ * is interpreted as a property name to be used in comparisons (for example `"special name"`
+ * to sort object by the value of their `special name` property). An expression can be
+ * optionally prefixed with `+` or `-` to control ascending or descending sort order
+ * (for example, `+name` or `-name`). If no property is provided, (e.g. `'+'`) then the array
+ * element itself is used to compare where sorting.
+ * - `Array`: An array of function or string predicates. The first predicate in the array
+ * is used for sorting, but when two items are equivalent, the next predicate is used.
*
- * @param {boolean=} reverse - If `true`, reverse the sorting order.
- * @param {(Function)=} comparator - The comparator function used to determine the relative order of
- * value pairs. If omitted, the built-in comparator will be used.
+ * If the predicate is missing or empty then it defaults to `'+'`.
*
- * @returns {Array} - The sorted array.
+ * @param {boolean=} reverse Reverse the order of the array.
+ * @returns {Array} Sorted copy of the source array.
*
*
* @example
- * ### Ordering a table with `ngRepeat`
- *
- * The example below demonstrates a simple {@link ngRepeat ngRepeat}, where the data is sorted by
- * age in descending order (expression is set to `'-age'`). The `comparator` is not set, which means
- * it defaults to the built-in comparator.
- *
-
+ * The example below demonstrates a simple ngRepeat, where the data is sorted
+ * by age in descending order (predicate is set to `'-age'`).
+ * `reverse` is not set, which means it defaults to `false`.
+
-
+
Name
Phone Number
@@ -28069,77 +27668,43 @@ function sliceFn(input, begin, end) {
- angular.module('orderByExample1', [])
+ angular.module('orderByExample', [])
.controller('ExampleController', ['$scope', function($scope) {
- $scope.friends = [
- {name: 'John', phone: '555-1212', age: 10},
- {name: 'Mary', phone: '555-9876', age: 19},
- {name: 'Mike', phone: '555-4321', age: 21},
- {name: 'Adam', phone: '555-5678', age: 35},
- {name: 'Julie', phone: '555-8765', age: 29}
- ];
+ $scope.friends =
+ [{name:'John', phone:'555-1212', age:10},
+ {name:'Mary', phone:'555-9876', age:19},
+ {name:'Mike', phone:'555-4321', age:21},
+ {name:'Adam', phone:'555-5678', age:35},
+ {name:'Julie', phone:'555-8765', age:29}];
}]);
-
- .friends {
- border-collapse: collapse;
- }
-
- .friends th {
- border-bottom: 1px solid;
- }
- .friends td, .friends th {
- border-left: 1px solid;
- padding: 5px 10px;
- }
- .friends td:first-child, .friends th:first-child {
- border-left: none;
- }
-
-
- // Element locators
- var names = element.all(by.repeater('friends').column('friend.name'));
-
- it('should sort friends by age in reverse order', function() {
- expect(names.get(0).getText()).toBe('Adam');
- expect(names.get(1).getText()).toBe('Julie');
- expect(names.get(2).getText()).toBe('Mike');
- expect(names.get(3).getText()).toBe('Mary');
- expect(names.get(4).getText()).toBe('John');
- });
-
- *
*
+ * The predicate and reverse parameters can be controlled dynamically through scope properties,
+ * as shown in the next example.
* @example
- * ### Changing parameters dynamically
- *
- * All parameters can be changed dynamically. The next example shows how you can make the columns of
- * a table sortable, by binding the `expression` and `reverse` parameters to scope properties.
- *
-
+
+
- .friends th {
- border-bottom: 1px solid;
- }
- .friends td, .friends th {
- border-left: 1px solid;
- padding: 5px 10px;
- }
- .friends td:first-child, .friends th:first-child {
- border-left: none;
- }
+
+ angular.module('orderByExample', [])
+ .controller('ExampleController', ['$scope', '$filter', function($scope, $filter) {
+ var orderBy = $filter('orderBy');
+ $scope.friends = [
+ { name: 'John', phone: '555-1212', age: 10 },
+ { name: 'Mary', phone: '555-9876', age: 19 },
+ { name: 'Mike', phone: '555-4321', age: 21 },
+ { name: 'Adam', phone: '555-5678', age: 35 },
+ { name: 'Julie', phone: '555-8765', age: 29 }
+ ];
+ $scope.order = function(predicate) {
+ $scope.predicate = predicate;
+ $scope.reverse = ($scope.predicate === predicate) ? !$scope.reverse : false;
+ $scope.friends = orderBy($scope.friends, predicate, $scope.reverse);
+ };
+ $scope.order('age', true);
+ }]);
+
+
.sortorder:after {
- content: '\25b2'; // BLACK UP-POINTING TRIANGLE
+ content: '\25b2';
}
.sortorder.reverse:after {
- content: '\25bc'; // BLACK DOWN-POINTING TRIANGLE
- }
-
-
- // Element locators
- var unsortButton = element(by.partialButtonText('unsorted'));
- var nameHeader = element(by.partialButtonText('Name'));
- var phoneHeader = element(by.partialButtonText('Phone'));
- var ageHeader = element(by.partialButtonText('Age'));
- var firstName = element(by.repeater('friends').column('friend.name').row(0));
- var lastName = element(by.repeater('friends').column('friend.name').row(4));
-
- it('should sort friends by some property, when clicking on the column header', function() {
- expect(firstName.getText()).toBe('Adam');
- expect(lastName.getText()).toBe('John');
-
- phoneHeader.click();
- expect(firstName.getText()).toBe('John');
- expect(lastName.getText()).toBe('Mary');
-
- nameHeader.click();
- expect(firstName.getText()).toBe('Adam');
- expect(lastName.getText()).toBe('Mike');
-
- ageHeader.click();
- expect(firstName.getText()).toBe('John');
- expect(lastName.getText()).toBe('Adam');
- });
-
- it('should sort friends in reverse order, when clicking on the same column', function() {
- expect(firstName.getText()).toBe('Adam');
- expect(lastName.getText()).toBe('John');
-
- ageHeader.click();
- expect(firstName.getText()).toBe('John');
- expect(lastName.getText()).toBe('Adam');
-
- ageHeader.click();
- expect(firstName.getText()).toBe('Adam');
- expect(lastName.getText()).toBe('John');
- });
-
- it('should restore the original order, when clicking "Set to unsorted"', function() {
- expect(firstName.getText()).toBe('Adam');
- expect(lastName.getText()).toBe('John');
-
- unsortButton.click();
- expect(firstName.getText()).toBe('John');
- expect(lastName.getText()).toBe('Julie');
- });
-
-
- *
- *
- * @example
- * ### Using a custom comparator
- *
- * If you have very specific requirements about the way items are sorted, you can pass your own
- * comparator function. For example, you might need to compare some strings in a locale-sensitive
- * way. (When specifying a custom comparator, you also need to pass a value for the `reverse`
- * argument - passing `false` retains the default sorting order, i.e. ascending.)
- *
-
-
-
-
-
Locale-sensitive Comparator
-
-
-
Name
-
Favorite Letter
-
-
-
{{friend.name}}
-
{{friend.favoriteLetter}}
-
-
-
-
-
Default Comparator
-
-
-
Name
-
Favorite Letter
-
-
-
{{friend.name}}
-
{{friend.favoriteLetter}}
-
-
-
-
-
-
- angular.module('orderByExample4', [])
- .controller('ExampleController', ['$scope', function($scope) {
- $scope.friends = [
- {name: 'John', favoriteLetter: 'Ä'},
- {name: 'Mary', favoriteLetter: 'Ü'},
- {name: 'Mike', favoriteLetter: 'Ö'},
- {name: 'Adam', favoriteLetter: 'H'},
- {name: 'Julie', favoriteLetter: 'Z'}
- ];
-
- $scope.localeSensitiveComparator = function(v1, v2) {
- // If we don't get strings, just compare by index
- if (v1.type !== 'string' || v2.type !== 'string') {
- return (v1.index < v2.index) ? -1 : 1;
- }
-
- // Compare strings alphabetically, taking locale into account
- return v1.value.localeCompare(v2.value);
- };
- }]);
-
-
- .friends-container {
- display: inline-block;
- margin: 0 30px;
- }
-
- .friends {
- border-collapse: collapse;
+ content: '\25bc';
}
-
- .friends th {
- border-bottom: 1px solid;
- }
- .friends td, .friends th {
- border-left: 1px solid;
- padding: 5px 10px;
- }
- .friends td:first-child, .friends th:first-child {
- border-left: none;
- }
-
-
- // Element locators
- var container = element(by.css('.custom-comparator'));
- var names = container.all(by.repeater('friends').column('friend.name'));
-
- it('should sort friends by favorite letter (in correct alphabetical order)', function() {
- expect(names.get(0).getText()).toBe('John');
- expect(names.get(1).getText()).toBe('Adam');
- expect(names.get(2).getText()).toBe('Mike');
- expect(names.get(3).getText()).toBe('Mary');
- expect(names.get(4).getText()).toBe('Julie');
- });
-
-
- *
+
+
*/
orderByFilter.$inject = ['$parse'];
function orderByFilter($parse) {
- return function(array, sortPredicate, reverseOrder, compareFn) {
+ return function(array, sortPredicate, reverseOrder) {
if (array == null) return array;
if (!isArrayLike(array)) {
@@ -28486,12 +27816,11 @@ function orderByFilter($parse) {
if (!isArray(sortPredicate)) { sortPredicate = [sortPredicate]; }
if (sortPredicate.length === 0) { sortPredicate = ['+']; }
- var predicates = processPredicates(sortPredicate);
-
- var descending = reverseOrder ? -1 : 1;
-
- // Define the `compare()` function. Use a default comparator if none is specified.
- var compare = isFunction(compareFn) ? compareFn : defaultCompare;
+ var predicates = processPredicates(sortPredicate, reverseOrder);
+ // Add a predicate at the end that evaluates to the element index. This makes the
+ // sort stable as it works as a tie-breaker when all the input predicates cannot
+ // distinguish between two elements.
+ predicates.push({ get: function() { return {}; }, descending: reverseOrder ? -1 : 1});
// The next three lines are a version of a Swartzian Transform idiom from Perl
// (sometimes called the Decorate-Sort-Undecorate idiom)
@@ -28503,12 +27832,8 @@ function orderByFilter($parse) {
return array;
function getComparisonObject(value, index) {
- // NOTE: We are adding an extra `tieBreaker` value based on the element's index.
- // This will be used to keep the sort stable when none of the input predicates can
- // distinguish between two elements.
return {
value: value,
- tieBreaker: {value: index, type: 'number', index: index},
predicateValues: predicates.map(function(predicate) {
return getPredicateValue(predicate.get(value), index);
})
@@ -28516,19 +27841,18 @@ function orderByFilter($parse) {
}
function doComparison(v1, v2) {
- for (var i = 0, ii = predicates.length; i < ii; i++) {
- var result = compare(v1.predicateValues[i], v2.predicateValues[i]);
- if (result) {
- return result * predicates[i].descending * descending;
- }
+ var result = 0;
+ for (var index=0, length = predicates.length; index < length; ++index) {
+ result = compare(v1.predicateValues[index], v2.predicateValues[index]) * predicates[index].descending;
+ if (result) break;
}
-
- return compare(v1.tieBreaker, v2.tieBreaker) * descending;
+ return result;
}
};
- function processPredicates(sortPredicates) {
- return sortPredicates.map(function(predicate) {
+ function processPredicates(sortPredicate, reverseOrder) {
+ reverseOrder = reverseOrder ? -1 : 1;
+ return sortPredicate.map(function(predicate) {
var descending = 1, get = identity;
if (isFunction(predicate)) {
@@ -28546,7 +27870,7 @@ function orderByFilter($parse) {
}
}
}
- return {get: get, descending: descending};
+ return { get: get, descending: descending * reverseOrder };
});
}
@@ -28561,9 +27885,9 @@ function orderByFilter($parse) {
}
}
- function objectValue(value) {
+ function objectValue(value, index) {
// If `valueOf` is a valid function use that
- if (isFunction(value.valueOf)) {
+ if (typeof value.valueOf === 'function') {
value = value.valueOf();
if (isPrimitive(value)) return value;
}
@@ -28572,8 +27896,8 @@ function orderByFilter($parse) {
value = value.toString();
if (isPrimitive(value)) return value;
}
-
- return value;
+ // We have a basic object so we use the position of the object in the collection
+ return index;
}
function getPredicateValue(value, index) {
@@ -28581,39 +27905,23 @@ function orderByFilter($parse) {
if (value === null) {
type = 'string';
value = 'null';
+ } else if (type === 'string') {
+ value = value.toLowerCase();
} else if (type === 'object') {
- value = objectValue(value);
+ value = objectValue(value, index);
}
- return {value: value, type: type, index: index};
+ return { value: value, type: type };
}
- function defaultCompare(v1, v2) {
+ function compare(v1, v2) {
var result = 0;
- var type1 = v1.type;
- var type2 = v2.type;
-
- if (type1 === type2) {
- var value1 = v1.value;
- var value2 = v2.value;
-
- if (type1 === 'string') {
- // Compare strings case-insensitively
- value1 = value1.toLowerCase();
- value2 = value2.toLowerCase();
- } else if (type1 === 'object') {
- // For basic objects, use the position of the object
- // in the collection instead of the value
- if (isObject(value1)) value1 = v1.index;
- if (isObject(value2)) value2 = v2.index;
- }
-
- if (value1 !== value2) {
- result = value1 < value2 ? -1 : 1;
+ if (v1.type === v2.type) {
+ if (v1.value !== v2.value) {
+ result = v1.value < v2.value ? -1 : 1;
}
} else {
- result = type1 < type2 ? -1 : 1;
+ result = v1.type < v2.type ? -1 : 1;
}
-
return result;
}
}
@@ -28893,11 +28201,9 @@ var htmlAnchorDirective = valueFn({
*
* @description
*
- * Sets the `readonly` attribute on the element, if the expression inside `ngReadonly` is truthy.
- * Note that `readonly` applies only to `input` elements with specific types. [See the input docs on
- * MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#attr-readonly) for more information.
+ * Sets the `readOnly` attribute on the element, if the expression inside `ngReadonly` is truthy.
*
- * A special directive is necessary because we cannot use interpolation inside the `readonly`
+ * A special directive is necessary because we cannot use interpolation inside the `readOnly`
* attribute. See the {@link guide/interpolation interpolation guide} for more info.
*
* @example
@@ -28934,13 +28240,6 @@ var htmlAnchorDirective = valueFn({
* A special directive is necessary because we cannot use interpolation inside the `selected`
* attribute. See the {@link guide/interpolation interpolation guide} for more info.
*
- *
- * **Note:** `ngSelected` does not interact with the `select` and `ngModel` directives, it only
- * sets the `selected` attribute on the element. If you are using `ngModel` on the select, you
- * should not use `ngSelected` on the options, as `ngModel` will set the select value and
- * selected options.
- *
- *
* @example
@@ -28977,11 +28276,6 @@ var htmlAnchorDirective = valueFn({
* A special directive is necessary because we cannot use interpolation inside the `open`
* attribute. See the {@link guide/interpolation interpolation guide} for more info.
*
- * ## A note about browser compatibility
- *
- * Edge, Firefox, and Internet Explorer do not support the `details` element, it is
- * recommended to use {@link ng.ngShow} and {@link ng.ngHide} instead.
- *
* @example
@@ -29672,9 +28966,7 @@ var ISO_DATE_REGEXP = /^\d{4,}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+(?:[+-
// 9. Fragment
// 1111111111111111 222 333333 44444 555555555555555555555555 666 77777777 8888888 999
var URL_REGEXP = /^[a-z][a-z\d.+-]*:\/*(?:[^:@]+(?::[^@]+)?@)?(?:[^\s:/?#]+|\[[a-f\d:]+\])(?::\d+)?(?:\/[^?#]*)?(?:\?[^#]*)?(?:#.*)?$/i;
-/* jshint maxlen:220 */
-var EMAIL_REGEXP = /^(?=.{1,254}$)(?=.{1,64}@)[-!#$%&'*+\/0-9=?A-Z^_`a-z{|}~]+(\.[-!#$%&'*+\/0-9=?A-Z^_`a-z{|}~]+)*@[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?(\.[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?)*$/;
-/* jshint maxlen:200 */
+var EMAIL_REGEXP = /^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i;
var NUMBER_REGEXP = /^\s*(\-|\+)?(\d+|(\d*(\.\d*)))([eE][+-]?\d+)?\s*$/;
var DATE_REGEXP = /^(\d{4,})-(\d{2})-(\d{2})$/;
var DATETIMELOCAL_REGEXP = /^(\d{4,})-(\d\d)-(\d\d)T(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/;
@@ -31059,7 +30351,7 @@ function numberInputType(scope, element, attr, ctrl, $sniffer, $browser) {
attr.$observe('min', function(val) {
if (isDefined(val) && !isNumber(val)) {
- val = parseFloat(val);
+ val = parseFloat(val, 10);
}
minVal = isNumber(val) && !isNaN(val) ? val : undefined;
// TODO(matsko): implement validateLater to reduce number of validations
@@ -31075,7 +30367,7 @@ function numberInputType(scope, element, attr, ctrl, $sniffer, $browser) {
attr.$observe('max', function(val) {
if (isDefined(val) && !isNumber(val)) {
- val = parseFloat(val);
+ val = parseFloat(val, 10);
}
maxVal = isNumber(val) && !isNaN(val) ? val : undefined;
// TODO(matsko): implement validateLater to reduce number of validations
@@ -31882,11 +31174,6 @@ function classDirective(name, selector) {
* When the expression changes, the previously added classes are removed and only then are the
* new classes added.
*
- * @knownIssue
- * You should not use {@link guide/interpolation interpolation} in the value of the `class`
- * attribute, when using the `ngClass` directive on the same element.
- * See {@link guide/interpolation#known-issues here} for more info.
- *
* @animations
* | Animation | Occurs |
* |----------------------------------|-------------------------------------|
@@ -35832,7 +35119,7 @@ var ngOptionsDirective = ['$compile', '$document', '$parse', function($compile,
for (var i = options.items.length - 1; i >= 0; i--) {
var option = options.items[i];
- if (isDefined(option.group)) {
+ if (option.group) {
jqLiteRemove(option.element.parentNode);
} else {
jqLiteRemove(option.element);
@@ -35864,8 +35151,7 @@ var ngOptionsDirective = ['$compile', '$document', '$parse', function($compile,
listFragment.appendChild(groupElement);
// Update the label on the group element
- // "null" is special cased because of Safari
- groupElement.label = option.group === null ? 'null' : option.group;
+ groupElement.label = option.group;
// Store it for use later
groupElementMap[option.group] = groupElement;
@@ -36201,7 +35487,7 @@ var ngPluralizeDirective = ['$locale', '$interpolate', '$log', function($locale,
* it's a prefix used by Angular for public (`$`) and private (`$$`) properties.
*
* - The built-in filters {@link ng.orderBy orderBy} and {@link ng.filter filter} do not work with
- * objects, and will throw an error if used with one.
+ * objects, and will throw if used with one.
*
* If you are hitting any of these limitations, the recommended workaround is to convert your object into an array
* that is sorted into the order that you prefer before providing it to `ngRepeat`. You could
@@ -37050,11 +36336,6 @@ var ngHideDirective = ['$animate', function($animate) {
* @description
* The `ngStyle` directive allows you to set CSS style on an HTML element conditionally.
*
- * @knownIssue
- * You should not use {@link guide/interpolation interpolation} in the value of the `style`
- * attribute, when using the `ngStyle` directive on the same element.
- * See {@link guide/interpolation#known-issues here} for more info.
- *
* @element ANY
* @param {expression} ngStyle
*
@@ -37466,63 +36747,37 @@ var ngSwitchDefaultDirective = ngDirective({
*
*/
var ngTranscludeMinErr = minErr('ngTransclude');
-var ngTranscludeDirective = ['$compile', function($compile) {
- return {
- restrict: 'EAC',
- terminal: true,
- compile: function ngTranscludeCompile(tElement) {
+var ngTranscludeDirective = ngDirective({
+ restrict: 'EAC',
+ link: function($scope, $element, $attrs, controller, $transclude) {
- // Remove and cache any original content to act as a fallback
- var fallbackLinkFn = $compile(tElement.contents());
- tElement.empty();
-
- return function ngTranscludePostLink($scope, $element, $attrs, controller, $transclude) {
-
- if (!$transclude) {
- throw ngTranscludeMinErr('orphan',
- 'Illegal use of ngTransclude directive in the template! ' +
- 'No parent directive that requires a transclusion found. ' +
- 'Element: {0}',
- startingTag($element));
- }
-
-
- // If the attribute is of the form: `ng-transclude="ng-transclude"` then treat it like the default
- if ($attrs.ngTransclude === $attrs.$attr.ngTransclude) {
- $attrs.ngTransclude = '';
- }
- var slotName = $attrs.ngTransclude || $attrs.ngTranscludeSlot;
-
- // If the slot is required and no transclusion content is provided then this call will throw an error
- $transclude(ngTranscludeCloneAttachFn, null, slotName);
-
- // If the slot is optional and no transclusion content is provided then use the fallback content
- if (slotName && !$transclude.isSlotFilled(slotName)) {
- useFallbackContent();
- }
+ if ($attrs.ngTransclude === $attrs.$attr.ngTransclude) {
+ // If the attribute is of the form: `ng-transclude="ng-transclude"`
+ // then treat it like the default
+ $attrs.ngTransclude = '';
+ }
- function ngTranscludeCloneAttachFn(clone, transcludedScope) {
- if (clone.length) {
- $element.append(clone);
- } else {
- useFallbackContent();
- // There is nothing linked against the transcluded scope since no content was available,
- // so it should be safe to clean up the generated scope.
- transcludedScope.$destroy();
- }
- }
+ function ngTranscludeCloneAttachFn(clone) {
+ if (clone.length) {
+ $element.empty();
+ $element.append(clone);
+ }
+ }
- function useFallbackContent() {
- // Since this is the fallback content rather than the transcluded content,
- // we link against the scope of this directive rather than the transcluded scope
- fallbackLinkFn($scope, function(clone) {
- $element.append(clone);
- });
- }
- };
+ if (!$transclude) {
+ throw ngTranscludeMinErr('orphan',
+ 'Illegal use of ngTransclude directive in the template! ' +
+ 'No parent directive that requires a transclusion found. ' +
+ 'Element: {0}',
+ startingTag($element));
}
- };
-}];
+
+ // If there is no slot name defined or the slot name is not optional
+ // then transclude the slot
+ var slotName = $attrs.ngTransclude || $attrs.ngTranscludeSlot;
+ $transclude(ngTranscludeCloneAttachFn, null, slotName);
+ }
+});
/**
* @ngdoc directive
@@ -38655,7 +37910,7 @@ Entity.prototype.encode = function encode(data, enc, /* internal */ reporter) {
return this._getEncoder(enc).encode(data, reporter);
};
-},{"../asn1":41,"inherits":434,"vm":490}],43:[function(require,module,exports){
+},{"../asn1":41,"inherits":435,"vm":491}],43:[function(require,module,exports){
var inherits = require('inherits');
var Reporter = require('../base').Reporter;
var Buffer = require('buffer').Buffer;
@@ -38773,7 +38028,7 @@ EncoderBuffer.prototype.join = function join(out, offset) {
return out;
};
-},{"../base":44,"buffer":90,"inherits":434}],44:[function(require,module,exports){
+},{"../base":44,"buffer":90,"inherits":435}],44:[function(require,module,exports){
var base = exports;
base.Reporter = require('./reporter').Reporter;
@@ -38847,7 +38102,7 @@ module.exports = Node;
var stateProps = [
'enc', 'parent', 'children', 'tag', 'args', 'reverseArgs', 'choice',
'optional', 'any', 'obj', 'use', 'alteredUse', 'key', 'default', 'explicit',
- 'implicit', 'contains'
+ 'implicit'
];
Node.prototype.clone = function clone() {
@@ -39052,17 +38307,17 @@ Node.prototype.contains = function contains(item) {
// Decoding
//
-Node.prototype._decode = function decode(input, options) {
+Node.prototype._decode = function decode(input) {
var state = this._baseState;
// Decode root node
if (state.parent === null)
- return input.wrapResult(state.children[0]._decode(input, options));
+ return input.wrapResult(state.children[0]._decode(input));
var result = state['default'];
var present = true;
- var prevKey = null;
+ var prevKey;
if (state.key !== null)
prevKey = input.enterKey(state.key);
@@ -39081,9 +38336,9 @@ Node.prototype._decode = function decode(input, options) {
var save = input.save();
try {
if (state.choice === null)
- this._decodeGeneric(state.tag, input, options);
+ this._decodeGeneric(state.tag, input);
else
- this._decodeChoice(input, options);
+ this._decodeChoice(input);
present = true;
} catch (e) {
present = false;
@@ -39111,8 +38366,6 @@ Node.prototype._decode = function decode(input, options) {
input = explicit;
}
- var start = input.offset;
-
// Unwrap implicit and normal values
if (state.use === null && state.choice === null) {
if (state.any)
@@ -39131,19 +38384,13 @@ Node.prototype._decode = function decode(input, options) {
input = body;
}
- if (options && options.track && state.tag !== null)
- options.track(input.path(), start, input.length, 'tagged');
-
- if (options && options.track && state.tag !== null)
- options.track(input.path(), input.offset, input.length, 'content');
-
// Select proper method for tag
if (state.any)
result = result;
else if (state.choice === null)
- result = this._decodeGeneric(state.tag, input, options);
+ result = this._decodeGeneric(state.tag, input);
else
- result = this._decodeChoice(input, options);
+ result = this._decodeChoice(input);
if (input.isError(result))
return result;
@@ -39153,15 +38400,14 @@ Node.prototype._decode = function decode(input, options) {
state.children.forEach(function decodeChildren(child) {
// NOTE: We are ignoring errors here, to let parser continue with other
// parts of encoded data
- child._decode(input, options);
+ child._decode(input);
});
}
// Decode contained/encoded by schema, only in bit or octet strings
if (state.contains && (state.tag === 'octstr' || state.tag === 'bitstr')) {
var data = new DecoderBuffer(result);
- result = this._getUse(state.contains, input._reporterState.obj)
- ._decode(data, options);
+ result = this._getUse(state.contains, input._reporterState.obj)._decode(data);
}
}
@@ -39172,40 +38418,35 @@ Node.prototype._decode = function decode(input, options) {
// Set key
if (state.key !== null && (result !== null || present === true))
input.leaveKey(prevKey, state.key, result);
- else if (prevKey !== null)
- input.exitKey(prevKey);
return result;
};
-Node.prototype._decodeGeneric = function decodeGeneric(tag, input, options) {
+Node.prototype._decodeGeneric = function decodeGeneric(tag, input) {
var state = this._baseState;
if (tag === 'seq' || tag === 'set')
return null;
if (tag === 'seqof' || tag === 'setof')
- return this._decodeList(input, tag, state.args[0], options);
+ return this._decodeList(input, tag, state.args[0]);
else if (/str$/.test(tag))
- return this._decodeStr(input, tag, options);
+ return this._decodeStr(input, tag);
else if (tag === 'objid' && state.args)
- return this._decodeObjid(input, state.args[0], state.args[1], options);
+ return this._decodeObjid(input, state.args[0], state.args[1]);
else if (tag === 'objid')
- return this._decodeObjid(input, null, null, options);
+ return this._decodeObjid(input, null, null);
else if (tag === 'gentime' || tag === 'utctime')
- return this._decodeTime(input, tag, options);
+ return this._decodeTime(input, tag);
else if (tag === 'null_')
- return this._decodeNull(input, options);
+ return this._decodeNull(input);
else if (tag === 'bool')
- return this._decodeBool(input, options);
+ return this._decodeBool(input);
else if (tag === 'int' || tag === 'enum')
- return this._decodeInt(input, state.args && state.args[0], options);
-
- if (state.use !== null) {
- return this._getUse(state.use, input._reporterState.obj)
- ._decode(input, options);
- } else {
+ return this._decodeInt(input, state.args && state.args[0]);
+ else if (state.use !== null)
+ return this._getUse(state.use, input._reporterState.obj)._decode(input);
+ else
return input.error('unknown tag: ' + tag);
- }
};
Node.prototype._getUse = function _getUse(entity, obj) {
@@ -39222,7 +38463,7 @@ Node.prototype._getUse = function _getUse(entity, obj) {
return state.useDecoder;
};
-Node.prototype._decodeChoice = function decodeChoice(input, options) {
+Node.prototype._decodeChoice = function decodeChoice(input) {
var state = this._baseState;
var result = null;
var match = false;
@@ -39231,7 +38472,7 @@ Node.prototype._decodeChoice = function decodeChoice(input, options) {
var save = input.save();
var node = state.choice[key];
try {
- var value = node._decode(input, options);
+ var value = node._decode(input);
if (input.isError(value))
return false;
@@ -39412,7 +38653,7 @@ Node.prototype._isPrintstr = function isPrintstr(str) {
return /^[A-Za-z0-9 '\(\)\+,\-\.\/:=\?]*$/.test(str);
};
-},{"../base":44,"minimalistic-assert":441}],46:[function(require,module,exports){
+},{"../base":44,"minimalistic-assert":442}],46:[function(require,module,exports){
var inherits = require('inherits');
function Reporter(options) {
@@ -39446,24 +38687,14 @@ Reporter.prototype.enterKey = function enterKey(key) {
return this._reporterState.path.push(key);
};
-Reporter.prototype.exitKey = function exitKey(index) {
- var state = this._reporterState;
-
- state.path = state.path.slice(0, index - 1);
-};
-
Reporter.prototype.leaveKey = function leaveKey(index, key, value) {
var state = this._reporterState;
- this.exitKey(index);
+ state.path = state.path.slice(0, index - 1);
if (state.obj !== null)
state.obj[key] = value;
};
-Reporter.prototype.path = function path() {
- return this._reporterState.path.join('/');
-};
-
Reporter.prototype.enterObject = function enterObject() {
var state = this._reporterState;
@@ -39535,7 +38766,7 @@ ReporterError.prototype.rethrow = function rethrow(msg) {
return this;
};
-},{"inherits":434}],47:[function(require,module,exports){
+},{"inherits":435}],47:[function(require,module,exports){
var constants = require('../constants');
exports.tagClass = {
@@ -39711,15 +38942,14 @@ DERNode.prototype._skipUntilEnd = function skipUntilEnd(buffer, fail) {
}
};
-DERNode.prototype._decodeList = function decodeList(buffer, tag, decoder,
- options) {
+DERNode.prototype._decodeList = function decodeList(buffer, tag, decoder) {
var result = [];
while (!buffer.isEmpty()) {
var possibleEnd = this._peekTag(buffer, 'end');
if (buffer.isError(possibleEnd))
return possibleEnd;
- var res = decoder.decode(buffer, 'der', options);
+ var res = decoder.decode(buffer, 'der');
if (buffer.isError(res) && possibleEnd)
break;
result.push(res);
@@ -39924,7 +39154,7 @@ function derDecodeLen(buf, primitive, fail) {
return len;
}
-},{"../../asn1":41,"inherits":434}],50:[function(require,module,exports){
+},{"../../asn1":41,"inherits":435}],50:[function(require,module,exports){
var decoders = exports;
decoders.der = require('./der');
@@ -39981,7 +39211,7 @@ PEMDecoder.prototype.decode = function decode(data, options) {
return DERDecoder.prototype.decode.call(this, input, options);
};
-},{"./der":49,"buffer":90,"inherits":434}],52:[function(require,module,exports){
+},{"./der":49,"buffer":90,"inherits":435}],52:[function(require,module,exports){
var inherits = require('inherits');
var Buffer = require('buffer').Buffer;
@@ -40276,7 +39506,7 @@ function encodeTag(tag, primitive, cls, reporter) {
return res;
}
-},{"../../asn1":41,"buffer":90,"inherits":434}],53:[function(require,module,exports){
+},{"../../asn1":41,"buffer":90,"inherits":435}],53:[function(require,module,exports){
var encoders = exports;
encoders.der = require('./der');
@@ -40305,7 +39535,7 @@ PEMEncoder.prototype.encode = function encode(data, options) {
return out.join('\n');
};
-},{"./der":52,"inherits":434}],55:[function(require,module,exports){
+},{"./der":52,"inherits":435}],55:[function(require,module,exports){
// http://wiki.commonjs.org/wiki/Unit_Testing/1.0
//
// THIS IS NOT TESTED NOR LIKELY TO WORK OUTSIDE V8!
@@ -40666,7 +39896,7 @@ var objectKeys = Object.keys || function (obj) {
return keys;
};
-},{"util/":487}],56:[function(require,module,exports){
+},{"util/":488}],56:[function(require,module,exports){
(function (global){
"use strict";
@@ -40701,7 +39931,7 @@ define(String.prototype, "padRight", "".padEnd);
[][key] && define(Array, key, Function.call.bind([][key]));
});
}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-},{"core-js/fn/regexp/escape":92,"core-js/shim":385,"regenerator-runtime/runtime":466}],57:[function(require,module,exports){
+},{"core-js/fn/regexp/escape":92,"core-js/shim":386,"regenerator-runtime/runtime":467}],57:[function(require,module,exports){
'use strict'
exports.toByteArray = toByteArray
@@ -40813,13 +40043,13 @@ function fromByteArray (uint8) {
}
},{}],58:[function(require,module,exports){
-/*! bignumber.js v2.4.0 https://github.com/MikeMcl/bignumber.js/LICENCE */
+/*! bignumber.js v2.3.0 https://github.com/MikeMcl/bignumber.js/LICENCE */
;(function (globalObj) {
'use strict';
/*
- bignumber.js v2.4.0
+ bignumber.js v2.3.0
A JavaScript library for arbitrary-precision arithmetic.
https://github.com/MikeMcl/bignumber.js
Copyright (c) 2016 Michael Mclaughlin
@@ -40827,7 +40057,7 @@ function fromByteArray (uint8) {
*/
- var BigNumber, cryptoObj, parseNumeric,
+ var cryptoObj, parseNumeric,
isNumeric = /^-?(\d+(\.\d*)?|\.\d+)(e[+-]?\d+)?$/i,
mathceil = Math.ceil,
mathfloor = Math.floor,
@@ -43529,17 +42759,13 @@ function fromByteArray (uint8) {
// EXPORT
- BigNumber = constructorFactory();
- BigNumber.default = BigNumber.BigNumber = BigNumber;
-
-
- // AMD.
+ // AMD.
if ( typeof define == 'function' && define.amd ) {
- define( function () { return BigNumber; } );
+ define( function () { return constructorFactory(); } );
// Node.js and other environments that support module.exports.
} else if ( typeof module != 'undefined' && module.exports ) {
- module.exports = BigNumber;
+ module.exports = constructorFactory();
// Split string stops browserify adding crypto shim.
if ( !cryptoObj ) try { cryptoObj = require('cry' + 'pto'); } catch (e) {}
@@ -43547,7 +42773,7 @@ function fromByteArray (uint8) {
// Browser.
} else {
if ( !globalObj ) globalObj = typeof self != 'undefined' ? self : Function('return this')();
- globalObj.BigNumber = BigNumber;
+ globalObj.BigNumber = constructorFactory();
}
})(this);
@@ -43724,12 +42950,8 @@ module.exports = {
}
BN.isBN = function isBN (num) {
- if (num instanceof BN) {
- return true;
- }
-
return num !== null && typeof num === 'object' &&
- num.constructor.wordSize === BN.wordSize && Array.isArray(num.words);
+ num.constructor.name === 'BN' && Array.isArray(num.words);
};
BN.max = function max (left, right) {
@@ -45770,10 +44992,6 @@ module.exports = {
assert(this.negative === 0, 'imaskn works only with positive numbers');
- if (this.length <= s) {
- return this;
- }
-
if (r !== 0) {
s++;
}
@@ -47438,7 +46656,7 @@ function xorTest (a, b) {
}
}).call(this,require("buffer").Buffer)
-},{"./aes":63,"./ghash":68,"buffer":90,"buffer-xor":89,"cipher-base":91,"inherits":434}],65:[function(require,module,exports){
+},{"./aes":63,"./ghash":68,"buffer":90,"buffer-xor":89,"cipher-base":91,"inherits":435}],65:[function(require,module,exports){
var ciphers = require('./encrypter')
exports.createCipher = exports.Cipher = ciphers.createCipher
exports.createCipheriv = exports.Cipheriv = ciphers.createCipheriv
@@ -47592,7 +46810,7 @@ exports.createDecipher = createDecipher
exports.createDecipheriv = createDecipheriv
}).call(this,require("buffer").Buffer)
-},{"./aes":63,"./authCipher":64,"./modes":69,"./modes/cbc":70,"./modes/cfb":71,"./modes/cfb1":72,"./modes/cfb8":73,"./modes/ctr":74,"./modes/ecb":75,"./modes/ofb":76,"./streamCipher":77,"buffer":90,"cipher-base":91,"evp_bytestokey":425,"inherits":434}],67:[function(require,module,exports){
+},{"./aes":63,"./authCipher":64,"./modes":69,"./modes/cbc":70,"./modes/cfb":71,"./modes/cfb1":72,"./modes/cfb8":73,"./modes/ctr":74,"./modes/ecb":75,"./modes/ofb":76,"./streamCipher":77,"buffer":90,"cipher-base":91,"evp_bytestokey":426,"inherits":435}],67:[function(require,module,exports){
(function (Buffer){
var aes = require('./aes')
var Transform = require('cipher-base')
@@ -47718,7 +46936,7 @@ exports.createCipheriv = createCipheriv
exports.createCipher = createCipher
}).call(this,require("buffer").Buffer)
-},{"./aes":63,"./authCipher":64,"./modes":69,"./modes/cbc":70,"./modes/cfb":71,"./modes/cfb1":72,"./modes/cfb8":73,"./modes/ctr":74,"./modes/ecb":75,"./modes/ofb":76,"./streamCipher":77,"buffer":90,"cipher-base":91,"evp_bytestokey":425,"inherits":434}],68:[function(require,module,exports){
+},{"./aes":63,"./authCipher":64,"./modes":69,"./modes/cbc":70,"./modes/cfb":71,"./modes/cfb1":72,"./modes/cfb8":73,"./modes/ctr":74,"./modes/ecb":75,"./modes/ofb":76,"./streamCipher":77,"buffer":90,"cipher-base":91,"evp_bytestokey":426,"inherits":435}],68:[function(require,module,exports){
(function (Buffer){
var zeros = new Buffer(16)
zeros.fill(0)
@@ -48196,7 +47414,7 @@ StreamCipher.prototype._final = function () {
}
}).call(this,require("buffer").Buffer)
-},{"./aes":63,"buffer":90,"cipher-base":91,"inherits":434}],78:[function(require,module,exports){
+},{"./aes":63,"buffer":90,"cipher-base":91,"inherits":435}],78:[function(require,module,exports){
var ebtk = require('evp_bytestokey')
var aes = require('browserify-aes/browser')
var DES = require('browserify-des')
@@ -48271,7 +47489,7 @@ function getCiphers () {
}
exports.listCiphers = exports.getCiphers = getCiphers
-},{"browserify-aes/browser":65,"browserify-aes/modes":69,"browserify-des":79,"browserify-des/modes":80,"evp_bytestokey":425}],79:[function(require,module,exports){
+},{"browserify-aes/browser":65,"browserify-aes/modes":69,"browserify-des":79,"browserify-des/modes":80,"evp_bytestokey":426}],79:[function(require,module,exports){
(function (Buffer){
var CipherBase = require('cipher-base')
var des = require('des.js')
@@ -48318,7 +47536,7 @@ DES.prototype._final = function () {
}
}).call(this,require("buffer").Buffer)
-},{"buffer":90,"cipher-base":91,"des.js":393,"inherits":434}],80:[function(require,module,exports){
+},{"buffer":90,"cipher-base":91,"des.js":394,"inherits":435}],80:[function(require,module,exports){
exports['des-ecb'] = {
key: 8,
iv: 0
@@ -48388,7 +47606,7 @@ function getr(priv) {
}
}).call(this,require("buffer").Buffer)
-},{"bn.js":60,"buffer":90,"randombytes":455}],82:[function(require,module,exports){
+},{"bn.js":60,"buffer":90,"randombytes":456}],82:[function(require,module,exports){
(function (Buffer){
const Sha3 = require('js-sha3')
@@ -48426,7 +47644,7 @@ module.exports = {
}
}).call(this,require("buffer").Buffer)
-},{"buffer":90,"js-sha3":437}],83:[function(require,module,exports){
+},{"buffer":90,"js-sha3":438}],83:[function(require,module,exports){
(function (Buffer){
'use strict'
exports['RSA-SHA224'] = exports.sha224WithRSAEncryption = {
@@ -48609,7 +47827,7 @@ module.exports = {
}
}).call(this,require("buffer").Buffer)
-},{"./algos":83,"./sign":86,"./verify":87,"buffer":90,"create-hash":388,"inherits":434,"stream":483}],85:[function(require,module,exports){
+},{"./algos":83,"./sign":86,"./verify":87,"buffer":90,"create-hash":389,"inherits":435,"stream":484}],85:[function(require,module,exports){
'use strict'
exports['1.3.132.0.10'] = 'secp256k1'
@@ -48812,7 +48030,7 @@ module.exports.getKey = getKey
module.exports.makeKey = makeKey
}).call(this,require("buffer").Buffer)
-},{"./curves":85,"bn.js":60,"browserify-rsa":81,"buffer":90,"create-hmac":391,"elliptic":403,"parse-asn1":445}],87:[function(require,module,exports){
+},{"./curves":85,"bn.js":60,"browserify-rsa":81,"buffer":90,"create-hmac":392,"elliptic":404,"parse-asn1":446}],87:[function(require,module,exports){
(function (Buffer){
// much of this based on https://github.com/indutny/self-signed/blob/gh-pages/lib/rsa.js
var curves = require('./curves')
@@ -48919,7 +48137,7 @@ function checkValue (b, q) {
module.exports = verify
}).call(this,require("buffer").Buffer)
-},{"./curves":85,"bn.js":60,"buffer":90,"elliptic":403,"parse-asn1":445}],88:[function(require,module,exports){
+},{"./curves":85,"bn.js":60,"buffer":90,"elliptic":404,"parse-asn1":446}],88:[function(require,module,exports){
(function (global){
'use strict';
@@ -49101,7 +48319,7 @@ exports.kMaxLength = kMaxLength()
function typedArraySupport () {
try {
var arr = new Uint8Array(1)
- arr.__proto__ = {__proto__: Uint8Array.prototype, foo: function () { return 42 }}
+ arr.foo = function () { return 42 }
return arr.foo() === 42 && // typed array instances can be augmented
typeof arr.subarray === 'function' && // chrome 9-10 lack `subarray`
arr.subarray(1, 1).byteLength === 0 // ie10 has broken `subarray`
@@ -49245,7 +48463,7 @@ function allocUnsafe (that, size) {
assertSize(size)
that = createBuffer(that, size < 0 ? 0 : checked(size) | 0)
if (!Buffer.TYPED_ARRAY_SUPPORT) {
- for (var i = 0; i < size; ++i) {
+ for (var i = 0; i < size; i++) {
that[i] = 0
}
}
@@ -49301,9 +48519,7 @@ function fromArrayBuffer (that, array, byteOffset, length) {
throw new RangeError('\'length\' is out of bounds')
}
- if (byteOffset === undefined && length === undefined) {
- array = new Uint8Array(array)
- } else if (length === undefined) {
+ if (length === undefined) {
array = new Uint8Array(array, byteOffset)
} else {
array = new Uint8Array(array, byteOffset, length)
@@ -49425,14 +48641,14 @@ Buffer.concat = function concat (list, length) {
var i
if (length === undefined) {
length = 0
- for (i = 0; i < list.length; ++i) {
+ for (i = 0; i < list.length; i++) {
length += list[i].length
}
}
var buffer = Buffer.allocUnsafe(length)
var pos = 0
- for (i = 0; i < list.length; ++i) {
+ for (i = 0; i < list.length; i++) {
var buf = list[i]
if (!Buffer.isBuffer(buf)) {
throw new TypeError('"list" argument must be an Array of Buffers')
@@ -49464,6 +48680,7 @@ function byteLength (string, encoding) {
switch (encoding) {
case 'ascii':
case 'binary':
+ // Deprecated
case 'raw':
case 'raws':
return len
@@ -49701,16 +48918,15 @@ function arrayIndexOf (arr, val, byteOffset, encoding) {
}
var foundIndex = -1
- for (var i = byteOffset; i < arrLength; ++i) {
- if (read(arr, i) === read(val, foundIndex === -1 ? 0 : i - foundIndex)) {
+ for (var i = 0; byteOffset + i < arrLength; i++) {
+ if (read(arr, byteOffset + i) === read(val, foundIndex === -1 ? 0 : i - foundIndex)) {
if (foundIndex === -1) foundIndex = i
- if (i - foundIndex + 1 === valLength) return foundIndex * indexSize
+ if (i - foundIndex + 1 === valLength) return (byteOffset + foundIndex) * indexSize
} else {
if (foundIndex !== -1) i -= i - foundIndex
foundIndex = -1
}
}
-
return -1
}
@@ -49775,7 +48991,7 @@ function hexWrite (buf, string, offset, length) {
if (length > strLen / 2) {
length = strLen / 2
}
- for (var i = 0; i < length; ++i) {
+ for (var i = 0; i < length; i++) {
var parsed = parseInt(string.substr(i * 2, 2), 16)
if (isNaN(parsed)) return i
buf[offset + i] = parsed
@@ -49989,7 +49205,7 @@ function asciiSlice (buf, start, end) {
var ret = ''
end = Math.min(buf.length, end)
- for (var i = start; i < end; ++i) {
+ for (var i = start; i < end; i++) {
ret += String.fromCharCode(buf[i] & 0x7F)
}
return ret
@@ -49999,7 +49215,7 @@ function binarySlice (buf, start, end) {
var ret = ''
end = Math.min(buf.length, end)
- for (var i = start; i < end; ++i) {
+ for (var i = start; i < end; i++) {
ret += String.fromCharCode(buf[i])
}
return ret
@@ -50012,7 +49228,7 @@ function hexSlice (buf, start, end) {
if (!end || end < 0 || end > len) end = len
var out = ''
- for (var i = start; i < end; ++i) {
+ for (var i = start; i < end; i++) {
out += toHex(buf[i])
}
return out
@@ -50055,7 +49271,7 @@ Buffer.prototype.slice = function slice (start, end) {
} else {
var sliceLen = end - start
newBuf = new Buffer(sliceLen, undefined)
- for (var i = 0; i < sliceLen; ++i) {
+ for (var i = 0; i < sliceLen; i++) {
newBuf[i] = this[i + start]
}
}
@@ -50282,7 +49498,7 @@ Buffer.prototype.writeUInt8 = function writeUInt8 (value, offset, noAssert) {
function objectWriteUInt16 (buf, value, offset, littleEndian) {
if (value < 0) value = 0xffff + value + 1
- for (var i = 0, j = Math.min(buf.length - offset, 2); i < j; ++i) {
+ for (var i = 0, j = Math.min(buf.length - offset, 2); i < j; i++) {
buf[offset + i] = (value & (0xff << (8 * (littleEndian ? i : 1 - i)))) >>>
(littleEndian ? i : 1 - i) * 8
}
@@ -50316,7 +49532,7 @@ Buffer.prototype.writeUInt16BE = function writeUInt16BE (value, offset, noAssert
function objectWriteUInt32 (buf, value, offset, littleEndian) {
if (value < 0) value = 0xffffffff + value + 1
- for (var i = 0, j = Math.min(buf.length - offset, 4); i < j; ++i) {
+ for (var i = 0, j = Math.min(buf.length - offset, 4); i < j; i++) {
buf[offset + i] = (value >>> (littleEndian ? i : 3 - i) * 8) & 0xff
}
}
@@ -50531,12 +49747,12 @@ Buffer.prototype.copy = function copy (target, targetStart, start, end) {
if (this === target && start < targetStart && targetStart < end) {
// descending copy from end
- for (i = len - 1; i >= 0; --i) {
+ for (i = len - 1; i >= 0; i--) {
target[i + targetStart] = this[i + start]
}
} else if (len < 1000 || !Buffer.TYPED_ARRAY_SUPPORT) {
// ascending copy from start
- for (i = 0; i < len; ++i) {
+ for (i = 0; i < len; i++) {
target[i + targetStart] = this[i + start]
}
} else {
@@ -50597,7 +49813,7 @@ Buffer.prototype.fill = function fill (val, start, end, encoding) {
var i
if (typeof val === 'number') {
- for (i = start; i < end; ++i) {
+ for (i = start; i < end; i++) {
this[i] = val
}
} else {
@@ -50605,7 +49821,7 @@ Buffer.prototype.fill = function fill (val, start, end, encoding) {
? val
: utf8ToBytes(new Buffer(val, encoding).toString())
var len = bytes.length
- for (i = 0; i < end - start; ++i) {
+ for (i = 0; i < end - start; i++) {
this[i + start] = bytes[i % len]
}
}
@@ -50647,7 +49863,7 @@ function utf8ToBytes (string, units) {
var leadSurrogate = null
var bytes = []
- for (var i = 0; i < length; ++i) {
+ for (var i = 0; i < length; i++) {
codePoint = string.charCodeAt(i)
// is surrogate component
@@ -50722,7 +49938,7 @@ function utf8ToBytes (string, units) {
function asciiToBytes (str) {
var byteArray = []
- for (var i = 0; i < str.length; ++i) {
+ for (var i = 0; i < str.length; i++) {
// Node's code seems to be doing this and not & 0x7F..
byteArray.push(str.charCodeAt(i) & 0xFF)
}
@@ -50732,7 +49948,7 @@ function asciiToBytes (str) {
function utf16leToBytes (str, units) {
var c, hi, lo
var byteArray = []
- for (var i = 0; i < str.length; ++i) {
+ for (var i = 0; i < str.length; i++) {
if ((units -= 2) < 0) break
c = str.charCodeAt(i)
@@ -50750,7 +49966,7 @@ function base64ToBytes (str) {
}
function blitBuffer (src, dst, offset, length) {
- for (var i = 0; i < length; ++i) {
+ for (var i = 0; i < length; i++) {
if ((i + offset >= dst.length) || (i >= src.length)) break
dst[i + offset] = src[i]
}
@@ -50762,7 +49978,7 @@ function isnan (val) {
}
}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-},{"base64-js":57,"ieee754":432,"isarray":436}],91:[function(require,module,exports){
+},{"base64-js":57,"ieee754":433,"isarray":437}],91:[function(require,module,exports){
(function (Buffer){
var Transform = require('stream').Transform
var inherits = require('inherits')
@@ -50856,19 +50072,19 @@ CipherBase.prototype._toString = function (value, enc, final) {
}
}).call(this,require("buffer").Buffer)
-},{"buffer":90,"inherits":434,"stream":483,"string_decoder":484}],92:[function(require,module,exports){
+},{"buffer":90,"inherits":435,"stream":484,"string_decoder":485}],92:[function(require,module,exports){
require('../../modules/core.regexp.escape');
module.exports = require('../../modules/_core').RegExp.escape;
-},{"../../modules/_core":113,"../../modules/core.regexp.escape":209}],93:[function(require,module,exports){
+},{"../../modules/_core":113,"../../modules/core.regexp.escape":210}],93:[function(require,module,exports){
module.exports = function(it){
if(typeof it != 'function')throw TypeError(it + ' is not a function!');
return it;
};
},{}],94:[function(require,module,exports){
-var cof = require('./_cof');
-module.exports = function(it, msg){
- if(typeof it != 'number' && cof(it) != 'Number')throw TypeError(msg);
- return +it;
+var cof = require('./_cof');
+module.exports = function(it, msg){
+ if(typeof it != 'number' && cof(it) != 'Number')throw TypeError(msg);
+ return +it;
};
},{"./_cof":108}],95:[function(require,module,exports){
// 22.1.3.31 Array.prototype[@@unscopables]
@@ -51010,50 +50226,50 @@ module.exports = function(TYPE, $create){
};
};
},{"./_array-species-create":105,"./_ctx":115,"./_iobject":135,"./_to-length":198,"./_to-object":199}],103:[function(require,module,exports){
-var aFunction = require('./_a-function')
- , toObject = require('./_to-object')
- , IObject = require('./_iobject')
- , toLength = require('./_to-length');
-
-module.exports = function(that, callbackfn, aLen, memo, isRight){
- aFunction(callbackfn);
- var O = toObject(that)
- , self = IObject(O)
- , length = toLength(O.length)
- , index = isRight ? length - 1 : 0
- , i = isRight ? -1 : 1;
- if(aLen < 2)for(;;){
- if(index in self){
- memo = self[index];
- index += i;
- break;
- }
- index += i;
- if(isRight ? index < 0 : length <= index){
- throw TypeError('Reduce of empty array with no initial value');
- }
- }
- for(;isRight ? index >= 0 : length > index; index += i)if(index in self){
- memo = callbackfn(memo, self[index], index, O);
- }
- return memo;
+var aFunction = require('./_a-function')
+ , toObject = require('./_to-object')
+ , IObject = require('./_iobject')
+ , toLength = require('./_to-length');
+
+module.exports = function(that, callbackfn, aLen, memo, isRight){
+ aFunction(callbackfn);
+ var O = toObject(that)
+ , self = IObject(O)
+ , length = toLength(O.length)
+ , index = isRight ? length - 1 : 0
+ , i = isRight ? -1 : 1;
+ if(aLen < 2)for(;;){
+ if(index in self){
+ memo = self[index];
+ index += i;
+ break;
+ }
+ index += i;
+ if(isRight ? index < 0 : length <= index){
+ throw TypeError('Reduce of empty array with no initial value');
+ }
+ }
+ for(;isRight ? index >= 0 : length > index; index += i)if(index in self){
+ memo = callbackfn(memo, self[index], index, O);
+ }
+ return memo;
};
},{"./_a-function":93,"./_iobject":135,"./_to-length":198,"./_to-object":199}],104:[function(require,module,exports){
-var isObject = require('./_is-object')
- , isArray = require('./_is-array')
- , SPECIES = require('./_wks')('species');
-
-module.exports = function(original){
- var C;
- if(isArray(original)){
- C = original.constructor;
- // cross-realm fallback
- if(typeof C == 'function' && (C === Array || isArray(C.prototype)))C = undefined;
- if(isObject(C)){
- C = C[SPECIES];
- if(C === null)C = undefined;
- }
- } return C === undefined ? Array : C;
+var isObject = require('./_is-object')
+ , isArray = require('./_is-array')
+ , SPECIES = require('./_wks')('species');
+
+module.exports = function(original){
+ var C;
+ if(isArray(original)){
+ C = original.constructor;
+ // cross-realm fallback
+ if(typeof C == 'function' && (C === Array || isArray(C.prototype)))C = undefined;
+ if(isObject(C)){
+ C = C[SPECIES];
+ if(C === null)C = undefined;
+ }
+ } return C === undefined ? Array : C;
};
},{"./_is-array":137,"./_is-object":139,"./_wks":207}],105:[function(require,module,exports){
// 9.4.2.3 ArraySpeciesCreate(originalArray, length)
@@ -51121,6 +50337,7 @@ module.exports = function(it){
'use strict';
var dP = require('./_object-dp').f
, create = require('./_object-create')
+ , hide = require('./_hide')
, redefineAll = require('./_redefine-all')
, ctx = require('./_ctx')
, anInstance = require('./_an-instance')
@@ -51260,7 +50477,7 @@ module.exports = {
setSpecies(NAME);
}
};
-},{"./_an-instance":96,"./_ctx":115,"./_defined":117,"./_descriptors":118,"./_for-of":127,"./_iter-define":143,"./_iter-step":145,"./_meta":152,"./_object-create":156,"./_object-dp":157,"./_redefine-all":176,"./_set-species":181}],110:[function(require,module,exports){
+},{"./_an-instance":96,"./_ctx":115,"./_defined":117,"./_descriptors":118,"./_for-of":127,"./_hide":130,"./_iter-define":143,"./_iter-step":145,"./_meta":152,"./_object-create":156,"./_object-dp":157,"./_redefine-all":176,"./_set-species":181}],110:[function(require,module,exports){
// https://github.com/DavidBruant/Map-Set.prototype.toJSON
var classof = require('./_classof')
, from = require('./_array-from-iterable');
@@ -51444,13 +50661,13 @@ module.exports = function(NAME, wrapper, methods, common, IS_MAP, IS_WEAK){
var core = module.exports = {version: '2.4.0'};
if(typeof __e == 'number')__e = core; // eslint-disable-line no-undef
},{}],114:[function(require,module,exports){
-'use strict';
-var $defineProperty = require('./_object-dp')
- , createDesc = require('./_property-desc');
-
-module.exports = function(object, index, value){
- if(index in object)$defineProperty.f(object, index, createDesc(0, value));
- else object[index] = value;
+'use strict';
+var $defineProperty = require('./_object-dp')
+ , createDesc = require('./_property-desc');
+
+module.exports = function(object, index, value){
+ if(index in object)$defineProperty.f(object, index, createDesc(0, value));
+ else object[index] = value;
};
},{"./_object-dp":157,"./_property-desc":175}],115:[function(require,module,exports){
// optional / simple context binding
@@ -51474,14 +50691,14 @@ module.exports = function(fn, that, length){
};
};
},{"./_a-function":93}],116:[function(require,module,exports){
-'use strict';
-var anObject = require('./_an-object')
- , toPrimitive = require('./_to-primitive')
- , NUMBER = 'number';
-
-module.exports = function(hint){
- if(hint !== 'string' && hint !== NUMBER && hint !== 'default')throw TypeError('Incorrect hint');
- return toPrimitive(anObject(this), hint != NUMBER);
+'use strict';
+var anObject = require('./_an-object')
+ , toPrimitive = require('./_to-primitive')
+ , NUMBER = 'number';
+
+module.exports = function(hint){
+ if(hint !== 'string' && hint !== NUMBER && hint !== 'default')throw TypeError('Incorrect hint');
+ return toPrimitive(anObject(this), hint != NUMBER);
};
},{"./_an-object":97,"./_to-primitive":200}],117:[function(require,module,exports){
// 7.2.1 RequireObjectCoercible(argument)
@@ -51503,9 +50720,9 @@ module.exports = function(it){
return is ? document.createElement(it) : {};
};
},{"./_global":128,"./_is-object":139}],120:[function(require,module,exports){
-// IE 8- don't enum bug keys
-module.exports = (
- 'constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf'
+// IE 8- don't enum bug keys
+module.exports = (
+ 'constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf'
).split(',');
},{}],121:[function(require,module,exports){
// all enumerable object keys, includes symbols
@@ -51679,17 +50896,17 @@ module.exports = require('./_descriptors') ? function(object, key, value){
},{"./_descriptors":118,"./_object-dp":157,"./_property-desc":175}],131:[function(require,module,exports){
module.exports = require('./_global').document && document.documentElement;
},{"./_global":128}],132:[function(require,module,exports){
-module.exports = !require('./_descriptors') && !require('./_fails')(function(){
- return Object.defineProperty(require('./_dom-create')('div'), 'a', {get: function(){ return 7; }}).a != 7;
+module.exports = !require('./_descriptors') && !require('./_fails')(function(){
+ return Object.defineProperty(require('./_dom-create')('div'), 'a', {get: function(){ return 7; }}).a != 7;
});
},{"./_descriptors":118,"./_dom-create":119,"./_fails":124}],133:[function(require,module,exports){
-var isObject = require('./_is-object')
- , setPrototypeOf = require('./_set-proto').set;
-module.exports = function(that, target, C){
- var P, S = target.constructor;
- if(S !== C && typeof S == 'function' && (P = S.prototype) !== C.prototype && isObject(P) && setPrototypeOf){
- setPrototypeOf(that, P);
- } return that;
+var isObject = require('./_is-object')
+ , setPrototypeOf = require('./_set-proto').set;
+module.exports = function(that, target, C){
+ var P, S = target.constructor;
+ if(S !== C && typeof S == 'function' && (P = S.prototype) !== C.prototype && isObject(P) && setPrototypeOf){
+ setPrototypeOf(that, P);
+ } return that;
};
},{"./_is-object":139,"./_set-proto":180}],134:[function(require,module,exports){
// fast apply, http://jsperf.lnkit.com/fast-apply/5
@@ -52015,7 +51232,7 @@ module.exports = {
key: toMetaKey,
exp: exp
};
-},{"./_export":122,"./_shared":184,"./es6.map":239,"./es6.weak-map":345}],154:[function(require,module,exports){
+},{"./_export":122,"./_shared":184,"./es6.map":240,"./es6.weak-map":346}],154:[function(require,module,exports){
var global = require('./_global')
, macrotask = require('./_task').set
, Observer = global.MutationObserver || global.WebKitMutationObserver
@@ -52119,48 +51336,46 @@ module.exports = !$assign || require('./_fails')(function(){
} return T;
} : $assign;
},{"./_fails":124,"./_iobject":135,"./_object-gops":163,"./_object-keys":166,"./_object-pie":167,"./_to-object":199}],156:[function(require,module,exports){
-// 19.1.2.2 / 15.2.3.5 Object.create(O [, Properties])
-var anObject = require('./_an-object')
- , dPs = require('./_object-dps')
- , enumBugKeys = require('./_enum-bug-keys')
- , IE_PROTO = require('./_shared-key')('IE_PROTO')
- , Empty = function(){ /* empty */ }
- , PROTOTYPE = 'prototype';
-
-// Create object with fake `null` prototype: use iframe Object with cleared prototype
-var createDict = function(){
- // Thrash, waste and sodomy: IE GC bug
- var iframe = require('./_dom-create')('iframe')
- , i = enumBugKeys.length
- , lt = '<'
- , gt = '>'
- , iframeDocument;
- iframe.style.display = 'none';
- require('./_html').appendChild(iframe);
- iframe.src = 'javascript:'; // eslint-disable-line no-script-url
- // createDict = iframe.contentWindow.Object;
- // html.removeChild(iframe);
- iframeDocument = iframe.contentWindow.document;
- iframeDocument.open();
- iframeDocument.write(lt + 'script' + gt + 'document.F=Object' + lt + '/script' + gt);
- iframeDocument.close();
- createDict = iframeDocument.F;
- while(i--)delete createDict[PROTOTYPE][enumBugKeys[i]];
- return createDict();
-};
-
-module.exports = Object.create || function create(O, Properties){
- var result;
- if(O !== null){
- Empty[PROTOTYPE] = anObject(O);
- result = new Empty;
- Empty[PROTOTYPE] = null;
- // add "__proto__" for Object.getPrototypeOf polyfill
- result[IE_PROTO] = O;
- } else result = createDict();
- return Properties === undefined ? result : dPs(result, Properties);
+// 19.1.2.2 / 15.2.3.5 Object.create(O [, Properties])
+var anObject = require('./_an-object')
+ , dPs = require('./_object-dps')
+ , enumBugKeys = require('./_enum-bug-keys')
+ , IE_PROTO = require('./_shared-key')('IE_PROTO')
+ , Empty = function(){ /* empty */ }
+ , PROTOTYPE = 'prototype';
+
+// Create object with fake `null` prototype: use iframe Object with cleared prototype
+var createDict = function(){
+ // Thrash, waste and sodomy: IE GC bug
+ var iframe = require('./_dom-create')('iframe')
+ , i = enumBugKeys.length
+ , gt = '>'
+ , iframeDocument;
+ iframe.style.display = 'none';
+ require('./_html').appendChild(iframe);
+ iframe.src = 'javascript:'; // eslint-disable-line no-script-url
+ // createDict = iframe.contentWindow.Object;
+ // html.removeChild(iframe);
+ iframeDocument = iframe.contentWindow.document;
+ iframeDocument.open();
+ iframeDocument.write('");
-}
-globalFuncs.getBlob = function(mime, str) {
- var str = (typeof str === 'object') ? JSON.stringify(str) : str;
- if (str == null) return '';
- var blob = new Blob([str], {
- type: mime
- });
- return window.URL.createObjectURL(blob);
-}
-globalFuncs.getSuccessText = function(str) {
- return '
'
-}
-globalFuncs.errorMsgs = [
- "Please enter valid amount. ",
- "Your password must be at least 9 characters. Please ensure it is a strong password. ",
- "Sorry! We don't have a clue what type of wallet file this is. ",
- "This is not a valid wallet file. ",
- "This unit doesn\'t exists, please use the one of the following units ",
- "Invalid address. ",
- "Invalid password. ",
- "Invalid amount. ",
- "Invalid gas limit. ",
- "Invalid data value. ",
- "Invalid gas amount. ",
- "Invalid nonce. ",
- "Invalid signed transaction. ",
- "A wallet with this nickname already exists. ",
- "Wallet not found. ",
- "Whoops. It doesnt look like a proposal with this ID exists yet or there is an error reading this proposal. ",
- "A wallet with this address already exists in storage. Please check your wallets page. ",
- "You need to have at some ETH in your account to cover the cost of gas. .01ETH should be more than sufficient for a few sends and votes. ",
- "All gas would be used on this transaction. This means you have already voted on this proposal or the debate period has ended.",
- "Invalid symbol"];
-globalFuncs.successMsgs = ["Valid address", "Wallet successfully decrypted", "Transaction submitted. TX ID: ", "New wallet added: ", "You have successfully voted. Thank you for being an active participant in The DAO."];
-globalFuncs.scrypt = {
- n: 1024
-};
-globalFuncs.postDelay = 300;
-globalFuncs.kdf = "scrypt";
-globalFuncs.defaultTxGasLimit = 21000;
-globalFuncs.digixClaimTxGasLimit = 150000;
-globalFuncs.donateAddress = "0x7cB57B5A97eAbe94205C07890BE4c1aD31E486A8";
-globalFuncs.isNumeric = function(n) {
- return !isNaN(parseFloat(n)) && isFinite(n);
-}
-globalFuncs.urlGet = function(name) {
- if (name = (new RegExp('[?&]' + encodeURIComponent(name) + '=([^&]*)')).exec(location.search)) return this.stripTags(decodeURIComponent(name[1]));
-}
-globalFuncs.stripTags = function(str) {
- var SCRIPT_REGEX = /)<[^<]*)*<\/script>/gi;
- while (SCRIPT_REGEX.test(str)) {
- str = str.replace(SCRIPT_REGEX, "");
- }
- return str;
-}
-globalFuncs.checkAndRedirectHTTPS = function() {
- var host = "myetherwallet.com";
- var githost = "kvhnuke.github.io";
- var githostw = "www.kvhnuke.github.io";
- var hostw = "www.myetherwallet.com";
- if ((host == window.location.host || githost == window.location.host || hostw == window.location.host || githostw == window.location.host) && (window.location.protocol != "https:")) window.location.protocol = "https";
-}
-globalFuncs.isStrongPass = function(password) {
- return password.length > 8;
-}
-globalFuncs.hexToAscii = function(hex) {
- return hex.match(/.{1,2}/g).map(function(v) {
- return String.fromCharCode(parseInt(v, 16));
- }).join('');
-}
-globalFuncs.isAlphaNumeric = function(value){
- return !/[^a-zA-Z0-9]/.test(value);
-}
-module.exports = globalFuncs;
+'use strict';
+var globalFuncs = function() {}
+globalFuncs.getBlockie = function(address) {
+ return blockies.create({
+ seed: address.toLowerCase(),
+ size: 8,
+ scale: 16
+ }).toDataURL();
+}
+globalFuncs.printPaperWallets = function(strJson) {
+ var win = window.open("about:blank", "_blank");
+ var data = "");
+}
+globalFuncs.getBlob = function(mime, str) {
+ var str = (typeof str === 'object') ? JSON.stringify(str) : str;
+ if (str == null) return '';
+ var blob = new Blob([str], {
+ type: mime
+ });
+ return window.URL.createObjectURL(blob);
+}
+globalFuncs.getSuccessText = function(str) {
+ return '
'
+}
+globalFuncs.errorMsgs = [
+ "Please enter valid amount. ",
+ "Your password must be at least 9 characters. Please ensure it is a strong password. ",
+ "Sorry! We don't have a clue what type of wallet file this is. ",
+ "This is not a valid wallet file. ",
+ "This unit doesn\'t exists, please use the one of the following units ",
+ "Invalid address. ",
+ "Invalid password. ",
+ "Invalid amount. ",
+ "Invalid gas limit. ",
+ "Invalid data value. ",
+ "Invalid gas amount. ",
+ "Invalid nonce. ",
+ "Invalid signed transaction. ",
+ "A wallet with this nickname already exists. ",
+ "Wallet not found. ",
+ "Whoops. It doesnt look like a proposal with this ID exists yet or there is an error reading this proposal. ",
+ "A wallet with this address already exists in storage. Please check your wallets page. ",
+ "You need to have at some ETH in your account to cover the cost of gas. .01ETH should be more than sufficient for a few sends and votes. ",
+ "All gas would be used on this transaction. This means you have already voted on this proposal or the debate period has ended.",
+ "Invalid symbol"];
+globalFuncs.successMsgs = ["Valid address", "Wallet successfully decrypted", "Transaction submitted. TX ID: ", "New wallet added: ", "You have successfully voted. Thank you for being an active participant in The DAO."];
+globalFuncs.scrypt = {
+ n: 1024
+};
+globalFuncs.postDelay = 300;
+globalFuncs.kdf = "scrypt";
+globalFuncs.defaultTxGasLimit = 21000;
+globalFuncs.digixClaimTxGasLimit = 150000;
+globalFuncs.donateAddress = "0x7cB57B5A97eAbe94205C07890BE4c1aD31E486A8";
+globalFuncs.isNumeric = function(n) {
+ return !isNaN(parseFloat(n)) && isFinite(n);
+}
+globalFuncs.urlGet = function(name) {
+ if (name = (new RegExp('[?&]' + encodeURIComponent(name) + '=([^&]*)')).exec(location.search)) return this.stripTags(decodeURIComponent(name[1]));
+}
+globalFuncs.stripTags = function(str) {
+ var SCRIPT_REGEX = /)<[^<]*)*<\/script>/gi;
+ while (SCRIPT_REGEX.test(str)) {
+ str = str.replace(SCRIPT_REGEX, "");
+ }
+ return str;
+}
+globalFuncs.checkAndRedirectHTTPS = function() {
+ var host = "myetherwallet.com";
+ var githost = "kvhnuke.github.io";
+ var githostw = "www.kvhnuke.github.io";
+ var hostw = "www.myetherwallet.com";
+ if ((host == window.location.host || githost == window.location.host || hostw == window.location.host || githostw == window.location.host) && (window.location.protocol != "https:")) window.location.protocol = "https";
+}
+globalFuncs.isStrongPass = function(password) {
+ return password.length > 8;
+}
+globalFuncs.hexToAscii = function(hex) {
+ return hex.match(/.{1,2}/g).map(function(v) {
+ return String.fromCharCode(parseInt(v, 16));
+ }).join('');
+}
+globalFuncs.isAlphaNumeric = function(value){
+ return !/[^a-zA-Z0-9]/.test(value);
+}
+module.exports = globalFuncs;
},{}],27:[function(require,module,exports){
-'use strict';
-var IS_CX = false;
-if(typeof chrome != 'undefined')
- IS_CX = chrome.windows === undefined ? false : true;
-require("babel-polyfill");
-var angular = require('angular');
-var angularTranslate = require('angular-translate');
-var angularSanitize = require('angular-sanitize');
-var BigNumber = require('bignumber.js');
-window.BigNumber = BigNumber;
-var marked = require('marked');
-window.marked = marked;
-var ethUtil = require('ethereumjs-util');
-ethUtil.crypto = require('crypto');
-ethUtil.Tx = require('ethereumjs-tx');
-ethUtil.scrypt = require('scryptsy');
-ethUtil.uuid = require('uuid');
-window.ethUtil = ethUtil;
-var Wallet = require('./myetherwallet');
-window.Wallet = Wallet;
-var Token = require('./tokens');
-window.Token = Token;
-var globalFuncs = require('./globalFuncs');
-window.globalFuncs = globalFuncs;
-var uiFuncs = require('./uiFuncs');
-window.uiFuncs = uiFuncs;
-var etherUnits = require('./etherUnits');
-window.etherUnits = etherUnits;
-var ajaxReq = require('./ajaxReq');
-window.ajaxReq = ajaxReq;
-var ethFuncs = require('./ethFuncs');
-window.ethFuncs = ethFuncs;
-var translate = require('./translations/translate.js');
-if(IS_CX){
- var cxFuncs = require('./cxFuncs');
- window.cxFuncs = cxFuncs;
-}
-var tabsCtrl = require('./controllers/tabsCtrl');
-var viewCtrl = require('./controllers/viewCtrl');
-var walletGenCtrl = require('./controllers/walletGenCtrl');
-var bulkGenCtrl = require('./controllers/bulkGenCtrl');
-var decryptWalletCtrl = require('./controllers/decryptWalletCtrl');
-var viewWalletCtrl = require('./controllers/viewWalletCtrl');
-var sendTxCtrl = require('./controllers/sendTxCtrl');
-var digixCtrl = require('./controllers/digixCtrl');
-var theDaoCtrl = require('./controllers/theDaoCtrl');
-var tokenCtrl = require('./controllers/tokenCtrl');
-var sendOfflineTxCtrl = require('./controllers/sendOfflineTxCtrl');
-var globalService = require('./services/globalService');
-var walletService = require('./services/walletService');
-var blockiesDrtv = require('./directives/blockiesDrtv');
-var QRCodeDrtv = require('./directives/QRCodeDrtv');
-var walletDecryptDrtv = require('./directives/walletDecryptDrtv');
-var cxWalletDecryptDrtv = require('./directives/cxWalletDecryptDrtv');
-var fileReaderDrtv = require('./directives/fileReaderDrtv');
-if(IS_CX){
- var addWalletCtrl = require('./controllers/CX/addWalletCtrl');
- var cxDecryptWalletCtrl = require('./controllers/CX/cxDecryptWalletCtrl');
- var myWalletsCtrl = require('./controllers/CX/myWalletsCtrl');
- var mainPopCtrl = require('./controllers/CX/mainPopCtrl');
- var quickSendCtrl = require('./controllers/CX/quickSendCtrl');
-}
-var app = angular.module('mewApp',['pascalprecht.translate','ngSanitize']);
-app.config(['$compileProvider', function($compileProvider) {
- $compileProvider.aHrefSanitizationWhitelist(/^\s*(|blob|https|):/);
-}]);
-app.config(['$translateProvider', function($translateProvider) {
- new translate($translateProvider);
-}]);
-app.factory('globalService', ['$http','$httpParamSerializerJQLike',globalService]);
-app.factory('walletService', walletService);
-app.directive('blockieAddress', blockiesDrtv);
-app.directive('qrCode', QRCodeDrtv);
-app.directive('onReadFile', fileReaderDrtv);
-app.directive('walletDecryptDrtv', walletDecryptDrtv);
-app.directive('cxWalletDecryptDrtv', cxWalletDecryptDrtv);
-app.controller('tabsCtrl', ['$scope', 'globalService', tabsCtrl]);
-app.controller('viewCtrl', ['$scope', 'globalService', viewCtrl]);
-app.controller('walletGenCtrl', ['$scope', walletGenCtrl]);
-app.controller('bulkGenCtrl', ['$scope', bulkGenCtrl]);
-app.controller('decryptWalletCtrl', ['$scope','$sce','walletService', decryptWalletCtrl]);
-app.controller('viewWalletCtrl', ['$scope','walletService', viewWalletCtrl]);
-app.controller('sendTxCtrl', ['$scope','$sce','walletService', sendTxCtrl]);
-app.controller('digixCtrl', ['$scope','$sce','walletService', digixCtrl]);
-app.controller('theDaoCtrl', ['$scope','$sce','walletService', theDaoCtrl]);
-app.controller('tokenCtrl', ['$scope','$sce','walletService', tokenCtrl]);
-app.controller('sendOfflineTxCtrl', ['$scope','$sce','walletService', sendOfflineTxCtrl]);
-if(IS_CX){
- app.controller('addWalletCtrl', ['$scope','$sce', addWalletCtrl]);
- app.controller('myWalletsCtrl', ['$scope','$sce', myWalletsCtrl]);
- app.controller('mainPopCtrl', ['$scope','$sce', mainPopCtrl]);
- app.controller('quickSendCtrl', ['$scope','$sce', quickSendCtrl]);
- app.controller('cxDecryptWalletCtrl', ['$scope','$sce','walletService', cxDecryptWalletCtrl]);
-}
-
-},{"./ajaxReq":1,"./controllers/CX/addWalletCtrl":2,"./controllers/CX/cxDecryptWalletCtrl":3,"./controllers/CX/mainPopCtrl":4,"./controllers/CX/myWalletsCtrl":5,"./controllers/CX/quickSendCtrl":6,"./controllers/bulkGenCtrl":7,"./controllers/decryptWalletCtrl":8,"./controllers/digixCtrl":9,"./controllers/sendOfflineTxCtrl":10,"./controllers/sendTxCtrl":11,"./controllers/tabsCtrl":12,"./controllers/theDaoCtrl":13,"./controllers/tokenCtrl":14,"./controllers/viewCtrl":15,"./controllers/viewWalletCtrl":16,"./controllers/walletGenCtrl":17,"./cxFuncs":18,"./directives/QRCodeDrtv":19,"./directives/blockiesDrtv":20,"./directives/cxWalletDecryptDrtv":21,"./directives/fileReaderDrtv":22,"./directives/walletDecryptDrtv":23,"./ethFuncs":24,"./etherUnits":25,"./globalFuncs":26,"./myetherwallet":28,"./services/globalService":29,"./services/walletService":30,"./tokens":31,"./translations/translate.js":34,"./uiFuncs":35,"angular":40,"angular-sanitize":37,"angular-translate":38,"babel-polyfill":56,"bignumber.js":58,"crypto":392,"ethereumjs-tx":422,"ethereumjs-util":423,"marked":439,"scryptsy":469,"uuid":489}],28:[function(require,module,exports){
+'use strict';
+var IS_CX = false;
+if(typeof chrome != 'undefined')
+ IS_CX = chrome.windows === undefined ? false : true;
+require("babel-polyfill");
+var angular = require('angular');
+var angularTranslate = require('angular-translate');
+var angularSanitize = require('angular-sanitize');
+var BigNumber = require('bignumber.js');
+window.BigNumber = BigNumber;
+var marked = require('marked');
+window.marked = marked;
+var ethUtil = require('ethereumjs-util');
+ethUtil.crypto = require('crypto');
+ethUtil.Tx = require('ethereumjs-tx');
+ethUtil.scrypt = require('scryptsy');
+ethUtil.uuid = require('uuid');
+window.ethUtil = ethUtil;
+var Wallet = require('./myetherwallet');
+window.Wallet = Wallet;
+var Token = require('./tokens');
+window.Token = Token;
+var globalFuncs = require('./globalFuncs');
+window.globalFuncs = globalFuncs;
+var uiFuncs = require('./uiFuncs');
+window.uiFuncs = uiFuncs;
+var etherUnits = require('./etherUnits');
+window.etherUnits = etherUnits;
+var ajaxReq = require('./ajaxReq');
+window.ajaxReq = ajaxReq;
+var ethFuncs = require('./ethFuncs');
+window.ethFuncs = ethFuncs;
+var translate = require('./translations/translate.js');
+if(IS_CX){
+ var cxFuncs = require('./cxFuncs');
+ window.cxFuncs = cxFuncs;
+}
+var tabsCtrl = require('./controllers/tabsCtrl');
+var viewCtrl = require('./controllers/viewCtrl');
+var walletGenCtrl = require('./controllers/walletGenCtrl');
+var bulkGenCtrl = require('./controllers/bulkGenCtrl');
+var decryptWalletCtrl = require('./controllers/decryptWalletCtrl');
+var viewWalletCtrl = require('./controllers/viewWalletCtrl');
+var sendTxCtrl = require('./controllers/sendTxCtrl');
+var digixCtrl = require('./controllers/digixCtrl');
+var theDaoCtrl = require('./controllers/theDaoCtrl');
+var tokenCtrl = require('./controllers/tokenCtrl');
+var sendOfflineTxCtrl = require('./controllers/sendOfflineTxCtrl');
+var globalService = require('./services/globalService');
+var walletService = require('./services/walletService');
+var blockiesDrtv = require('./directives/blockiesDrtv');
+var QRCodeDrtv = require('./directives/QRCodeDrtv');
+var walletDecryptDrtv = require('./directives/walletDecryptDrtv');
+var cxWalletDecryptDrtv = require('./directives/cxWalletDecryptDrtv');
+var fileReaderDrtv = require('./directives/fileReaderDrtv');
+if(IS_CX){
+ var addWalletCtrl = require('./controllers/CX/addWalletCtrl');
+ var cxDecryptWalletCtrl = require('./controllers/CX/cxDecryptWalletCtrl');
+ var myWalletsCtrl = require('./controllers/CX/myWalletsCtrl');
+ var mainPopCtrl = require('./controllers/CX/mainPopCtrl');
+ var quickSendCtrl = require('./controllers/CX/quickSendCtrl');
+}
+var app = angular.module('mewApp',['pascalprecht.translate','ngSanitize']);
+app.config(['$compileProvider', function($compileProvider) {
+ $compileProvider.aHrefSanitizationWhitelist(/^\s*(|blob|https|):/);
+}]);
+app.config(['$translateProvider', function($translateProvider) {
+ new translate($translateProvider);
+}]);
+app.factory('globalService', ['$http','$httpParamSerializerJQLike',globalService]);
+app.factory('walletService', walletService);
+app.directive('blockieAddress', blockiesDrtv);
+app.directive('qrCode', QRCodeDrtv);
+app.directive('onReadFile', fileReaderDrtv);
+app.directive('walletDecryptDrtv', walletDecryptDrtv);
+app.directive('cxWalletDecryptDrtv', cxWalletDecryptDrtv);
+app.controller('tabsCtrl', ['$scope', 'globalService', tabsCtrl]);
+app.controller('viewCtrl', ['$scope', 'globalService', viewCtrl]);
+app.controller('walletGenCtrl', ['$scope', walletGenCtrl]);
+app.controller('bulkGenCtrl', ['$scope', bulkGenCtrl]);
+app.controller('decryptWalletCtrl', ['$scope','$sce','walletService', decryptWalletCtrl]);
+app.controller('viewWalletCtrl', ['$scope','walletService', viewWalletCtrl]);
+app.controller('sendTxCtrl', ['$scope','$sce','walletService', sendTxCtrl]);
+app.controller('digixCtrl', ['$scope','$sce','walletService', digixCtrl]);
+app.controller('theDaoCtrl', ['$scope','$sce','walletService', theDaoCtrl]);
+app.controller('tokenCtrl', ['$scope','$sce','walletService', tokenCtrl]);
+app.controller('sendOfflineTxCtrl', ['$scope','$sce','walletService', sendOfflineTxCtrl]);
+if(IS_CX){
+ app.controller('addWalletCtrl', ['$scope','$sce', addWalletCtrl]);
+ app.controller('myWalletsCtrl', ['$scope','$sce', myWalletsCtrl]);
+ app.controller('mainPopCtrl', ['$scope','$sce', mainPopCtrl]);
+ app.controller('quickSendCtrl', ['$scope','$sce', quickSendCtrl]);
+ app.controller('cxDecryptWalletCtrl', ['$scope','$sce','walletService', cxDecryptWalletCtrl]);
+}
+
+},{"./ajaxReq":1,"./controllers/CX/addWalletCtrl":2,"./controllers/CX/cxDecryptWalletCtrl":3,"./controllers/CX/mainPopCtrl":4,"./controllers/CX/myWalletsCtrl":5,"./controllers/CX/quickSendCtrl":6,"./controllers/bulkGenCtrl":7,"./controllers/decryptWalletCtrl":8,"./controllers/digixCtrl":9,"./controllers/sendOfflineTxCtrl":10,"./controllers/sendTxCtrl":11,"./controllers/tabsCtrl":12,"./controllers/theDaoCtrl":13,"./controllers/tokenCtrl":14,"./controllers/viewCtrl":15,"./controllers/viewWalletCtrl":16,"./controllers/walletGenCtrl":17,"./cxFuncs":18,"./directives/QRCodeDrtv":19,"./directives/blockiesDrtv":20,"./directives/cxWalletDecryptDrtv":21,"./directives/fileReaderDrtv":22,"./directives/walletDecryptDrtv":23,"./ethFuncs":24,"./etherUnits":25,"./globalFuncs":26,"./myetherwallet":28,"./services/globalService":29,"./services/walletService":30,"./tokens":31,"./translations/translate.js":34,"./uiFuncs":35,"angular":40,"angular-sanitize":37,"angular-translate":38,"babel-polyfill":56,"bignumber.js":58,"crypto":393,"ethereumjs-tx":423,"ethereumjs-util":424,"marked":440,"scryptsy":470,"uuid":490}],28:[function(require,module,exports){
(function (Buffer){
-'use strict';
-var Wallet = function(priv) {
- this.privKey = priv.length == 32 ? priv : Buffer(priv, 'hex')
-}
-Wallet.generate = function(icapDirect) {
- if (icapDirect) {
- while (true) {
- var privKey = ethUtil.crypto.randomBytes(32)
- if (ethUtil.privateToAddress(privKey)[0] === 0) {
- return new Wallet(privKey)
- }
- }
- } else {
- return new Wallet(ethUtil.crypto.randomBytes(32))
- }
-}
-Wallet.prototype.getPrivateKey = function() {
- return this.privKey
-}
-Wallet.prototype.getPrivateKeyString = function() {
- return this.getPrivateKey().toString('hex')
-}
-Wallet.prototype.getPublicKey = function() {
- return ethUtil.privateToPublic(this.privKey)
-}
-Wallet.prototype.getPublicKeyString = function() {
- return '0x' + this.getPublicKey().toString('hex')
-}
-Wallet.prototype.getAddress = function() {
- return ethUtil.privateToAddress(this.privKey)
-}
-Wallet.prototype.getAddressString = function() {
- return '0x' + this.getAddress().toString('hex')
-}
-Wallet.prototype.getChecksumAddressString = function() {
- return ethUtil.toChecksumAddress(this.getAddressString())
-}
-Wallet.fromPrivateKey = function(priv) {
- return new Wallet(priv)
-}
-Wallet.prototype.toV3 = function(password, opts) {
- opts = opts || {}
- var salt = opts.salt || ethUtil.crypto.randomBytes(32)
- var iv = opts.iv || ethUtil.crypto.randomBytes(16)
- var derivedKey
- var kdf = opts.kdf || 'scrypt'
- var kdfparams = {
- dklen: opts.dklen || 32,
- salt: salt.toString('hex')
- }
- if (kdf === 'pbkdf2') {
- kdfparams.c = opts.c || 262144
- kdfparams.prf = 'hmac-sha256'
- derivedKey = ethUtil.crypto.pbkdf2Sync(new Buffer(password), salt, kdfparams.c, kdfparams.dklen, 'sha256')
- } else if (kdf === 'scrypt') {
- // FIXME: support progress reporting callback
- kdfparams.n = opts.n || 262144
- kdfparams.r = opts.r || 8
- kdfparams.p = opts.p || 1
- derivedKey = ethUtil.scrypt(new Buffer(password), salt, kdfparams.n, kdfparams.r, kdfparams.p, kdfparams.dklen)
- } else {
- throw new Error('Unsupported kdf')
- }
- var cipher = ethUtil.crypto.createCipheriv(opts.cipher || 'aes-128-ctr', derivedKey.slice(0, 16), iv)
- if (!cipher) {
- throw new Error('Unsupported cipher')
- }
- var ciphertext = Buffer.concat([cipher.update(this.privKey), cipher.final()])
- var mac = ethUtil.sha3(Buffer.concat([derivedKey.slice(16, 32), new Buffer(ciphertext, 'hex')]))
- return {
- version: 3,
- id: ethUtil.uuid.v4({
- random: opts.uuid || ethUtil.crypto.randomBytes(16)
- }),
- address: this.getAddress().toString('hex'),
- Crypto: {
- ciphertext: ciphertext.toString('hex'),
- cipherparams: {
- iv: iv.toString('hex')
- },
- cipher: opts.cipher || 'aes-128-ctr',
- kdf: kdf,
- kdfparams: kdfparams,
- mac: mac.toString('hex')
- }
- }
-}
-Wallet.prototype.toJSON = function() {
- return {
- address: this.getAddressString(),
- checksumAddress: this.getChecksumAddressString(),
- privKey: this.getPrivateKeyString(),
- pubKey: this.getPublicKeyString(),
- publisher:"MyEtherWallet",
- encrypted:false,
- version:2
- }
-}
-Wallet.fromMyEtherWallet = function(input, password) {
- var json = (typeof input === 'object') ? input : JSON.parse(input)
- var privKey
- if (!json.locked) {
- if (json.private.length !== 64) {
- throw new Error('Invalid private key length')
- }
- privKey = new Buffer(json.private, 'hex')
- } else {
- if (typeof password !== 'string') {
- throw new Error('Password required')
- }
- if (password.length < 7) {
- throw new Error('Password must be at least 7 characters')
- }
- var cipher = json.encrypted ? json.private.slice(0, 128) : json.private
- cipher = Wallet.decodeCryptojsSalt(cipher)
- var evp = Wallet.evp_kdf(new Buffer(password), cipher.salt, {
- keysize: 32,
- ivsize: 16
- })
- var decipher = ethUtil.crypto.createDecipheriv('aes-256-cbc', evp.key, evp.iv)
- privKey = Wallet.decipherBuffer(decipher, new Buffer(cipher.ciphertext))
- privKey = new Buffer((privKey.toString()), 'hex')
- }
- var wallet = new Wallet(privKey)
- if (wallet.getAddressString() !== json.address) {
- throw new Error('Invalid private key or address')
- }
- return wallet
-}
-Wallet.fromMyEtherWalletV2 = function (input){
- var json = (typeof input === 'object') ? input : JSON.parse(input);
- if (json.privKey.length !== 64) {
- throw new Error('Invalid private key length');
- };
- var privKey = new Buffer(json.privKey, 'hex');
- return new Wallet(privKey);
-}
-Wallet.fromEthSale = function(input, password) {
- var json = (typeof input === 'object') ? input : JSON.parse(input)
- var encseed = new Buffer(json.encseed, 'hex')
- var derivedKey = ethUtil.crypto.pbkdf2Sync(Buffer(password), Buffer(password), 2000, 32, 'sha256').slice(0, 16)
- var decipher = ethUtil.crypto.createDecipheriv('aes-128-cbc', derivedKey, encseed.slice(0, 16))
- var seed = Wallet.decipherBuffer(decipher, encseed.slice(16))
- var wallet = new Wallet(ethUtil.sha3(seed))
- if (wallet.getAddress().toString('hex') !== json.ethaddr) {
- throw new Error('Decoded key mismatch - possibly wrong passphrase')
- }
- return wallet
-}
-Wallet.fromMyEtherWalletKey = function(input, password) {
- var cipher = input.slice(0, 128)
- cipher = Wallet.decodeCryptojsSalt(cipher)
- var evp = Wallet.evp_kdf(new Buffer(password), cipher.salt, {
- keysize: 32,
- ivsize: 16
- })
- var decipher = ethUtil.crypto.createDecipheriv('aes-256-cbc', evp.key, evp.iv)
- var privKey = Wallet.decipherBuffer(decipher, new Buffer(cipher.ciphertext))
- privKey = new Buffer((privKey.toString()), 'hex')
- return new Wallet(privKey)
-}
-Wallet.fromV3 = function(input, password, nonStrict) {
- var json = (typeof input === 'object') ? input : JSON.parse(nonStrict ? input.toLowerCase() : input)
- if (json.version !== 3) {
- throw new Error('Not a V3 wallet')
- }
- var derivedKey
- var kdfparams
- if (json.crypto.kdf === 'scrypt') {
- kdfparams = json.crypto.kdfparams
- derivedKey = ethUtil.scrypt(new Buffer(password), new Buffer(kdfparams.salt, 'hex'), kdfparams.n, kdfparams.r, kdfparams.p, kdfparams.dklen)
- } else if (json.crypto.kdf === 'pbkdf2') {
- kdfparams = json.crypto.kdfparams
- if (kdfparams.prf !== 'hmac-sha256') {
- throw new Error('Unsupported parameters to PBKDF2')
- }
- derivedKey = ethUtil.crypto.pbkdf2Sync(new Buffer(password), new Buffer(kdfparams.salt, 'hex'), kdfparams.c, kdfparams.dklen, 'sha256')
- } else {
- throw new Error('Unsupported key derivation scheme')
- }
- var ciphertext = new Buffer(json.crypto.ciphertext, 'hex')
- var mac = ethUtil.sha3(Buffer.concat([derivedKey.slice(16, 32), ciphertext]))
- if (mac.toString('hex') !== json.crypto.mac) {
- throw new Error('Key derivation failed - possibly wrong passphrase')
- }
- var decipher = ethUtil.crypto.createDecipheriv(json.crypto.cipher, derivedKey.slice(0, 16), new Buffer(json.crypto.cipherparams.iv, 'hex'))
- var seed = Wallet.decipherBuffer(decipher, ciphertext, 'hex')
- return new Wallet(seed)
-}
-Wallet.prototype.toV3String = function(password, opts) {
- return JSON.stringify(this.toV3(password, opts))
-}
-Wallet.prototype.getV3Filename = function (timestamp) {
- var ts = timestamp ? new Date(timestamp) : new Date()
- return [
- 'UTC--',
- ts.toJSON().replace(/:/g, '-'),
- '--',
- this.getAddress().toString('hex')
- ].join('')
-}
-Wallet.decipherBuffer = function(decipher, data) {
- return Buffer.concat([decipher.update(data), decipher.final()])
-}
-Wallet.decodeCryptojsSalt = function(input) {
- var ciphertext = new Buffer(input, 'base64')
- if (ciphertext.slice(0, 8).toString() === 'Salted__') {
- return {
- salt: ciphertext.slice(8, 16),
- ciphertext: ciphertext.slice(16)
- }
- } else {
- return {
- ciphertext: ciphertext
- }
- }
-}
-Wallet.evp_kdf = function(data, salt, opts) {
- // A single EVP iteration, returns `D_i`, where block equlas to `D_(i-1)`
-
- function iter(block) {
- var hash = ethUtil.crypto.createHash(opts.digest || 'md5')
- hash.update(block)
- hash.update(data)
- hash.update(salt)
- block = hash.digest()
- for (var i = 1; i < (opts.count || 1); i++) {
- hash = ethUtil.crypto.createHash(opts.digest || 'md5')
- hash.update(block)
- block = hash.digest()
- }
- return block
- }
- var keysize = opts.keysize || 16
- var ivsize = opts.ivsize || 16
- var ret = []
- var i = 0
- while (Buffer.concat(ret).length < (keysize + ivsize)) {
- ret[i] = iter((i === 0) ? new Buffer(0) : ret[i - 1])
- i++
- }
- var tmp = Buffer.concat(ret)
- return {
- key: tmp.slice(0, keysize),
- iv: tmp.slice(keysize, keysize + ivsize)
- }
-}
-Wallet.walletRequirePass = function(ethjson) {
- var jsonArr;
- try {
- jsonArr = JSON.parse(ethjson);
- } catch (err) {
- throw globalFuncs.errorMsgs[3];
- }
- if (jsonArr.encseed != null) return true;
- else if (jsonArr.Crypto != null || jsonArr.crypto != null) return true
- else if (jsonArr.hash != null && jsonArr.locked) return true;
- else if (jsonArr.hash != null && !jsonArr.locked) return false;
- else if (jsonArr.publisher == "MyEtherWallet" && !jsonArr.encrypted) return false;
- else
- throw globalFuncs.errorMsgs[2];
-}
-Wallet.getWalletFromPrivKeyFile = function(strjson, password) {
- var jsonArr = JSON.parse(strjson);
- if (jsonArr.encseed != null) return Wallet.fromEthSale(strjson, password);
- else if (jsonArr.Crypto != null || jsonArr.crypto != null) return Wallet.fromV3(strjson, password, true);
- else if (jsonArr.hash != null) return Wallet.fromMyEtherWallet(strjson, password);
- else if (jsonArr.publisher == "MyEtherWallet") return Wallet.fromMyEtherWalletV2(strjson);
- else
- throw globalFuncs.errorMsgs[2];
-}
+'use strict';
+var Wallet = function(priv) {
+ this.privKey = priv.length == 32 ? priv : Buffer(priv, 'hex')
+}
+Wallet.generate = function(icapDirect) {
+ if (icapDirect) {
+ while (true) {
+ var privKey = ethUtil.crypto.randomBytes(32)
+ if (ethUtil.privateToAddress(privKey)[0] === 0) {
+ return new Wallet(privKey)
+ }
+ }
+ } else {
+ return new Wallet(ethUtil.crypto.randomBytes(32))
+ }
+}
+Wallet.prototype.getPrivateKey = function() {
+ return this.privKey
+}
+Wallet.prototype.getPrivateKeyString = function() {
+ return this.getPrivateKey().toString('hex')
+}
+Wallet.prototype.getPublicKey = function() {
+ return ethUtil.privateToPublic(this.privKey)
+}
+Wallet.prototype.getPublicKeyString = function() {
+ return '0x' + this.getPublicKey().toString('hex')
+}
+Wallet.prototype.getAddress = function() {
+ return ethUtil.privateToAddress(this.privKey)
+}
+Wallet.prototype.getAddressString = function() {
+ return '0x' + this.getAddress().toString('hex')
+}
+Wallet.prototype.getChecksumAddressString = function() {
+ return ethUtil.toChecksumAddress(this.getAddressString())
+}
+Wallet.fromPrivateKey = function(priv) {
+ return new Wallet(priv)
+}
+Wallet.prototype.toV3 = function(password, opts) {
+ opts = opts || {}
+ var salt = opts.salt || ethUtil.crypto.randomBytes(32)
+ var iv = opts.iv || ethUtil.crypto.randomBytes(16)
+ var derivedKey
+ var kdf = opts.kdf || 'scrypt'
+ var kdfparams = {
+ dklen: opts.dklen || 32,
+ salt: salt.toString('hex')
+ }
+ if (kdf === 'pbkdf2') {
+ kdfparams.c = opts.c || 262144
+ kdfparams.prf = 'hmac-sha256'
+ derivedKey = ethUtil.crypto.pbkdf2Sync(new Buffer(password), salt, kdfparams.c, kdfparams.dklen, 'sha256')
+ } else if (kdf === 'scrypt') {
+ // FIXME: support progress reporting callback
+ kdfparams.n = opts.n || 262144
+ kdfparams.r = opts.r || 8
+ kdfparams.p = opts.p || 1
+ derivedKey = ethUtil.scrypt(new Buffer(password), salt, kdfparams.n, kdfparams.r, kdfparams.p, kdfparams.dklen)
+ } else {
+ throw new Error('Unsupported kdf')
+ }
+ var cipher = ethUtil.crypto.createCipheriv(opts.cipher || 'aes-128-ctr', derivedKey.slice(0, 16), iv)
+ if (!cipher) {
+ throw new Error('Unsupported cipher')
+ }
+ var ciphertext = Buffer.concat([cipher.update(this.privKey), cipher.final()])
+ var mac = ethUtil.sha3(Buffer.concat([derivedKey.slice(16, 32), new Buffer(ciphertext, 'hex')]))
+ return {
+ version: 3,
+ id: ethUtil.uuid.v4({
+ random: opts.uuid || ethUtil.crypto.randomBytes(16)
+ }),
+ address: this.getAddress().toString('hex'),
+ Crypto: {
+ ciphertext: ciphertext.toString('hex'),
+ cipherparams: {
+ iv: iv.toString('hex')
+ },
+ cipher: opts.cipher || 'aes-128-ctr',
+ kdf: kdf,
+ kdfparams: kdfparams,
+ mac: mac.toString('hex')
+ }
+ }
+}
+Wallet.prototype.toJSON = function() {
+ return {
+ address: this.getAddressString(),
+ checksumAddress: this.getChecksumAddressString(),
+ privKey: this.getPrivateKeyString(),
+ pubKey: this.getPublicKeyString(),
+ publisher:"MyEtherWallet",
+ encrypted:false,
+ version:2
+ }
+}
+Wallet.fromMyEtherWallet = function(input, password) {
+ var json = (typeof input === 'object') ? input : JSON.parse(input)
+ var privKey
+ if (!json.locked) {
+ if (json.private.length !== 64) {
+ throw new Error('Invalid private key length')
+ }
+ privKey = new Buffer(json.private, 'hex')
+ } else {
+ if (typeof password !== 'string') {
+ throw new Error('Password required')
+ }
+ if (password.length < 7) {
+ throw new Error('Password must be at least 7 characters')
+ }
+ var cipher = json.encrypted ? json.private.slice(0, 128) : json.private
+ cipher = Wallet.decodeCryptojsSalt(cipher)
+ var evp = Wallet.evp_kdf(new Buffer(password), cipher.salt, {
+ keysize: 32,
+ ivsize: 16
+ })
+ var decipher = ethUtil.crypto.createDecipheriv('aes-256-cbc', evp.key, evp.iv)
+ privKey = Wallet.decipherBuffer(decipher, new Buffer(cipher.ciphertext))
+ privKey = new Buffer((privKey.toString()), 'hex')
+ }
+ var wallet = new Wallet(privKey)
+ if (wallet.getAddressString() !== json.address) {
+ throw new Error('Invalid private key or address')
+ }
+ return wallet
+}
+Wallet.fromMyEtherWalletV2 = function (input){
+ var json = (typeof input === 'object') ? input : JSON.parse(input);
+ if (json.privKey.length !== 64) {
+ throw new Error('Invalid private key length');
+ };
+ var privKey = new Buffer(json.privKey, 'hex');
+ return new Wallet(privKey);
+}
+Wallet.fromEthSale = function(input, password) {
+ var json = (typeof input === 'object') ? input : JSON.parse(input)
+ var encseed = new Buffer(json.encseed, 'hex')
+ var derivedKey = ethUtil.crypto.pbkdf2Sync(Buffer(password), Buffer(password), 2000, 32, 'sha256').slice(0, 16)
+ var decipher = ethUtil.crypto.createDecipheriv('aes-128-cbc', derivedKey, encseed.slice(0, 16))
+ var seed = Wallet.decipherBuffer(decipher, encseed.slice(16))
+ var wallet = new Wallet(ethUtil.sha3(seed))
+ if (wallet.getAddress().toString('hex') !== json.ethaddr) {
+ throw new Error('Decoded key mismatch - possibly wrong passphrase')
+ }
+ return wallet
+}
+Wallet.fromMyEtherWalletKey = function(input, password) {
+ var cipher = input.slice(0, 128)
+ cipher = Wallet.decodeCryptojsSalt(cipher)
+ var evp = Wallet.evp_kdf(new Buffer(password), cipher.salt, {
+ keysize: 32,
+ ivsize: 16
+ })
+ var decipher = ethUtil.crypto.createDecipheriv('aes-256-cbc', evp.key, evp.iv)
+ var privKey = Wallet.decipherBuffer(decipher, new Buffer(cipher.ciphertext))
+ privKey = new Buffer((privKey.toString()), 'hex')
+ return new Wallet(privKey)
+}
+Wallet.fromV3 = function(input, password, nonStrict) {
+ var json = (typeof input === 'object') ? input : JSON.parse(nonStrict ? input.toLowerCase() : input)
+ if (json.version !== 3) {
+ throw new Error('Not a V3 wallet')
+ }
+ var derivedKey
+ var kdfparams
+ if (json.crypto.kdf === 'scrypt') {
+ kdfparams = json.crypto.kdfparams
+ derivedKey = ethUtil.scrypt(new Buffer(password), new Buffer(kdfparams.salt, 'hex'), kdfparams.n, kdfparams.r, kdfparams.p, kdfparams.dklen)
+ } else if (json.crypto.kdf === 'pbkdf2') {
+ kdfparams = json.crypto.kdfparams
+ if (kdfparams.prf !== 'hmac-sha256') {
+ throw new Error('Unsupported parameters to PBKDF2')
+ }
+ derivedKey = ethUtil.crypto.pbkdf2Sync(new Buffer(password), new Buffer(kdfparams.salt, 'hex'), kdfparams.c, kdfparams.dklen, 'sha256')
+ } else {
+ throw new Error('Unsupported key derivation scheme')
+ }
+ var ciphertext = new Buffer(json.crypto.ciphertext, 'hex')
+ var mac = ethUtil.sha3(Buffer.concat([derivedKey.slice(16, 32), ciphertext]))
+ if (mac.toString('hex') !== json.crypto.mac) {
+ throw new Error('Key derivation failed - possibly wrong passphrase')
+ }
+ var decipher = ethUtil.crypto.createDecipheriv(json.crypto.cipher, derivedKey.slice(0, 16), new Buffer(json.crypto.cipherparams.iv, 'hex'))
+ var seed = Wallet.decipherBuffer(decipher, ciphertext, 'hex')
+ return new Wallet(seed)
+}
+Wallet.prototype.toV3String = function(password, opts) {
+ return JSON.stringify(this.toV3(password, opts))
+}
+Wallet.prototype.getV3Filename = function (timestamp) {
+ var ts = timestamp ? new Date(timestamp) : new Date()
+ return [
+ 'UTC--',
+ ts.toJSON().replace(/:/g, '-'),
+ '--',
+ this.getAddress().toString('hex')
+ ].join('')
+}
+Wallet.decipherBuffer = function(decipher, data) {
+ return Buffer.concat([decipher.update(data), decipher.final()])
+}
+Wallet.decodeCryptojsSalt = function(input) {
+ var ciphertext = new Buffer(input, 'base64')
+ if (ciphertext.slice(0, 8).toString() === 'Salted__') {
+ return {
+ salt: ciphertext.slice(8, 16),
+ ciphertext: ciphertext.slice(16)
+ }
+ } else {
+ return {
+ ciphertext: ciphertext
+ }
+ }
+}
+Wallet.evp_kdf = function(data, salt, opts) {
+ // A single EVP iteration, returns `D_i`, where block equlas to `D_(i-1)`
+
+ function iter(block) {
+ var hash = ethUtil.crypto.createHash(opts.digest || 'md5')
+ hash.update(block)
+ hash.update(data)
+ hash.update(salt)
+ block = hash.digest()
+ for (var i = 1; i < (opts.count || 1); i++) {
+ hash = ethUtil.crypto.createHash(opts.digest || 'md5')
+ hash.update(block)
+ block = hash.digest()
+ }
+ return block
+ }
+ var keysize = opts.keysize || 16
+ var ivsize = opts.ivsize || 16
+ var ret = []
+ var i = 0
+ while (Buffer.concat(ret).length < (keysize + ivsize)) {
+ ret[i] = iter((i === 0) ? new Buffer(0) : ret[i - 1])
+ i++
+ }
+ var tmp = Buffer.concat(ret)
+ return {
+ key: tmp.slice(0, keysize),
+ iv: tmp.slice(keysize, keysize + ivsize)
+ }
+}
+Wallet.walletRequirePass = function(ethjson) {
+ var jsonArr;
+ try {
+ jsonArr = JSON.parse(ethjson);
+ } catch (err) {
+ throw globalFuncs.errorMsgs[3];
+ }
+ if (jsonArr.encseed != null) return true;
+ else if (jsonArr.Crypto != null || jsonArr.crypto != null) return true
+ else if (jsonArr.hash != null && jsonArr.locked) return true;
+ else if (jsonArr.hash != null && !jsonArr.locked) return false;
+ else if (jsonArr.publisher == "MyEtherWallet" && !jsonArr.encrypted) return false;
+ else
+ throw globalFuncs.errorMsgs[2];
+}
+Wallet.getWalletFromPrivKeyFile = function(strjson, password) {
+ var jsonArr = JSON.parse(strjson);
+ if (jsonArr.encseed != null) return Wallet.fromEthSale(strjson, password);
+ else if (jsonArr.Crypto != null || jsonArr.crypto != null) return Wallet.fromV3(strjson, password, true);
+ else if (jsonArr.hash != null) return Wallet.fromMyEtherWallet(strjson, password);
+ else if (jsonArr.publisher == "MyEtherWallet") return Wallet.fromMyEtherWalletV2(strjson);
+ else
+ throw globalFuncs.errorMsgs[2];
+}
module.exports = Wallet;
}).call(this,require("buffer").Buffer)
},{"buffer":90}],29:[function(require,module,exports){
-'use strict';
-var globalService = function($http, $httpParamSerializerJQLike) {
- globalFuncs.checkAndRedirectHTTPS();
- ajaxReq.http = $http;
- ajaxReq.postSerializer = $httpParamSerializerJQLike;
-
- var tabs = {
- generateWallet: {
- id: 0,
- name: "Generate Wallet",
- url: "generate-wallet",
- mew: true,
- cx: false
- },
- bulkGenerate: {
- id: 1,
- name: "Bulk Generate",
- url: "bulk-generate",
- mew: false,
- cx: false
- },
- myWallet: {
- id: 2,
- name: "My Wallets",
- url: "my-wallet",
- mew: false,
- cx: true
- },
- addWallet: {
- id: 3,
- name: "Add Wallet",
- url: "add-wallet",
- mew: false,
- cx: true
- },
- sendTransaction: {
- id: 4,
- name: "Send Ether",
- url: "send-transaction",
- mew: true,
- cx: true
- },
- tokens: {
- id: 5,
- name: "Send Tokens",
- url: "send-tokens",
- mew: true,
- cx: true
- },
- offlineTransaction: {
- id: 6,
- name: "Send Offline",
- url:"offline-transaction",
- mew: true,
- cx: false
- },
- dao: {
- id: 7,
- name: "Withdraw DAO",
- url: "the-dao",
- mew: true,
- cx: true
- },
- digix: {
- id: 8,
- name: "Claim DGD",
- url: "digix",
- mew: true,
- cx: true
- },
- viewWalletInfo: {
- id: 9,
- name: "View Wallet Info",
- url: "view-wallet-info",
- mew: true,
- cx: false
- },
- help: {
- id: 10,
- name: "Help",
- url: "help",
- mew: true,
- cx: true
- }
- };
- var currentTab = 0;
- if(typeof chrome != 'undefined')
- currentTab = chrome.windows === undefined ? 0 : 3;
- return {
- tabs: tabs,
- currentTab: currentTab
- };
-};
-module.exports = globalService;
-
-
+'use strict';
+var globalService = function($http, $httpParamSerializerJQLike) {
+ globalFuncs.checkAndRedirectHTTPS();
+ ajaxReq.http = $http;
+ ajaxReq.postSerializer = $httpParamSerializerJQLike;
+
+ var tabs = {
+ generateWallet: {
+ id: 0,
+ name: "Generate Wallet",
+ url: "generate-wallet",
+ mew: true,
+ cx: false
+ },
+ bulkGenerate: {
+ id: 1,
+ name: "Bulk Generate",
+ url: "bulk-generate",
+ mew: false,
+ cx: false
+ },
+ myWallet: {
+ id: 2,
+ name: "My Wallets",
+ url: "my-wallet",
+ mew: false,
+ cx: true
+ },
+ addWallet: {
+ id: 3,
+ name: "Add Wallet",
+ url: "add-wallet",
+ mew: false,
+ cx: true
+ },
+ sendTransaction: {
+ id: 4,
+ name: "Send Ether",
+ url: "send-transaction",
+ mew: true,
+ cx: true
+ },
+ tokens: {
+ id: 5,
+ name: "Send Tokens",
+ url: "send-tokens",
+ mew: true,
+ cx: true
+ },
+ offlineTransaction: {
+ id: 6,
+ name: "Send Offline",
+ url:"offline-transaction",
+ mew: true,
+ cx: false
+ },
+ dao: {
+ id: 7,
+ name: "Withdraw DAO",
+ url: "the-dao",
+ mew: true,
+ cx: true
+ },
+ digix: {
+ id: 8,
+ name: "Claim DGD",
+ url: "digix",
+ mew: true,
+ cx: true
+ },
+ viewWalletInfo: {
+ id: 9,
+ name: "View Wallet Info",
+ url: "view-wallet-info",
+ mew: true,
+ cx: false
+ },
+ help: {
+ id: 10,
+ name: "Help",
+ url: "help",
+ mew: true,
+ cx: true
+ }
+ };
+ var currentTab = 0;
+ if(typeof chrome != 'undefined')
+ currentTab = chrome.windows === undefined ? 0 : 3;
+ return {
+ tabs: tabs,
+ currentTab: currentTab
+ };
+};
+module.exports = globalService;
+
+
},{}],30:[function(require,module,exports){
-'use strict';
-var walletService = function() {
- return {
- wallet: null,
- password:''
- }
-};
+'use strict';
+var walletService = function() {
+ return {
+ wallet: null,
+ password:''
+ }
+};
module.exports = walletService;
},{}],31:[function(require,module,exports){
-'use strict';
-var Token = function(contractAddress, userAddress, symbol, decimal) {
- this.contractAddress = contractAddress;
- this.userAddress = userAddress
- this.symbol = symbol;;
- this.decimal = decimal;
- this.setBalance();
-}
-Token.balanceHex = "0x70a08231";
-Token.transferHex = "0xa9059cbb";
-Token.popTokens = [{
- "address": "0xbb9bc244d798123fde783fcc1c72d3bb8c189413",
- "symbol": "DAO",
- "decimal": 16
-},
-{
- "address": "0xe0b7927c4af23765cb51314a0e0521a9645f0e2a",
- "symbol": "DGD",
- "decimal": 9
-},
-{
- "address": "0xc66ea802717bfb9833400264dd12c2bceaa34a6d",
- "symbol": "MKR",
- "decimal": 18
-},
-{
- "address": "0x89205A3A3b2A69De6Dbf7f01ED13B2108B2c43e7",
- "symbol": "🦄 Unicorn",
- "decimal": 0
-},
-{
- "address": "0x74c1e4b8cae59269ec1d85d3d4f324396048f4ac",
- "symbol": "🍺 BeerCoin",
- "decimal": 0
-}];
-Token.prototype.getContractAddress = function() {
- return this.contractAddress;
-}
-Token.prototype.getUserAddress = function() {
- return this.userAddress;
-}
-Token.prototype.getSymbol = function() {
- return this.symbol;
-}
-Token.prototype.getDecimal = function() {
- return this.decimal;
-}
-Token.prototype.getBalance = function() {
- return this.balance;
-}
-Token.prototype.getBalanceBN = function() {
- return this.balanceBN;
-}
-Token.prototype.setBalance = function() {
- var balanceCall = ethFuncs.getDataObj(this.contractAddress, Token.balanceHex, [ethFuncs.getNakedAddress(this.userAddress)]);
- var parentObj = this;
- ajaxReq.getEthCall(balanceCall, function(data) {
- if (!data.error) {
- parentObj.balance = new BigNumber(data.data).div(new BigNumber(10).pow(parentObj.getDecimal())).toString();
- parentObj.balanceBN = new BigNumber(data.data).toString();
- }
- });
-}
-Token.prototype.getData = function(toAdd, value) {
- try {
- if (!ethFuncs.validateEtherAddress(toAdd)) throw globalFuncs.errorMsgs[5];
- else if (!globalFuncs.isNumeric(value) || parseFloat(value) < 0) throw globalFuncs.errorMsgs[7];
- var value = ethFuncs.padLeft(new BigNumber(value).times(new BigNumber(10).pow(this.getDecimal())).toString(16), 64);
- var toAdd = ethFuncs.padLeft(ethFuncs.getNakedAddress(toAdd), 64);
- var data = Token.transferHex + toAdd + value;
- return {
- isError: false,
- data: data
- };
- } catch (e) {
- return {
- isError: true,
- error: e
- };
- }
-}
-module.exports = Token;
+'use strict';
+var Token = function(contractAddress, userAddress, symbol, decimal) {
+ this.contractAddress = contractAddress;
+ this.userAddress = userAddress
+ this.symbol = symbol;;
+ this.decimal = decimal;
+ this.setBalance();
+}
+Token.balanceHex = "0x70a08231";
+Token.transferHex = "0xa9059cbb";
+Token.popTokens = [{
+ "address": "0xbb9bc244d798123fde783fcc1c72d3bb8c189413",
+ "symbol": "DAO",
+ "decimal": 16
+},
+{
+ "address": "0xe0b7927c4af23765cb51314a0e0521a9645f0e2a",
+ "symbol": "DGD",
+ "decimal": 9
+},
+{
+ "address": "0xc66ea802717bfb9833400264dd12c2bceaa34a6d",
+ "symbol": "MKR",
+ "decimal": 18
+},
+{
+ "address": "0x89205A3A3b2A69De6Dbf7f01ED13B2108B2c43e7",
+ "symbol": "🦄 Unicorn",
+ "decimal": 0
+},
+{
+ "address": "0x74c1e4b8cae59269ec1d85d3d4f324396048f4ac",
+ "symbol": "🍺 BeerCoin",
+ "decimal": 0
+}];
+Token.prototype.getContractAddress = function() {
+ return this.contractAddress;
+}
+Token.prototype.getUserAddress = function() {
+ return this.userAddress;
+}
+Token.prototype.getSymbol = function() {
+ return this.symbol;
+}
+Token.prototype.getDecimal = function() {
+ return this.decimal;
+}
+Token.prototype.getBalance = function() {
+ return this.balance;
+}
+Token.prototype.getBalanceBN = function() {
+ return this.balanceBN;
+}
+Token.prototype.setBalance = function() {
+ var balanceCall = ethFuncs.getDataObj(this.contractAddress, Token.balanceHex, [ethFuncs.getNakedAddress(this.userAddress)]);
+ var parentObj = this;
+ ajaxReq.getEthCall(balanceCall, function(data) {
+ if (!data.error) {
+ parentObj.balance = new BigNumber(data.data).div(new BigNumber(10).pow(parentObj.getDecimal())).toString();
+ parentObj.balanceBN = new BigNumber(data.data).toString();
+ }
+ });
+}
+Token.prototype.getData = function(toAdd, value) {
+ try {
+ if (!ethFuncs.validateEtherAddress(toAdd)) throw globalFuncs.errorMsgs[5];
+ else if (!globalFuncs.isNumeric(value) || parseFloat(value) < 0) throw globalFuncs.errorMsgs[7];
+ var value = ethFuncs.padLeft(new BigNumber(value).times(new BigNumber(10).pow(this.getDecimal())).toString(16), 64);
+ var toAdd = ethFuncs.padLeft(ethFuncs.getNakedAddress(toAdd), 64);
+ var data = Token.transferHex + toAdd + value;
+ return {
+ isError: false,
+ data: data
+ };
+ } catch (e) {
+ return {
+ isError: true,
+ error: e
+ };
+ }
+}
+module.exports = Token;
},{}],32:[function(require,module,exports){
-'use strict';
-var en = function() {}
-en.code = 'en';
-en.data = {
- /* Do Not Change */
- translate_version: '0.0',
- CX_version: '2.9',
- MEW_vesion: '2.9',
-
- /* Navigation */
- NAV_MyWallets: 'My Wallets',
- NAV_AddWallet: 'Add Wallet',
- NAV_SendEther: 'Send Ether',
- NAV_SendTokens: 'Send Tokens',
- NAV_WithdrawDAO: 'Withdraw DAO',
- NAV_ClaimDGD: 'Claim DGD',
- NAV_Help: 'Withdraw DAO',
- NAV_Contracts: 'Contracts',
- NAV_Contact: 'Contact',
-
- /* General */
- GEN_Download: 'Download',
- GEN_Address: 'Your Address',
- GEN_AddessDesc: 'You may know this as your "Account #" or your "Public Key". It is what you send people so they can send you ETH. That icon is an easy way to recognize your address.',
- GEN_PrivKey: 'Private Key (unencrypted)',
- GEN_PrivKeyDesc: 'This is the unencrypted text version of your private key, meaning no password is necessary. If someone were to find your unencrypted private key, they could access your wallet without a password. For this reason, encrypted versions are typically recommended.',
- GEN_Print: 'Print Paper Wallet',
- GEN_PrintDesc: 'ProTip: Click print and save this as a PDF, even if you do not own a printer!',
- GEN_Keystore: 'Keystore/JSON File (Encrypted · Mist/Geth Format · Recommended)',
- GEN_KeystoreDesc: 'This Keystore / JSON file matches the format used by Mist & Geth so you can easily import it in the future. It is the recommended file to download and back up.',
- GEN_Json: 'JSON File (unencrypted)',
- GEN_JsonDesc: 'This is the unencrypted, JSON format of your private key. This means you do not need the password but anyone who finds your JSON can access your wallet & Ether without the password.',
-
- GEN_Balance: 'Account Balance',
- GEN_Equiv: 'Equivalent Value',
- GEN_TransHistory: 'Transaction History',
-
- /* Header */
- MEW_Warning_1: '',
- CX_Warning_1: 'Make sure you have **external backups** of any wallets you store here. Many things could happen that would cause you to lose the data in this Chrome Extension, including uninstalling and reinstalling the extension. This extension is a way to easily access your wallets, **not** a way to back them up.',
- MEW_Tagline: 'Open Source JavaScript Client-Side Ether Wallet Chrome Extension',
- CX_Tagline: 'Open Source JavaScript Client-Side Ether Wallet Chrome Extension',
-
- /* View Wallet Details */
- VIEWWALLET_Title: 'View Wallet Details',
- VIEWWALLET_Subtitle: 'Download an unencrypted private key, grab your encrypted Mist/Geth Keystore file, or re-print your paper wallet. You may want to do this in order to [import your account into Geth/Mist](http://ethereum.stackexchange.com/questions/465/how-to-import-a-plain-private-key-into-geth/). You can also do this with the [MyEtherWallet CX](https://chrome.google.com/webstore/detail/myetherwallet-cx/nlbmnnijcnlegkjjpcfjclmcfggfefdm/) and save your wallet for easier and quicker access. If you just want to check your balance, we recommend using a blockchain explorer like etherscan.io or live.ether.camp.',
- VIEWWALLET_SuccessMsg: 'Success! Here are your wallet details.',
-
- /* MEW Wallet Decrypt */
-
-};
-module.exports = en;
+'use strict';
+var en = function() {}
+en.code = 'en';
+en.data = {
+ /* Do Not Change */
+ translate_version: '0.0',
+ CX_version: '2.9',
+ MEW_vesion: '2.9',
+
+ /* Navigation */
+ NAV_MyWallets: 'My Wallets',
+ NAV_AddWallet: 'Add Wallet',
+ NAV_SendEther: 'Send Ether',
+ NAV_SendTokens: 'Send Tokens',
+ NAV_WithdrawDAO: 'Withdraw DAO',
+ NAV_ClaimDGD: 'Claim DGD',
+ NAV_Help: 'Withdraw DAO',
+ NAV_Contracts: 'Contracts',
+ NAV_Contact: 'Contact',
+
+ /* General */
+ GEN_Download: 'Download',
+ GEN_Address: 'Your Address',
+ GEN_AddessDesc: 'You may know this as your "Account #" or your "Public Key". It is what you send people so they can send you ETH. That icon is an easy way to recognize your address.',
+ GEN_PrivKey: 'Private Key (unencrypted)',
+ GEN_PrivKeyDesc: 'This is the unencrypted text version of your private key, meaning no password is necessary. If someone were to find your unencrypted private key, they could access your wallet without a password. For this reason, encrypted versions are typically recommended.',
+ GEN_Print: 'Print Paper Wallet',
+ GEN_PrintDesc: 'ProTip: Click print and save this as a PDF, even if you do not own a printer!',
+ GEN_Keystore: 'Keystore/JSON File (Encrypted · Mist/Geth Format · Recommended)',
+ GEN_KeystoreDesc: 'This Keystore / JSON file matches the format used by Mist & Geth so you can easily import it in the future. It is the recommended file to download and back up.',
+ GEN_Json: 'JSON File (unencrypted)',
+ GEN_JsonDesc: 'This is the unencrypted, JSON format of your private key. This means you do not need the password but anyone who finds your JSON can access your wallet & Ether without the password.',
+
+ GEN_Balance: 'Account Balance',
+ GEN_Equiv: 'Equivalent Value',
+ GEN_TransHistory: 'Transaction History',
+
+ /* Header */
+ MEW_Warning_1: '',
+ CX_Warning_1: 'Make sure you have **external backups** of any wallets you store here. Many things could happen that would cause you to lose the data in this Chrome Extension, including uninstalling and reinstalling the extension. This extension is a way to easily access your wallets, **not** a way to back them up.',
+ MEW_Tagline: 'Open Source JavaScript Client-Side Ether Wallet Chrome Extension',
+ CX_Tagline: 'Open Source JavaScript Client-Side Ether Wallet Chrome Extension',
+
+ /* View Wallet Details */
+ VIEWWALLET_Title: 'View Wallet Details',
+ VIEWWALLET_Subtitle: 'Download an unencrypted private key, grab your encrypted Mist/Geth Keystore file, or re-print your paper wallet. You may want to do this in order to [import your account into Geth/Mist](http://ethereum.stackexchange.com/questions/465/how-to-import-a-plain-private-key-into-geth/). You can also do this with the [MyEtherWallet CX](https://chrome.google.com/webstore/detail/myetherwallet-cx/nlbmnnijcnlegkjjpcfjclmcfggfefdm/) and save your wallet for easier and quicker access. If you just want to check your balance, we recommend using a blockchain explorer like etherscan.io or live.ether.camp.',
+ VIEWWALLET_SuccessMsg: 'Success! Here are your wallet details.',
+
+ /* MEW Wallet Decrypt */
+
+};
+module.exports = en;
},{}],33:[function(require,module,exports){
-'use strict';
-var fr = function() {}
-fr.code = 'fr';
-fr.data = {
- TITLE: 'Bonjur',
- FOO: 'This is a paragraph.',
- BUTTON_LANG_EN: 'english',
- BUTTON_LANG_DE: 'german'
-};
+'use strict';
+var fr = function() {}
+fr.code = 'fr';
+fr.data = {
+ TITLE: 'Bonjur',
+ FOO: 'This is a paragraph.',
+ BUTTON_LANG_EN: 'english',
+ BUTTON_LANG_DE: 'german'
+};
module.exports = fr;
},{}],34:[function(require,module,exports){
-'use strict';
-var en = require('./en');
-var fr = require('./fr');
-var translate = function($translateProvider) {
- $translateProvider.translations(en.code, translate.marked(en.data));
- $translateProvider.translations(fr.code, translate.marked(fr.data));
- $translateProvider.preferredLanguage(en.code);
- $translateProvider.useSanitizeValueStrategy(null);
-}
-translate.marked = function(data) {
- var tData = data;
- for (var key in tData) if (tData.hasOwnProperty(key)) tData[key] = marked(tData[key]);
- return tData;
-}
+'use strict';
+var en = require('./en');
+var fr = require('./fr');
+var translate = function($translateProvider) {
+ $translateProvider.translations(en.code, translate.marked(en.data));
+ $translateProvider.translations(fr.code, translate.marked(fr.data));
+ $translateProvider.preferredLanguage(en.code);
+ $translateProvider.useSanitizeValueStrategy(null);
+}
+translate.marked = function(data) {
+ var tData = data;
+ for (var key in tData) if (tData.hasOwnProperty(key)) tData[key] = marked(tData[key]);
+ return tData;
+}
module.exports = translate;
},{"./en":32,"./fr":33}],35:[function(require,module,exports){
(function (Buffer){
-'use strict';
-var uiFuncs = function() {}
-uiFuncs.getTxData = function($scope) {
- return {
- to: $scope.tx.to,
- value: $scope.tx.value,
- unit: $scope.tx.unit,
- gasLimit: $scope.tx.gasLimit,
- data: $scope.tx.data,
- from: $scope.wallet.getAddressString(),
- privKey: $scope.wallet.getPrivateKeyString()
- };
-}
-uiFuncs.generateClassicTx = function(txData, callback) {
- try {
- if (!ethFuncs.validateEtherAddress(txData.to)) throw globalFuncs.errorMsgs[5];
- else if (!globalFuncs.isNumeric(txData.value) || parseFloat(txData.value) < 0) throw globalFuncs.errorMsgs[7];
- else if (!globalFuncs.isNumeric(txData.gasLimit) || parseFloat(txData.gasLimit) <= 0) throw globalFuncs.errorMsgs[8];
- else if (!ethFuncs.validateHexString(txData.data)) throw globalFuncs.errorMsgs[9];
- ajaxReq.getClassicTransactionData(txData.from, function(data) {
- if (data.error) throw data.msg;
- data = data.data;
- var rawTx = {
- nonce: ethFuncs.sanitizeHex(data.nonce),
- gasPrice: ethFuncs.sanitizeHex(ethFuncs.addTinyMoreToGas(data.gasprice)),
- gasLimit: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(txData.gasLimit)),
- to: ethFuncs.sanitizeHex(txData.to),
- value: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(etherUnits.toWei(txData.value, txData.unit))),
- data: ethFuncs.sanitizeHex(txData.data)
- }
- var eTx = new ethUtil.Tx(rawTx);
- eTx.sign(new Buffer(txData.privKey, 'hex'));
- rawTx.rawTx = JSON.stringify(rawTx);
- rawTx.signedTx = '0x' + eTx.serialize().toString('hex');
- rawTx.isError = false;
- if (callback !== undefined) callback(rawTx);
- });
- } catch (e) {
- if (callback !== undefined) callback({
- isError: true,
- error: e
- });
- }
-}
-uiFuncs.sendClassicTx = function(signedTx, callback) {
- ajaxReq.sendClassicRawTx(signedTx, function(data) {
- var resp = {};
- if (data.error) {
- resp = {
- isError: true,
- error: data.msg
- };
- } else {
- resp = {
- isError: false,
- data: data.data
- };
- }
- if (callback !== undefined) callback(resp);
- });
-}
-uiFuncs.generateTx = function(txData, callback) {
- try {
- if (!ethFuncs.validateEtherAddress(txData.to)) throw globalFuncs.errorMsgs[5];
- else if (!globalFuncs.isNumeric(txData.value) || parseFloat(txData.value) < 0) throw globalFuncs.errorMsgs[7];
- else if (!globalFuncs.isNumeric(txData.gasLimit) || parseFloat(txData.gasLimit) <= 0) throw globalFuncs.errorMsgs[8];
- else if (!ethFuncs.validateHexString(txData.data)) throw globalFuncs.errorMsgs[9];
- ajaxReq.getTransactionData(txData.from, function(data) {
- if (data.error) throw data.msg;
- data = data.data;
- var rawTx = {
- nonce: ethFuncs.sanitizeHex(data.nonce),
- gasPrice: ethFuncs.sanitizeHex(ethFuncs.addTinyMoreToGas(data.gasprice)),
- gasLimit: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(txData.gasLimit)),
- to: ethFuncs.sanitizeHex(txData.to),
- value: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(etherUnits.toWei(txData.value, txData.unit))),
- data: ethFuncs.sanitizeHex(txData.data)
- }
- var eTx = new ethUtil.Tx(rawTx);
- eTx.sign(new Buffer(txData.privKey, 'hex'));
- rawTx.rawTx = JSON.stringify(rawTx);
- rawTx.signedTx = '0x' + eTx.serialize().toString('hex');
- rawTx.isError = false;
- if (callback !== undefined) callback(rawTx);
- });
- } catch (e) {
- if (callback !== undefined) callback({
- isError: true,
- error: e
- });
- }
-}
-uiFuncs.sendTx = function(signedTx, callback) {
- ajaxReq.sendRawTx(signedTx, function(data) {
- var resp = {};
- if (data.error) {
- resp = {
- isError: true,
- error: data.msg
- };
- } else {
- resp = {
- isError: false,
- data: data.data
- };
- }
- if (callback !== undefined) callback(resp);
- });
-}
-uiFuncs.transferAllBalance = function(fromAdd, gasLimit, callback) {
- try {
- ajaxReq.getTransactionData(fromAdd, function(data) {
- if (data.error) throw data.msg;
- data = data.data;
- var gasPrice = new BigNumber(ethFuncs.sanitizeHex(ethFuncs.addTinyMoreToGas(data.gasprice))).times(gasLimit);
- var maxVal = new BigNumber(data.balance).minus(gasPrice);
- maxVal = etherUnits.toEther(maxVal, 'wei') < 0 ? 0 : etherUnits.toEther(maxVal, 'wei');
- if (callback !== undefined) callback({
- isError: false,
- unit: "ether",
- value: maxVal
- });
- });
- } catch (e) {
- if (callback !== undefined) callback({
- isError: true,
- error: e
- });
- }
-}
+'use strict';
+var uiFuncs = function() {}
+uiFuncs.getTxData = function($scope) {
+ return {
+ to: $scope.tx.to,
+ value: $scope.tx.value,
+ unit: $scope.tx.unit,
+ gasLimit: $scope.tx.gasLimit,
+ data: $scope.tx.data,
+ from: $scope.wallet.getAddressString(),
+ privKey: $scope.wallet.getPrivateKeyString()
+ };
+}
+uiFuncs.generateClassicTx = function(txData, callback) {
+ try {
+ if (!ethFuncs.validateEtherAddress(txData.to)) throw globalFuncs.errorMsgs[5];
+ else if (!globalFuncs.isNumeric(txData.value) || parseFloat(txData.value) < 0) throw globalFuncs.errorMsgs[7];
+ else if (!globalFuncs.isNumeric(txData.gasLimit) || parseFloat(txData.gasLimit) <= 0) throw globalFuncs.errorMsgs[8];
+ else if (!ethFuncs.validateHexString(txData.data)) throw globalFuncs.errorMsgs[9];
+ ajaxReq.getClassicTransactionData(txData.from, function(data) {
+ if (data.error) throw data.msg;
+ data = data.data;
+ var rawTx = {
+ nonce: ethFuncs.sanitizeHex(data.nonce),
+ gasPrice: ethFuncs.sanitizeHex(ethFuncs.addTinyMoreToGas(data.gasprice)),
+ gasLimit: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(txData.gasLimit)),
+ to: ethFuncs.sanitizeHex(txData.to),
+ value: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(etherUnits.toWei(txData.value, txData.unit))),
+ data: ethFuncs.sanitizeHex(txData.data)
+ }
+ var eTx = new ethUtil.Tx(rawTx);
+ eTx.sign(new Buffer(txData.privKey, 'hex'));
+ rawTx.rawTx = JSON.stringify(rawTx);
+ rawTx.signedTx = '0x' + eTx.serialize().toString('hex');
+ rawTx.isError = false;
+ if (callback !== undefined) callback(rawTx);
+ });
+ } catch (e) {
+ if (callback !== undefined) callback({
+ isError: true,
+ error: e
+ });
+ }
+}
+uiFuncs.sendClassicTx = function(signedTx, callback) {
+ ajaxReq.sendClassicRawTx(signedTx, function(data) {
+ var resp = {};
+ if (data.error) {
+ resp = {
+ isError: true,
+ error: data.msg
+ };
+ } else {
+ resp = {
+ isError: false,
+ data: data.data
+ };
+ }
+ if (callback !== undefined) callback(resp);
+ });
+}
+uiFuncs.generateTx = function(txData, callback) {
+ try {
+ if (!ethFuncs.validateEtherAddress(txData.to)) throw globalFuncs.errorMsgs[5];
+ else if (!globalFuncs.isNumeric(txData.value) || parseFloat(txData.value) < 0) throw globalFuncs.errorMsgs[7];
+ else if (!globalFuncs.isNumeric(txData.gasLimit) || parseFloat(txData.gasLimit) <= 0) throw globalFuncs.errorMsgs[8];
+ else if (!ethFuncs.validateHexString(txData.data)) throw globalFuncs.errorMsgs[9];
+ ajaxReq.getTransactionData(txData.from, function(data) {
+ if (data.error) throw data.msg;
+ data = data.data;
+ var rawTx = {
+ nonce: ethFuncs.sanitizeHex(data.nonce),
+ gasPrice: ethFuncs.sanitizeHex(ethFuncs.addTinyMoreToGas(data.gasprice)),
+ gasLimit: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(txData.gasLimit)),
+ to: ethFuncs.sanitizeHex(txData.to),
+ value: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(etherUnits.toWei(txData.value, txData.unit))),
+ data: ethFuncs.sanitizeHex(txData.data)
+ }
+ var eTx = new ethUtil.Tx(rawTx);
+ eTx.sign(new Buffer(txData.privKey, 'hex'));
+ rawTx.rawTx = JSON.stringify(rawTx);
+ rawTx.signedTx = '0x' + eTx.serialize().toString('hex');
+ rawTx.isError = false;
+ if (callback !== undefined) callback(rawTx);
+ });
+ } catch (e) {
+ if (callback !== undefined) callback({
+ isError: true,
+ error: e
+ });
+ }
+}
+uiFuncs.sendTx = function(signedTx, callback) {
+ ajaxReq.sendRawTx(signedTx, function(data) {
+ var resp = {};
+ if (data.error) {
+ resp = {
+ isError: true,
+ error: data.msg
+ };
+ } else {
+ resp = {
+ isError: false,
+ data: data.data
+ };
+ }
+ if (callback !== undefined) callback(resp);
+ });
+}
+uiFuncs.transferAllBalance = function(fromAdd, gasLimit, callback) {
+ try {
+ ajaxReq.getTransactionData(fromAdd, function(data) {
+ if (data.error) throw data.msg;
+ data = data.data;
+ var gasPrice = new BigNumber(ethFuncs.sanitizeHex(ethFuncs.addTinyMoreToGas(data.gasprice))).times(gasLimit);
+ var maxVal = new BigNumber(data.balance).minus(gasPrice);
+ maxVal = etherUnits.toEther(maxVal, 'wei') < 0 ? 0 : etherUnits.toEther(maxVal, 'wei');
+ if (callback !== undefined) callback({
+ isError: false,
+ unit: "ether",
+ value: maxVal
+ });
+ });
+ } catch (e) {
+ if (callback !== undefined) callback({
+ isError: true,
+ error: e
+ });
+ }
+}
module.exports = uiFuncs;
}).call(this,require("buffer").Buffer)
},{"buffer":90}],36:[function(require,module,exports){
@@ -6810,7 +6810,7 @@ return 'pascalprecht.translate';
},{}],39:[function(require,module,exports){
/**
- * @license AngularJS v1.5.8
+ * @license AngularJS v1.5.6
* (c) 2010-2016 Google, Inc. http://angularjs.org
* License: MIT
*/
@@ -6868,7 +6868,7 @@ function minErr(module, ErrorConstructor) {
return match;
});
- message += '\nhttp://errors.angularjs.org/1.5.8/' +
+ message += '\nhttp://errors.angularjs.org/1.5.6/' +
(module ? module + '/' : '') + code;
for (i = SKIP_INDEXES, paramPrefix = '?'; i < templateArgs.length; i++, paramPrefix = '&') {
@@ -6937,6 +6937,7 @@ function minErr(module, ErrorConstructor) {
includes: true,
arrayRemove: true,
copy: true,
+ shallowCopy: true,
equals: true,
csp: true,
jq: true,
@@ -7632,13 +7633,7 @@ function arrayRemove(array, value) {
* * If a destination is provided, all of its elements (for arrays) or properties (for objects)
* are deleted and then all elements/properties from the source are copied to it.
* * If `source` is not an object or array (inc. `null` and `undefined`), `source` is returned.
- * * If `source` is identical to `destination` an exception will be thrown.
- *
- *
- *
- * Only enumerable properties are taken into account. Non-enumerable properties (both on `source`
- * and on `destination`) will be ignored.
- *
+ * * If `source` is identical to 'destination' an exception will be thrown.
*
* @param {*} source The source that will be used to make a copy.
* Can be any type, including primitives, `null`, and `undefined`.
@@ -7647,42 +7642,41 @@ function arrayRemove(array, value) {
* @returns {*} The copy or updated `destination`, if `destination` was specified.
*
* @example
-
-
-
+
+
+
+
*/
function copy(source, destination) {
var stackSource = [];
@@ -7789,7 +7783,7 @@ function copy(source, destination) {
case '[object Uint8ClampedArray]':
case '[object Uint16Array]':
case '[object Uint32Array]':
- return new source.constructor(copyElement(source.buffer), source.byteOffset, source.length);
+ return new source.constructor(copyElement(source.buffer));
case '[object ArrayBuffer]':
//Support: IE10
@@ -7821,6 +7815,31 @@ function copy(source, destination) {
}
}
+/**
+ * Creates a shallow copy of an object, an array or a primitive.
+ *
+ * Assumes that there are no proto properties for objects.
+ */
+function shallowCopy(src, dst) {
+ if (isArray(src)) {
+ dst = dst || [];
+
+ for (var i = 0, ii = src.length; i < ii; i++) {
+ dst[i] = src[i];
+ }
+ } else if (isObject(src)) {
+ dst = dst || {};
+
+ for (var key in src) {
+ if (!(key.charAt(0) === '$' && key.charAt(1) === '$')) {
+ dst[key] = src[key];
+ }
+ }
+ }
+
+ return dst || src;
+}
+
/**
* @ngdoc function
@@ -9161,34 +9180,7 @@ function setupModuleLoader(window) {
}
-/* global shallowCopy: true */
-
-/**
- * Creates a shallow copy of an object, an array or a primitive.
- *
- * Assumes that there are no proto properties for objects.
- */
-function shallowCopy(src, dst) {
- if (isArray(src)) {
- dst = dst || [];
-
- for (var i = 0, ii = src.length; i < ii; i++) {
- dst[i] = src[i];
- }
- } else if (isObject(src)) {
- dst = dst || {};
-
- for (var key in src) {
- if (!(key.charAt(0) === '$' && key.charAt(1) === '$')) {
- dst[key] = src[key];
- }
- }
- }
-
- return dst || src;
-}
-
-/* global toDebugString: true */
+/* global: toDebugString: true */
function serializeObject(obj) {
var seen = [];
@@ -9292,7 +9284,6 @@ function toDebugString(obj) {
$HttpParamSerializerJQLikeProvider,
$HttpBackendProvider,
$xhrFactoryProvider,
- $jsonpCallbacksProvider,
$LocationProvider,
$LogProvider,
$ParseProvider,
@@ -9330,11 +9321,11 @@ function toDebugString(obj) {
* - `codeName` – `{string}` – Code name of the release, such as "jiggling-armfat".
*/
var version = {
- full: '1.5.8', // all of these placeholder strings will be replaced by grunt's
+ full: '1.5.6', // all of these placeholder strings will be replaced by grunt's
major: 1, // package task
minor: 5,
- dot: 8,
- codeName: 'arbitrary-fallbacks'
+ dot: 6,
+ codeName: 'arrow-stringification'
};
@@ -9365,7 +9356,7 @@ function publishExternalAPI(angular) {
'isDate': isDate,
'lowercase': lowercase,
'uppercase': uppercase,
- 'callbacks': {$$counter: 0},
+ 'callbacks': {counter: 0},
'getTestability': getTestability,
'$$minErr': minErr,
'$$csp': csp,
@@ -9454,7 +9445,6 @@ function publishExternalAPI(angular) {
$httpParamSerializerJQLike: $HttpParamSerializerJQLikeProvider,
$httpBackend: $HttpBackendProvider,
$xhrFactory: $xhrFactoryProvider,
- $jsonpCallbacks: $jsonpCallbacksProvider,
$location: $LocationProvider,
$log: $LogProvider,
$parse: $ParseProvider,
@@ -9531,7 +9521,7 @@ function publishExternalAPI(angular) {
* ## Angular's jqLite
* jqLite provides only the following jQuery methods:
*
- * - [`addClass()`](http://api.jquery.com/addClass/) - Does not support a function as first argument
+ * - [`addClass()`](http://api.jquery.com/addClass/)
* - [`after()`](http://api.jquery.com/after/)
* - [`append()`](http://api.jquery.com/append/)
* - [`attr()`](http://api.jquery.com/attr/) - Does not support functions as parameters
@@ -9558,7 +9548,7 @@ function publishExternalAPI(angular) {
* - [`ready()`](http://api.jquery.com/ready/)
* - [`remove()`](http://api.jquery.com/remove/)
* - [`removeAttr()`](http://api.jquery.com/removeAttr/)
- * - [`removeClass()`](http://api.jquery.com/removeClass/) - Does not support a function as first argument
+ * - [`removeClass()`](http://api.jquery.com/removeClass/)
* - [`removeData()`](http://api.jquery.com/removeData/)
* - [`replaceWith()`](http://api.jquery.com/replaceWith/)
* - [`text()`](http://api.jquery.com/text/)
@@ -9693,7 +9683,7 @@ function jqLiteBuildFragment(html, context) {
nodes.push(context.createTextNode(html));
} else {
// Convert html into DOM nodes
- tmp = fragment.appendChild(context.createElement("div"));
+ tmp = tmp || fragment.appendChild(context.createElement("div"));
tag = (TAG_NAME_REGEXP.exec(html) || ["", ""])[1].toLowerCase();
wrap = wrapMap[tag] || wrapMap._default;
tmp.innerHTML = wrap[1] + html.replace(XHTML_TAG_REGEXP, "<$1>") + wrap[2];
@@ -11506,10 +11496,10 @@ function createInjector(modulesToLoad, strictDi) {
if (msie <= 11) {
return false;
}
- // Support: Edge 12-13 only
- // See: https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/6156135/
+ // Workaround for MS Edge.
+ // Check https://connect.microsoft.com/IE/Feedback/Details/2211653
return typeof func === 'function'
- && /^(?:class\b|constructor\()/.test(stringifyFn(func));
+ && /^(?:class\s|constructor\()/.test(stringifyFn(func));
}
function invoke(fn, self, locals, serviceName) {
@@ -12250,13 +12240,7 @@ var $AnimateProvider = ['$provide', function($provide) {
* @param {DOMElement} parent the parent element which will append the element as
* a child (so long as the after element is not present)
* @param {DOMElement=} after the sibling element after which the element will be appended
- * @param {object=} options an optional collection of options/styles that will be applied to the element.
- * The object can have the following properties:
- *
- * - **addClass** - `{string}` - space-separated CSS classes to add to element
- * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
- * - **removeClass** - `{string}` - space-separated CSS classes to remove from element
- * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+ * @param {object=} options an optional collection of options/styles that will be applied to the element
*
* @return {Promise} the animation callback promise
*/
@@ -12282,13 +12266,7 @@ var $AnimateProvider = ['$provide', function($provide) {
* @param {DOMElement} parent the parent element which will append the element as
* a child (so long as the after element is not present)
* @param {DOMElement=} after the sibling element after which the element will be appended
- * @param {object=} options an optional collection of options/styles that will be applied to the element.
- * The object can have the following properties:
- *
- * - **addClass** - `{string}` - space-separated CSS classes to add to element
- * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
- * - **removeClass** - `{string}` - space-separated CSS classes to remove from element
- * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+ * @param {object=} options an optional collection of options/styles that will be applied to the element
*
* @return {Promise} the animation callback promise
*/
@@ -12309,13 +12287,7 @@ var $AnimateProvider = ['$provide', function($provide) {
* digest once the animation has completed.
*
* @param {DOMElement} element the element which will be removed from the DOM
- * @param {object=} options an optional collection of options/styles that will be applied to the element.
- * The object can have the following properties:
- *
- * - **addClass** - `{string}` - space-separated CSS classes to add to element
- * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
- * - **removeClass** - `{string}` - space-separated CSS classes to remove from element
- * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+ * @param {object=} options an optional collection of options/styles that will be applied to the element
*
* @return {Promise} the animation callback promise
*/
@@ -12339,13 +12311,7 @@ var $AnimateProvider = ['$provide', function($provide) {
*
* @param {DOMElement} element the element which the CSS classes will be applied to
* @param {string} className the CSS class(es) that will be added (multiple classes are separated via spaces)
- * @param {object=} options an optional collection of options/styles that will be applied to the element.
- * The object can have the following properties:
- *
- * - **addClass** - `{string}` - space-separated CSS classes to add to element
- * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
- * - **removeClass** - `{string}` - space-separated CSS classes to remove from element
- * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+ * @param {object=} options an optional collection of options/styles that will be applied to the element
*
* @return {Promise} the animation callback promise
*/
@@ -12369,13 +12335,7 @@ var $AnimateProvider = ['$provide', function($provide) {
*
* @param {DOMElement} element the element which the CSS classes will be applied to
* @param {string} className the CSS class(es) that will be removed (multiple classes are separated via spaces)
- * @param {object=} options an optional collection of options/styles that will be applied to the element.
- * The object can have the following properties:
- *
- * - **addClass** - `{string}` - space-separated CSS classes to add to element
- * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
- * - **removeClass** - `{string}` - space-separated CSS classes to remove from element
- * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+ * @param {object=} options an optional collection of options/styles that will be applied to the element
*
* @return {Promise} the animation callback promise
*/
@@ -12400,13 +12360,7 @@ var $AnimateProvider = ['$provide', function($provide) {
* @param {DOMElement} element the element which the CSS classes will be applied to
* @param {string} add the CSS class(es) that will be added (multiple classes are separated via spaces)
* @param {string} remove the CSS class(es) that will be removed (multiple classes are separated via spaces)
- * @param {object=} options an optional collection of options/styles that will be applied to the element.
- * The object can have the following properties:
- *
- * - **addClass** - `{string}` - space-separated CSS classes to add to element
- * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
- * - **removeClass** - `{string}` - space-separated CSS classes to remove from element
- * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+ * @param {object=} options an optional collection of options/styles that will be applied to the element
*
* @return {Promise} the animation callback promise
*/
@@ -12447,13 +12401,7 @@ var $AnimateProvider = ['$provide', function($provide) {
* @param {string=} className an optional CSS class that will be applied to the element for the duration of the animation. If
* this value is left as empty then a CSS class of `ng-inline-animate` will be applied to the element.
* (Note that if no animation is detected then this value will not be applied to the element.)
- * @param {object=} options an optional collection of options/styles that will be applied to the element.
- * The object can have the following properties:
- *
- * - **addClass** - `{string}` - space-separated CSS classes to add to element
- * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
- * - **removeClass** - `{string}` - space-separated CSS classes to remove from element
- * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+ * @param {object=} options an optional collection of options/styles that will be applied to the element
*
* @return {Promise} the animation callback promise
*/
@@ -13541,9 +13489,8 @@ function $TemplateCacheProvider() {
* There are many different options for a directive.
*
* The difference resides in the return value of the factory function.
- * You can either return a {@link $compile#directive-definition-object Directive Definition Object (see below)}
- * that defines the directive properties, or just the `postLink` function (all other properties will have
- * the default values).
+ * You can either return a "Directive Definition Object" (see below) that defines the directive properties,
+ * or just the `postLink` function (all other properties will have the default values).
*
*
* **Best Practice:** It's recommended to use the "directive definition object" form.
@@ -13607,125 +13554,6 @@ function $TemplateCacheProvider() {
* });
* ```
*
- * ### Life-cycle hooks
- * Directive controllers can provide the following methods that are called by Angular at points in the life-cycle of the
- * directive:
- * * `$onInit()` - Called on each controller after all the controllers on an element have been constructed and
- * had their bindings initialized (and before the pre & post linking functions for the directives on
- * this element). This is a good place to put initialization code for your controller.
- * * `$onChanges(changesObj)` - Called whenever one-way (`<`) or interpolation (`@`) bindings are updated. The
- * `changesObj` is a hash whose keys are the names of the bound properties that have changed, and the values are an
- * object of the form `{ currentValue, previousValue, isFirstChange() }`. Use this hook to trigger updates within a
- * component such as cloning the bound value to prevent accidental mutation of the outer value.
- * * `$doCheck()` - Called on each turn of the digest cycle. Provides an opportunity to detect and act on
- * changes. Any actions that you wish to take in response to the changes that you detect must be
- * invoked from this hook; implementing this has no effect on when `$onChanges` is called. For example, this hook
- * could be useful if you wish to perform a deep equality check, or to check a Date object, changes to which would not
- * be detected by Angular's change detector and thus not trigger `$onChanges`. This hook is invoked with no arguments;
- * if detecting changes, you must store the previous value(s) for comparison to the current values.
- * * `$onDestroy()` - Called on a controller when its containing scope is destroyed. Use this hook for releasing
- * external resources, watches and event handlers. Note that components have their `$onDestroy()` hooks called in
- * the same order as the `$scope.$broadcast` events are triggered, which is top down. This means that parent
- * components will have their `$onDestroy()` hook called before child components.
- * * `$postLink()` - Called after this controller's element and its children have been linked. Similar to the post-link
- * function this hook can be used to set up DOM event handlers and do direct DOM manipulation.
- * Note that child elements that contain `templateUrl` directives will not have been compiled and linked since
- * they are waiting for their template to load asynchronously and their own compilation and linking has been
- * suspended until that occurs.
- *
- * #### Comparison with Angular 2 life-cycle hooks
- * Angular 2 also uses life-cycle hooks for its components. While the Angular 1 life-cycle hooks are similar there are
- * some differences that you should be aware of, especially when it comes to moving your code from Angular 1 to Angular 2:
- *
- * * Angular 1 hooks are prefixed with `$`, such as `$onInit`. Angular 2 hooks are prefixed with `ng`, such as `ngOnInit`.
- * * Angular 1 hooks can be defined on the controller prototype or added to the controller inside its constructor.
- * In Angular 2 you can only define hooks on the prototype of the Component class.
- * * Due to the differences in change-detection, you may get many more calls to `$doCheck` in Angular 1 than you would to
- * `ngDoCheck` in Angular 2
- * * Changes to the model inside `$doCheck` will trigger new turns of the digest loop, which will cause the changes to be
- * propagated throughout the application.
- * Angular 2 does not allow the `ngDoCheck` hook to trigger a change outside of the component. It will either throw an
- * error or do nothing depending upon the state of `enableProdMode()`.
- *
- * #### Life-cycle hook examples
- *
- * This example shows how you can check for mutations to a Date object even though the identity of the object
- * has not changed.
- *
- *
- *
- * angular.module('do-check-module', [])
- * .component('app', {
- * template:
- * 'Month: ' +
- * 'Date: {{ $ctrl.date }}' +
- * '',
- * controller: function() {
- * this.date = new Date();
- * this.month = this.date.getMonth();
- * this.updateDate = function() {
- * this.date.setMonth(this.month);
- * };
- * }
- * })
- * .component('test', {
- * bindings: { date: '<' },
- * template:
- * '
{{ $ctrl.log | json }}
',
- * controller: function() {
- * var previousValue;
- * this.log = [];
- * this.$doCheck = function() {
- * var currentValue = this.date && this.date.valueOf();
- * if (previousValue !== currentValue) {
- * this.log.push('doCheck: date mutated: ' + this.date);
- * previousValue = currentValue;
- * }
- * };
- * }
- * });
- *
- *
- *
- *
- *
- *
- * This example show how you might use `$doCheck` to trigger changes in your component's inputs even if the
- * actual identity of the component doesn't change. (Be aware that cloning and deep equality checks on large
- * arrays or objects can have a negative impact on your application performance)
- *
- *
- *
- *
',
- * controller: function() {
- * this.log = [];
- *
- * this.$doCheck = function() {
- * if (this.items_ref !== this.items) {
- * this.log.push('doCheck: items changed');
- * this.items_ref = this.items;
- * }
- * if (!angular.equals(this.items_clone, this.items)) {
- * this.log.push('doCheck: items mutated');
- * this.items_clone = angular.copy(this.items);
- * }
- * };
- * }
- * });
- *
- *
*
*
* ### Directive Definition Object
@@ -13901,6 +13729,25 @@ function $TemplateCacheProvider() {
* The `$transclude` function also has a method on it, `$transclude.isSlotFilled(slotName)`, which returns
* `true` if the specified slot contains content (i.e. one or more DOM nodes).
*
+ * The controller can provide the following methods that act as life-cycle hooks:
+ * * `$onInit()` - Called on each controller after all the controllers on an element have been constructed and
+ * had their bindings initialized (and before the pre & post linking functions for the directives on
+ * this element). This is a good place to put initialization code for your controller.
+ * * `$onChanges(changesObj)` - Called whenever one-way (`<`) or interpolation (`@`) bindings are updated. The
+ * `changesObj` is a hash whose keys are the names of the bound properties that have changed, and the values are an
+ * object of the form `{ currentValue, previousValue, isFirstChange() }`. Use this hook to trigger updates within a
+ * component such as cloning the bound value to prevent accidental mutation of the outer value.
+ * * `$onDestroy()` - Called on a controller when its containing scope is destroyed. Use this hook for releasing
+ * external resources, watches and event handlers. Note that components have their `$onDestroy()` hooks called in
+ * the same order as the `$scope.$broadcast` events are triggered, which is top down. This means that parent
+ * components will have their `$onDestroy()` hook called before child components.
+ * * `$postLink()` - Called after this controller's element and its children have been linked. Similar to the post-link
+ * function this hook can be used to set up DOM event handlers and do direct DOM manipulation.
+ * Note that child elements that contain `templateUrl` directives will not have been compiled and linked since
+ * they are waiting for their template to load asynchronously and their own compilation and linking has been
+ * suspended until that occurs.
+ *
+ *
* #### `require`
* Require another directive and inject its controller as the fourth argument to the linking function. The
* `require` property can be a string, an array or an object:
@@ -14098,8 +13945,8 @@ function $TemplateCacheProvider() {
* any other controller.
*
* * `transcludeFn` - A transclude linking function pre-bound to the correct transclusion scope.
- * This is the same as the `$transclude` parameter of directive controllers,
- * see {@link ng.$compile#-controller- the controller section for details}.
+ * This is the same as the `$transclude`
+ * parameter of directive controllers, see there for details.
* `function([scope], cloneLinkingFn, futureParentElement)`.
*
* #### Pre-linking function
@@ -14901,19 +14748,11 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
}
// We must run this hook in an apply since the $$postDigest runs outside apply
$rootScope.$apply(function() {
- var errors = [];
for (var i = 0, ii = onChangesQueue.length; i < ii; ++i) {
- try {
- onChangesQueue[i]();
- } catch (e) {
- errors.push(e);
- }
+ onChangesQueue[i]();
}
// Reset the queue to trigger a new schedule next time there is a change
onChangesQueue = undefined;
- if (errors.length) {
- throw errors;
- }
});
} finally {
onChangesTtl++;
@@ -15554,7 +15393,19 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
addTextInterpolateDirective(directives, node.nodeValue);
break;
case NODE_TYPE_COMMENT: /* Comment */
- collectCommentDirectives(node, directives, attrs, maxPriority, ignoreDirective);
+ try {
+ match = COMMENT_DIRECTIVE_REGEXP.exec(node.nodeValue);
+ if (match) {
+ nName = directiveNormalize(match[1]);
+ if (addDirective(directives, nName, 'M', maxPriority, ignoreDirective)) {
+ attrs[nName] = trim(match[2]);
+ }
+ }
+ } catch (e) {
+ // turns out that under some circumstances IE9 throws errors when one attempts to read
+ // comment's node value.
+ // Just ignore it and continue. (Can't seem to reproduce in test case.)
+ }
break;
}
@@ -15562,24 +15413,6 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
return directives;
}
- function collectCommentDirectives(node, directives, attrs, maxPriority, ignoreDirective) {
- // function created because of performance, try/catch disables
- // the optimization of the whole function #14848
- try {
- var match = COMMENT_DIRECTIVE_REGEXP.exec(node.nodeValue);
- if (match) {
- var nName = directiveNormalize(match[1]);
- if (addDirective(directives, nName, 'M', maxPriority, ignoreDirective)) {
- attrs[nName] = trim(match[2]);
- }
- }
- } catch (e) {
- // turns out that under some circumstances IE9 throws errors when one attempts to read
- // comment's node value.
- // Just ignore it and continue. (Can't seem to reproduce in test case.)
- }
- }
-
/**
* Given a node with an directive-start it collects all of the siblings until it finds
* directive-end.
@@ -16095,22 +15928,10 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
forEach(elementControllers, function(controller) {
var controllerInstance = controller.instance;
if (isFunction(controllerInstance.$onChanges)) {
- try {
- controllerInstance.$onChanges(controller.bindingInfo.initialChanges);
- } catch (e) {
- $exceptionHandler(e);
- }
+ controllerInstance.$onChanges(controller.bindingInfo.initialChanges);
}
if (isFunction(controllerInstance.$onInit)) {
- try {
- controllerInstance.$onInit();
- } catch (e) {
- $exceptionHandler(e);
- }
- }
- if (isFunction(controllerInstance.$doCheck)) {
- controllerScope.$watch(function() { controllerInstance.$doCheck(); });
- controllerInstance.$doCheck();
+ controllerInstance.$onInit();
}
if (isFunction(controllerInstance.$onDestroy)) {
controllerScope.$on('$destroy', function callOnDestroyHook() {
@@ -16374,16 +16195,18 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
// copy the new attributes on the old attrs object
forEach(src, function(value, key) {
- // Check if we already set this attribute in the loop above.
- // `dst` will never contain hasOwnProperty as DOM parser won't let it.
- // You will get an "InvalidCharacterError: DOM Exception 5" error if you
- // have an attribute like "has-own-property" or "data-has-own-property", etc.
- if (!dst.hasOwnProperty(key) && key.charAt(0) !== '$') {
+ if (key == 'class') {
+ safeAddClass($element, value);
+ dst['class'] = (dst['class'] ? dst['class'] + ' ' : '') + value;
+ } else if (key == 'style') {
+ $element.attr('style', $element.attr('style') + ';' + value);
+ dst['style'] = (dst['style'] ? dst['style'] + ';' : '') + value;
+ // `dst` will never contain hasOwnProperty as DOM parser won't let it.
+ // You will get an "InvalidCharacterError: DOM Exception 5" error if you
+ // have an attribute like "has-own-property" or "data-has-own-property", etc.
+ } else if (key.charAt(0) != '$' && !dst.hasOwnProperty(key)) {
dst[key] = value;
-
- if (key !== 'class' && key !== 'style') {
- dstAttr[key] = srcAttr[key];
- }
+ dstAttr[key] = srcAttr[key];
}
});
}
@@ -16758,7 +16581,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
forEach(bindings, function initializeBinding(definition, scopeName) {
var attrName = definition.attrName,
optional = definition.optional,
- mode = definition.mode, // @, =, <, or &
+ mode = definition.mode, // @, =, or &
lastValue,
parentGet, parentSet, compare, removeWatch;
@@ -17244,21 +17067,18 @@ function $DocumentProvider() {
*
* ## Example:
*
- * The example below will overwrite the default `$exceptionHandler` in order to (a) log uncaught
- * errors to the backend for later inspection by the developers and (b) to use `$log.warn()` instead
- * of `$log.error()`.
- *
* ```js
- * angular.
- * module('exceptionOverwrite', []).
- * factory('$exceptionHandler', ['$log', 'logErrorsToBackend', function($log, logErrorsToBackend) {
- * return function myExceptionHandler(exception, cause) {
- * logErrorsToBackend(exception, cause);
- * $log.warn(exception, cause);
- * };
- * }]);
+ * angular.module('exceptionOverride', []).factory('$exceptionHandler', function() {
+ * return function(exception, cause) {
+ * exception.message += ' (caused by "' + cause + '")';
+ * throw exception;
+ * };
+ * });
* ```
*
+ * This example will override the normal action of `$exceptionHandler`, to make angular
+ * exceptions fail hard when they happen, instead of just logging to the console.
+ *
*
* Note, that code executed in event-listeners (even those registered using jqLite's `on`/`bind`
* methods) does not delegate exceptions to the {@link ng.$exceptionHandler $exceptionHandler}
@@ -17268,7 +17088,7 @@ function $DocumentProvider() {
* `try { ... } catch(e) { $exceptionHandler(e); }`
*
* @param {Error} exception Exception associated with the error.
- * @param {string=} cause Optional information about the context in which
+ * @param {string=} cause optional information about the context in which
* the error was thrown.
*
*/
@@ -17338,7 +17158,7 @@ function $HttpParamSerializerProvider() {
* * `{'foo': 'bar'}` results in `foo=bar`
* * `{'foo': Date.now()}` results in `foo=2015-04-01T09%3A50%3A49.262Z` (`toISOString()` and encoded representation of a Date object)
* * `{'foo': ['bar', 'baz']}` results in `foo=bar&foo=baz` (repeated key for each array element)
- * * `{'foo': {'bar':'baz'}}` results in `foo=%7B%22bar%22%3A%22baz%22%7D` (stringified and encoded representation of an object)
+ * * `{'foo': {'bar':'baz'}}` results in `foo=%7B%22bar%22%3A%22baz%22%7D"` (stringified and encoded representation of an object)
*
* Note that serializer will sort the request parameters alphabetically.
* */
@@ -17889,7 +17709,7 @@ function $HttpProvider() {
*
* ### Overriding the Default Transformations Per Request
*
- * If you wish to override the request/response transformations only for a single request then provide
+ * If you wish override the request/response transformations only for a single request then provide
* `transformRequest` and/or `transformResponse` properties on the configuration object passed
* into `$http`.
*
@@ -17932,7 +17752,7 @@ function $HttpProvider() {
* * cache a specific response - set config.cache value to TRUE or to a cache object
*
* If caching is enabled, but neither the default cache nor config.cache are set to a cache object,
- * then the default `$cacheFactory("$http")` object is used.
+ * then the default `$cacheFactory($http)` object is used.
*
* The default cache value can be set by updating the
* {@link ng.$http#defaults `$http.defaults.cache`} property or the
@@ -18260,25 +18080,48 @@ function $HttpProvider() {
config.headers = mergeHeaders(requestConfig);
config.method = uppercase(config.method);
config.paramSerializer = isString(config.paramSerializer) ?
- $injector.get(config.paramSerializer) : config.paramSerializer;
+ $injector.get(config.paramSerializer) : config.paramSerializer;
+
+ var serverRequest = function(config) {
+ var headers = config.headers;
+ var reqData = transformData(config.data, headersGetter(headers), undefined, config.transformRequest);
- var requestInterceptors = [];
- var responseInterceptors = [];
+ // strip content-type if data is undefined
+ if (isUndefined(reqData)) {
+ forEach(headers, function(value, header) {
+ if (lowercase(header) === 'content-type') {
+ delete headers[header];
+ }
+ });
+ }
+
+ if (isUndefined(config.withCredentials) && !isUndefined(defaults.withCredentials)) {
+ config.withCredentials = defaults.withCredentials;
+ }
+
+ // send request
+ return sendReq(config, reqData).then(transformResponse, transformResponse);
+ };
+
+ var chain = [serverRequest, undefined];
var promise = $q.when(config);
// apply interceptors
forEach(reversedInterceptors, function(interceptor) {
if (interceptor.request || interceptor.requestError) {
- requestInterceptors.unshift(interceptor.request, interceptor.requestError);
+ chain.unshift(interceptor.request, interceptor.requestError);
}
if (interceptor.response || interceptor.responseError) {
- responseInterceptors.push(interceptor.response, interceptor.responseError);
+ chain.push(interceptor.response, interceptor.responseError);
}
});
- promise = chainInterceptors(promise, requestInterceptors);
- promise = promise.then(serverRequest);
- promise = chainInterceptors(promise, responseInterceptors);
+ while (chain.length) {
+ var thenFn = chain.shift();
+ var rejectFn = chain.shift();
+
+ promise = promise.then(thenFn, rejectFn);
+ }
if (useLegacyPromise) {
promise.success = function(fn) {
@@ -18305,18 +18148,14 @@ function $HttpProvider() {
return promise;
-
- function chainInterceptors(promise, interceptors) {
- for (var i = 0, ii = interceptors.length; i < ii;) {
- var thenFn = interceptors[i++];
- var rejectFn = interceptors[i++];
-
- promise = promise.then(thenFn, rejectFn);
- }
-
- interceptors.length = 0;
-
- return promise;
+ function transformResponse(response) {
+ // make a copy since the response must be cacheable
+ var resp = extend({}, response);
+ resp.data = transformData(response.data, response.headers, response.status,
+ config.transformResponse);
+ return (isSuccess(response.status))
+ ? resp
+ : $q.reject(resp);
}
function executeHeaderFns(headers, config) {
@@ -18360,37 +18199,6 @@ function $HttpProvider() {
// execute if header value is a function for merged headers
return executeHeaderFns(reqHeaders, shallowCopy(config));
}
-
- function serverRequest(config) {
- var headers = config.headers;
- var reqData = transformData(config.data, headersGetter(headers), undefined, config.transformRequest);
-
- // strip content-type if data is undefined
- if (isUndefined(reqData)) {
- forEach(headers, function(value, header) {
- if (lowercase(header) === 'content-type') {
- delete headers[header];
- }
- });
- }
-
- if (isUndefined(config.withCredentials) && !isUndefined(defaults.withCredentials)) {
- config.withCredentials = defaults.withCredentials;
- }
-
- // send request
- return sendReq(config, reqData).then(transformResponse, transformResponse);
- }
-
- function transformResponse(response) {
- // make a copy since the response must be cacheable
- var resp = extend({}, response);
- resp.data = transformData(response.data, response.headers, response.status,
- config.transformResponse);
- return (isSuccess(response.status))
- ? resp
- : $q.reject(resp);
- }
}
$http.pendingRequests = [];
@@ -18437,8 +18245,6 @@ function $HttpProvider() {
*
* @description
* Shortcut method to perform `JSONP` request.
- * If you would like to customise where and how the callbacks are stored then try overriding
- * or decorating the {@link $jsonpCallbacks} service.
*
* @param {string} url Relative or absolute URL specifying the destination of the request.
* The name of the callback should be the string `JSON_CALLBACK`.
@@ -18712,7 +18518,7 @@ function $xhrFactoryProvider() {
/**
* @ngdoc service
* @name $httpBackend
- * @requires $jsonpCallbacks
+ * @requires $window
* @requires $document
* @requires $xhrFactory
*
@@ -18727,8 +18533,8 @@ function $xhrFactoryProvider() {
* $httpBackend} which can be trained with responses.
*/
function $HttpBackendProvider() {
- this.$get = ['$browser', '$jsonpCallbacks', '$document', '$xhrFactory', function($browser, $jsonpCallbacks, $document, $xhrFactory) {
- return createHttpBackend($browser, $xhrFactory, $browser.defer, $jsonpCallbacks, $document[0]);
+ this.$get = ['$browser', '$window', '$document', '$xhrFactory', function($browser, $window, $document, $xhrFactory) {
+ return createHttpBackend($browser, $xhrFactory, $browser.defer, $window.angular.callbacks, $document[0]);
}];
}
@@ -18738,13 +18544,17 @@ function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDoc
$browser.$$incOutstandingRequestCount();
url = url || $browser.url();
- if (lowercase(method) === 'jsonp') {
- var callbackPath = callbacks.createCallback(url);
- var jsonpDone = jsonpReq(url, callbackPath, function(status, text) {
- // jsonpReq only ever sets status to 200 (OK), 404 (ERROR) or -1 (WAITING)
- var response = (status === 200) && callbacks.getResponse(callbackPath);
- completeRequest(callback, status, response, "", text);
- callbacks.removeCallback(callbackPath);
+ if (lowercase(method) == 'jsonp') {
+ var callbackId = '_' + (callbacks.counter++).toString(36);
+ callbacks[callbackId] = function(data) {
+ callbacks[callbackId].data = data;
+ callbacks[callbackId].called = true;
+ };
+
+ var jsonpDone = jsonpReq(url.replace('JSON_CALLBACK', 'angular.callbacks.' + callbackId),
+ callbackId, function(status, text) {
+ completeRequest(callback, status, callbacks[callbackId].data, "", text);
+ callbacks[callbackId] = noop;
});
} else {
@@ -18846,8 +18656,7 @@ function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDoc
}
};
- function jsonpReq(url, callbackPath, done) {
- url = url.replace('JSON_CALLBACK', callbackPath);
+ function jsonpReq(url, callbackId, done) {
// we can't use jQuery/jqLite here because jQuery does crazy stuff with script elements, e.g.:
// - fetches local scripts via XHR and evals them
// - adds and immediately removes script elements from the document
@@ -18865,7 +18674,7 @@ function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDoc
var text = "unknown";
if (event) {
- if (event.type === "load" && !callbacks.wasCalled(callbackPath)) {
+ if (event.type === "load" && !callbacks[callbackId].called) {
event = { type: "error" };
}
text = event.type;
@@ -19064,7 +18873,7 @@ function $InterpolateProvider() {
*
* `allOrNothing` is useful for interpolating URLs. `ngSrc` and `ngSrcset` use this behavior.
*
- * #### Escaped Interpolation
+ * ####Escaped Interpolation
* $interpolate provides a mechanism for escaping interpolation markers. Start and end markers
* can be escaped by preceding each of their characters with a REVERSE SOLIDUS U+005C (backslash).
* It will be rendered as a regular start/end marker, and will not be interpreted as an expression
@@ -19487,87 +19296,6 @@ function $IntervalProvider() {
}];
}
-/**
- * @ngdoc service
- * @name $jsonpCallbacks
- * @requires $window
- * @description
- * This service handles the lifecycle of callbacks to handle JSONP requests.
- * Override this service if you wish to customise where the callbacks are stored and
- * how they vary compared to the requested url.
- */
-var $jsonpCallbacksProvider = function() {
- this.$get = ['$window', function($window) {
- var callbacks = $window.angular.callbacks;
- var callbackMap = {};
-
- function createCallback(callbackId) {
- var callback = function(data) {
- callback.data = data;
- callback.called = true;
- };
- callback.id = callbackId;
- return callback;
- }
-
- return {
- /**
- * @ngdoc method
- * @name $jsonpCallbacks#createCallback
- * @param {string} url the url of the JSONP request
- * @returns {string} the callback path to send to the server as part of the JSONP request
- * @description
- * {@link $httpBackend} calls this method to create a callback and get hold of the path to the callback
- * to pass to the server, which will be used to call the callback with its payload in the JSONP response.
- */
- createCallback: function(url) {
- var callbackId = '_' + (callbacks.$$counter++).toString(36);
- var callbackPath = 'angular.callbacks.' + callbackId;
- var callback = createCallback(callbackId);
- callbackMap[callbackPath] = callbacks[callbackId] = callback;
- return callbackPath;
- },
- /**
- * @ngdoc method
- * @name $jsonpCallbacks#wasCalled
- * @param {string} callbackPath the path to the callback that was sent in the JSONP request
- * @returns {boolean} whether the callback has been called, as a result of the JSONP response
- * @description
- * {@link $httpBackend} calls this method to find out whether the JSONP response actually called the
- * callback that was passed in the request.
- */
- wasCalled: function(callbackPath) {
- return callbackMap[callbackPath].called;
- },
- /**
- * @ngdoc method
- * @name $jsonpCallbacks#getResponse
- * @param {string} callbackPath the path to the callback that was sent in the JSONP request
- * @returns {*} the data received from the response via the registered callback
- * @description
- * {@link $httpBackend} calls this method to get hold of the data that was provided to the callback
- * in the JSONP response.
- */
- getResponse: function(callbackPath) {
- return callbackMap[callbackPath].data;
- },
- /**
- * @ngdoc method
- * @name $jsonpCallbacks#removeCallback
- * @param {string} callbackPath the path to the callback that was sent in the JSONP request
- * @description
- * {@link $httpBackend} calls this method to remove the callback after the JSONP request has
- * completed or timed-out.
- */
- removeCallback: function(callbackPath) {
- var callback = callbackMap[callbackPath];
- delete callbacks[callback.id];
- delete callbackMap[callbackPath];
- }
- };
- }];
-};
-
/**
* @ngdoc service
* @name $locale
@@ -19907,12 +19635,6 @@ function LocationHashbangInHtml5Url(appBase, appBaseNoFile, hashPrefix) {
var locationPrototype = {
- /**
- * Ensure absolute url is initialized.
- * @private
- */
- $$absUrl:'',
-
/**
* Are we in html5 mode?
* @private
@@ -21286,7 +21008,7 @@ AST.prototype = {
var args = [];
if (this.peekToken().text !== ')') {
do {
- args.push(this.filterChain());
+ args.push(this.expression());
} while (this.expect(','));
}
return args;
@@ -23013,7 +22735,7 @@ function $ParseProvider() {
*
* **Methods**
*
- * - `then(successCallback, [errorCallback], [notifyCallback])` – regardless of when the promise was or
+ * - `then(successCallback, errorCallback, notifyCallback)` – regardless of when the promise was or
* will be resolved or rejected, `then` calls one of the success or error callbacks asynchronously
* as soon as the result is available. The callbacks are called with a single argument: the result
* or rejection reason. Additionally, the notify callback may be called zero or more times to
@@ -23024,8 +22746,7 @@ function $ParseProvider() {
* with the value which is resolved in that promise using
* [promise chaining](http://www.html5rocks.com/en/tutorials/es6/promises/#toc-promises-queues)).
* It also notifies via the return value of the `notifyCallback` method. The promise cannot be
- * resolved or rejected from the notifyCallback method. The errorCallback and notifyCallback
- * arguments are optional.
+ * resolved or rejected from the notifyCallback method.
*
* - `catch(errorCallback)` – shorthand for `promise.then(null, errorCallback)`
*
@@ -23440,30 +23161,6 @@ function qFactory(nextTick, exceptionHandler) {
return deferred.promise;
}
- /**
- * @ngdoc method
- * @name $q#race
- * @kind function
- *
- * @description
- * Returns a promise that resolves or rejects as soon as one of those promises
- * resolves or rejects, with the value or reason from that promise.
- *
- * @param {Array.|Object.} promises An array or hash of promises.
- * @returns {Promise} a promise that resolves or rejects as soon as one of the `promises`
- * resolves or rejects, with the value or reason from that promise.
- */
-
- function race(promises) {
- var deferred = defer();
-
- forEach(promises, function(promise) {
- when(promise).then(deferred.resolve, deferred.reject);
- });
-
- return deferred.promise;
- }
-
var $Q = function Q(resolver) {
if (!isFunction(resolver)) {
throw $qMinErr('norslvr', "Expected resolverFn, got '{0}'", resolver);
@@ -23493,7 +23190,6 @@ function qFactory(nextTick, exceptionHandler) {
$Q.when = when;
$Q.resolve = resolve;
$Q.all = all;
- $Q.race = race;
return $Q;
}
@@ -26845,11 +26541,10 @@ function $FilterProvider($provide) {
* - `Object`: A pattern object can be used to filter specific properties on objects contained
* by `array`. For example `{name:"M", phone:"1"}` predicate will return an array of items
* which have property `name` containing "M" and property `phone` containing "1". A special
- * property name (`$` by default) can be used (e.g. as in `{$: "text"}`) to accept a match
- * against any property of the object or its nested object properties. That's equivalent to the
- * simple substring match with a `string` as described above. The special property name can be
- * overwritten, using the `anyPropertyKey` parameter.
- * The predicate can be negated by prefixing the string with `!`.
+ * property name `$` can be used (as in `{$:"text"}`) to accept a match against any
+ * property of the object or its nested object properties. That's equivalent to the simple
+ * substring match with a `string` as described above. The predicate can be negated by prefixing
+ * the string with `!`.
* For example `{name: "!M"}` predicate will return an array of items which have property `name`
* not containing "M".
*
@@ -26883,9 +26578,6 @@ function $FilterProvider($provide) {
* Primitive values are converted to strings. Objects are not compared against primitives,
* unless they have a custom `toString` method (e.g. `Date` objects).
*
- * @param {string=} anyPropertyKey The special property name that matches against any property.
- * By default `$`.
- *
* @example
@@ -26954,9 +26646,8 @@ function $FilterProvider($provide) {
*/
-
function filterFilter() {
- return function(array, expression, comparator, anyPropertyKey) {
+ return function(array, expression, comparator) {
if (!isArrayLike(array)) {
if (array == null) {
return array;
@@ -26965,7 +26656,6 @@ function filterFilter() {
}
}
- anyPropertyKey = anyPropertyKey || '$';
var expressionType = getTypeForFilter(expression);
var predicateFn;
var matchAgainstAnyProp;
@@ -26982,7 +26672,7 @@ function filterFilter() {
//jshint -W086
case 'object':
//jshint +W086
- predicateFn = createPredicateFn(expression, comparator, anyPropertyKey, matchAgainstAnyProp);
+ predicateFn = createPredicateFn(expression, comparator, matchAgainstAnyProp);
break;
default:
return array;
@@ -26993,8 +26683,8 @@ function filterFilter() {
}
// Helper functions for `filterFilter`
-function createPredicateFn(expression, comparator, anyPropertyKey, matchAgainstAnyProp) {
- var shouldMatchPrimitives = isObject(expression) && (anyPropertyKey in expression);
+function createPredicateFn(expression, comparator, matchAgainstAnyProp) {
+ var shouldMatchPrimitives = isObject(expression) && ('$' in expression);
var predicateFn;
if (comparator === true) {
@@ -27022,25 +26712,25 @@ function createPredicateFn(expression, comparator, anyPropertyKey, matchAgainstA
predicateFn = function(item) {
if (shouldMatchPrimitives && !isObject(item)) {
- return deepCompare(item, expression[anyPropertyKey], comparator, anyPropertyKey, false);
+ return deepCompare(item, expression.$, comparator, false);
}
- return deepCompare(item, expression, comparator, anyPropertyKey, matchAgainstAnyProp);
+ return deepCompare(item, expression, comparator, matchAgainstAnyProp);
};
return predicateFn;
}
-function deepCompare(actual, expected, comparator, anyPropertyKey, matchAgainstAnyProp, dontMatchWholeObject) {
+function deepCompare(actual, expected, comparator, matchAgainstAnyProp, dontMatchWholeObject) {
var actualType = getTypeForFilter(actual);
var expectedType = getTypeForFilter(expected);
if ((expectedType === 'string') && (expected.charAt(0) === '!')) {
- return !deepCompare(actual, expected.substring(1), comparator, anyPropertyKey, matchAgainstAnyProp);
+ return !deepCompare(actual, expected.substring(1), comparator, matchAgainstAnyProp);
} else if (isArray(actual)) {
// In case `actual` is an array, consider it a match
// if ANY of it's items matches `expected`
return actual.some(function(item) {
- return deepCompare(item, expected, comparator, anyPropertyKey, matchAgainstAnyProp);
+ return deepCompare(item, expected, comparator, matchAgainstAnyProp);
});
}
@@ -27049,11 +26739,11 @@ function deepCompare(actual, expected, comparator, anyPropertyKey, matchAgainstA
var key;
if (matchAgainstAnyProp) {
for (key in actual) {
- if ((key.charAt(0) !== '$') && deepCompare(actual[key], expected, comparator, anyPropertyKey, true)) {
+ if ((key.charAt(0) !== '$') && deepCompare(actual[key], expected, comparator, true)) {
return true;
}
}
- return dontMatchWholeObject ? false : deepCompare(actual, expected, comparator, anyPropertyKey, false);
+ return dontMatchWholeObject ? false : deepCompare(actual, expected, comparator, false);
} else if (expectedType === 'object') {
for (key in expected) {
var expectedVal = expected[key];
@@ -27061,9 +26751,9 @@ function deepCompare(actual, expected, comparator, anyPropertyKey, matchAgainstA
continue;
}
- var matchAnyProperty = key === anyPropertyKey;
+ var matchAnyProperty = key === '$';
var actualVal = matchAnyProperty ? actual : actual[key];
- if (!deepCompare(actualVal, expectedVal, comparator, anyPropertyKey, matchAnyProperty, matchAnyProperty)) {
+ if (!deepCompare(actualVal, expectedVal, comparator, matchAnyProperty, matchAnyProperty)) {
return false;
}
}
@@ -27801,22 +27491,21 @@ var uppercaseFilter = valueFn(uppercase);
* @kind function
*
* @description
- * Creates a new array or string containing only a specified number of elements. The elements are
- * taken from either the beginning or the end of the source array, string or number, as specified by
- * the value and sign (positive or negative) of `limit`. Other array-like objects are also supported
- * (e.g. array subclasses, NodeLists, jqLite/jQuery collections etc). If a number is used as input,
- * it is converted to a string.
- *
- * @param {Array|ArrayLike|string|number} input - Array/array-like, string or number to be limited.
- * @param {string|number} limit - The length of the returned array or string. If the `limit` number
+ * Creates a new array or string containing only a specified number of elements. The elements
+ * are taken from either the beginning or the end of the source array, string or number, as specified by
+ * the value and sign (positive or negative) of `limit`. If a number is used as input, it is
+ * converted to a string.
+ *
+ * @param {Array|string|number} input Source array, string or number to be limited.
+ * @param {string|number} limit The length of the returned array or string. If the `limit` number
* is positive, `limit` number of items from the beginning of the source array/string are copied.
* If the number is negative, `limit` number of items from the end of the source array/string
* are copied. The `limit` will be trimmed if it exceeds `array.length`. If `limit` is undefined,
* the input will be returned unchanged.
- * @param {(string|number)=} begin - Index at which to begin limitation. As a negative index,
- * `begin` indicates an offset from the end of `input`. Defaults to `0`.
- * @returns {Array|string} A new sub-array or substring of length `limit` or less if the input had
- * less than `limit` elements.
+ * @param {(string|number)=} begin Index at which to begin limitation. As a negative index, `begin`
+ * indicates an offset from the end of `input`. Defaults to `0`.
+ * @returns {Array|string} A new sub-array or substring of length `limit` or less if input array
+ * had less than `limit` elements.
*
* @example
@@ -27904,157 +27593,67 @@ function limitToFilter() {
if (isNaN(limit)) return input;
if (isNumber(input)) input = input.toString();
- if (!isArrayLike(input)) return input;
+ if (!isArray(input) && !isString(input)) return input;
begin = (!begin || isNaN(begin)) ? 0 : toInt(begin);
begin = (begin < 0) ? Math.max(0, input.length + begin) : begin;
if (limit >= 0) {
- return sliceFn(input, begin, begin + limit);
+ return input.slice(begin, begin + limit);
} else {
if (begin === 0) {
- return sliceFn(input, limit, input.length);
+ return input.slice(limit, input.length);
} else {
- return sliceFn(input, Math.max(0, begin + limit), begin);
+ return input.slice(Math.max(0, begin + limit), begin);
}
}
};
}
-function sliceFn(input, begin, end) {
- if (isString(input)) return input.slice(begin, end);
-
- return slice.call(input, begin, end);
-}
-
/**
* @ngdoc filter
* @name orderBy
* @kind function
*
* @description
- * Returns an array containing the items from the specified `collection`, ordered by a `comparator`
- * function based on the values computed using the `expression` predicate.
- *
- * For example, `[{id: 'foo'}, {id: 'bar'}] | orderBy:'id'` would result in
- * `[{id: 'bar'}, {id: 'foo'}]`.
+ * Orders a specified `array` by the `expression` predicate. It is ordered alphabetically
+ * for strings and numerically for numbers. Note: if you notice numbers are not being sorted
+ * as expected, make sure they are actually being saved as numbers and not strings.
+ * Array-like values (e.g. NodeLists, jQuery objects, TypedArrays, Strings, etc) are also supported.
*
- * The `collection` can be an Array or array-like object (e.g. NodeList, jQuery object, TypedArray,
- * String, etc).
- *
- * The `expression` can be a single predicate, or a list of predicates each serving as a tie-breaker
- * for the preceeding one. The `expression` is evaluated against each item and the output is used
- * for comparing with other items.
- *
- * You can change the sorting order by setting `reverse` to `true`. By default, items are sorted in
- * ascending order.
- *
- * The comparison is done using the `comparator` function. If none is specified, a default, built-in
- * comparator is used (see below for details - in a nutshell, it compares numbers numerically and
- * strings alphabetically).
- *
- * ### Under the hood
- *
- * Ordering the specified `collection` happens in two phases:
- *
- * 1. All items are passed through the predicate (or predicates), and the returned values are saved
- * along with their type (`string`, `number` etc). For example, an item `{label: 'foo'}`, passed
- * through a predicate that extracts the value of the `label` property, would be transformed to:
- * ```
- * {
- * value: 'foo',
- * type: 'string',
- * index: ...
- * }
- * ```
- * 2. The comparator function is used to sort the items, based on the derived values, types and
- * indices.
- *
- * If you use a custom comparator, it will be called with pairs of objects of the form
- * `{value: ..., type: '...', index: ...}` and is expected to return `0` if the objects are equal
- * (as far as the comparator is concerned), `-1` if the 1st one should be ranked higher than the
- * second, or `1` otherwise.
- *
- * In order to ensure that the sorting will be deterministic across platforms, if none of the
- * specified predicates can distinguish between two items, `orderBy` will automatically introduce a
- * dummy predicate that returns the item's index as `value`.
- * (If you are using a custom comparator, make sure it can handle this predicate as well.)
- *
- * Finally, in an attempt to simplify things, if a predicate returns an object as the extracted
- * value for an item, `orderBy` will try to convert that object to a primitive value, before passing
- * it to the comparator. The following rules govern the conversion:
- *
- * 1. If the object has a `valueOf()` method that returns a primitive, its return value will be
- * used instead.
- * (If the object has a `valueOf()` method that returns another object, then the returned object
- * will be used in subsequent steps.)
- * 2. If the object has a custom `toString()` method (i.e. not the one inherited from `Object`) that
- * returns a primitive, its return value will be used instead.
- * (If the object has a `toString()` method that returns another object, then the returned object
- * will be used in subsequent steps.)
- * 3. No conversion; the object itself is used.
- *
- * ### The default comparator
- *
- * The default, built-in comparator should be sufficient for most usecases. In short, it compares
- * numbers numerically, strings alphabetically (and case-insensitively), for objects falls back to
- * using their index in the original collection, and sorts values of different types by type.
- *
- * More specifically, it follows these steps to determine the relative order of items:
- *
- * 1. If the compared values are of different types, compare the types themselves alphabetically.
- * 2. If both values are of type `string`, compare them alphabetically in a case- and
- * locale-insensitive way.
- * 3. If both values are objects, compare their indices instead.
- * 4. Otherwise, return:
- * - `0`, if the values are equal (by strict equality comparison, i.e. using `===`).
- * - `-1`, if the 1st value is "less than" the 2nd value (compared using the `<` operator).
- * - `1`, otherwise.
- *
- * **Note:** If you notice numbers not being sorted as expected, make sure they are actually being
- * saved as numbers and not strings.
- *
- * @param {Array|ArrayLike} collection - The collection (array or array-like object) to sort.
- * @param {(Function|string|Array.)=} expression - A predicate (or list of
- * predicates) to be used by the comparator to determine the order of elements.
+ * @param {Array} array The array (or array-like object) to sort.
+ * @param {function(*)|string|Array.<(function(*)|string)>=} expression A predicate to be
+ * used by the comparator to determine the order of elements.
*
* Can be one of:
*
- * - `Function`: A getter function. This function will be called with each item as argument and
- * the return value will be used for sorting.
- * - `string`: An Angular expression. This expression will be evaluated against each item and the
- * result will be used for sorting. For example, use `'label'` to sort by a property called
- * `label` or `'label.substring(0, 3)'` to sort by the first 3 characters of the `label`
- * property.
- * (The result of a constant expression is interpreted as a property name to be used for
- * comparison. For example, use `'"special name"'` (note the extra pair of quotes) to sort by a
- * property called `special name`.)
- * An expression can be optionally prefixed with `+` or `-` to control the sorting direction,
- * ascending or descending. For example, `'+label'` or `'-label'`. If no property is provided,
- * (e.g. `'+'` or `'-'`), the collection element itself is used in comparisons.
- * - `Array`: An array of function and/or string predicates. If a predicate cannot determine the
- * relative order of two items, the next predicate is used as a tie-breaker.
- *
- * **Note:** If the predicate is missing or empty then it defaults to `'+'`.
+ * - `function`: Getter function. The result of this function will be sorted using the
+ * `<`, `===`, `>` operator.
+ * - `string`: An Angular expression. The result of this expression is used to compare elements
+ * (for example `name` to sort by a property called `name` or `name.substr(0, 3)` to sort by
+ * 3 first characters of a property called `name`). The result of a constant expression
+ * is interpreted as a property name to be used in comparisons (for example `"special name"`
+ * to sort object by the value of their `special name` property). An expression can be
+ * optionally prefixed with `+` or `-` to control ascending or descending sort order
+ * (for example, `+name` or `-name`). If no property is provided, (e.g. `'+'`) then the array
+ * element itself is used to compare where sorting.
+ * - `Array`: An array of function or string predicates. The first predicate in the array
+ * is used for sorting, but when two items are equivalent, the next predicate is used.
*
- * @param {boolean=} reverse - If `true`, reverse the sorting order.
- * @param {(Function)=} comparator - The comparator function used to determine the relative order of
- * value pairs. If omitted, the built-in comparator will be used.
+ * If the predicate is missing or empty then it defaults to `'+'`.
*
- * @returns {Array} - The sorted array.
+ * @param {boolean=} reverse Reverse the order of the array.
+ * @returns {Array} Sorted copy of the source array.
*
*
* @example
- * ### Ordering a table with `ngRepeat`
- *
- * The example below demonstrates a simple {@link ngRepeat ngRepeat}, where the data is sorted by
- * age in descending order (expression is set to `'-age'`). The `comparator` is not set, which means
- * it defaults to the built-in comparator.
- *
-
+ * The example below demonstrates a simple ngRepeat, where the data is sorted
+ * by age in descending order (predicate is set to `'-age'`).
+ * `reverse` is not set, which means it defaults to `false`.
+
-
+
Name
Phone Number
@@ -28069,77 +27668,43 @@ function sliceFn(input, begin, end) {
- angular.module('orderByExample1', [])
+ angular.module('orderByExample', [])
.controller('ExampleController', ['$scope', function($scope) {
- $scope.friends = [
- {name: 'John', phone: '555-1212', age: 10},
- {name: 'Mary', phone: '555-9876', age: 19},
- {name: 'Mike', phone: '555-4321', age: 21},
- {name: 'Adam', phone: '555-5678', age: 35},
- {name: 'Julie', phone: '555-8765', age: 29}
- ];
+ $scope.friends =
+ [{name:'John', phone:'555-1212', age:10},
+ {name:'Mary', phone:'555-9876', age:19},
+ {name:'Mike', phone:'555-4321', age:21},
+ {name:'Adam', phone:'555-5678', age:35},
+ {name:'Julie', phone:'555-8765', age:29}];
}]);
-
- .friends {
- border-collapse: collapse;
- }
-
- .friends th {
- border-bottom: 1px solid;
- }
- .friends td, .friends th {
- border-left: 1px solid;
- padding: 5px 10px;
- }
- .friends td:first-child, .friends th:first-child {
- border-left: none;
- }
-
-
- // Element locators
- var names = element.all(by.repeater('friends').column('friend.name'));
-
- it('should sort friends by age in reverse order', function() {
- expect(names.get(0).getText()).toBe('Adam');
- expect(names.get(1).getText()).toBe('Julie');
- expect(names.get(2).getText()).toBe('Mike');
- expect(names.get(3).getText()).toBe('Mary');
- expect(names.get(4).getText()).toBe('John');
- });
-
- *
*
+ * The predicate and reverse parameters can be controlled dynamically through scope properties,
+ * as shown in the next example.
* @example
- * ### Changing parameters dynamically
- *
- * All parameters can be changed dynamically. The next example shows how you can make the columns of
- * a table sortable, by binding the `expression` and `reverse` parameters to scope properties.
- *
-
+
+
- .friends th {
- border-bottom: 1px solid;
- }
- .friends td, .friends th {
- border-left: 1px solid;
- padding: 5px 10px;
- }
- .friends td:first-child, .friends th:first-child {
- border-left: none;
- }
+
+ angular.module('orderByExample', [])
+ .controller('ExampleController', ['$scope', '$filter', function($scope, $filter) {
+ var orderBy = $filter('orderBy');
+ $scope.friends = [
+ { name: 'John', phone: '555-1212', age: 10 },
+ { name: 'Mary', phone: '555-9876', age: 19 },
+ { name: 'Mike', phone: '555-4321', age: 21 },
+ { name: 'Adam', phone: '555-5678', age: 35 },
+ { name: 'Julie', phone: '555-8765', age: 29 }
+ ];
+ $scope.order = function(predicate) {
+ $scope.predicate = predicate;
+ $scope.reverse = ($scope.predicate === predicate) ? !$scope.reverse : false;
+ $scope.friends = orderBy($scope.friends, predicate, $scope.reverse);
+ };
+ $scope.order('age', true);
+ }]);
+
+
.sortorder:after {
- content: '\25b2'; // BLACK UP-POINTING TRIANGLE
+ content: '\25b2';
}
.sortorder.reverse:after {
- content: '\25bc'; // BLACK DOWN-POINTING TRIANGLE
- }
-
-
- // Element locators
- var unsortButton = element(by.partialButtonText('unsorted'));
- var nameHeader = element(by.partialButtonText('Name'));
- var phoneHeader = element(by.partialButtonText('Phone'));
- var ageHeader = element(by.partialButtonText('Age'));
- var firstName = element(by.repeater('friends').column('friend.name').row(0));
- var lastName = element(by.repeater('friends').column('friend.name').row(4));
-
- it('should sort friends by some property, when clicking on the column header', function() {
- expect(firstName.getText()).toBe('Adam');
- expect(lastName.getText()).toBe('John');
-
- phoneHeader.click();
- expect(firstName.getText()).toBe('John');
- expect(lastName.getText()).toBe('Mary');
-
- nameHeader.click();
- expect(firstName.getText()).toBe('Adam');
- expect(lastName.getText()).toBe('Mike');
-
- ageHeader.click();
- expect(firstName.getText()).toBe('John');
- expect(lastName.getText()).toBe('Adam');
- });
-
- it('should sort friends in reverse order, when clicking on the same column', function() {
- expect(firstName.getText()).toBe('Adam');
- expect(lastName.getText()).toBe('John');
-
- ageHeader.click();
- expect(firstName.getText()).toBe('John');
- expect(lastName.getText()).toBe('Adam');
-
- ageHeader.click();
- expect(firstName.getText()).toBe('Adam');
- expect(lastName.getText()).toBe('John');
- });
-
- it('should restore the original order, when clicking "Set to unsorted"', function() {
- expect(firstName.getText()).toBe('Adam');
- expect(lastName.getText()).toBe('John');
-
- unsortButton.click();
- expect(firstName.getText()).toBe('John');
- expect(lastName.getText()).toBe('Julie');
- });
-
-
- *
- *
- * @example
- * ### Using a custom comparator
- *
- * If you have very specific requirements about the way items are sorted, you can pass your own
- * comparator function. For example, you might need to compare some strings in a locale-sensitive
- * way. (When specifying a custom comparator, you also need to pass a value for the `reverse`
- * argument - passing `false` retains the default sorting order, i.e. ascending.)
- *
-
-
-
-
-
Locale-sensitive Comparator
-
-
-
Name
-
Favorite Letter
-
-
-
{{friend.name}}
-
{{friend.favoriteLetter}}
-
-
-
-
-
Default Comparator
-
-
-
Name
-
Favorite Letter
-
-
-
{{friend.name}}
-
{{friend.favoriteLetter}}
-
-
-
-
-
-
- angular.module('orderByExample4', [])
- .controller('ExampleController', ['$scope', function($scope) {
- $scope.friends = [
- {name: 'John', favoriteLetter: 'Ä'},
- {name: 'Mary', favoriteLetter: 'Ü'},
- {name: 'Mike', favoriteLetter: 'Ö'},
- {name: 'Adam', favoriteLetter: 'H'},
- {name: 'Julie', favoriteLetter: 'Z'}
- ];
-
- $scope.localeSensitiveComparator = function(v1, v2) {
- // If we don't get strings, just compare by index
- if (v1.type !== 'string' || v2.type !== 'string') {
- return (v1.index < v2.index) ? -1 : 1;
- }
-
- // Compare strings alphabetically, taking locale into account
- return v1.value.localeCompare(v2.value);
- };
- }]);
-
-
- .friends-container {
- display: inline-block;
- margin: 0 30px;
- }
-
- .friends {
- border-collapse: collapse;
+ content: '\25bc';
}
-
- .friends th {
- border-bottom: 1px solid;
- }
- .friends td, .friends th {
- border-left: 1px solid;
- padding: 5px 10px;
- }
- .friends td:first-child, .friends th:first-child {
- border-left: none;
- }
-
-
- // Element locators
- var container = element(by.css('.custom-comparator'));
- var names = container.all(by.repeater('friends').column('friend.name'));
-
- it('should sort friends by favorite letter (in correct alphabetical order)', function() {
- expect(names.get(0).getText()).toBe('John');
- expect(names.get(1).getText()).toBe('Adam');
- expect(names.get(2).getText()).toBe('Mike');
- expect(names.get(3).getText()).toBe('Mary');
- expect(names.get(4).getText()).toBe('Julie');
- });
-
-
- *
+
+
*/
orderByFilter.$inject = ['$parse'];
function orderByFilter($parse) {
- return function(array, sortPredicate, reverseOrder, compareFn) {
+ return function(array, sortPredicate, reverseOrder) {
if (array == null) return array;
if (!isArrayLike(array)) {
@@ -28486,12 +27816,11 @@ function orderByFilter($parse) {
if (!isArray(sortPredicate)) { sortPredicate = [sortPredicate]; }
if (sortPredicate.length === 0) { sortPredicate = ['+']; }
- var predicates = processPredicates(sortPredicate);
-
- var descending = reverseOrder ? -1 : 1;
-
- // Define the `compare()` function. Use a default comparator if none is specified.
- var compare = isFunction(compareFn) ? compareFn : defaultCompare;
+ var predicates = processPredicates(sortPredicate, reverseOrder);
+ // Add a predicate at the end that evaluates to the element index. This makes the
+ // sort stable as it works as a tie-breaker when all the input predicates cannot
+ // distinguish between two elements.
+ predicates.push({ get: function() { return {}; }, descending: reverseOrder ? -1 : 1});
// The next three lines are a version of a Swartzian Transform idiom from Perl
// (sometimes called the Decorate-Sort-Undecorate idiom)
@@ -28503,12 +27832,8 @@ function orderByFilter($parse) {
return array;
function getComparisonObject(value, index) {
- // NOTE: We are adding an extra `tieBreaker` value based on the element's index.
- // This will be used to keep the sort stable when none of the input predicates can
- // distinguish between two elements.
return {
value: value,
- tieBreaker: {value: index, type: 'number', index: index},
predicateValues: predicates.map(function(predicate) {
return getPredicateValue(predicate.get(value), index);
})
@@ -28516,19 +27841,18 @@ function orderByFilter($parse) {
}
function doComparison(v1, v2) {
- for (var i = 0, ii = predicates.length; i < ii; i++) {
- var result = compare(v1.predicateValues[i], v2.predicateValues[i]);
- if (result) {
- return result * predicates[i].descending * descending;
- }
+ var result = 0;
+ for (var index=0, length = predicates.length; index < length; ++index) {
+ result = compare(v1.predicateValues[index], v2.predicateValues[index]) * predicates[index].descending;
+ if (result) break;
}
-
- return compare(v1.tieBreaker, v2.tieBreaker) * descending;
+ return result;
}
};
- function processPredicates(sortPredicates) {
- return sortPredicates.map(function(predicate) {
+ function processPredicates(sortPredicate, reverseOrder) {
+ reverseOrder = reverseOrder ? -1 : 1;
+ return sortPredicate.map(function(predicate) {
var descending = 1, get = identity;
if (isFunction(predicate)) {
@@ -28546,7 +27870,7 @@ function orderByFilter($parse) {
}
}
}
- return {get: get, descending: descending};
+ return { get: get, descending: descending * reverseOrder };
});
}
@@ -28561,9 +27885,9 @@ function orderByFilter($parse) {
}
}
- function objectValue(value) {
+ function objectValue(value, index) {
// If `valueOf` is a valid function use that
- if (isFunction(value.valueOf)) {
+ if (typeof value.valueOf === 'function') {
value = value.valueOf();
if (isPrimitive(value)) return value;
}
@@ -28572,8 +27896,8 @@ function orderByFilter($parse) {
value = value.toString();
if (isPrimitive(value)) return value;
}
-
- return value;
+ // We have a basic object so we use the position of the object in the collection
+ return index;
}
function getPredicateValue(value, index) {
@@ -28581,39 +27905,23 @@ function orderByFilter($parse) {
if (value === null) {
type = 'string';
value = 'null';
+ } else if (type === 'string') {
+ value = value.toLowerCase();
} else if (type === 'object') {
- value = objectValue(value);
+ value = objectValue(value, index);
}
- return {value: value, type: type, index: index};
+ return { value: value, type: type };
}
- function defaultCompare(v1, v2) {
+ function compare(v1, v2) {
var result = 0;
- var type1 = v1.type;
- var type2 = v2.type;
-
- if (type1 === type2) {
- var value1 = v1.value;
- var value2 = v2.value;
-
- if (type1 === 'string') {
- // Compare strings case-insensitively
- value1 = value1.toLowerCase();
- value2 = value2.toLowerCase();
- } else if (type1 === 'object') {
- // For basic objects, use the position of the object
- // in the collection instead of the value
- if (isObject(value1)) value1 = v1.index;
- if (isObject(value2)) value2 = v2.index;
- }
-
- if (value1 !== value2) {
- result = value1 < value2 ? -1 : 1;
+ if (v1.type === v2.type) {
+ if (v1.value !== v2.value) {
+ result = v1.value < v2.value ? -1 : 1;
}
} else {
- result = type1 < type2 ? -1 : 1;
+ result = v1.type < v2.type ? -1 : 1;
}
-
return result;
}
}
@@ -28893,11 +28201,9 @@ var htmlAnchorDirective = valueFn({
*
* @description
*
- * Sets the `readonly` attribute on the element, if the expression inside `ngReadonly` is truthy.
- * Note that `readonly` applies only to `input` elements with specific types. [See the input docs on
- * MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#attr-readonly) for more information.
+ * Sets the `readOnly` attribute on the element, if the expression inside `ngReadonly` is truthy.
*
- * A special directive is necessary because we cannot use interpolation inside the `readonly`
+ * A special directive is necessary because we cannot use interpolation inside the `readOnly`
* attribute. See the {@link guide/interpolation interpolation guide} for more info.
*
* @example
@@ -28934,13 +28240,6 @@ var htmlAnchorDirective = valueFn({
* A special directive is necessary because we cannot use interpolation inside the `selected`
* attribute. See the {@link guide/interpolation interpolation guide} for more info.
*
- *
- * **Note:** `ngSelected` does not interact with the `select` and `ngModel` directives, it only
- * sets the `selected` attribute on the element. If you are using `ngModel` on the select, you
- * should not use `ngSelected` on the options, as `ngModel` will set the select value and
- * selected options.
- *
- *
* @example
@@ -28977,11 +28276,6 @@ var htmlAnchorDirective = valueFn({
* A special directive is necessary because we cannot use interpolation inside the `open`
* attribute. See the {@link guide/interpolation interpolation guide} for more info.
*
- * ## A note about browser compatibility
- *
- * Edge, Firefox, and Internet Explorer do not support the `details` element, it is
- * recommended to use {@link ng.ngShow} and {@link ng.ngHide} instead.
- *
* @example
@@ -29672,9 +28966,7 @@ var ISO_DATE_REGEXP = /^\d{4,}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+(?:[+-
// 9. Fragment
// 1111111111111111 222 333333 44444 555555555555555555555555 666 77777777 8888888 999
var URL_REGEXP = /^[a-z][a-z\d.+-]*:\/*(?:[^:@]+(?::[^@]+)?@)?(?:[^\s:/?#]+|\[[a-f\d:]+\])(?::\d+)?(?:\/[^?#]*)?(?:\?[^#]*)?(?:#.*)?$/i;
-/* jshint maxlen:220 */
-var EMAIL_REGEXP = /^(?=.{1,254}$)(?=.{1,64}@)[-!#$%&'*+\/0-9=?A-Z^_`a-z{|}~]+(\.[-!#$%&'*+\/0-9=?A-Z^_`a-z{|}~]+)*@[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?(\.[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?)*$/;
-/* jshint maxlen:200 */
+var EMAIL_REGEXP = /^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i;
var NUMBER_REGEXP = /^\s*(\-|\+)?(\d+|(\d*(\.\d*)))([eE][+-]?\d+)?\s*$/;
var DATE_REGEXP = /^(\d{4,})-(\d{2})-(\d{2})$/;
var DATETIMELOCAL_REGEXP = /^(\d{4,})-(\d\d)-(\d\d)T(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/;
@@ -31059,7 +30351,7 @@ function numberInputType(scope, element, attr, ctrl, $sniffer, $browser) {
attr.$observe('min', function(val) {
if (isDefined(val) && !isNumber(val)) {
- val = parseFloat(val);
+ val = parseFloat(val, 10);
}
minVal = isNumber(val) && !isNaN(val) ? val : undefined;
// TODO(matsko): implement validateLater to reduce number of validations
@@ -31075,7 +30367,7 @@ function numberInputType(scope, element, attr, ctrl, $sniffer, $browser) {
attr.$observe('max', function(val) {
if (isDefined(val) && !isNumber(val)) {
- val = parseFloat(val);
+ val = parseFloat(val, 10);
}
maxVal = isNumber(val) && !isNaN(val) ? val : undefined;
// TODO(matsko): implement validateLater to reduce number of validations
@@ -31882,11 +31174,6 @@ function classDirective(name, selector) {
* When the expression changes, the previously added classes are removed and only then are the
* new classes added.
*
- * @knownIssue
- * You should not use {@link guide/interpolation interpolation} in the value of the `class`
- * attribute, when using the `ngClass` directive on the same element.
- * See {@link guide/interpolation#known-issues here} for more info.
- *
* @animations
* | Animation | Occurs |
* |----------------------------------|-------------------------------------|
@@ -35832,7 +35119,7 @@ var ngOptionsDirective = ['$compile', '$document', '$parse', function($compile,
for (var i = options.items.length - 1; i >= 0; i--) {
var option = options.items[i];
- if (isDefined(option.group)) {
+ if (option.group) {
jqLiteRemove(option.element.parentNode);
} else {
jqLiteRemove(option.element);
@@ -35864,8 +35151,7 @@ var ngOptionsDirective = ['$compile', '$document', '$parse', function($compile,
listFragment.appendChild(groupElement);
// Update the label on the group element
- // "null" is special cased because of Safari
- groupElement.label = option.group === null ? 'null' : option.group;
+ groupElement.label = option.group;
// Store it for use later
groupElementMap[option.group] = groupElement;
@@ -36201,7 +35487,7 @@ var ngPluralizeDirective = ['$locale', '$interpolate', '$log', function($locale,
* it's a prefix used by Angular for public (`$`) and private (`$$`) properties.
*
* - The built-in filters {@link ng.orderBy orderBy} and {@link ng.filter filter} do not work with
- * objects, and will throw an error if used with one.
+ * objects, and will throw if used with one.
*
* If you are hitting any of these limitations, the recommended workaround is to convert your object into an array
* that is sorted into the order that you prefer before providing it to `ngRepeat`. You could
@@ -37050,11 +36336,6 @@ var ngHideDirective = ['$animate', function($animate) {
* @description
* The `ngStyle` directive allows you to set CSS style on an HTML element conditionally.
*
- * @knownIssue
- * You should not use {@link guide/interpolation interpolation} in the value of the `style`
- * attribute, when using the `ngStyle` directive on the same element.
- * See {@link guide/interpolation#known-issues here} for more info.
- *
* @element ANY
* @param {expression} ngStyle
*
@@ -37466,63 +36747,37 @@ var ngSwitchDefaultDirective = ngDirective({
*
*/
var ngTranscludeMinErr = minErr('ngTransclude');
-var ngTranscludeDirective = ['$compile', function($compile) {
- return {
- restrict: 'EAC',
- terminal: true,
- compile: function ngTranscludeCompile(tElement) {
+var ngTranscludeDirective = ngDirective({
+ restrict: 'EAC',
+ link: function($scope, $element, $attrs, controller, $transclude) {
- // Remove and cache any original content to act as a fallback
- var fallbackLinkFn = $compile(tElement.contents());
- tElement.empty();
-
- return function ngTranscludePostLink($scope, $element, $attrs, controller, $transclude) {
-
- if (!$transclude) {
- throw ngTranscludeMinErr('orphan',
- 'Illegal use of ngTransclude directive in the template! ' +
- 'No parent directive that requires a transclusion found. ' +
- 'Element: {0}',
- startingTag($element));
- }
-
-
- // If the attribute is of the form: `ng-transclude="ng-transclude"` then treat it like the default
- if ($attrs.ngTransclude === $attrs.$attr.ngTransclude) {
- $attrs.ngTransclude = '';
- }
- var slotName = $attrs.ngTransclude || $attrs.ngTranscludeSlot;
-
- // If the slot is required and no transclusion content is provided then this call will throw an error
- $transclude(ngTranscludeCloneAttachFn, null, slotName);
-
- // If the slot is optional and no transclusion content is provided then use the fallback content
- if (slotName && !$transclude.isSlotFilled(slotName)) {
- useFallbackContent();
- }
+ if ($attrs.ngTransclude === $attrs.$attr.ngTransclude) {
+ // If the attribute is of the form: `ng-transclude="ng-transclude"`
+ // then treat it like the default
+ $attrs.ngTransclude = '';
+ }
- function ngTranscludeCloneAttachFn(clone, transcludedScope) {
- if (clone.length) {
- $element.append(clone);
- } else {
- useFallbackContent();
- // There is nothing linked against the transcluded scope since no content was available,
- // so it should be safe to clean up the generated scope.
- transcludedScope.$destroy();
- }
- }
+ function ngTranscludeCloneAttachFn(clone) {
+ if (clone.length) {
+ $element.empty();
+ $element.append(clone);
+ }
+ }
- function useFallbackContent() {
- // Since this is the fallback content rather than the transcluded content,
- // we link against the scope of this directive rather than the transcluded scope
- fallbackLinkFn($scope, function(clone) {
- $element.append(clone);
- });
- }
- };
+ if (!$transclude) {
+ throw ngTranscludeMinErr('orphan',
+ 'Illegal use of ngTransclude directive in the template! ' +
+ 'No parent directive that requires a transclusion found. ' +
+ 'Element: {0}',
+ startingTag($element));
}
- };
-}];
+
+ // If there is no slot name defined or the slot name is not optional
+ // then transclude the slot
+ var slotName = $attrs.ngTransclude || $attrs.ngTranscludeSlot;
+ $transclude(ngTranscludeCloneAttachFn, null, slotName);
+ }
+});
/**
* @ngdoc directive
@@ -38655,7 +37910,7 @@ Entity.prototype.encode = function encode(data, enc, /* internal */ reporter) {
return this._getEncoder(enc).encode(data, reporter);
};
-},{"../asn1":41,"inherits":434,"vm":490}],43:[function(require,module,exports){
+},{"../asn1":41,"inherits":435,"vm":491}],43:[function(require,module,exports){
var inherits = require('inherits');
var Reporter = require('../base').Reporter;
var Buffer = require('buffer').Buffer;
@@ -38773,7 +38028,7 @@ EncoderBuffer.prototype.join = function join(out, offset) {
return out;
};
-},{"../base":44,"buffer":90,"inherits":434}],44:[function(require,module,exports){
+},{"../base":44,"buffer":90,"inherits":435}],44:[function(require,module,exports){
var base = exports;
base.Reporter = require('./reporter').Reporter;
@@ -38847,7 +38102,7 @@ module.exports = Node;
var stateProps = [
'enc', 'parent', 'children', 'tag', 'args', 'reverseArgs', 'choice',
'optional', 'any', 'obj', 'use', 'alteredUse', 'key', 'default', 'explicit',
- 'implicit', 'contains'
+ 'implicit'
];
Node.prototype.clone = function clone() {
@@ -39052,17 +38307,17 @@ Node.prototype.contains = function contains(item) {
// Decoding
//
-Node.prototype._decode = function decode(input, options) {
+Node.prototype._decode = function decode(input) {
var state = this._baseState;
// Decode root node
if (state.parent === null)
- return input.wrapResult(state.children[0]._decode(input, options));
+ return input.wrapResult(state.children[0]._decode(input));
var result = state['default'];
var present = true;
- var prevKey = null;
+ var prevKey;
if (state.key !== null)
prevKey = input.enterKey(state.key);
@@ -39081,9 +38336,9 @@ Node.prototype._decode = function decode(input, options) {
var save = input.save();
try {
if (state.choice === null)
- this._decodeGeneric(state.tag, input, options);
+ this._decodeGeneric(state.tag, input);
else
- this._decodeChoice(input, options);
+ this._decodeChoice(input);
present = true;
} catch (e) {
present = false;
@@ -39111,8 +38366,6 @@ Node.prototype._decode = function decode(input, options) {
input = explicit;
}
- var start = input.offset;
-
// Unwrap implicit and normal values
if (state.use === null && state.choice === null) {
if (state.any)
@@ -39131,19 +38384,13 @@ Node.prototype._decode = function decode(input, options) {
input = body;
}
- if (options && options.track && state.tag !== null)
- options.track(input.path(), start, input.length, 'tagged');
-
- if (options && options.track && state.tag !== null)
- options.track(input.path(), input.offset, input.length, 'content');
-
// Select proper method for tag
if (state.any)
result = result;
else if (state.choice === null)
- result = this._decodeGeneric(state.tag, input, options);
+ result = this._decodeGeneric(state.tag, input);
else
- result = this._decodeChoice(input, options);
+ result = this._decodeChoice(input);
if (input.isError(result))
return result;
@@ -39153,15 +38400,14 @@ Node.prototype._decode = function decode(input, options) {
state.children.forEach(function decodeChildren(child) {
// NOTE: We are ignoring errors here, to let parser continue with other
// parts of encoded data
- child._decode(input, options);
+ child._decode(input);
});
}
// Decode contained/encoded by schema, only in bit or octet strings
if (state.contains && (state.tag === 'octstr' || state.tag === 'bitstr')) {
var data = new DecoderBuffer(result);
- result = this._getUse(state.contains, input._reporterState.obj)
- ._decode(data, options);
+ result = this._getUse(state.contains, input._reporterState.obj)._decode(data);
}
}
@@ -39172,40 +38418,35 @@ Node.prototype._decode = function decode(input, options) {
// Set key
if (state.key !== null && (result !== null || present === true))
input.leaveKey(prevKey, state.key, result);
- else if (prevKey !== null)
- input.exitKey(prevKey);
return result;
};
-Node.prototype._decodeGeneric = function decodeGeneric(tag, input, options) {
+Node.prototype._decodeGeneric = function decodeGeneric(tag, input) {
var state = this._baseState;
if (tag === 'seq' || tag === 'set')
return null;
if (tag === 'seqof' || tag === 'setof')
- return this._decodeList(input, tag, state.args[0], options);
+ return this._decodeList(input, tag, state.args[0]);
else if (/str$/.test(tag))
- return this._decodeStr(input, tag, options);
+ return this._decodeStr(input, tag);
else if (tag === 'objid' && state.args)
- return this._decodeObjid(input, state.args[0], state.args[1], options);
+ return this._decodeObjid(input, state.args[0], state.args[1]);
else if (tag === 'objid')
- return this._decodeObjid(input, null, null, options);
+ return this._decodeObjid(input, null, null);
else if (tag === 'gentime' || tag === 'utctime')
- return this._decodeTime(input, tag, options);
+ return this._decodeTime(input, tag);
else if (tag === 'null_')
- return this._decodeNull(input, options);
+ return this._decodeNull(input);
else if (tag === 'bool')
- return this._decodeBool(input, options);
+ return this._decodeBool(input);
else if (tag === 'int' || tag === 'enum')
- return this._decodeInt(input, state.args && state.args[0], options);
-
- if (state.use !== null) {
- return this._getUse(state.use, input._reporterState.obj)
- ._decode(input, options);
- } else {
+ return this._decodeInt(input, state.args && state.args[0]);
+ else if (state.use !== null)
+ return this._getUse(state.use, input._reporterState.obj)._decode(input);
+ else
return input.error('unknown tag: ' + tag);
- }
};
Node.prototype._getUse = function _getUse(entity, obj) {
@@ -39222,7 +38463,7 @@ Node.prototype._getUse = function _getUse(entity, obj) {
return state.useDecoder;
};
-Node.prototype._decodeChoice = function decodeChoice(input, options) {
+Node.prototype._decodeChoice = function decodeChoice(input) {
var state = this._baseState;
var result = null;
var match = false;
@@ -39231,7 +38472,7 @@ Node.prototype._decodeChoice = function decodeChoice(input, options) {
var save = input.save();
var node = state.choice[key];
try {
- var value = node._decode(input, options);
+ var value = node._decode(input);
if (input.isError(value))
return false;
@@ -39412,7 +38653,7 @@ Node.prototype._isPrintstr = function isPrintstr(str) {
return /^[A-Za-z0-9 '\(\)\+,\-\.\/:=\?]*$/.test(str);
};
-},{"../base":44,"minimalistic-assert":441}],46:[function(require,module,exports){
+},{"../base":44,"minimalistic-assert":442}],46:[function(require,module,exports){
var inherits = require('inherits');
function Reporter(options) {
@@ -39446,24 +38687,14 @@ Reporter.prototype.enterKey = function enterKey(key) {
return this._reporterState.path.push(key);
};
-Reporter.prototype.exitKey = function exitKey(index) {
- var state = this._reporterState;
-
- state.path = state.path.slice(0, index - 1);
-};
-
Reporter.prototype.leaveKey = function leaveKey(index, key, value) {
var state = this._reporterState;
- this.exitKey(index);
+ state.path = state.path.slice(0, index - 1);
if (state.obj !== null)
state.obj[key] = value;
};
-Reporter.prototype.path = function path() {
- return this._reporterState.path.join('/');
-};
-
Reporter.prototype.enterObject = function enterObject() {
var state = this._reporterState;
@@ -39535,7 +38766,7 @@ ReporterError.prototype.rethrow = function rethrow(msg) {
return this;
};
-},{"inherits":434}],47:[function(require,module,exports){
+},{"inherits":435}],47:[function(require,module,exports){
var constants = require('../constants');
exports.tagClass = {
@@ -39711,15 +38942,14 @@ DERNode.prototype._skipUntilEnd = function skipUntilEnd(buffer, fail) {
}
};
-DERNode.prototype._decodeList = function decodeList(buffer, tag, decoder,
- options) {
+DERNode.prototype._decodeList = function decodeList(buffer, tag, decoder) {
var result = [];
while (!buffer.isEmpty()) {
var possibleEnd = this._peekTag(buffer, 'end');
if (buffer.isError(possibleEnd))
return possibleEnd;
- var res = decoder.decode(buffer, 'der', options);
+ var res = decoder.decode(buffer, 'der');
if (buffer.isError(res) && possibleEnd)
break;
result.push(res);
@@ -39924,7 +39154,7 @@ function derDecodeLen(buf, primitive, fail) {
return len;
}
-},{"../../asn1":41,"inherits":434}],50:[function(require,module,exports){
+},{"../../asn1":41,"inherits":435}],50:[function(require,module,exports){
var decoders = exports;
decoders.der = require('./der');
@@ -39981,7 +39211,7 @@ PEMDecoder.prototype.decode = function decode(data, options) {
return DERDecoder.prototype.decode.call(this, input, options);
};
-},{"./der":49,"buffer":90,"inherits":434}],52:[function(require,module,exports){
+},{"./der":49,"buffer":90,"inherits":435}],52:[function(require,module,exports){
var inherits = require('inherits');
var Buffer = require('buffer').Buffer;
@@ -40276,7 +39506,7 @@ function encodeTag(tag, primitive, cls, reporter) {
return res;
}
-},{"../../asn1":41,"buffer":90,"inherits":434}],53:[function(require,module,exports){
+},{"../../asn1":41,"buffer":90,"inherits":435}],53:[function(require,module,exports){
var encoders = exports;
encoders.der = require('./der');
@@ -40305,7 +39535,7 @@ PEMEncoder.prototype.encode = function encode(data, options) {
return out.join('\n');
};
-},{"./der":52,"inherits":434}],55:[function(require,module,exports){
+},{"./der":52,"inherits":435}],55:[function(require,module,exports){
// http://wiki.commonjs.org/wiki/Unit_Testing/1.0
//
// THIS IS NOT TESTED NOR LIKELY TO WORK OUTSIDE V8!
@@ -40666,7 +39896,7 @@ var objectKeys = Object.keys || function (obj) {
return keys;
};
-},{"util/":487}],56:[function(require,module,exports){
+},{"util/":488}],56:[function(require,module,exports){
(function (global){
"use strict";
@@ -40701,7 +39931,7 @@ define(String.prototype, "padRight", "".padEnd);
[][key] && define(Array, key, Function.call.bind([][key]));
});
}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-},{"core-js/fn/regexp/escape":92,"core-js/shim":385,"regenerator-runtime/runtime":466}],57:[function(require,module,exports){
+},{"core-js/fn/regexp/escape":92,"core-js/shim":386,"regenerator-runtime/runtime":467}],57:[function(require,module,exports){
'use strict'
exports.toByteArray = toByteArray
@@ -40813,13 +40043,13 @@ function fromByteArray (uint8) {
}
},{}],58:[function(require,module,exports){
-/*! bignumber.js v2.4.0 https://github.com/MikeMcl/bignumber.js/LICENCE */
+/*! bignumber.js v2.3.0 https://github.com/MikeMcl/bignumber.js/LICENCE */
;(function (globalObj) {
'use strict';
/*
- bignumber.js v2.4.0
+ bignumber.js v2.3.0
A JavaScript library for arbitrary-precision arithmetic.
https://github.com/MikeMcl/bignumber.js
Copyright (c) 2016 Michael Mclaughlin
@@ -40827,7 +40057,7 @@ function fromByteArray (uint8) {
*/
- var BigNumber, cryptoObj, parseNumeric,
+ var cryptoObj, parseNumeric,
isNumeric = /^-?(\d+(\.\d*)?|\.\d+)(e[+-]?\d+)?$/i,
mathceil = Math.ceil,
mathfloor = Math.floor,
@@ -43529,17 +42759,13 @@ function fromByteArray (uint8) {
// EXPORT
- BigNumber = constructorFactory();
- BigNumber.default = BigNumber.BigNumber = BigNumber;
-
-
- // AMD.
+ // AMD.
if ( typeof define == 'function' && define.amd ) {
- define( function () { return BigNumber; } );
+ define( function () { return constructorFactory(); } );
// Node.js and other environments that support module.exports.
} else if ( typeof module != 'undefined' && module.exports ) {
- module.exports = BigNumber;
+ module.exports = constructorFactory();
// Split string stops browserify adding crypto shim.
if ( !cryptoObj ) try { cryptoObj = require('cry' + 'pto'); } catch (e) {}
@@ -43547,7 +42773,7 @@ function fromByteArray (uint8) {
// Browser.
} else {
if ( !globalObj ) globalObj = typeof self != 'undefined' ? self : Function('return this')();
- globalObj.BigNumber = BigNumber;
+ globalObj.BigNumber = constructorFactory();
}
})(this);
@@ -43724,12 +42950,8 @@ module.exports = {
}
BN.isBN = function isBN (num) {
- if (num instanceof BN) {
- return true;
- }
-
return num !== null && typeof num === 'object' &&
- num.constructor.wordSize === BN.wordSize && Array.isArray(num.words);
+ num.constructor.name === 'BN' && Array.isArray(num.words);
};
BN.max = function max (left, right) {
@@ -45770,10 +44992,6 @@ module.exports = {
assert(this.negative === 0, 'imaskn works only with positive numbers');
- if (this.length <= s) {
- return this;
- }
-
if (r !== 0) {
s++;
}
@@ -47438,7 +46656,7 @@ function xorTest (a, b) {
}
}).call(this,require("buffer").Buffer)
-},{"./aes":63,"./ghash":68,"buffer":90,"buffer-xor":89,"cipher-base":91,"inherits":434}],65:[function(require,module,exports){
+},{"./aes":63,"./ghash":68,"buffer":90,"buffer-xor":89,"cipher-base":91,"inherits":435}],65:[function(require,module,exports){
var ciphers = require('./encrypter')
exports.createCipher = exports.Cipher = ciphers.createCipher
exports.createCipheriv = exports.Cipheriv = ciphers.createCipheriv
@@ -47592,7 +46810,7 @@ exports.createDecipher = createDecipher
exports.createDecipheriv = createDecipheriv
}).call(this,require("buffer").Buffer)
-},{"./aes":63,"./authCipher":64,"./modes":69,"./modes/cbc":70,"./modes/cfb":71,"./modes/cfb1":72,"./modes/cfb8":73,"./modes/ctr":74,"./modes/ecb":75,"./modes/ofb":76,"./streamCipher":77,"buffer":90,"cipher-base":91,"evp_bytestokey":425,"inherits":434}],67:[function(require,module,exports){
+},{"./aes":63,"./authCipher":64,"./modes":69,"./modes/cbc":70,"./modes/cfb":71,"./modes/cfb1":72,"./modes/cfb8":73,"./modes/ctr":74,"./modes/ecb":75,"./modes/ofb":76,"./streamCipher":77,"buffer":90,"cipher-base":91,"evp_bytestokey":426,"inherits":435}],67:[function(require,module,exports){
(function (Buffer){
var aes = require('./aes')
var Transform = require('cipher-base')
@@ -47718,7 +46936,7 @@ exports.createCipheriv = createCipheriv
exports.createCipher = createCipher
}).call(this,require("buffer").Buffer)
-},{"./aes":63,"./authCipher":64,"./modes":69,"./modes/cbc":70,"./modes/cfb":71,"./modes/cfb1":72,"./modes/cfb8":73,"./modes/ctr":74,"./modes/ecb":75,"./modes/ofb":76,"./streamCipher":77,"buffer":90,"cipher-base":91,"evp_bytestokey":425,"inherits":434}],68:[function(require,module,exports){
+},{"./aes":63,"./authCipher":64,"./modes":69,"./modes/cbc":70,"./modes/cfb":71,"./modes/cfb1":72,"./modes/cfb8":73,"./modes/ctr":74,"./modes/ecb":75,"./modes/ofb":76,"./streamCipher":77,"buffer":90,"cipher-base":91,"evp_bytestokey":426,"inherits":435}],68:[function(require,module,exports){
(function (Buffer){
var zeros = new Buffer(16)
zeros.fill(0)
@@ -48196,7 +47414,7 @@ StreamCipher.prototype._final = function () {
}
}).call(this,require("buffer").Buffer)
-},{"./aes":63,"buffer":90,"cipher-base":91,"inherits":434}],78:[function(require,module,exports){
+},{"./aes":63,"buffer":90,"cipher-base":91,"inherits":435}],78:[function(require,module,exports){
var ebtk = require('evp_bytestokey')
var aes = require('browserify-aes/browser')
var DES = require('browserify-des')
@@ -48271,7 +47489,7 @@ function getCiphers () {
}
exports.listCiphers = exports.getCiphers = getCiphers
-},{"browserify-aes/browser":65,"browserify-aes/modes":69,"browserify-des":79,"browserify-des/modes":80,"evp_bytestokey":425}],79:[function(require,module,exports){
+},{"browserify-aes/browser":65,"browserify-aes/modes":69,"browserify-des":79,"browserify-des/modes":80,"evp_bytestokey":426}],79:[function(require,module,exports){
(function (Buffer){
var CipherBase = require('cipher-base')
var des = require('des.js')
@@ -48318,7 +47536,7 @@ DES.prototype._final = function () {
}
}).call(this,require("buffer").Buffer)
-},{"buffer":90,"cipher-base":91,"des.js":393,"inherits":434}],80:[function(require,module,exports){
+},{"buffer":90,"cipher-base":91,"des.js":394,"inherits":435}],80:[function(require,module,exports){
exports['des-ecb'] = {
key: 8,
iv: 0
@@ -48388,7 +47606,7 @@ function getr(priv) {
}
}).call(this,require("buffer").Buffer)
-},{"bn.js":60,"buffer":90,"randombytes":455}],82:[function(require,module,exports){
+},{"bn.js":60,"buffer":90,"randombytes":456}],82:[function(require,module,exports){
(function (Buffer){
const Sha3 = require('js-sha3')
@@ -48426,7 +47644,7 @@ module.exports = {
}
}).call(this,require("buffer").Buffer)
-},{"buffer":90,"js-sha3":437}],83:[function(require,module,exports){
+},{"buffer":90,"js-sha3":438}],83:[function(require,module,exports){
(function (Buffer){
'use strict'
exports['RSA-SHA224'] = exports.sha224WithRSAEncryption = {
@@ -48609,7 +47827,7 @@ module.exports = {
}
}).call(this,require("buffer").Buffer)
-},{"./algos":83,"./sign":86,"./verify":87,"buffer":90,"create-hash":388,"inherits":434,"stream":483}],85:[function(require,module,exports){
+},{"./algos":83,"./sign":86,"./verify":87,"buffer":90,"create-hash":389,"inherits":435,"stream":484}],85:[function(require,module,exports){
'use strict'
exports['1.3.132.0.10'] = 'secp256k1'
@@ -48812,7 +48030,7 @@ module.exports.getKey = getKey
module.exports.makeKey = makeKey
}).call(this,require("buffer").Buffer)
-},{"./curves":85,"bn.js":60,"browserify-rsa":81,"buffer":90,"create-hmac":391,"elliptic":403,"parse-asn1":445}],87:[function(require,module,exports){
+},{"./curves":85,"bn.js":60,"browserify-rsa":81,"buffer":90,"create-hmac":392,"elliptic":404,"parse-asn1":446}],87:[function(require,module,exports){
(function (Buffer){
// much of this based on https://github.com/indutny/self-signed/blob/gh-pages/lib/rsa.js
var curves = require('./curves')
@@ -48919,7 +48137,7 @@ function checkValue (b, q) {
module.exports = verify
}).call(this,require("buffer").Buffer)
-},{"./curves":85,"bn.js":60,"buffer":90,"elliptic":403,"parse-asn1":445}],88:[function(require,module,exports){
+},{"./curves":85,"bn.js":60,"buffer":90,"elliptic":404,"parse-asn1":446}],88:[function(require,module,exports){
(function (global){
'use strict';
@@ -49101,7 +48319,7 @@ exports.kMaxLength = kMaxLength()
function typedArraySupport () {
try {
var arr = new Uint8Array(1)
- arr.__proto__ = {__proto__: Uint8Array.prototype, foo: function () { return 42 }}
+ arr.foo = function () { return 42 }
return arr.foo() === 42 && // typed array instances can be augmented
typeof arr.subarray === 'function' && // chrome 9-10 lack `subarray`
arr.subarray(1, 1).byteLength === 0 // ie10 has broken `subarray`
@@ -49245,7 +48463,7 @@ function allocUnsafe (that, size) {
assertSize(size)
that = createBuffer(that, size < 0 ? 0 : checked(size) | 0)
if (!Buffer.TYPED_ARRAY_SUPPORT) {
- for (var i = 0; i < size; ++i) {
+ for (var i = 0; i < size; i++) {
that[i] = 0
}
}
@@ -49301,9 +48519,7 @@ function fromArrayBuffer (that, array, byteOffset, length) {
throw new RangeError('\'length\' is out of bounds')
}
- if (byteOffset === undefined && length === undefined) {
- array = new Uint8Array(array)
- } else if (length === undefined) {
+ if (length === undefined) {
array = new Uint8Array(array, byteOffset)
} else {
array = new Uint8Array(array, byteOffset, length)
@@ -49425,14 +48641,14 @@ Buffer.concat = function concat (list, length) {
var i
if (length === undefined) {
length = 0
- for (i = 0; i < list.length; ++i) {
+ for (i = 0; i < list.length; i++) {
length += list[i].length
}
}
var buffer = Buffer.allocUnsafe(length)
var pos = 0
- for (i = 0; i < list.length; ++i) {
+ for (i = 0; i < list.length; i++) {
var buf = list[i]
if (!Buffer.isBuffer(buf)) {
throw new TypeError('"list" argument must be an Array of Buffers')
@@ -49464,6 +48680,7 @@ function byteLength (string, encoding) {
switch (encoding) {
case 'ascii':
case 'binary':
+ // Deprecated
case 'raw':
case 'raws':
return len
@@ -49701,16 +48918,15 @@ function arrayIndexOf (arr, val, byteOffset, encoding) {
}
var foundIndex = -1
- for (var i = byteOffset; i < arrLength; ++i) {
- if (read(arr, i) === read(val, foundIndex === -1 ? 0 : i - foundIndex)) {
+ for (var i = 0; byteOffset + i < arrLength; i++) {
+ if (read(arr, byteOffset + i) === read(val, foundIndex === -1 ? 0 : i - foundIndex)) {
if (foundIndex === -1) foundIndex = i
- if (i - foundIndex + 1 === valLength) return foundIndex * indexSize
+ if (i - foundIndex + 1 === valLength) return (byteOffset + foundIndex) * indexSize
} else {
if (foundIndex !== -1) i -= i - foundIndex
foundIndex = -1
}
}
-
return -1
}
@@ -49775,7 +48991,7 @@ function hexWrite (buf, string, offset, length) {
if (length > strLen / 2) {
length = strLen / 2
}
- for (var i = 0; i < length; ++i) {
+ for (var i = 0; i < length; i++) {
var parsed = parseInt(string.substr(i * 2, 2), 16)
if (isNaN(parsed)) return i
buf[offset + i] = parsed
@@ -49989,7 +49205,7 @@ function asciiSlice (buf, start, end) {
var ret = ''
end = Math.min(buf.length, end)
- for (var i = start; i < end; ++i) {
+ for (var i = start; i < end; i++) {
ret += String.fromCharCode(buf[i] & 0x7F)
}
return ret
@@ -49999,7 +49215,7 @@ function binarySlice (buf, start, end) {
var ret = ''
end = Math.min(buf.length, end)
- for (var i = start; i < end; ++i) {
+ for (var i = start; i < end; i++) {
ret += String.fromCharCode(buf[i])
}
return ret
@@ -50012,7 +49228,7 @@ function hexSlice (buf, start, end) {
if (!end || end < 0 || end > len) end = len
var out = ''
- for (var i = start; i < end; ++i) {
+ for (var i = start; i < end; i++) {
out += toHex(buf[i])
}
return out
@@ -50055,7 +49271,7 @@ Buffer.prototype.slice = function slice (start, end) {
} else {
var sliceLen = end - start
newBuf = new Buffer(sliceLen, undefined)
- for (var i = 0; i < sliceLen; ++i) {
+ for (var i = 0; i < sliceLen; i++) {
newBuf[i] = this[i + start]
}
}
@@ -50282,7 +49498,7 @@ Buffer.prototype.writeUInt8 = function writeUInt8 (value, offset, noAssert) {
function objectWriteUInt16 (buf, value, offset, littleEndian) {
if (value < 0) value = 0xffff + value + 1
- for (var i = 0, j = Math.min(buf.length - offset, 2); i < j; ++i) {
+ for (var i = 0, j = Math.min(buf.length - offset, 2); i < j; i++) {
buf[offset + i] = (value & (0xff << (8 * (littleEndian ? i : 1 - i)))) >>>
(littleEndian ? i : 1 - i) * 8
}
@@ -50316,7 +49532,7 @@ Buffer.prototype.writeUInt16BE = function writeUInt16BE (value, offset, noAssert
function objectWriteUInt32 (buf, value, offset, littleEndian) {
if (value < 0) value = 0xffffffff + value + 1
- for (var i = 0, j = Math.min(buf.length - offset, 4); i < j; ++i) {
+ for (var i = 0, j = Math.min(buf.length - offset, 4); i < j; i++) {
buf[offset + i] = (value >>> (littleEndian ? i : 3 - i) * 8) & 0xff
}
}
@@ -50531,12 +49747,12 @@ Buffer.prototype.copy = function copy (target, targetStart, start, end) {
if (this === target && start < targetStart && targetStart < end) {
// descending copy from end
- for (i = len - 1; i >= 0; --i) {
+ for (i = len - 1; i >= 0; i--) {
target[i + targetStart] = this[i + start]
}
} else if (len < 1000 || !Buffer.TYPED_ARRAY_SUPPORT) {
// ascending copy from start
- for (i = 0; i < len; ++i) {
+ for (i = 0; i < len; i++) {
target[i + targetStart] = this[i + start]
}
} else {
@@ -50597,7 +49813,7 @@ Buffer.prototype.fill = function fill (val, start, end, encoding) {
var i
if (typeof val === 'number') {
- for (i = start; i < end; ++i) {
+ for (i = start; i < end; i++) {
this[i] = val
}
} else {
@@ -50605,7 +49821,7 @@ Buffer.prototype.fill = function fill (val, start, end, encoding) {
? val
: utf8ToBytes(new Buffer(val, encoding).toString())
var len = bytes.length
- for (i = 0; i < end - start; ++i) {
+ for (i = 0; i < end - start; i++) {
this[i + start] = bytes[i % len]
}
}
@@ -50647,7 +49863,7 @@ function utf8ToBytes (string, units) {
var leadSurrogate = null
var bytes = []
- for (var i = 0; i < length; ++i) {
+ for (var i = 0; i < length; i++) {
codePoint = string.charCodeAt(i)
// is surrogate component
@@ -50722,7 +49938,7 @@ function utf8ToBytes (string, units) {
function asciiToBytes (str) {
var byteArray = []
- for (var i = 0; i < str.length; ++i) {
+ for (var i = 0; i < str.length; i++) {
// Node's code seems to be doing this and not & 0x7F..
byteArray.push(str.charCodeAt(i) & 0xFF)
}
@@ -50732,7 +49948,7 @@ function asciiToBytes (str) {
function utf16leToBytes (str, units) {
var c, hi, lo
var byteArray = []
- for (var i = 0; i < str.length; ++i) {
+ for (var i = 0; i < str.length; i++) {
if ((units -= 2) < 0) break
c = str.charCodeAt(i)
@@ -50750,7 +49966,7 @@ function base64ToBytes (str) {
}
function blitBuffer (src, dst, offset, length) {
- for (var i = 0; i < length; ++i) {
+ for (var i = 0; i < length; i++) {
if ((i + offset >= dst.length) || (i >= src.length)) break
dst[i + offset] = src[i]
}
@@ -50762,7 +49978,7 @@ function isnan (val) {
}
}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-},{"base64-js":57,"ieee754":432,"isarray":436}],91:[function(require,module,exports){
+},{"base64-js":57,"ieee754":433,"isarray":437}],91:[function(require,module,exports){
(function (Buffer){
var Transform = require('stream').Transform
var inherits = require('inherits')
@@ -50856,19 +50072,19 @@ CipherBase.prototype._toString = function (value, enc, final) {
}
}).call(this,require("buffer").Buffer)
-},{"buffer":90,"inherits":434,"stream":483,"string_decoder":484}],92:[function(require,module,exports){
+},{"buffer":90,"inherits":435,"stream":484,"string_decoder":485}],92:[function(require,module,exports){
require('../../modules/core.regexp.escape');
module.exports = require('../../modules/_core').RegExp.escape;
-},{"../../modules/_core":113,"../../modules/core.regexp.escape":209}],93:[function(require,module,exports){
+},{"../../modules/_core":113,"../../modules/core.regexp.escape":210}],93:[function(require,module,exports){
module.exports = function(it){
if(typeof it != 'function')throw TypeError(it + ' is not a function!');
return it;
};
},{}],94:[function(require,module,exports){
-var cof = require('./_cof');
-module.exports = function(it, msg){
- if(typeof it != 'number' && cof(it) != 'Number')throw TypeError(msg);
- return +it;
+var cof = require('./_cof');
+module.exports = function(it, msg){
+ if(typeof it != 'number' && cof(it) != 'Number')throw TypeError(msg);
+ return +it;
};
},{"./_cof":108}],95:[function(require,module,exports){
// 22.1.3.31 Array.prototype[@@unscopables]
@@ -51010,50 +50226,50 @@ module.exports = function(TYPE, $create){
};
};
},{"./_array-species-create":105,"./_ctx":115,"./_iobject":135,"./_to-length":198,"./_to-object":199}],103:[function(require,module,exports){
-var aFunction = require('./_a-function')
- , toObject = require('./_to-object')
- , IObject = require('./_iobject')
- , toLength = require('./_to-length');
-
-module.exports = function(that, callbackfn, aLen, memo, isRight){
- aFunction(callbackfn);
- var O = toObject(that)
- , self = IObject(O)
- , length = toLength(O.length)
- , index = isRight ? length - 1 : 0
- , i = isRight ? -1 : 1;
- if(aLen < 2)for(;;){
- if(index in self){
- memo = self[index];
- index += i;
- break;
- }
- index += i;
- if(isRight ? index < 0 : length <= index){
- throw TypeError('Reduce of empty array with no initial value');
- }
- }
- for(;isRight ? index >= 0 : length > index; index += i)if(index in self){
- memo = callbackfn(memo, self[index], index, O);
- }
- return memo;
+var aFunction = require('./_a-function')
+ , toObject = require('./_to-object')
+ , IObject = require('./_iobject')
+ , toLength = require('./_to-length');
+
+module.exports = function(that, callbackfn, aLen, memo, isRight){
+ aFunction(callbackfn);
+ var O = toObject(that)
+ , self = IObject(O)
+ , length = toLength(O.length)
+ , index = isRight ? length - 1 : 0
+ , i = isRight ? -1 : 1;
+ if(aLen < 2)for(;;){
+ if(index in self){
+ memo = self[index];
+ index += i;
+ break;
+ }
+ index += i;
+ if(isRight ? index < 0 : length <= index){
+ throw TypeError('Reduce of empty array with no initial value');
+ }
+ }
+ for(;isRight ? index >= 0 : length > index; index += i)if(index in self){
+ memo = callbackfn(memo, self[index], index, O);
+ }
+ return memo;
};
},{"./_a-function":93,"./_iobject":135,"./_to-length":198,"./_to-object":199}],104:[function(require,module,exports){
-var isObject = require('./_is-object')
- , isArray = require('./_is-array')
- , SPECIES = require('./_wks')('species');
-
-module.exports = function(original){
- var C;
- if(isArray(original)){
- C = original.constructor;
- // cross-realm fallback
- if(typeof C == 'function' && (C === Array || isArray(C.prototype)))C = undefined;
- if(isObject(C)){
- C = C[SPECIES];
- if(C === null)C = undefined;
- }
- } return C === undefined ? Array : C;
+var isObject = require('./_is-object')
+ , isArray = require('./_is-array')
+ , SPECIES = require('./_wks')('species');
+
+module.exports = function(original){
+ var C;
+ if(isArray(original)){
+ C = original.constructor;
+ // cross-realm fallback
+ if(typeof C == 'function' && (C === Array || isArray(C.prototype)))C = undefined;
+ if(isObject(C)){
+ C = C[SPECIES];
+ if(C === null)C = undefined;
+ }
+ } return C === undefined ? Array : C;
};
},{"./_is-array":137,"./_is-object":139,"./_wks":207}],105:[function(require,module,exports){
// 9.4.2.3 ArraySpeciesCreate(originalArray, length)
@@ -51121,6 +50337,7 @@ module.exports = function(it){
'use strict';
var dP = require('./_object-dp').f
, create = require('./_object-create')
+ , hide = require('./_hide')
, redefineAll = require('./_redefine-all')
, ctx = require('./_ctx')
, anInstance = require('./_an-instance')
@@ -51260,7 +50477,7 @@ module.exports = {
setSpecies(NAME);
}
};
-},{"./_an-instance":96,"./_ctx":115,"./_defined":117,"./_descriptors":118,"./_for-of":127,"./_iter-define":143,"./_iter-step":145,"./_meta":152,"./_object-create":156,"./_object-dp":157,"./_redefine-all":176,"./_set-species":181}],110:[function(require,module,exports){
+},{"./_an-instance":96,"./_ctx":115,"./_defined":117,"./_descriptors":118,"./_for-of":127,"./_hide":130,"./_iter-define":143,"./_iter-step":145,"./_meta":152,"./_object-create":156,"./_object-dp":157,"./_redefine-all":176,"./_set-species":181}],110:[function(require,module,exports){
// https://github.com/DavidBruant/Map-Set.prototype.toJSON
var classof = require('./_classof')
, from = require('./_array-from-iterable');
@@ -51444,13 +50661,13 @@ module.exports = function(NAME, wrapper, methods, common, IS_MAP, IS_WEAK){
var core = module.exports = {version: '2.4.0'};
if(typeof __e == 'number')__e = core; // eslint-disable-line no-undef
},{}],114:[function(require,module,exports){
-'use strict';
-var $defineProperty = require('./_object-dp')
- , createDesc = require('./_property-desc');
-
-module.exports = function(object, index, value){
- if(index in object)$defineProperty.f(object, index, createDesc(0, value));
- else object[index] = value;
+'use strict';
+var $defineProperty = require('./_object-dp')
+ , createDesc = require('./_property-desc');
+
+module.exports = function(object, index, value){
+ if(index in object)$defineProperty.f(object, index, createDesc(0, value));
+ else object[index] = value;
};
},{"./_object-dp":157,"./_property-desc":175}],115:[function(require,module,exports){
// optional / simple context binding
@@ -51474,14 +50691,14 @@ module.exports = function(fn, that, length){
};
};
},{"./_a-function":93}],116:[function(require,module,exports){
-'use strict';
-var anObject = require('./_an-object')
- , toPrimitive = require('./_to-primitive')
- , NUMBER = 'number';
-
-module.exports = function(hint){
- if(hint !== 'string' && hint !== NUMBER && hint !== 'default')throw TypeError('Incorrect hint');
- return toPrimitive(anObject(this), hint != NUMBER);
+'use strict';
+var anObject = require('./_an-object')
+ , toPrimitive = require('./_to-primitive')
+ , NUMBER = 'number';
+
+module.exports = function(hint){
+ if(hint !== 'string' && hint !== NUMBER && hint !== 'default')throw TypeError('Incorrect hint');
+ return toPrimitive(anObject(this), hint != NUMBER);
};
},{"./_an-object":97,"./_to-primitive":200}],117:[function(require,module,exports){
// 7.2.1 RequireObjectCoercible(argument)
@@ -51503,9 +50720,9 @@ module.exports = function(it){
return is ? document.createElement(it) : {};
};
},{"./_global":128,"./_is-object":139}],120:[function(require,module,exports){
-// IE 8- don't enum bug keys
-module.exports = (
- 'constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf'
+// IE 8- don't enum bug keys
+module.exports = (
+ 'constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf'
).split(',');
},{}],121:[function(require,module,exports){
// all enumerable object keys, includes symbols
@@ -51679,17 +50896,17 @@ module.exports = require('./_descriptors') ? function(object, key, value){
},{"./_descriptors":118,"./_object-dp":157,"./_property-desc":175}],131:[function(require,module,exports){
module.exports = require('./_global').document && document.documentElement;
},{"./_global":128}],132:[function(require,module,exports){
-module.exports = !require('./_descriptors') && !require('./_fails')(function(){
- return Object.defineProperty(require('./_dom-create')('div'), 'a', {get: function(){ return 7; }}).a != 7;
+module.exports = !require('./_descriptors') && !require('./_fails')(function(){
+ return Object.defineProperty(require('./_dom-create')('div'), 'a', {get: function(){ return 7; }}).a != 7;
});
},{"./_descriptors":118,"./_dom-create":119,"./_fails":124}],133:[function(require,module,exports){
-var isObject = require('./_is-object')
- , setPrototypeOf = require('./_set-proto').set;
-module.exports = function(that, target, C){
- var P, S = target.constructor;
- if(S !== C && typeof S == 'function' && (P = S.prototype) !== C.prototype && isObject(P) && setPrototypeOf){
- setPrototypeOf(that, P);
- } return that;
+var isObject = require('./_is-object')
+ , setPrototypeOf = require('./_set-proto').set;
+module.exports = function(that, target, C){
+ var P, S = target.constructor;
+ if(S !== C && typeof S == 'function' && (P = S.prototype) !== C.prototype && isObject(P) && setPrototypeOf){
+ setPrototypeOf(that, P);
+ } return that;
};
},{"./_is-object":139,"./_set-proto":180}],134:[function(require,module,exports){
// fast apply, http://jsperf.lnkit.com/fast-apply/5
@@ -52015,7 +51232,7 @@ module.exports = {
key: toMetaKey,
exp: exp
};
-},{"./_export":122,"./_shared":184,"./es6.map":239,"./es6.weak-map":345}],154:[function(require,module,exports){
+},{"./_export":122,"./_shared":184,"./es6.map":240,"./es6.weak-map":346}],154:[function(require,module,exports){
var global = require('./_global')
, macrotask = require('./_task').set
, Observer = global.MutationObserver || global.WebKitMutationObserver
@@ -52119,48 +51336,46 @@ module.exports = !$assign || require('./_fails')(function(){
} return T;
} : $assign;
},{"./_fails":124,"./_iobject":135,"./_object-gops":163,"./_object-keys":166,"./_object-pie":167,"./_to-object":199}],156:[function(require,module,exports){
-// 19.1.2.2 / 15.2.3.5 Object.create(O [, Properties])
-var anObject = require('./_an-object')
- , dPs = require('./_object-dps')
- , enumBugKeys = require('./_enum-bug-keys')
- , IE_PROTO = require('./_shared-key')('IE_PROTO')
- , Empty = function(){ /* empty */ }
- , PROTOTYPE = 'prototype';
-
-// Create object with fake `null` prototype: use iframe Object with cleared prototype
-var createDict = function(){
- // Thrash, waste and sodomy: IE GC bug
- var iframe = require('./_dom-create')('iframe')
- , i = enumBugKeys.length
- , lt = '<'
- , gt = '>'
- , iframeDocument;
- iframe.style.display = 'none';
- require('./_html').appendChild(iframe);
- iframe.src = 'javascript:'; // eslint-disable-line no-script-url
- // createDict = iframe.contentWindow.Object;
- // html.removeChild(iframe);
- iframeDocument = iframe.contentWindow.document;
- iframeDocument.open();
- iframeDocument.write(lt + 'script' + gt + 'document.F=Object' + lt + '/script' + gt);
- iframeDocument.close();
- createDict = iframeDocument.F;
- while(i--)delete createDict[PROTOTYPE][enumBugKeys[i]];
- return createDict();
-};
-
-module.exports = Object.create || function create(O, Properties){
- var result;
- if(O !== null){
- Empty[PROTOTYPE] = anObject(O);
- result = new Empty;
- Empty[PROTOTYPE] = null;
- // add "__proto__" for Object.getPrototypeOf polyfill
- result[IE_PROTO] = O;
- } else result = createDict();
- return Properties === undefined ? result : dPs(result, Properties);
+// 19.1.2.2 / 15.2.3.5 Object.create(O [, Properties])
+var anObject = require('./_an-object')
+ , dPs = require('./_object-dps')
+ , enumBugKeys = require('./_enum-bug-keys')
+ , IE_PROTO = require('./_shared-key')('IE_PROTO')
+ , Empty = function(){ /* empty */ }
+ , PROTOTYPE = 'prototype';
+
+// Create object with fake `null` prototype: use iframe Object with cleared prototype
+var createDict = function(){
+ // Thrash, waste and sodomy: IE GC bug
+ var iframe = require('./_dom-create')('iframe')
+ , i = enumBugKeys.length
+ , gt = '>'
+ , iframeDocument;
+ iframe.style.display = 'none';
+ require('./_html').appendChild(iframe);
+ iframe.src = 'javascript:'; // eslint-disable-line no-script-url
+ // createDict = iframe.contentWindow.Object;
+ // html.removeChild(iframe);
+ iframeDocument = iframe.contentWindow.document;
+ iframeDocument.open();
+ iframeDocument.write('");
-}
-globalFuncs.getBlob = function(mime, str) {
- var str = (typeof str === 'object') ? JSON.stringify(str) : str;
- if (str == null) return '';
- var blob = new Blob([str], {
- type: mime
- });
- return window.URL.createObjectURL(blob);
-}
-globalFuncs.getSuccessText = function(str) {
- return '
'
-}
-globalFuncs.errorMsgs = [
- "Please enter valid amount. ",
- "Your password must be at least 9 characters. Please ensure it is a strong password. ",
- "Sorry! We don't have a clue what type of wallet file this is. ",
- "This is not a valid wallet file. ",
- "This unit doesn\'t exists, please use the one of the following units ",
- "Invalid address. ",
- "Invalid password. ",
- "Invalid amount. ",
- "Invalid gas limit. ",
- "Invalid data value. ",
- "Invalid gas amount. ",
- "Invalid nonce. ",
- "Invalid signed transaction. ",
- "A wallet with this nickname already exists. ",
- "Wallet not found. ",
- "Whoops. It doesnt look like a proposal with this ID exists yet or there is an error reading this proposal. ",
- "A wallet with this address already exists in storage. Please check your wallets page. ",
- "You need to have at some ETH in your account to cover the cost of gas. .01ETH should be more than sufficient for a few sends and votes. ",
- "All gas would be used on this transaction. This means you have already voted on this proposal or the debate period has ended.",
- "Invalid symbol"];
-globalFuncs.successMsgs = ["Valid address", "Wallet successfully decrypted", "Transaction submitted. TX ID: ", "New wallet added: ", "You have successfully voted. Thank you for being an active participant in The DAO."];
-globalFuncs.scrypt = {
- n: 1024
-};
-globalFuncs.postDelay = 300;
-globalFuncs.kdf = "scrypt";
-globalFuncs.defaultTxGasLimit = 21000;
-globalFuncs.digixClaimTxGasLimit = 150000;
-globalFuncs.donateAddress = "0x7cB57B5A97eAbe94205C07890BE4c1aD31E486A8";
-globalFuncs.isNumeric = function(n) {
- return !isNaN(parseFloat(n)) && isFinite(n);
-}
-globalFuncs.urlGet = function(name) {
- if (name = (new RegExp('[?&]' + encodeURIComponent(name) + '=([^&]*)')).exec(location.search)) return this.stripTags(decodeURIComponent(name[1]));
-}
-globalFuncs.stripTags = function(str) {
- var SCRIPT_REGEX = /)<[^<]*)*<\/script>/gi;
- while (SCRIPT_REGEX.test(str)) {
- str = str.replace(SCRIPT_REGEX, "");
- }
- return str;
-}
-globalFuncs.checkAndRedirectHTTPS = function() {
- var host = "myetherwallet.com";
- var githost = "kvhnuke.github.io";
- var githostw = "www.kvhnuke.github.io";
- var hostw = "www.myetherwallet.com";
- if ((host == window.location.host || githost == window.location.host || hostw == window.location.host || githostw == window.location.host) && (window.location.protocol != "https:")) window.location.protocol = "https";
-}
-globalFuncs.isStrongPass = function(password) {
- return password.length > 8;
-}
-globalFuncs.hexToAscii = function(hex) {
- return hex.match(/.{1,2}/g).map(function(v) {
- return String.fromCharCode(parseInt(v, 16));
- }).join('');
-}
-globalFuncs.isAlphaNumeric = function(value){
- return !/[^a-zA-Z0-9]/.test(value);
-}
-module.exports = globalFuncs;
+'use strict';
+var globalFuncs = function() {}
+globalFuncs.getBlockie = function(address) {
+ return blockies.create({
+ seed: address.toLowerCase(),
+ size: 8,
+ scale: 16
+ }).toDataURL();
+}
+globalFuncs.printPaperWallets = function(strJson) {
+ var win = window.open("about:blank", "_blank");
+ var data = "");
+}
+globalFuncs.getBlob = function(mime, str) {
+ var str = (typeof str === 'object') ? JSON.stringify(str) : str;
+ if (str == null) return '';
+ var blob = new Blob([str], {
+ type: mime
+ });
+ return window.URL.createObjectURL(blob);
+}
+globalFuncs.getSuccessText = function(str) {
+ return '
'
+}
+globalFuncs.errorMsgs = [
+ "Please enter valid amount. ",
+ "Your password must be at least 9 characters. Please ensure it is a strong password. ",
+ "Sorry! We don't have a clue what type of wallet file this is. ",
+ "This is not a valid wallet file. ",
+ "This unit doesn\'t exists, please use the one of the following units ",
+ "Invalid address. ",
+ "Invalid password. ",
+ "Invalid amount. ",
+ "Invalid gas limit. ",
+ "Invalid data value. ",
+ "Invalid gas amount. ",
+ "Invalid nonce. ",
+ "Invalid signed transaction. ",
+ "A wallet with this nickname already exists. ",
+ "Wallet not found. ",
+ "Whoops. It doesnt look like a proposal with this ID exists yet or there is an error reading this proposal. ",
+ "A wallet with this address already exists in storage. Please check your wallets page. ",
+ "You need to have at some ETH in your account to cover the cost of gas. .01ETH should be more than sufficient for a few sends and votes. ",
+ "All gas would be used on this transaction. This means you have already voted on this proposal or the debate period has ended.",
+ "Invalid symbol"];
+globalFuncs.successMsgs = ["Valid address", "Wallet successfully decrypted", "Transaction submitted. TX ID: ", "New wallet added: ", "You have successfully voted. Thank you for being an active participant in The DAO."];
+globalFuncs.scrypt = {
+ n: 1024
+};
+globalFuncs.postDelay = 300;
+globalFuncs.kdf = "scrypt";
+globalFuncs.defaultTxGasLimit = 21000;
+globalFuncs.digixClaimTxGasLimit = 150000;
+globalFuncs.donateAddress = "0x7cB57B5A97eAbe94205C07890BE4c1aD31E486A8";
+globalFuncs.isNumeric = function(n) {
+ return !isNaN(parseFloat(n)) && isFinite(n);
+}
+globalFuncs.urlGet = function(name) {
+ if (name = (new RegExp('[?&]' + encodeURIComponent(name) + '=([^&]*)')).exec(location.search)) return this.stripTags(decodeURIComponent(name[1]));
+}
+globalFuncs.stripTags = function(str) {
+ var SCRIPT_REGEX = /)<[^<]*)*<\/script>/gi;
+ while (SCRIPT_REGEX.test(str)) {
+ str = str.replace(SCRIPT_REGEX, "");
+ }
+ return str;
+}
+globalFuncs.checkAndRedirectHTTPS = function() {
+ var host = "myetherwallet.com";
+ var githost = "kvhnuke.github.io";
+ var githostw = "www.kvhnuke.github.io";
+ var hostw = "www.myetherwallet.com";
+ if ((host == window.location.host || githost == window.location.host || hostw == window.location.host || githostw == window.location.host) && (window.location.protocol != "https:")) window.location.protocol = "https";
+}
+globalFuncs.isStrongPass = function(password) {
+ return password.length > 8;
+}
+globalFuncs.hexToAscii = function(hex) {
+ return hex.match(/.{1,2}/g).map(function(v) {
+ return String.fromCharCode(parseInt(v, 16));
+ }).join('');
+}
+globalFuncs.isAlphaNumeric = function(value){
+ return !/[^a-zA-Z0-9]/.test(value);
+}
+module.exports = globalFuncs;
},{}],27:[function(require,module,exports){
-'use strict';
-var IS_CX = false;
-if(typeof chrome != 'undefined')
- IS_CX = chrome.windows === undefined ? false : true;
-require("babel-polyfill");
-var angular = require('angular');
-var angularTranslate = require('angular-translate');
-var angularSanitize = require('angular-sanitize');
-var BigNumber = require('bignumber.js');
-window.BigNumber = BigNumber;
-var marked = require('marked');
-window.marked = marked;
-var ethUtil = require('ethereumjs-util');
-ethUtil.crypto = require('crypto');
-ethUtil.Tx = require('ethereumjs-tx');
-ethUtil.scrypt = require('scryptsy');
-ethUtil.uuid = require('uuid');
-window.ethUtil = ethUtil;
-var Wallet = require('./myetherwallet');
-window.Wallet = Wallet;
-var Token = require('./tokens');
-window.Token = Token;
-var globalFuncs = require('./globalFuncs');
-window.globalFuncs = globalFuncs;
-var uiFuncs = require('./uiFuncs');
-window.uiFuncs = uiFuncs;
-var etherUnits = require('./etherUnits');
-window.etherUnits = etherUnits;
-var ajaxReq = require('./ajaxReq');
-window.ajaxReq = ajaxReq;
-var ethFuncs = require('./ethFuncs');
-window.ethFuncs = ethFuncs;
-var translate = require('./translations/translate.js');
-if(IS_CX){
- var cxFuncs = require('./cxFuncs');
- window.cxFuncs = cxFuncs;
-}
-var tabsCtrl = require('./controllers/tabsCtrl');
-var viewCtrl = require('./controllers/viewCtrl');
-var walletGenCtrl = require('./controllers/walletGenCtrl');
-var bulkGenCtrl = require('./controllers/bulkGenCtrl');
-var decryptWalletCtrl = require('./controllers/decryptWalletCtrl');
-var viewWalletCtrl = require('./controllers/viewWalletCtrl');
-var sendTxCtrl = require('./controllers/sendTxCtrl');
-var digixCtrl = require('./controllers/digixCtrl');
-var theDaoCtrl = require('./controllers/theDaoCtrl');
-var tokenCtrl = require('./controllers/tokenCtrl');
-var sendOfflineTxCtrl = require('./controllers/sendOfflineTxCtrl');
-var globalService = require('./services/globalService');
-var walletService = require('./services/walletService');
-var blockiesDrtv = require('./directives/blockiesDrtv');
-var QRCodeDrtv = require('./directives/QRCodeDrtv');
-var walletDecryptDrtv = require('./directives/walletDecryptDrtv');
-var cxWalletDecryptDrtv = require('./directives/cxWalletDecryptDrtv');
-var fileReaderDrtv = require('./directives/fileReaderDrtv');
-if(IS_CX){
- var addWalletCtrl = require('./controllers/CX/addWalletCtrl');
- var cxDecryptWalletCtrl = require('./controllers/CX/cxDecryptWalletCtrl');
- var myWalletsCtrl = require('./controllers/CX/myWalletsCtrl');
- var mainPopCtrl = require('./controllers/CX/mainPopCtrl');
- var quickSendCtrl = require('./controllers/CX/quickSendCtrl');
-}
-var app = angular.module('mewApp',['pascalprecht.translate','ngSanitize']);
-app.config(['$compileProvider', function($compileProvider) {
- $compileProvider.aHrefSanitizationWhitelist(/^\s*(|blob|https|):/);
-}]);
-app.config(['$translateProvider', function($translateProvider) {
- new translate($translateProvider);
-}]);
-app.factory('globalService', ['$http','$httpParamSerializerJQLike',globalService]);
-app.factory('walletService', walletService);
-app.directive('blockieAddress', blockiesDrtv);
-app.directive('qrCode', QRCodeDrtv);
-app.directive('onReadFile', fileReaderDrtv);
-app.directive('walletDecryptDrtv', walletDecryptDrtv);
-app.directive('cxWalletDecryptDrtv', cxWalletDecryptDrtv);
-app.controller('tabsCtrl', ['$scope', 'globalService', tabsCtrl]);
-app.controller('viewCtrl', ['$scope', 'globalService', viewCtrl]);
-app.controller('walletGenCtrl', ['$scope', walletGenCtrl]);
-app.controller('bulkGenCtrl', ['$scope', bulkGenCtrl]);
-app.controller('decryptWalletCtrl', ['$scope','$sce','walletService', decryptWalletCtrl]);
-app.controller('viewWalletCtrl', ['$scope','walletService', viewWalletCtrl]);
-app.controller('sendTxCtrl', ['$scope','$sce','walletService', sendTxCtrl]);
-app.controller('digixCtrl', ['$scope','$sce','walletService', digixCtrl]);
-app.controller('theDaoCtrl', ['$scope','$sce','walletService', theDaoCtrl]);
-app.controller('tokenCtrl', ['$scope','$sce','walletService', tokenCtrl]);
-app.controller('sendOfflineTxCtrl', ['$scope','$sce','walletService', sendOfflineTxCtrl]);
-if(IS_CX){
- app.controller('addWalletCtrl', ['$scope','$sce', addWalletCtrl]);
- app.controller('myWalletsCtrl', ['$scope','$sce', myWalletsCtrl]);
- app.controller('mainPopCtrl', ['$scope','$sce', mainPopCtrl]);
- app.controller('quickSendCtrl', ['$scope','$sce', quickSendCtrl]);
- app.controller('cxDecryptWalletCtrl', ['$scope','$sce','walletService', cxDecryptWalletCtrl]);
-}
-
-},{"./ajaxReq":1,"./controllers/CX/addWalletCtrl":2,"./controllers/CX/cxDecryptWalletCtrl":3,"./controllers/CX/mainPopCtrl":4,"./controllers/CX/myWalletsCtrl":5,"./controllers/CX/quickSendCtrl":6,"./controllers/bulkGenCtrl":7,"./controllers/decryptWalletCtrl":8,"./controllers/digixCtrl":9,"./controllers/sendOfflineTxCtrl":10,"./controllers/sendTxCtrl":11,"./controllers/tabsCtrl":12,"./controllers/theDaoCtrl":13,"./controllers/tokenCtrl":14,"./controllers/viewCtrl":15,"./controllers/viewWalletCtrl":16,"./controllers/walletGenCtrl":17,"./cxFuncs":18,"./directives/QRCodeDrtv":19,"./directives/blockiesDrtv":20,"./directives/cxWalletDecryptDrtv":21,"./directives/fileReaderDrtv":22,"./directives/walletDecryptDrtv":23,"./ethFuncs":24,"./etherUnits":25,"./globalFuncs":26,"./myetherwallet":28,"./services/globalService":29,"./services/walletService":30,"./tokens":31,"./translations/translate.js":34,"./uiFuncs":35,"angular":40,"angular-sanitize":37,"angular-translate":38,"babel-polyfill":56,"bignumber.js":58,"crypto":392,"ethereumjs-tx":422,"ethereumjs-util":423,"marked":439,"scryptsy":469,"uuid":489}],28:[function(require,module,exports){
+'use strict';
+var IS_CX = false;
+if(typeof chrome != 'undefined')
+ IS_CX = chrome.windows === undefined ? false : true;
+require("babel-polyfill");
+var angular = require('angular');
+var angularTranslate = require('angular-translate');
+var angularSanitize = require('angular-sanitize');
+var BigNumber = require('bignumber.js');
+window.BigNumber = BigNumber;
+var marked = require('marked');
+window.marked = marked;
+var ethUtil = require('ethereumjs-util');
+ethUtil.crypto = require('crypto');
+ethUtil.Tx = require('ethereumjs-tx');
+ethUtil.scrypt = require('scryptsy');
+ethUtil.uuid = require('uuid');
+window.ethUtil = ethUtil;
+var Wallet = require('./myetherwallet');
+window.Wallet = Wallet;
+var Token = require('./tokens');
+window.Token = Token;
+var globalFuncs = require('./globalFuncs');
+window.globalFuncs = globalFuncs;
+var uiFuncs = require('./uiFuncs');
+window.uiFuncs = uiFuncs;
+var etherUnits = require('./etherUnits');
+window.etherUnits = etherUnits;
+var ajaxReq = require('./ajaxReq');
+window.ajaxReq = ajaxReq;
+var ethFuncs = require('./ethFuncs');
+window.ethFuncs = ethFuncs;
+var translate = require('./translations/translate.js');
+if(IS_CX){
+ var cxFuncs = require('./cxFuncs');
+ window.cxFuncs = cxFuncs;
+}
+var tabsCtrl = require('./controllers/tabsCtrl');
+var viewCtrl = require('./controllers/viewCtrl');
+var walletGenCtrl = require('./controllers/walletGenCtrl');
+var bulkGenCtrl = require('./controllers/bulkGenCtrl');
+var decryptWalletCtrl = require('./controllers/decryptWalletCtrl');
+var viewWalletCtrl = require('./controllers/viewWalletCtrl');
+var sendTxCtrl = require('./controllers/sendTxCtrl');
+var digixCtrl = require('./controllers/digixCtrl');
+var theDaoCtrl = require('./controllers/theDaoCtrl');
+var tokenCtrl = require('./controllers/tokenCtrl');
+var sendOfflineTxCtrl = require('./controllers/sendOfflineTxCtrl');
+var globalService = require('./services/globalService');
+var walletService = require('./services/walletService');
+var blockiesDrtv = require('./directives/blockiesDrtv');
+var QRCodeDrtv = require('./directives/QRCodeDrtv');
+var walletDecryptDrtv = require('./directives/walletDecryptDrtv');
+var cxWalletDecryptDrtv = require('./directives/cxWalletDecryptDrtv');
+var fileReaderDrtv = require('./directives/fileReaderDrtv');
+if(IS_CX){
+ var addWalletCtrl = require('./controllers/CX/addWalletCtrl');
+ var cxDecryptWalletCtrl = require('./controllers/CX/cxDecryptWalletCtrl');
+ var myWalletsCtrl = require('./controllers/CX/myWalletsCtrl');
+ var mainPopCtrl = require('./controllers/CX/mainPopCtrl');
+ var quickSendCtrl = require('./controllers/CX/quickSendCtrl');
+}
+var app = angular.module('mewApp',['pascalprecht.translate','ngSanitize']);
+app.config(['$compileProvider', function($compileProvider) {
+ $compileProvider.aHrefSanitizationWhitelist(/^\s*(|blob|https|):/);
+}]);
+app.config(['$translateProvider', function($translateProvider) {
+ new translate($translateProvider);
+}]);
+app.factory('globalService', ['$http','$httpParamSerializerJQLike',globalService]);
+app.factory('walletService', walletService);
+app.directive('blockieAddress', blockiesDrtv);
+app.directive('qrCode', QRCodeDrtv);
+app.directive('onReadFile', fileReaderDrtv);
+app.directive('walletDecryptDrtv', walletDecryptDrtv);
+app.directive('cxWalletDecryptDrtv', cxWalletDecryptDrtv);
+app.controller('tabsCtrl', ['$scope', 'globalService', tabsCtrl]);
+app.controller('viewCtrl', ['$scope', 'globalService', viewCtrl]);
+app.controller('walletGenCtrl', ['$scope', walletGenCtrl]);
+app.controller('bulkGenCtrl', ['$scope', bulkGenCtrl]);
+app.controller('decryptWalletCtrl', ['$scope','$sce','walletService', decryptWalletCtrl]);
+app.controller('viewWalletCtrl', ['$scope','walletService', viewWalletCtrl]);
+app.controller('sendTxCtrl', ['$scope','$sce','walletService', sendTxCtrl]);
+app.controller('digixCtrl', ['$scope','$sce','walletService', digixCtrl]);
+app.controller('theDaoCtrl', ['$scope','$sce','walletService', theDaoCtrl]);
+app.controller('tokenCtrl', ['$scope','$sce','walletService', tokenCtrl]);
+app.controller('sendOfflineTxCtrl', ['$scope','$sce','walletService', sendOfflineTxCtrl]);
+if(IS_CX){
+ app.controller('addWalletCtrl', ['$scope','$sce', addWalletCtrl]);
+ app.controller('myWalletsCtrl', ['$scope','$sce', myWalletsCtrl]);
+ app.controller('mainPopCtrl', ['$scope','$sce', mainPopCtrl]);
+ app.controller('quickSendCtrl', ['$scope','$sce', quickSendCtrl]);
+ app.controller('cxDecryptWalletCtrl', ['$scope','$sce','walletService', cxDecryptWalletCtrl]);
+}
+
+},{"./ajaxReq":1,"./controllers/CX/addWalletCtrl":2,"./controllers/CX/cxDecryptWalletCtrl":3,"./controllers/CX/mainPopCtrl":4,"./controllers/CX/myWalletsCtrl":5,"./controllers/CX/quickSendCtrl":6,"./controllers/bulkGenCtrl":7,"./controllers/decryptWalletCtrl":8,"./controllers/digixCtrl":9,"./controllers/sendOfflineTxCtrl":10,"./controllers/sendTxCtrl":11,"./controllers/tabsCtrl":12,"./controllers/theDaoCtrl":13,"./controllers/tokenCtrl":14,"./controllers/viewCtrl":15,"./controllers/viewWalletCtrl":16,"./controllers/walletGenCtrl":17,"./cxFuncs":18,"./directives/QRCodeDrtv":19,"./directives/blockiesDrtv":20,"./directives/cxWalletDecryptDrtv":21,"./directives/fileReaderDrtv":22,"./directives/walletDecryptDrtv":23,"./ethFuncs":24,"./etherUnits":25,"./globalFuncs":26,"./myetherwallet":28,"./services/globalService":29,"./services/walletService":30,"./tokens":31,"./translations/translate.js":34,"./uiFuncs":35,"angular":40,"angular-sanitize":37,"angular-translate":38,"babel-polyfill":56,"bignumber.js":58,"crypto":393,"ethereumjs-tx":423,"ethereumjs-util":424,"marked":440,"scryptsy":470,"uuid":490}],28:[function(require,module,exports){
(function (Buffer){
-'use strict';
-var Wallet = function(priv) {
- this.privKey = priv.length == 32 ? priv : Buffer(priv, 'hex')
-}
-Wallet.generate = function(icapDirect) {
- if (icapDirect) {
- while (true) {
- var privKey = ethUtil.crypto.randomBytes(32)
- if (ethUtil.privateToAddress(privKey)[0] === 0) {
- return new Wallet(privKey)
- }
- }
- } else {
- return new Wallet(ethUtil.crypto.randomBytes(32))
- }
-}
-Wallet.prototype.getPrivateKey = function() {
- return this.privKey
-}
-Wallet.prototype.getPrivateKeyString = function() {
- return this.getPrivateKey().toString('hex')
-}
-Wallet.prototype.getPublicKey = function() {
- return ethUtil.privateToPublic(this.privKey)
-}
-Wallet.prototype.getPublicKeyString = function() {
- return '0x' + this.getPublicKey().toString('hex')
-}
-Wallet.prototype.getAddress = function() {
- return ethUtil.privateToAddress(this.privKey)
-}
-Wallet.prototype.getAddressString = function() {
- return '0x' + this.getAddress().toString('hex')
-}
-Wallet.prototype.getChecksumAddressString = function() {
- return ethUtil.toChecksumAddress(this.getAddressString())
-}
-Wallet.fromPrivateKey = function(priv) {
- return new Wallet(priv)
-}
-Wallet.prototype.toV3 = function(password, opts) {
- opts = opts || {}
- var salt = opts.salt || ethUtil.crypto.randomBytes(32)
- var iv = opts.iv || ethUtil.crypto.randomBytes(16)
- var derivedKey
- var kdf = opts.kdf || 'scrypt'
- var kdfparams = {
- dklen: opts.dklen || 32,
- salt: salt.toString('hex')
- }
- if (kdf === 'pbkdf2') {
- kdfparams.c = opts.c || 262144
- kdfparams.prf = 'hmac-sha256'
- derivedKey = ethUtil.crypto.pbkdf2Sync(new Buffer(password), salt, kdfparams.c, kdfparams.dklen, 'sha256')
- } else if (kdf === 'scrypt') {
- // FIXME: support progress reporting callback
- kdfparams.n = opts.n || 262144
- kdfparams.r = opts.r || 8
- kdfparams.p = opts.p || 1
- derivedKey = ethUtil.scrypt(new Buffer(password), salt, kdfparams.n, kdfparams.r, kdfparams.p, kdfparams.dklen)
- } else {
- throw new Error('Unsupported kdf')
- }
- var cipher = ethUtil.crypto.createCipheriv(opts.cipher || 'aes-128-ctr', derivedKey.slice(0, 16), iv)
- if (!cipher) {
- throw new Error('Unsupported cipher')
- }
- var ciphertext = Buffer.concat([cipher.update(this.privKey), cipher.final()])
- var mac = ethUtil.sha3(Buffer.concat([derivedKey.slice(16, 32), new Buffer(ciphertext, 'hex')]))
- return {
- version: 3,
- id: ethUtil.uuid.v4({
- random: opts.uuid || ethUtil.crypto.randomBytes(16)
- }),
- address: this.getAddress().toString('hex'),
- Crypto: {
- ciphertext: ciphertext.toString('hex'),
- cipherparams: {
- iv: iv.toString('hex')
- },
- cipher: opts.cipher || 'aes-128-ctr',
- kdf: kdf,
- kdfparams: kdfparams,
- mac: mac.toString('hex')
- }
- }
-}
-Wallet.prototype.toJSON = function() {
- return {
- address: this.getAddressString(),
- checksumAddress: this.getChecksumAddressString(),
- privKey: this.getPrivateKeyString(),
- pubKey: this.getPublicKeyString(),
- publisher:"MyEtherWallet",
- encrypted:false,
- version:2
- }
-}
-Wallet.fromMyEtherWallet = function(input, password) {
- var json = (typeof input === 'object') ? input : JSON.parse(input)
- var privKey
- if (!json.locked) {
- if (json.private.length !== 64) {
- throw new Error('Invalid private key length')
- }
- privKey = new Buffer(json.private, 'hex')
- } else {
- if (typeof password !== 'string') {
- throw new Error('Password required')
- }
- if (password.length < 7) {
- throw new Error('Password must be at least 7 characters')
- }
- var cipher = json.encrypted ? json.private.slice(0, 128) : json.private
- cipher = Wallet.decodeCryptojsSalt(cipher)
- var evp = Wallet.evp_kdf(new Buffer(password), cipher.salt, {
- keysize: 32,
- ivsize: 16
- })
- var decipher = ethUtil.crypto.createDecipheriv('aes-256-cbc', evp.key, evp.iv)
- privKey = Wallet.decipherBuffer(decipher, new Buffer(cipher.ciphertext))
- privKey = new Buffer((privKey.toString()), 'hex')
- }
- var wallet = new Wallet(privKey)
- if (wallet.getAddressString() !== json.address) {
- throw new Error('Invalid private key or address')
- }
- return wallet
-}
-Wallet.fromMyEtherWalletV2 = function (input){
- var json = (typeof input === 'object') ? input : JSON.parse(input);
- if (json.privKey.length !== 64) {
- throw new Error('Invalid private key length');
- };
- var privKey = new Buffer(json.privKey, 'hex');
- return new Wallet(privKey);
-}
-Wallet.fromEthSale = function(input, password) {
- var json = (typeof input === 'object') ? input : JSON.parse(input)
- var encseed = new Buffer(json.encseed, 'hex')
- var derivedKey = ethUtil.crypto.pbkdf2Sync(Buffer(password), Buffer(password), 2000, 32, 'sha256').slice(0, 16)
- var decipher = ethUtil.crypto.createDecipheriv('aes-128-cbc', derivedKey, encseed.slice(0, 16))
- var seed = Wallet.decipherBuffer(decipher, encseed.slice(16))
- var wallet = new Wallet(ethUtil.sha3(seed))
- if (wallet.getAddress().toString('hex') !== json.ethaddr) {
- throw new Error('Decoded key mismatch - possibly wrong passphrase')
- }
- return wallet
-}
-Wallet.fromMyEtherWalletKey = function(input, password) {
- var cipher = input.slice(0, 128)
- cipher = Wallet.decodeCryptojsSalt(cipher)
- var evp = Wallet.evp_kdf(new Buffer(password), cipher.salt, {
- keysize: 32,
- ivsize: 16
- })
- var decipher = ethUtil.crypto.createDecipheriv('aes-256-cbc', evp.key, evp.iv)
- var privKey = Wallet.decipherBuffer(decipher, new Buffer(cipher.ciphertext))
- privKey = new Buffer((privKey.toString()), 'hex')
- return new Wallet(privKey)
-}
-Wallet.fromV3 = function(input, password, nonStrict) {
- var json = (typeof input === 'object') ? input : JSON.parse(nonStrict ? input.toLowerCase() : input)
- if (json.version !== 3) {
- throw new Error('Not a V3 wallet')
- }
- var derivedKey
- var kdfparams
- if (json.crypto.kdf === 'scrypt') {
- kdfparams = json.crypto.kdfparams
- derivedKey = ethUtil.scrypt(new Buffer(password), new Buffer(kdfparams.salt, 'hex'), kdfparams.n, kdfparams.r, kdfparams.p, kdfparams.dklen)
- } else if (json.crypto.kdf === 'pbkdf2') {
- kdfparams = json.crypto.kdfparams
- if (kdfparams.prf !== 'hmac-sha256') {
- throw new Error('Unsupported parameters to PBKDF2')
- }
- derivedKey = ethUtil.crypto.pbkdf2Sync(new Buffer(password), new Buffer(kdfparams.salt, 'hex'), kdfparams.c, kdfparams.dklen, 'sha256')
- } else {
- throw new Error('Unsupported key derivation scheme')
- }
- var ciphertext = new Buffer(json.crypto.ciphertext, 'hex')
- var mac = ethUtil.sha3(Buffer.concat([derivedKey.slice(16, 32), ciphertext]))
- if (mac.toString('hex') !== json.crypto.mac) {
- throw new Error('Key derivation failed - possibly wrong passphrase')
- }
- var decipher = ethUtil.crypto.createDecipheriv(json.crypto.cipher, derivedKey.slice(0, 16), new Buffer(json.crypto.cipherparams.iv, 'hex'))
- var seed = Wallet.decipherBuffer(decipher, ciphertext, 'hex')
- return new Wallet(seed)
-}
-Wallet.prototype.toV3String = function(password, opts) {
- return JSON.stringify(this.toV3(password, opts))
-}
-Wallet.prototype.getV3Filename = function (timestamp) {
- var ts = timestamp ? new Date(timestamp) : new Date()
- return [
- 'UTC--',
- ts.toJSON().replace(/:/g, '-'),
- '--',
- this.getAddress().toString('hex')
- ].join('')
-}
-Wallet.decipherBuffer = function(decipher, data) {
- return Buffer.concat([decipher.update(data), decipher.final()])
-}
-Wallet.decodeCryptojsSalt = function(input) {
- var ciphertext = new Buffer(input, 'base64')
- if (ciphertext.slice(0, 8).toString() === 'Salted__') {
- return {
- salt: ciphertext.slice(8, 16),
- ciphertext: ciphertext.slice(16)
- }
- } else {
- return {
- ciphertext: ciphertext
- }
- }
-}
-Wallet.evp_kdf = function(data, salt, opts) {
- // A single EVP iteration, returns `D_i`, where block equlas to `D_(i-1)`
-
- function iter(block) {
- var hash = ethUtil.crypto.createHash(opts.digest || 'md5')
- hash.update(block)
- hash.update(data)
- hash.update(salt)
- block = hash.digest()
- for (var i = 1; i < (opts.count || 1); i++) {
- hash = ethUtil.crypto.createHash(opts.digest || 'md5')
- hash.update(block)
- block = hash.digest()
- }
- return block
- }
- var keysize = opts.keysize || 16
- var ivsize = opts.ivsize || 16
- var ret = []
- var i = 0
- while (Buffer.concat(ret).length < (keysize + ivsize)) {
- ret[i] = iter((i === 0) ? new Buffer(0) : ret[i - 1])
- i++
- }
- var tmp = Buffer.concat(ret)
- return {
- key: tmp.slice(0, keysize),
- iv: tmp.slice(keysize, keysize + ivsize)
- }
-}
-Wallet.walletRequirePass = function(ethjson) {
- var jsonArr;
- try {
- jsonArr = JSON.parse(ethjson);
- } catch (err) {
- throw globalFuncs.errorMsgs[3];
- }
- if (jsonArr.encseed != null) return true;
- else if (jsonArr.Crypto != null || jsonArr.crypto != null) return true
- else if (jsonArr.hash != null && jsonArr.locked) return true;
- else if (jsonArr.hash != null && !jsonArr.locked) return false;
- else if (jsonArr.publisher == "MyEtherWallet" && !jsonArr.encrypted) return false;
- else
- throw globalFuncs.errorMsgs[2];
-}
-Wallet.getWalletFromPrivKeyFile = function(strjson, password) {
- var jsonArr = JSON.parse(strjson);
- if (jsonArr.encseed != null) return Wallet.fromEthSale(strjson, password);
- else if (jsonArr.Crypto != null || jsonArr.crypto != null) return Wallet.fromV3(strjson, password, true);
- else if (jsonArr.hash != null) return Wallet.fromMyEtherWallet(strjson, password);
- else if (jsonArr.publisher == "MyEtherWallet") return Wallet.fromMyEtherWalletV2(strjson);
- else
- throw globalFuncs.errorMsgs[2];
-}
+'use strict';
+var Wallet = function(priv) {
+ this.privKey = priv.length == 32 ? priv : Buffer(priv, 'hex')
+}
+Wallet.generate = function(icapDirect) {
+ if (icapDirect) {
+ while (true) {
+ var privKey = ethUtil.crypto.randomBytes(32)
+ if (ethUtil.privateToAddress(privKey)[0] === 0) {
+ return new Wallet(privKey)
+ }
+ }
+ } else {
+ return new Wallet(ethUtil.crypto.randomBytes(32))
+ }
+}
+Wallet.prototype.getPrivateKey = function() {
+ return this.privKey
+}
+Wallet.prototype.getPrivateKeyString = function() {
+ return this.getPrivateKey().toString('hex')
+}
+Wallet.prototype.getPublicKey = function() {
+ return ethUtil.privateToPublic(this.privKey)
+}
+Wallet.prototype.getPublicKeyString = function() {
+ return '0x' + this.getPublicKey().toString('hex')
+}
+Wallet.prototype.getAddress = function() {
+ return ethUtil.privateToAddress(this.privKey)
+}
+Wallet.prototype.getAddressString = function() {
+ return '0x' + this.getAddress().toString('hex')
+}
+Wallet.prototype.getChecksumAddressString = function() {
+ return ethUtil.toChecksumAddress(this.getAddressString())
+}
+Wallet.fromPrivateKey = function(priv) {
+ return new Wallet(priv)
+}
+Wallet.prototype.toV3 = function(password, opts) {
+ opts = opts || {}
+ var salt = opts.salt || ethUtil.crypto.randomBytes(32)
+ var iv = opts.iv || ethUtil.crypto.randomBytes(16)
+ var derivedKey
+ var kdf = opts.kdf || 'scrypt'
+ var kdfparams = {
+ dklen: opts.dklen || 32,
+ salt: salt.toString('hex')
+ }
+ if (kdf === 'pbkdf2') {
+ kdfparams.c = opts.c || 262144
+ kdfparams.prf = 'hmac-sha256'
+ derivedKey = ethUtil.crypto.pbkdf2Sync(new Buffer(password), salt, kdfparams.c, kdfparams.dklen, 'sha256')
+ } else if (kdf === 'scrypt') {
+ // FIXME: support progress reporting callback
+ kdfparams.n = opts.n || 262144
+ kdfparams.r = opts.r || 8
+ kdfparams.p = opts.p || 1
+ derivedKey = ethUtil.scrypt(new Buffer(password), salt, kdfparams.n, kdfparams.r, kdfparams.p, kdfparams.dklen)
+ } else {
+ throw new Error('Unsupported kdf')
+ }
+ var cipher = ethUtil.crypto.createCipheriv(opts.cipher || 'aes-128-ctr', derivedKey.slice(0, 16), iv)
+ if (!cipher) {
+ throw new Error('Unsupported cipher')
+ }
+ var ciphertext = Buffer.concat([cipher.update(this.privKey), cipher.final()])
+ var mac = ethUtil.sha3(Buffer.concat([derivedKey.slice(16, 32), new Buffer(ciphertext, 'hex')]))
+ return {
+ version: 3,
+ id: ethUtil.uuid.v4({
+ random: opts.uuid || ethUtil.crypto.randomBytes(16)
+ }),
+ address: this.getAddress().toString('hex'),
+ Crypto: {
+ ciphertext: ciphertext.toString('hex'),
+ cipherparams: {
+ iv: iv.toString('hex')
+ },
+ cipher: opts.cipher || 'aes-128-ctr',
+ kdf: kdf,
+ kdfparams: kdfparams,
+ mac: mac.toString('hex')
+ }
+ }
+}
+Wallet.prototype.toJSON = function() {
+ return {
+ address: this.getAddressString(),
+ checksumAddress: this.getChecksumAddressString(),
+ privKey: this.getPrivateKeyString(),
+ pubKey: this.getPublicKeyString(),
+ publisher:"MyEtherWallet",
+ encrypted:false,
+ version:2
+ }
+}
+Wallet.fromMyEtherWallet = function(input, password) {
+ var json = (typeof input === 'object') ? input : JSON.parse(input)
+ var privKey
+ if (!json.locked) {
+ if (json.private.length !== 64) {
+ throw new Error('Invalid private key length')
+ }
+ privKey = new Buffer(json.private, 'hex')
+ } else {
+ if (typeof password !== 'string') {
+ throw new Error('Password required')
+ }
+ if (password.length < 7) {
+ throw new Error('Password must be at least 7 characters')
+ }
+ var cipher = json.encrypted ? json.private.slice(0, 128) : json.private
+ cipher = Wallet.decodeCryptojsSalt(cipher)
+ var evp = Wallet.evp_kdf(new Buffer(password), cipher.salt, {
+ keysize: 32,
+ ivsize: 16
+ })
+ var decipher = ethUtil.crypto.createDecipheriv('aes-256-cbc', evp.key, evp.iv)
+ privKey = Wallet.decipherBuffer(decipher, new Buffer(cipher.ciphertext))
+ privKey = new Buffer((privKey.toString()), 'hex')
+ }
+ var wallet = new Wallet(privKey)
+ if (wallet.getAddressString() !== json.address) {
+ throw new Error('Invalid private key or address')
+ }
+ return wallet
+}
+Wallet.fromMyEtherWalletV2 = function (input){
+ var json = (typeof input === 'object') ? input : JSON.parse(input);
+ if (json.privKey.length !== 64) {
+ throw new Error('Invalid private key length');
+ };
+ var privKey = new Buffer(json.privKey, 'hex');
+ return new Wallet(privKey);
+}
+Wallet.fromEthSale = function(input, password) {
+ var json = (typeof input === 'object') ? input : JSON.parse(input)
+ var encseed = new Buffer(json.encseed, 'hex')
+ var derivedKey = ethUtil.crypto.pbkdf2Sync(Buffer(password), Buffer(password), 2000, 32, 'sha256').slice(0, 16)
+ var decipher = ethUtil.crypto.createDecipheriv('aes-128-cbc', derivedKey, encseed.slice(0, 16))
+ var seed = Wallet.decipherBuffer(decipher, encseed.slice(16))
+ var wallet = new Wallet(ethUtil.sha3(seed))
+ if (wallet.getAddress().toString('hex') !== json.ethaddr) {
+ throw new Error('Decoded key mismatch - possibly wrong passphrase')
+ }
+ return wallet
+}
+Wallet.fromMyEtherWalletKey = function(input, password) {
+ var cipher = input.slice(0, 128)
+ cipher = Wallet.decodeCryptojsSalt(cipher)
+ var evp = Wallet.evp_kdf(new Buffer(password), cipher.salt, {
+ keysize: 32,
+ ivsize: 16
+ })
+ var decipher = ethUtil.crypto.createDecipheriv('aes-256-cbc', evp.key, evp.iv)
+ var privKey = Wallet.decipherBuffer(decipher, new Buffer(cipher.ciphertext))
+ privKey = new Buffer((privKey.toString()), 'hex')
+ return new Wallet(privKey)
+}
+Wallet.fromV3 = function(input, password, nonStrict) {
+ var json = (typeof input === 'object') ? input : JSON.parse(nonStrict ? input.toLowerCase() : input)
+ if (json.version !== 3) {
+ throw new Error('Not a V3 wallet')
+ }
+ var derivedKey
+ var kdfparams
+ if (json.crypto.kdf === 'scrypt') {
+ kdfparams = json.crypto.kdfparams
+ derivedKey = ethUtil.scrypt(new Buffer(password), new Buffer(kdfparams.salt, 'hex'), kdfparams.n, kdfparams.r, kdfparams.p, kdfparams.dklen)
+ } else if (json.crypto.kdf === 'pbkdf2') {
+ kdfparams = json.crypto.kdfparams
+ if (kdfparams.prf !== 'hmac-sha256') {
+ throw new Error('Unsupported parameters to PBKDF2')
+ }
+ derivedKey = ethUtil.crypto.pbkdf2Sync(new Buffer(password), new Buffer(kdfparams.salt, 'hex'), kdfparams.c, kdfparams.dklen, 'sha256')
+ } else {
+ throw new Error('Unsupported key derivation scheme')
+ }
+ var ciphertext = new Buffer(json.crypto.ciphertext, 'hex')
+ var mac = ethUtil.sha3(Buffer.concat([derivedKey.slice(16, 32), ciphertext]))
+ if (mac.toString('hex') !== json.crypto.mac) {
+ throw new Error('Key derivation failed - possibly wrong passphrase')
+ }
+ var decipher = ethUtil.crypto.createDecipheriv(json.crypto.cipher, derivedKey.slice(0, 16), new Buffer(json.crypto.cipherparams.iv, 'hex'))
+ var seed = Wallet.decipherBuffer(decipher, ciphertext, 'hex')
+ return new Wallet(seed)
+}
+Wallet.prototype.toV3String = function(password, opts) {
+ return JSON.stringify(this.toV3(password, opts))
+}
+Wallet.prototype.getV3Filename = function (timestamp) {
+ var ts = timestamp ? new Date(timestamp) : new Date()
+ return [
+ 'UTC--',
+ ts.toJSON().replace(/:/g, '-'),
+ '--',
+ this.getAddress().toString('hex')
+ ].join('')
+}
+Wallet.decipherBuffer = function(decipher, data) {
+ return Buffer.concat([decipher.update(data), decipher.final()])
+}
+Wallet.decodeCryptojsSalt = function(input) {
+ var ciphertext = new Buffer(input, 'base64')
+ if (ciphertext.slice(0, 8).toString() === 'Salted__') {
+ return {
+ salt: ciphertext.slice(8, 16),
+ ciphertext: ciphertext.slice(16)
+ }
+ } else {
+ return {
+ ciphertext: ciphertext
+ }
+ }
+}
+Wallet.evp_kdf = function(data, salt, opts) {
+ // A single EVP iteration, returns `D_i`, where block equlas to `D_(i-1)`
+
+ function iter(block) {
+ var hash = ethUtil.crypto.createHash(opts.digest || 'md5')
+ hash.update(block)
+ hash.update(data)
+ hash.update(salt)
+ block = hash.digest()
+ for (var i = 1; i < (opts.count || 1); i++) {
+ hash = ethUtil.crypto.createHash(opts.digest || 'md5')
+ hash.update(block)
+ block = hash.digest()
+ }
+ return block
+ }
+ var keysize = opts.keysize || 16
+ var ivsize = opts.ivsize || 16
+ var ret = []
+ var i = 0
+ while (Buffer.concat(ret).length < (keysize + ivsize)) {
+ ret[i] = iter((i === 0) ? new Buffer(0) : ret[i - 1])
+ i++
+ }
+ var tmp = Buffer.concat(ret)
+ return {
+ key: tmp.slice(0, keysize),
+ iv: tmp.slice(keysize, keysize + ivsize)
+ }
+}
+Wallet.walletRequirePass = function(ethjson) {
+ var jsonArr;
+ try {
+ jsonArr = JSON.parse(ethjson);
+ } catch (err) {
+ throw globalFuncs.errorMsgs[3];
+ }
+ if (jsonArr.encseed != null) return true;
+ else if (jsonArr.Crypto != null || jsonArr.crypto != null) return true
+ else if (jsonArr.hash != null && jsonArr.locked) return true;
+ else if (jsonArr.hash != null && !jsonArr.locked) return false;
+ else if (jsonArr.publisher == "MyEtherWallet" && !jsonArr.encrypted) return false;
+ else
+ throw globalFuncs.errorMsgs[2];
+}
+Wallet.getWalletFromPrivKeyFile = function(strjson, password) {
+ var jsonArr = JSON.parse(strjson);
+ if (jsonArr.encseed != null) return Wallet.fromEthSale(strjson, password);
+ else if (jsonArr.Crypto != null || jsonArr.crypto != null) return Wallet.fromV3(strjson, password, true);
+ else if (jsonArr.hash != null) return Wallet.fromMyEtherWallet(strjson, password);
+ else if (jsonArr.publisher == "MyEtherWallet") return Wallet.fromMyEtherWalletV2(strjson);
+ else
+ throw globalFuncs.errorMsgs[2];
+}
module.exports = Wallet;
}).call(this,require("buffer").Buffer)
},{"buffer":90}],29:[function(require,module,exports){
-'use strict';
-var globalService = function($http, $httpParamSerializerJQLike) {
- globalFuncs.checkAndRedirectHTTPS();
- ajaxReq.http = $http;
- ajaxReq.postSerializer = $httpParamSerializerJQLike;
-
- var tabs = {
- generateWallet: {
- id: 0,
- name: "Generate Wallet",
- url: "generate-wallet",
- mew: true,
- cx: false
- },
- bulkGenerate: {
- id: 1,
- name: "Bulk Generate",
- url: "bulk-generate",
- mew: false,
- cx: false
- },
- myWallet: {
- id: 2,
- name: "My Wallets",
- url: "my-wallet",
- mew: false,
- cx: true
- },
- addWallet: {
- id: 3,
- name: "Add Wallet",
- url: "add-wallet",
- mew: false,
- cx: true
- },
- sendTransaction: {
- id: 4,
- name: "Send Ether",
- url: "send-transaction",
- mew: true,
- cx: true
- },
- tokens: {
- id: 5,
- name: "Send Tokens",
- url: "send-tokens",
- mew: true,
- cx: true
- },
- offlineTransaction: {
- id: 6,
- name: "Send Offline",
- url:"offline-transaction",
- mew: true,
- cx: false
- },
- dao: {
- id: 7,
- name: "Withdraw DAO",
- url: "the-dao",
- mew: true,
- cx: true
- },
- digix: {
- id: 8,
- name: "Claim DGD",
- url: "digix",
- mew: true,
- cx: true
- },
- viewWalletInfo: {
- id: 9,
- name: "View Wallet Info",
- url: "view-wallet-info",
- mew: true,
- cx: false
- },
- help: {
- id: 10,
- name: "Help",
- url: "help",
- mew: true,
- cx: true
- }
- };
- var currentTab = 0;
- if(typeof chrome != 'undefined')
- currentTab = chrome.windows === undefined ? 0 : 3;
- return {
- tabs: tabs,
- currentTab: currentTab
- };
-};
-module.exports = globalService;
-
-
+'use strict';
+var globalService = function($http, $httpParamSerializerJQLike) {
+ globalFuncs.checkAndRedirectHTTPS();
+ ajaxReq.http = $http;
+ ajaxReq.postSerializer = $httpParamSerializerJQLike;
+
+ var tabs = {
+ generateWallet: {
+ id: 0,
+ name: "Generate Wallet",
+ url: "generate-wallet",
+ mew: true,
+ cx: false
+ },
+ bulkGenerate: {
+ id: 1,
+ name: "Bulk Generate",
+ url: "bulk-generate",
+ mew: false,
+ cx: false
+ },
+ myWallet: {
+ id: 2,
+ name: "My Wallets",
+ url: "my-wallet",
+ mew: false,
+ cx: true
+ },
+ addWallet: {
+ id: 3,
+ name: "Add Wallet",
+ url: "add-wallet",
+ mew: false,
+ cx: true
+ },
+ sendTransaction: {
+ id: 4,
+ name: "Send Ether",
+ url: "send-transaction",
+ mew: true,
+ cx: true
+ },
+ tokens: {
+ id: 5,
+ name: "Send Tokens",
+ url: "send-tokens",
+ mew: true,
+ cx: true
+ },
+ offlineTransaction: {
+ id: 6,
+ name: "Send Offline",
+ url:"offline-transaction",
+ mew: true,
+ cx: false
+ },
+ dao: {
+ id: 7,
+ name: "Withdraw DAO",
+ url: "the-dao",
+ mew: true,
+ cx: true
+ },
+ digix: {
+ id: 8,
+ name: "Claim DGD",
+ url: "digix",
+ mew: true,
+ cx: true
+ },
+ viewWalletInfo: {
+ id: 9,
+ name: "View Wallet Info",
+ url: "view-wallet-info",
+ mew: true,
+ cx: false
+ },
+ help: {
+ id: 10,
+ name: "Help",
+ url: "help",
+ mew: true,
+ cx: true
+ }
+ };
+ var currentTab = 0;
+ if(typeof chrome != 'undefined')
+ currentTab = chrome.windows === undefined ? 0 : 3;
+ return {
+ tabs: tabs,
+ currentTab: currentTab
+ };
+};
+module.exports = globalService;
+
+
},{}],30:[function(require,module,exports){
-'use strict';
-var walletService = function() {
- return {
- wallet: null,
- password:''
- }
-};
+'use strict';
+var walletService = function() {
+ return {
+ wallet: null,
+ password:''
+ }
+};
module.exports = walletService;
},{}],31:[function(require,module,exports){
-'use strict';
-var Token = function(contractAddress, userAddress, symbol, decimal) {
- this.contractAddress = contractAddress;
- this.userAddress = userAddress
- this.symbol = symbol;;
- this.decimal = decimal;
- this.setBalance();
-}
-Token.balanceHex = "0x70a08231";
-Token.transferHex = "0xa9059cbb";
-Token.popTokens = [{
- "address": "0xbb9bc244d798123fde783fcc1c72d3bb8c189413",
- "symbol": "DAO",
- "decimal": 16
-},
-{
- "address": "0xe0b7927c4af23765cb51314a0e0521a9645f0e2a",
- "symbol": "DGD",
- "decimal": 9
-},
-{
- "address": "0xc66ea802717bfb9833400264dd12c2bceaa34a6d",
- "symbol": "MKR",
- "decimal": 18
-},
-{
- "address": "0x89205A3A3b2A69De6Dbf7f01ED13B2108B2c43e7",
- "symbol": "🦄 Unicorn",
- "decimal": 0
-},
-{
- "address": "0x74c1e4b8cae59269ec1d85d3d4f324396048f4ac",
- "symbol": "🍺 BeerCoin",
- "decimal": 0
-}];
-Token.prototype.getContractAddress = function() {
- return this.contractAddress;
-}
-Token.prototype.getUserAddress = function() {
- return this.userAddress;
-}
-Token.prototype.getSymbol = function() {
- return this.symbol;
-}
-Token.prototype.getDecimal = function() {
- return this.decimal;
-}
-Token.prototype.getBalance = function() {
- return this.balance;
-}
-Token.prototype.getBalanceBN = function() {
- return this.balanceBN;
-}
-Token.prototype.setBalance = function() {
- var balanceCall = ethFuncs.getDataObj(this.contractAddress, Token.balanceHex, [ethFuncs.getNakedAddress(this.userAddress)]);
- var parentObj = this;
- ajaxReq.getEthCall(balanceCall, function(data) {
- if (!data.error) {
- parentObj.balance = new BigNumber(data.data).div(new BigNumber(10).pow(parentObj.getDecimal())).toString();
- parentObj.balanceBN = new BigNumber(data.data).toString();
- }
- });
-}
-Token.prototype.getData = function(toAdd, value) {
- try {
- if (!ethFuncs.validateEtherAddress(toAdd)) throw globalFuncs.errorMsgs[5];
- else if (!globalFuncs.isNumeric(value) || parseFloat(value) < 0) throw globalFuncs.errorMsgs[7];
- var value = ethFuncs.padLeft(new BigNumber(value).times(new BigNumber(10).pow(this.getDecimal())).toString(16), 64);
- var toAdd = ethFuncs.padLeft(ethFuncs.getNakedAddress(toAdd), 64);
- var data = Token.transferHex + toAdd + value;
- return {
- isError: false,
- data: data
- };
- } catch (e) {
- return {
- isError: true,
- error: e
- };
- }
-}
-module.exports = Token;
+'use strict';
+var Token = function(contractAddress, userAddress, symbol, decimal) {
+ this.contractAddress = contractAddress;
+ this.userAddress = userAddress
+ this.symbol = symbol;;
+ this.decimal = decimal;
+ this.setBalance();
+}
+Token.balanceHex = "0x70a08231";
+Token.transferHex = "0xa9059cbb";
+Token.popTokens = [{
+ "address": "0xbb9bc244d798123fde783fcc1c72d3bb8c189413",
+ "symbol": "DAO",
+ "decimal": 16
+},
+{
+ "address": "0xe0b7927c4af23765cb51314a0e0521a9645f0e2a",
+ "symbol": "DGD",
+ "decimal": 9
+},
+{
+ "address": "0xc66ea802717bfb9833400264dd12c2bceaa34a6d",
+ "symbol": "MKR",
+ "decimal": 18
+},
+{
+ "address": "0x89205A3A3b2A69De6Dbf7f01ED13B2108B2c43e7",
+ "symbol": "🦄 Unicorn",
+ "decimal": 0
+},
+{
+ "address": "0x74c1e4b8cae59269ec1d85d3d4f324396048f4ac",
+ "symbol": "🍺 BeerCoin",
+ "decimal": 0
+}];
+Token.prototype.getContractAddress = function() {
+ return this.contractAddress;
+}
+Token.prototype.getUserAddress = function() {
+ return this.userAddress;
+}
+Token.prototype.getSymbol = function() {
+ return this.symbol;
+}
+Token.prototype.getDecimal = function() {
+ return this.decimal;
+}
+Token.prototype.getBalance = function() {
+ return this.balance;
+}
+Token.prototype.getBalanceBN = function() {
+ return this.balanceBN;
+}
+Token.prototype.setBalance = function() {
+ var balanceCall = ethFuncs.getDataObj(this.contractAddress, Token.balanceHex, [ethFuncs.getNakedAddress(this.userAddress)]);
+ var parentObj = this;
+ ajaxReq.getEthCall(balanceCall, function(data) {
+ if (!data.error) {
+ parentObj.balance = new BigNumber(data.data).div(new BigNumber(10).pow(parentObj.getDecimal())).toString();
+ parentObj.balanceBN = new BigNumber(data.data).toString();
+ }
+ });
+}
+Token.prototype.getData = function(toAdd, value) {
+ try {
+ if (!ethFuncs.validateEtherAddress(toAdd)) throw globalFuncs.errorMsgs[5];
+ else if (!globalFuncs.isNumeric(value) || parseFloat(value) < 0) throw globalFuncs.errorMsgs[7];
+ var value = ethFuncs.padLeft(new BigNumber(value).times(new BigNumber(10).pow(this.getDecimal())).toString(16), 64);
+ var toAdd = ethFuncs.padLeft(ethFuncs.getNakedAddress(toAdd), 64);
+ var data = Token.transferHex + toAdd + value;
+ return {
+ isError: false,
+ data: data
+ };
+ } catch (e) {
+ return {
+ isError: true,
+ error: e
+ };
+ }
+}
+module.exports = Token;
},{}],32:[function(require,module,exports){
-'use strict';
-var en = function() {}
-en.code = 'en';
-en.data = {
- /* Do Not Change */
- translate_version: '0.0',
- CX_version: '2.9',
- MEW_vesion: '2.9',
-
- /* Navigation */
- NAV_MyWallets: 'My Wallets',
- NAV_AddWallet: 'Add Wallet',
- NAV_SendEther: 'Send Ether',
- NAV_SendTokens: 'Send Tokens',
- NAV_WithdrawDAO: 'Withdraw DAO',
- NAV_ClaimDGD: 'Claim DGD',
- NAV_Help: 'Withdraw DAO',
- NAV_Contracts: 'Contracts',
- NAV_Contact: 'Contact',
-
- /* General */
- GEN_Download: 'Download',
- GEN_Address: 'Your Address',
- GEN_AddessDesc: 'You may know this as your "Account #" or your "Public Key". It is what you send people so they can send you ETH. That icon is an easy way to recognize your address.',
- GEN_PrivKey: 'Private Key (unencrypted)',
- GEN_PrivKeyDesc: 'This is the unencrypted text version of your private key, meaning no password is necessary. If someone were to find your unencrypted private key, they could access your wallet without a password. For this reason, encrypted versions are typically recommended.',
- GEN_Print: 'Print Paper Wallet',
- GEN_PrintDesc: 'ProTip: Click print and save this as a PDF, even if you do not own a printer!',
- GEN_Keystore: 'Keystore/JSON File (Encrypted · Mist/Geth Format · Recommended)',
- GEN_KeystoreDesc: 'This Keystore / JSON file matches the format used by Mist & Geth so you can easily import it in the future. It is the recommended file to download and back up.',
- GEN_Json: 'JSON File (unencrypted)',
- GEN_JsonDesc: 'This is the unencrypted, JSON format of your private key. This means you do not need the password but anyone who finds your JSON can access your wallet & Ether without the password.',
-
- GEN_Balance: 'Account Balance',
- GEN_Equiv: 'Equivalent Value',
- GEN_TransHistory: 'Transaction History',
-
- /* Header */
- MEW_Warning_1: '',
- CX_Warning_1: 'Make sure you have **external backups** of any wallets you store here. Many things could happen that would cause you to lose the data in this Chrome Extension, including uninstalling and reinstalling the extension. This extension is a way to easily access your wallets, **not** a way to back them up.',
- MEW_Tagline: 'Open Source JavaScript Client-Side Ether Wallet Chrome Extension',
- CX_Tagline: 'Open Source JavaScript Client-Side Ether Wallet Chrome Extension',
-
- /* View Wallet Details */
- VIEWWALLET_Title: 'View Wallet Details',
- VIEWWALLET_Subtitle: 'Download an unencrypted private key, grab your encrypted Mist/Geth Keystore file, or re-print your paper wallet. You may want to do this in order to [import your account into Geth/Mist](http://ethereum.stackexchange.com/questions/465/how-to-import-a-plain-private-key-into-geth/). You can also do this with the [MyEtherWallet CX](https://chrome.google.com/webstore/detail/myetherwallet-cx/nlbmnnijcnlegkjjpcfjclmcfggfefdm/) and save your wallet for easier and quicker access. If you just want to check your balance, we recommend using a blockchain explorer like etherscan.io or live.ether.camp.',
- VIEWWALLET_SuccessMsg: 'Success! Here are your wallet details.',
-
- /* MEW Wallet Decrypt */
-
-};
-module.exports = en;
+'use strict';
+var en = function() {}
+en.code = 'en';
+en.data = {
+ /* Do Not Change */
+ translate_version: '0.0',
+ CX_version: '2.9',
+ MEW_vesion: '2.9',
+
+ /* Navigation */
+ NAV_MyWallets: 'My Wallets',
+ NAV_AddWallet: 'Add Wallet',
+ NAV_SendEther: 'Send Ether',
+ NAV_SendTokens: 'Send Tokens',
+ NAV_WithdrawDAO: 'Withdraw DAO',
+ NAV_ClaimDGD: 'Claim DGD',
+ NAV_Help: 'Withdraw DAO',
+ NAV_Contracts: 'Contracts',
+ NAV_Contact: 'Contact',
+
+ /* General */
+ GEN_Download: 'Download',
+ GEN_Address: 'Your Address',
+ GEN_AddessDesc: 'You may know this as your "Account #" or your "Public Key". It is what you send people so they can send you ETH. That icon is an easy way to recognize your address.',
+ GEN_PrivKey: 'Private Key (unencrypted)',
+ GEN_PrivKeyDesc: 'This is the unencrypted text version of your private key, meaning no password is necessary. If someone were to find your unencrypted private key, they could access your wallet without a password. For this reason, encrypted versions are typically recommended.',
+ GEN_Print: 'Print Paper Wallet',
+ GEN_PrintDesc: 'ProTip: Click print and save this as a PDF, even if you do not own a printer!',
+ GEN_Keystore: 'Keystore/JSON File (Encrypted · Mist/Geth Format · Recommended)',
+ GEN_KeystoreDesc: 'This Keystore / JSON file matches the format used by Mist & Geth so you can easily import it in the future. It is the recommended file to download and back up.',
+ GEN_Json: 'JSON File (unencrypted)',
+ GEN_JsonDesc: 'This is the unencrypted, JSON format of your private key. This means you do not need the password but anyone who finds your JSON can access your wallet & Ether without the password.',
+
+ GEN_Balance: 'Account Balance',
+ GEN_Equiv: 'Equivalent Value',
+ GEN_TransHistory: 'Transaction History',
+
+ /* Header */
+ MEW_Warning_1: '',
+ CX_Warning_1: 'Make sure you have **external backups** of any wallets you store here. Many things could happen that would cause you to lose the data in this Chrome Extension, including uninstalling and reinstalling the extension. This extension is a way to easily access your wallets, **not** a way to back them up.',
+ MEW_Tagline: 'Open Source JavaScript Client-Side Ether Wallet Chrome Extension',
+ CX_Tagline: 'Open Source JavaScript Client-Side Ether Wallet Chrome Extension',
+
+ /* View Wallet Details */
+ VIEWWALLET_Title: 'View Wallet Details',
+ VIEWWALLET_Subtitle: 'Download an unencrypted private key, grab your encrypted Mist/Geth Keystore file, or re-print your paper wallet. You may want to do this in order to [import your account into Geth/Mist](http://ethereum.stackexchange.com/questions/465/how-to-import-a-plain-private-key-into-geth/). You can also do this with the [MyEtherWallet CX](https://chrome.google.com/webstore/detail/myetherwallet-cx/nlbmnnijcnlegkjjpcfjclmcfggfefdm/) and save your wallet for easier and quicker access. If you just want to check your balance, we recommend using a blockchain explorer like etherscan.io or live.ether.camp.',
+ VIEWWALLET_SuccessMsg: 'Success! Here are your wallet details.',
+
+ /* MEW Wallet Decrypt */
+
+};
+module.exports = en;
},{}],33:[function(require,module,exports){
-'use strict';
-var fr = function() {}
-fr.code = 'fr';
-fr.data = {
- TITLE: 'Bonjur',
- FOO: 'This is a paragraph.',
- BUTTON_LANG_EN: 'english',
- BUTTON_LANG_DE: 'german'
-};
+'use strict';
+var fr = function() {}
+fr.code = 'fr';
+fr.data = {
+ TITLE: 'Bonjur',
+ FOO: 'This is a paragraph.',
+ BUTTON_LANG_EN: 'english',
+ BUTTON_LANG_DE: 'german'
+};
module.exports = fr;
},{}],34:[function(require,module,exports){
-'use strict';
-var en = require('./en');
-var fr = require('./fr');
-var translate = function($translateProvider) {
- $translateProvider.translations(en.code, translate.marked(en.data));
- $translateProvider.translations(fr.code, translate.marked(fr.data));
- $translateProvider.preferredLanguage(en.code);
- $translateProvider.useSanitizeValueStrategy(null);
-}
-translate.marked = function(data) {
- var tData = data;
- for (var key in tData) if (tData.hasOwnProperty(key)) tData[key] = marked(tData[key]);
- return tData;
-}
+'use strict';
+var en = require('./en');
+var fr = require('./fr');
+var translate = function($translateProvider) {
+ $translateProvider.translations(en.code, translate.marked(en.data));
+ $translateProvider.translations(fr.code, translate.marked(fr.data));
+ $translateProvider.preferredLanguage(en.code);
+ $translateProvider.useSanitizeValueStrategy(null);
+}
+translate.marked = function(data) {
+ var tData = data;
+ for (var key in tData) if (tData.hasOwnProperty(key)) tData[key] = marked(tData[key]);
+ return tData;
+}
module.exports = translate;
},{"./en":32,"./fr":33}],35:[function(require,module,exports){
(function (Buffer){
-'use strict';
-var uiFuncs = function() {}
-uiFuncs.getTxData = function($scope) {
- return {
- to: $scope.tx.to,
- value: $scope.tx.value,
- unit: $scope.tx.unit,
- gasLimit: $scope.tx.gasLimit,
- data: $scope.tx.data,
- from: $scope.wallet.getAddressString(),
- privKey: $scope.wallet.getPrivateKeyString()
- };
-}
-uiFuncs.generateClassicTx = function(txData, callback) {
- try {
- if (!ethFuncs.validateEtherAddress(txData.to)) throw globalFuncs.errorMsgs[5];
- else if (!globalFuncs.isNumeric(txData.value) || parseFloat(txData.value) < 0) throw globalFuncs.errorMsgs[7];
- else if (!globalFuncs.isNumeric(txData.gasLimit) || parseFloat(txData.gasLimit) <= 0) throw globalFuncs.errorMsgs[8];
- else if (!ethFuncs.validateHexString(txData.data)) throw globalFuncs.errorMsgs[9];
- ajaxReq.getClassicTransactionData(txData.from, function(data) {
- if (data.error) throw data.msg;
- data = data.data;
- var rawTx = {
- nonce: ethFuncs.sanitizeHex(data.nonce),
- gasPrice: ethFuncs.sanitizeHex(ethFuncs.addTinyMoreToGas(data.gasprice)),
- gasLimit: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(txData.gasLimit)),
- to: ethFuncs.sanitizeHex(txData.to),
- value: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(etherUnits.toWei(txData.value, txData.unit))),
- data: ethFuncs.sanitizeHex(txData.data)
- }
- var eTx = new ethUtil.Tx(rawTx);
- eTx.sign(new Buffer(txData.privKey, 'hex'));
- rawTx.rawTx = JSON.stringify(rawTx);
- rawTx.signedTx = '0x' + eTx.serialize().toString('hex');
- rawTx.isError = false;
- if (callback !== undefined) callback(rawTx);
- });
- } catch (e) {
- if (callback !== undefined) callback({
- isError: true,
- error: e
- });
- }
-}
-uiFuncs.sendClassicTx = function(signedTx, callback) {
- ajaxReq.sendClassicRawTx(signedTx, function(data) {
- var resp = {};
- if (data.error) {
- resp = {
- isError: true,
- error: data.msg
- };
- } else {
- resp = {
- isError: false,
- data: data.data
- };
- }
- if (callback !== undefined) callback(resp);
- });
-}
-uiFuncs.generateTx = function(txData, callback) {
- try {
- if (!ethFuncs.validateEtherAddress(txData.to)) throw globalFuncs.errorMsgs[5];
- else if (!globalFuncs.isNumeric(txData.value) || parseFloat(txData.value) < 0) throw globalFuncs.errorMsgs[7];
- else if (!globalFuncs.isNumeric(txData.gasLimit) || parseFloat(txData.gasLimit) <= 0) throw globalFuncs.errorMsgs[8];
- else if (!ethFuncs.validateHexString(txData.data)) throw globalFuncs.errorMsgs[9];
- ajaxReq.getTransactionData(txData.from, function(data) {
- if (data.error) throw data.msg;
- data = data.data;
- var rawTx = {
- nonce: ethFuncs.sanitizeHex(data.nonce),
- gasPrice: ethFuncs.sanitizeHex(ethFuncs.addTinyMoreToGas(data.gasprice)),
- gasLimit: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(txData.gasLimit)),
- to: ethFuncs.sanitizeHex(txData.to),
- value: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(etherUnits.toWei(txData.value, txData.unit))),
- data: ethFuncs.sanitizeHex(txData.data)
- }
- var eTx = new ethUtil.Tx(rawTx);
- eTx.sign(new Buffer(txData.privKey, 'hex'));
- rawTx.rawTx = JSON.stringify(rawTx);
- rawTx.signedTx = '0x' + eTx.serialize().toString('hex');
- rawTx.isError = false;
- if (callback !== undefined) callback(rawTx);
- });
- } catch (e) {
- if (callback !== undefined) callback({
- isError: true,
- error: e
- });
- }
-}
-uiFuncs.sendTx = function(signedTx, callback) {
- ajaxReq.sendRawTx(signedTx, function(data) {
- var resp = {};
- if (data.error) {
- resp = {
- isError: true,
- error: data.msg
- };
- } else {
- resp = {
- isError: false,
- data: data.data
- };
- }
- if (callback !== undefined) callback(resp);
- });
-}
-uiFuncs.transferAllBalance = function(fromAdd, gasLimit, callback) {
- try {
- ajaxReq.getTransactionData(fromAdd, function(data) {
- if (data.error) throw data.msg;
- data = data.data;
- var gasPrice = new BigNumber(ethFuncs.sanitizeHex(ethFuncs.addTinyMoreToGas(data.gasprice))).times(gasLimit);
- var maxVal = new BigNumber(data.balance).minus(gasPrice);
- maxVal = etherUnits.toEther(maxVal, 'wei') < 0 ? 0 : etherUnits.toEther(maxVal, 'wei');
- if (callback !== undefined) callback({
- isError: false,
- unit: "ether",
- value: maxVal
- });
- });
- } catch (e) {
- if (callback !== undefined) callback({
- isError: true,
- error: e
- });
- }
-}
+'use strict';
+var uiFuncs = function() {}
+uiFuncs.getTxData = function($scope) {
+ return {
+ to: $scope.tx.to,
+ value: $scope.tx.value,
+ unit: $scope.tx.unit,
+ gasLimit: $scope.tx.gasLimit,
+ data: $scope.tx.data,
+ from: $scope.wallet.getAddressString(),
+ privKey: $scope.wallet.getPrivateKeyString()
+ };
+}
+uiFuncs.generateClassicTx = function(txData, callback) {
+ try {
+ if (!ethFuncs.validateEtherAddress(txData.to)) throw globalFuncs.errorMsgs[5];
+ else if (!globalFuncs.isNumeric(txData.value) || parseFloat(txData.value) < 0) throw globalFuncs.errorMsgs[7];
+ else if (!globalFuncs.isNumeric(txData.gasLimit) || parseFloat(txData.gasLimit) <= 0) throw globalFuncs.errorMsgs[8];
+ else if (!ethFuncs.validateHexString(txData.data)) throw globalFuncs.errorMsgs[9];
+ ajaxReq.getClassicTransactionData(txData.from, function(data) {
+ if (data.error) throw data.msg;
+ data = data.data;
+ var rawTx = {
+ nonce: ethFuncs.sanitizeHex(data.nonce),
+ gasPrice: ethFuncs.sanitizeHex(ethFuncs.addTinyMoreToGas(data.gasprice)),
+ gasLimit: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(txData.gasLimit)),
+ to: ethFuncs.sanitizeHex(txData.to),
+ value: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(etherUnits.toWei(txData.value, txData.unit))),
+ data: ethFuncs.sanitizeHex(txData.data)
+ }
+ var eTx = new ethUtil.Tx(rawTx);
+ eTx.sign(new Buffer(txData.privKey, 'hex'));
+ rawTx.rawTx = JSON.stringify(rawTx);
+ rawTx.signedTx = '0x' + eTx.serialize().toString('hex');
+ rawTx.isError = false;
+ if (callback !== undefined) callback(rawTx);
+ });
+ } catch (e) {
+ if (callback !== undefined) callback({
+ isError: true,
+ error: e
+ });
+ }
+}
+uiFuncs.sendClassicTx = function(signedTx, callback) {
+ ajaxReq.sendClassicRawTx(signedTx, function(data) {
+ var resp = {};
+ if (data.error) {
+ resp = {
+ isError: true,
+ error: data.msg
+ };
+ } else {
+ resp = {
+ isError: false,
+ data: data.data
+ };
+ }
+ if (callback !== undefined) callback(resp);
+ });
+}
+uiFuncs.generateTx = function(txData, callback) {
+ try {
+ if (!ethFuncs.validateEtherAddress(txData.to)) throw globalFuncs.errorMsgs[5];
+ else if (!globalFuncs.isNumeric(txData.value) || parseFloat(txData.value) < 0) throw globalFuncs.errorMsgs[7];
+ else if (!globalFuncs.isNumeric(txData.gasLimit) || parseFloat(txData.gasLimit) <= 0) throw globalFuncs.errorMsgs[8];
+ else if (!ethFuncs.validateHexString(txData.data)) throw globalFuncs.errorMsgs[9];
+ ajaxReq.getTransactionData(txData.from, function(data) {
+ if (data.error) throw data.msg;
+ data = data.data;
+ var rawTx = {
+ nonce: ethFuncs.sanitizeHex(data.nonce),
+ gasPrice: ethFuncs.sanitizeHex(ethFuncs.addTinyMoreToGas(data.gasprice)),
+ gasLimit: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(txData.gasLimit)),
+ to: ethFuncs.sanitizeHex(txData.to),
+ value: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(etherUnits.toWei(txData.value, txData.unit))),
+ data: ethFuncs.sanitizeHex(txData.data)
+ }
+ var eTx = new ethUtil.Tx(rawTx);
+ eTx.sign(new Buffer(txData.privKey, 'hex'));
+ rawTx.rawTx = JSON.stringify(rawTx);
+ rawTx.signedTx = '0x' + eTx.serialize().toString('hex');
+ rawTx.isError = false;
+ if (callback !== undefined) callback(rawTx);
+ });
+ } catch (e) {
+ if (callback !== undefined) callback({
+ isError: true,
+ error: e
+ });
+ }
+}
+uiFuncs.sendTx = function(signedTx, callback) {
+ ajaxReq.sendRawTx(signedTx, function(data) {
+ var resp = {};
+ if (data.error) {
+ resp = {
+ isError: true,
+ error: data.msg
+ };
+ } else {
+ resp = {
+ isError: false,
+ data: data.data
+ };
+ }
+ if (callback !== undefined) callback(resp);
+ });
+}
+uiFuncs.transferAllBalance = function(fromAdd, gasLimit, callback) {
+ try {
+ ajaxReq.getTransactionData(fromAdd, function(data) {
+ if (data.error) throw data.msg;
+ data = data.data;
+ var gasPrice = new BigNumber(ethFuncs.sanitizeHex(ethFuncs.addTinyMoreToGas(data.gasprice))).times(gasLimit);
+ var maxVal = new BigNumber(data.balance).minus(gasPrice);
+ maxVal = etherUnits.toEther(maxVal, 'wei') < 0 ? 0 : etherUnits.toEther(maxVal, 'wei');
+ if (callback !== undefined) callback({
+ isError: false,
+ unit: "ether",
+ value: maxVal
+ });
+ });
+ } catch (e) {
+ if (callback !== undefined) callback({
+ isError: true,
+ error: e
+ });
+ }
+}
module.exports = uiFuncs;
}).call(this,require("buffer").Buffer)
},{"buffer":90}],36:[function(require,module,exports){
@@ -6810,7 +6810,7 @@ return 'pascalprecht.translate';
},{}],39:[function(require,module,exports){
/**
- * @license AngularJS v1.5.8
+ * @license AngularJS v1.5.6
* (c) 2010-2016 Google, Inc. http://angularjs.org
* License: MIT
*/
@@ -6868,7 +6868,7 @@ function minErr(module, ErrorConstructor) {
return match;
});
- message += '\nhttp://errors.angularjs.org/1.5.8/' +
+ message += '\nhttp://errors.angularjs.org/1.5.6/' +
(module ? module + '/' : '') + code;
for (i = SKIP_INDEXES, paramPrefix = '?'; i < templateArgs.length; i++, paramPrefix = '&') {
@@ -6937,6 +6937,7 @@ function minErr(module, ErrorConstructor) {
includes: true,
arrayRemove: true,
copy: true,
+ shallowCopy: true,
equals: true,
csp: true,
jq: true,
@@ -7632,13 +7633,7 @@ function arrayRemove(array, value) {
* * If a destination is provided, all of its elements (for arrays) or properties (for objects)
* are deleted and then all elements/properties from the source are copied to it.
* * If `source` is not an object or array (inc. `null` and `undefined`), `source` is returned.
- * * If `source` is identical to `destination` an exception will be thrown.
- *
- *
- *
- * Only enumerable properties are taken into account. Non-enumerable properties (both on `source`
- * and on `destination`) will be ignored.
- *
+ * * If `source` is identical to 'destination' an exception will be thrown.
*
* @param {*} source The source that will be used to make a copy.
* Can be any type, including primitives, `null`, and `undefined`.
@@ -7647,42 +7642,41 @@ function arrayRemove(array, value) {
* @returns {*} The copy or updated `destination`, if `destination` was specified.
*
* @example
-
-
-
+
+
+
+
*/
function copy(source, destination) {
var stackSource = [];
@@ -7789,7 +7783,7 @@ function copy(source, destination) {
case '[object Uint8ClampedArray]':
case '[object Uint16Array]':
case '[object Uint32Array]':
- return new source.constructor(copyElement(source.buffer), source.byteOffset, source.length);
+ return new source.constructor(copyElement(source.buffer));
case '[object ArrayBuffer]':
//Support: IE10
@@ -7821,6 +7815,31 @@ function copy(source, destination) {
}
}
+/**
+ * Creates a shallow copy of an object, an array or a primitive.
+ *
+ * Assumes that there are no proto properties for objects.
+ */
+function shallowCopy(src, dst) {
+ if (isArray(src)) {
+ dst = dst || [];
+
+ for (var i = 0, ii = src.length; i < ii; i++) {
+ dst[i] = src[i];
+ }
+ } else if (isObject(src)) {
+ dst = dst || {};
+
+ for (var key in src) {
+ if (!(key.charAt(0) === '$' && key.charAt(1) === '$')) {
+ dst[key] = src[key];
+ }
+ }
+ }
+
+ return dst || src;
+}
+
/**
* @ngdoc function
@@ -9161,34 +9180,7 @@ function setupModuleLoader(window) {
}
-/* global shallowCopy: true */
-
-/**
- * Creates a shallow copy of an object, an array or a primitive.
- *
- * Assumes that there are no proto properties for objects.
- */
-function shallowCopy(src, dst) {
- if (isArray(src)) {
- dst = dst || [];
-
- for (var i = 0, ii = src.length; i < ii; i++) {
- dst[i] = src[i];
- }
- } else if (isObject(src)) {
- dst = dst || {};
-
- for (var key in src) {
- if (!(key.charAt(0) === '$' && key.charAt(1) === '$')) {
- dst[key] = src[key];
- }
- }
- }
-
- return dst || src;
-}
-
-/* global toDebugString: true */
+/* global: toDebugString: true */
function serializeObject(obj) {
var seen = [];
@@ -9292,7 +9284,6 @@ function toDebugString(obj) {
$HttpParamSerializerJQLikeProvider,
$HttpBackendProvider,
$xhrFactoryProvider,
- $jsonpCallbacksProvider,
$LocationProvider,
$LogProvider,
$ParseProvider,
@@ -9330,11 +9321,11 @@ function toDebugString(obj) {
* - `codeName` – `{string}` – Code name of the release, such as "jiggling-armfat".
*/
var version = {
- full: '1.5.8', // all of these placeholder strings will be replaced by grunt's
+ full: '1.5.6', // all of these placeholder strings will be replaced by grunt's
major: 1, // package task
minor: 5,
- dot: 8,
- codeName: 'arbitrary-fallbacks'
+ dot: 6,
+ codeName: 'arrow-stringification'
};
@@ -9365,7 +9356,7 @@ function publishExternalAPI(angular) {
'isDate': isDate,
'lowercase': lowercase,
'uppercase': uppercase,
- 'callbacks': {$$counter: 0},
+ 'callbacks': {counter: 0},
'getTestability': getTestability,
'$$minErr': minErr,
'$$csp': csp,
@@ -9454,7 +9445,6 @@ function publishExternalAPI(angular) {
$httpParamSerializerJQLike: $HttpParamSerializerJQLikeProvider,
$httpBackend: $HttpBackendProvider,
$xhrFactory: $xhrFactoryProvider,
- $jsonpCallbacks: $jsonpCallbacksProvider,
$location: $LocationProvider,
$log: $LogProvider,
$parse: $ParseProvider,
@@ -9531,7 +9521,7 @@ function publishExternalAPI(angular) {
* ## Angular's jqLite
* jqLite provides only the following jQuery methods:
*
- * - [`addClass()`](http://api.jquery.com/addClass/) - Does not support a function as first argument
+ * - [`addClass()`](http://api.jquery.com/addClass/)
* - [`after()`](http://api.jquery.com/after/)
* - [`append()`](http://api.jquery.com/append/)
* - [`attr()`](http://api.jquery.com/attr/) - Does not support functions as parameters
@@ -9558,7 +9548,7 @@ function publishExternalAPI(angular) {
* - [`ready()`](http://api.jquery.com/ready/)
* - [`remove()`](http://api.jquery.com/remove/)
* - [`removeAttr()`](http://api.jquery.com/removeAttr/)
- * - [`removeClass()`](http://api.jquery.com/removeClass/) - Does not support a function as first argument
+ * - [`removeClass()`](http://api.jquery.com/removeClass/)
* - [`removeData()`](http://api.jquery.com/removeData/)
* - [`replaceWith()`](http://api.jquery.com/replaceWith/)
* - [`text()`](http://api.jquery.com/text/)
@@ -9693,7 +9683,7 @@ function jqLiteBuildFragment(html, context) {
nodes.push(context.createTextNode(html));
} else {
// Convert html into DOM nodes
- tmp = fragment.appendChild(context.createElement("div"));
+ tmp = tmp || fragment.appendChild(context.createElement("div"));
tag = (TAG_NAME_REGEXP.exec(html) || ["", ""])[1].toLowerCase();
wrap = wrapMap[tag] || wrapMap._default;
tmp.innerHTML = wrap[1] + html.replace(XHTML_TAG_REGEXP, "<$1>") + wrap[2];
@@ -11506,10 +11496,10 @@ function createInjector(modulesToLoad, strictDi) {
if (msie <= 11) {
return false;
}
- // Support: Edge 12-13 only
- // See: https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/6156135/
+ // Workaround for MS Edge.
+ // Check https://connect.microsoft.com/IE/Feedback/Details/2211653
return typeof func === 'function'
- && /^(?:class\b|constructor\()/.test(stringifyFn(func));
+ && /^(?:class\s|constructor\()/.test(stringifyFn(func));
}
function invoke(fn, self, locals, serviceName) {
@@ -12250,13 +12240,7 @@ var $AnimateProvider = ['$provide', function($provide) {
* @param {DOMElement} parent the parent element which will append the element as
* a child (so long as the after element is not present)
* @param {DOMElement=} after the sibling element after which the element will be appended
- * @param {object=} options an optional collection of options/styles that will be applied to the element.
- * The object can have the following properties:
- *
- * - **addClass** - `{string}` - space-separated CSS classes to add to element
- * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
- * - **removeClass** - `{string}` - space-separated CSS classes to remove from element
- * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+ * @param {object=} options an optional collection of options/styles that will be applied to the element
*
* @return {Promise} the animation callback promise
*/
@@ -12282,13 +12266,7 @@ var $AnimateProvider = ['$provide', function($provide) {
* @param {DOMElement} parent the parent element which will append the element as
* a child (so long as the after element is not present)
* @param {DOMElement=} after the sibling element after which the element will be appended
- * @param {object=} options an optional collection of options/styles that will be applied to the element.
- * The object can have the following properties:
- *
- * - **addClass** - `{string}` - space-separated CSS classes to add to element
- * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
- * - **removeClass** - `{string}` - space-separated CSS classes to remove from element
- * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+ * @param {object=} options an optional collection of options/styles that will be applied to the element
*
* @return {Promise} the animation callback promise
*/
@@ -12309,13 +12287,7 @@ var $AnimateProvider = ['$provide', function($provide) {
* digest once the animation has completed.
*
* @param {DOMElement} element the element which will be removed from the DOM
- * @param {object=} options an optional collection of options/styles that will be applied to the element.
- * The object can have the following properties:
- *
- * - **addClass** - `{string}` - space-separated CSS classes to add to element
- * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
- * - **removeClass** - `{string}` - space-separated CSS classes to remove from element
- * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+ * @param {object=} options an optional collection of options/styles that will be applied to the element
*
* @return {Promise} the animation callback promise
*/
@@ -12339,13 +12311,7 @@ var $AnimateProvider = ['$provide', function($provide) {
*
* @param {DOMElement} element the element which the CSS classes will be applied to
* @param {string} className the CSS class(es) that will be added (multiple classes are separated via spaces)
- * @param {object=} options an optional collection of options/styles that will be applied to the element.
- * The object can have the following properties:
- *
- * - **addClass** - `{string}` - space-separated CSS classes to add to element
- * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
- * - **removeClass** - `{string}` - space-separated CSS classes to remove from element
- * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+ * @param {object=} options an optional collection of options/styles that will be applied to the element
*
* @return {Promise} the animation callback promise
*/
@@ -12369,13 +12335,7 @@ var $AnimateProvider = ['$provide', function($provide) {
*
* @param {DOMElement} element the element which the CSS classes will be applied to
* @param {string} className the CSS class(es) that will be removed (multiple classes are separated via spaces)
- * @param {object=} options an optional collection of options/styles that will be applied to the element.
- * The object can have the following properties:
- *
- * - **addClass** - `{string}` - space-separated CSS classes to add to element
- * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
- * - **removeClass** - `{string}` - space-separated CSS classes to remove from element
- * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+ * @param {object=} options an optional collection of options/styles that will be applied to the element
*
* @return {Promise} the animation callback promise
*/
@@ -12400,13 +12360,7 @@ var $AnimateProvider = ['$provide', function($provide) {
* @param {DOMElement} element the element which the CSS classes will be applied to
* @param {string} add the CSS class(es) that will be added (multiple classes are separated via spaces)
* @param {string} remove the CSS class(es) that will be removed (multiple classes are separated via spaces)
- * @param {object=} options an optional collection of options/styles that will be applied to the element.
- * The object can have the following properties:
- *
- * - **addClass** - `{string}` - space-separated CSS classes to add to element
- * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
- * - **removeClass** - `{string}` - space-separated CSS classes to remove from element
- * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+ * @param {object=} options an optional collection of options/styles that will be applied to the element
*
* @return {Promise} the animation callback promise
*/
@@ -12447,13 +12401,7 @@ var $AnimateProvider = ['$provide', function($provide) {
* @param {string=} className an optional CSS class that will be applied to the element for the duration of the animation. If
* this value is left as empty then a CSS class of `ng-inline-animate` will be applied to the element.
* (Note that if no animation is detected then this value will not be applied to the element.)
- * @param {object=} options an optional collection of options/styles that will be applied to the element.
- * The object can have the following properties:
- *
- * - **addClass** - `{string}` - space-separated CSS classes to add to element
- * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
- * - **removeClass** - `{string}` - space-separated CSS classes to remove from element
- * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+ * @param {object=} options an optional collection of options/styles that will be applied to the element
*
* @return {Promise} the animation callback promise
*/
@@ -13541,9 +13489,8 @@ function $TemplateCacheProvider() {
* There are many different options for a directive.
*
* The difference resides in the return value of the factory function.
- * You can either return a {@link $compile#directive-definition-object Directive Definition Object (see below)}
- * that defines the directive properties, or just the `postLink` function (all other properties will have
- * the default values).
+ * You can either return a "Directive Definition Object" (see below) that defines the directive properties,
+ * or just the `postLink` function (all other properties will have the default values).
*
*
* **Best Practice:** It's recommended to use the "directive definition object" form.
@@ -13607,125 +13554,6 @@ function $TemplateCacheProvider() {
* });
* ```
*
- * ### Life-cycle hooks
- * Directive controllers can provide the following methods that are called by Angular at points in the life-cycle of the
- * directive:
- * * `$onInit()` - Called on each controller after all the controllers on an element have been constructed and
- * had their bindings initialized (and before the pre & post linking functions for the directives on
- * this element). This is a good place to put initialization code for your controller.
- * * `$onChanges(changesObj)` - Called whenever one-way (`<`) or interpolation (`@`) bindings are updated. The
- * `changesObj` is a hash whose keys are the names of the bound properties that have changed, and the values are an
- * object of the form `{ currentValue, previousValue, isFirstChange() }`. Use this hook to trigger updates within a
- * component such as cloning the bound value to prevent accidental mutation of the outer value.
- * * `$doCheck()` - Called on each turn of the digest cycle. Provides an opportunity to detect and act on
- * changes. Any actions that you wish to take in response to the changes that you detect must be
- * invoked from this hook; implementing this has no effect on when `$onChanges` is called. For example, this hook
- * could be useful if you wish to perform a deep equality check, or to check a Date object, changes to which would not
- * be detected by Angular's change detector and thus not trigger `$onChanges`. This hook is invoked with no arguments;
- * if detecting changes, you must store the previous value(s) for comparison to the current values.
- * * `$onDestroy()` - Called on a controller when its containing scope is destroyed. Use this hook for releasing
- * external resources, watches and event handlers. Note that components have their `$onDestroy()` hooks called in
- * the same order as the `$scope.$broadcast` events are triggered, which is top down. This means that parent
- * components will have their `$onDestroy()` hook called before child components.
- * * `$postLink()` - Called after this controller's element and its children have been linked. Similar to the post-link
- * function this hook can be used to set up DOM event handlers and do direct DOM manipulation.
- * Note that child elements that contain `templateUrl` directives will not have been compiled and linked since
- * they are waiting for their template to load asynchronously and their own compilation and linking has been
- * suspended until that occurs.
- *
- * #### Comparison with Angular 2 life-cycle hooks
- * Angular 2 also uses life-cycle hooks for its components. While the Angular 1 life-cycle hooks are similar there are
- * some differences that you should be aware of, especially when it comes to moving your code from Angular 1 to Angular 2:
- *
- * * Angular 1 hooks are prefixed with `$`, such as `$onInit`. Angular 2 hooks are prefixed with `ng`, such as `ngOnInit`.
- * * Angular 1 hooks can be defined on the controller prototype or added to the controller inside its constructor.
- * In Angular 2 you can only define hooks on the prototype of the Component class.
- * * Due to the differences in change-detection, you may get many more calls to `$doCheck` in Angular 1 than you would to
- * `ngDoCheck` in Angular 2
- * * Changes to the model inside `$doCheck` will trigger new turns of the digest loop, which will cause the changes to be
- * propagated throughout the application.
- * Angular 2 does not allow the `ngDoCheck` hook to trigger a change outside of the component. It will either throw an
- * error or do nothing depending upon the state of `enableProdMode()`.
- *
- * #### Life-cycle hook examples
- *
- * This example shows how you can check for mutations to a Date object even though the identity of the object
- * has not changed.
- *
- *
- *
- * angular.module('do-check-module', [])
- * .component('app', {
- * template:
- * 'Month: ' +
- * 'Date: {{ $ctrl.date }}' +
- * '',
- * controller: function() {
- * this.date = new Date();
- * this.month = this.date.getMonth();
- * this.updateDate = function() {
- * this.date.setMonth(this.month);
- * };
- * }
- * })
- * .component('test', {
- * bindings: { date: '<' },
- * template:
- * '
{{ $ctrl.log | json }}
',
- * controller: function() {
- * var previousValue;
- * this.log = [];
- * this.$doCheck = function() {
- * var currentValue = this.date && this.date.valueOf();
- * if (previousValue !== currentValue) {
- * this.log.push('doCheck: date mutated: ' + this.date);
- * previousValue = currentValue;
- * }
- * };
- * }
- * });
- *
- *
- *
- *
- *
- *
- * This example show how you might use `$doCheck` to trigger changes in your component's inputs even if the
- * actual identity of the component doesn't change. (Be aware that cloning and deep equality checks on large
- * arrays or objects can have a negative impact on your application performance)
- *
- *
- *
- *
',
- * controller: function() {
- * this.log = [];
- *
- * this.$doCheck = function() {
- * if (this.items_ref !== this.items) {
- * this.log.push('doCheck: items changed');
- * this.items_ref = this.items;
- * }
- * if (!angular.equals(this.items_clone, this.items)) {
- * this.log.push('doCheck: items mutated');
- * this.items_clone = angular.copy(this.items);
- * }
- * };
- * }
- * });
- *
- *
*
*
* ### Directive Definition Object
@@ -13901,6 +13729,25 @@ function $TemplateCacheProvider() {
* The `$transclude` function also has a method on it, `$transclude.isSlotFilled(slotName)`, which returns
* `true` if the specified slot contains content (i.e. one or more DOM nodes).
*
+ * The controller can provide the following methods that act as life-cycle hooks:
+ * * `$onInit()` - Called on each controller after all the controllers on an element have been constructed and
+ * had their bindings initialized (and before the pre & post linking functions for the directives on
+ * this element). This is a good place to put initialization code for your controller.
+ * * `$onChanges(changesObj)` - Called whenever one-way (`<`) or interpolation (`@`) bindings are updated. The
+ * `changesObj` is a hash whose keys are the names of the bound properties that have changed, and the values are an
+ * object of the form `{ currentValue, previousValue, isFirstChange() }`. Use this hook to trigger updates within a
+ * component such as cloning the bound value to prevent accidental mutation of the outer value.
+ * * `$onDestroy()` - Called on a controller when its containing scope is destroyed. Use this hook for releasing
+ * external resources, watches and event handlers. Note that components have their `$onDestroy()` hooks called in
+ * the same order as the `$scope.$broadcast` events are triggered, which is top down. This means that parent
+ * components will have their `$onDestroy()` hook called before child components.
+ * * `$postLink()` - Called after this controller's element and its children have been linked. Similar to the post-link
+ * function this hook can be used to set up DOM event handlers and do direct DOM manipulation.
+ * Note that child elements that contain `templateUrl` directives will not have been compiled and linked since
+ * they are waiting for their template to load asynchronously and their own compilation and linking has been
+ * suspended until that occurs.
+ *
+ *
* #### `require`
* Require another directive and inject its controller as the fourth argument to the linking function. The
* `require` property can be a string, an array or an object:
@@ -14098,8 +13945,8 @@ function $TemplateCacheProvider() {
* any other controller.
*
* * `transcludeFn` - A transclude linking function pre-bound to the correct transclusion scope.
- * This is the same as the `$transclude` parameter of directive controllers,
- * see {@link ng.$compile#-controller- the controller section for details}.
+ * This is the same as the `$transclude`
+ * parameter of directive controllers, see there for details.
* `function([scope], cloneLinkingFn, futureParentElement)`.
*
* #### Pre-linking function
@@ -14901,19 +14748,11 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
}
// We must run this hook in an apply since the $$postDigest runs outside apply
$rootScope.$apply(function() {
- var errors = [];
for (var i = 0, ii = onChangesQueue.length; i < ii; ++i) {
- try {
- onChangesQueue[i]();
- } catch (e) {
- errors.push(e);
- }
+ onChangesQueue[i]();
}
// Reset the queue to trigger a new schedule next time there is a change
onChangesQueue = undefined;
- if (errors.length) {
- throw errors;
- }
});
} finally {
onChangesTtl++;
@@ -15554,7 +15393,19 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
addTextInterpolateDirective(directives, node.nodeValue);
break;
case NODE_TYPE_COMMENT: /* Comment */
- collectCommentDirectives(node, directives, attrs, maxPriority, ignoreDirective);
+ try {
+ match = COMMENT_DIRECTIVE_REGEXP.exec(node.nodeValue);
+ if (match) {
+ nName = directiveNormalize(match[1]);
+ if (addDirective(directives, nName, 'M', maxPriority, ignoreDirective)) {
+ attrs[nName] = trim(match[2]);
+ }
+ }
+ } catch (e) {
+ // turns out that under some circumstances IE9 throws errors when one attempts to read
+ // comment's node value.
+ // Just ignore it and continue. (Can't seem to reproduce in test case.)
+ }
break;
}
@@ -15562,24 +15413,6 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
return directives;
}
- function collectCommentDirectives(node, directives, attrs, maxPriority, ignoreDirective) {
- // function created because of performance, try/catch disables
- // the optimization of the whole function #14848
- try {
- var match = COMMENT_DIRECTIVE_REGEXP.exec(node.nodeValue);
- if (match) {
- var nName = directiveNormalize(match[1]);
- if (addDirective(directives, nName, 'M', maxPriority, ignoreDirective)) {
- attrs[nName] = trim(match[2]);
- }
- }
- } catch (e) {
- // turns out that under some circumstances IE9 throws errors when one attempts to read
- // comment's node value.
- // Just ignore it and continue. (Can't seem to reproduce in test case.)
- }
- }
-
/**
* Given a node with an directive-start it collects all of the siblings until it finds
* directive-end.
@@ -16095,22 +15928,10 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
forEach(elementControllers, function(controller) {
var controllerInstance = controller.instance;
if (isFunction(controllerInstance.$onChanges)) {
- try {
- controllerInstance.$onChanges(controller.bindingInfo.initialChanges);
- } catch (e) {
- $exceptionHandler(e);
- }
+ controllerInstance.$onChanges(controller.bindingInfo.initialChanges);
}
if (isFunction(controllerInstance.$onInit)) {
- try {
- controllerInstance.$onInit();
- } catch (e) {
- $exceptionHandler(e);
- }
- }
- if (isFunction(controllerInstance.$doCheck)) {
- controllerScope.$watch(function() { controllerInstance.$doCheck(); });
- controllerInstance.$doCheck();
+ controllerInstance.$onInit();
}
if (isFunction(controllerInstance.$onDestroy)) {
controllerScope.$on('$destroy', function callOnDestroyHook() {
@@ -16374,16 +16195,18 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
// copy the new attributes on the old attrs object
forEach(src, function(value, key) {
- // Check if we already set this attribute in the loop above.
- // `dst` will never contain hasOwnProperty as DOM parser won't let it.
- // You will get an "InvalidCharacterError: DOM Exception 5" error if you
- // have an attribute like "has-own-property" or "data-has-own-property", etc.
- if (!dst.hasOwnProperty(key) && key.charAt(0) !== '$') {
+ if (key == 'class') {
+ safeAddClass($element, value);
+ dst['class'] = (dst['class'] ? dst['class'] + ' ' : '') + value;
+ } else if (key == 'style') {
+ $element.attr('style', $element.attr('style') + ';' + value);
+ dst['style'] = (dst['style'] ? dst['style'] + ';' : '') + value;
+ // `dst` will never contain hasOwnProperty as DOM parser won't let it.
+ // You will get an "InvalidCharacterError: DOM Exception 5" error if you
+ // have an attribute like "has-own-property" or "data-has-own-property", etc.
+ } else if (key.charAt(0) != '$' && !dst.hasOwnProperty(key)) {
dst[key] = value;
-
- if (key !== 'class' && key !== 'style') {
- dstAttr[key] = srcAttr[key];
- }
+ dstAttr[key] = srcAttr[key];
}
});
}
@@ -16758,7 +16581,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
forEach(bindings, function initializeBinding(definition, scopeName) {
var attrName = definition.attrName,
optional = definition.optional,
- mode = definition.mode, // @, =, <, or &
+ mode = definition.mode, // @, =, or &
lastValue,
parentGet, parentSet, compare, removeWatch;
@@ -17244,21 +17067,18 @@ function $DocumentProvider() {
*
* ## Example:
*
- * The example below will overwrite the default `$exceptionHandler` in order to (a) log uncaught
- * errors to the backend for later inspection by the developers and (b) to use `$log.warn()` instead
- * of `$log.error()`.
- *
* ```js
- * angular.
- * module('exceptionOverwrite', []).
- * factory('$exceptionHandler', ['$log', 'logErrorsToBackend', function($log, logErrorsToBackend) {
- * return function myExceptionHandler(exception, cause) {
- * logErrorsToBackend(exception, cause);
- * $log.warn(exception, cause);
- * };
- * }]);
+ * angular.module('exceptionOverride', []).factory('$exceptionHandler', function() {
+ * return function(exception, cause) {
+ * exception.message += ' (caused by "' + cause + '")';
+ * throw exception;
+ * };
+ * });
* ```
*
+ * This example will override the normal action of `$exceptionHandler`, to make angular
+ * exceptions fail hard when they happen, instead of just logging to the console.
+ *
*
* Note, that code executed in event-listeners (even those registered using jqLite's `on`/`bind`
* methods) does not delegate exceptions to the {@link ng.$exceptionHandler $exceptionHandler}
@@ -17268,7 +17088,7 @@ function $DocumentProvider() {
* `try { ... } catch(e) { $exceptionHandler(e); }`
*
* @param {Error} exception Exception associated with the error.
- * @param {string=} cause Optional information about the context in which
+ * @param {string=} cause optional information about the context in which
* the error was thrown.
*
*/
@@ -17338,7 +17158,7 @@ function $HttpParamSerializerProvider() {
* * `{'foo': 'bar'}` results in `foo=bar`
* * `{'foo': Date.now()}` results in `foo=2015-04-01T09%3A50%3A49.262Z` (`toISOString()` and encoded representation of a Date object)
* * `{'foo': ['bar', 'baz']}` results in `foo=bar&foo=baz` (repeated key for each array element)
- * * `{'foo': {'bar':'baz'}}` results in `foo=%7B%22bar%22%3A%22baz%22%7D` (stringified and encoded representation of an object)
+ * * `{'foo': {'bar':'baz'}}` results in `foo=%7B%22bar%22%3A%22baz%22%7D"` (stringified and encoded representation of an object)
*
* Note that serializer will sort the request parameters alphabetically.
* */
@@ -17889,7 +17709,7 @@ function $HttpProvider() {
*
* ### Overriding the Default Transformations Per Request
*
- * If you wish to override the request/response transformations only for a single request then provide
+ * If you wish override the request/response transformations only for a single request then provide
* `transformRequest` and/or `transformResponse` properties on the configuration object passed
* into `$http`.
*
@@ -17932,7 +17752,7 @@ function $HttpProvider() {
* * cache a specific response - set config.cache value to TRUE or to a cache object
*
* If caching is enabled, but neither the default cache nor config.cache are set to a cache object,
- * then the default `$cacheFactory("$http")` object is used.
+ * then the default `$cacheFactory($http)` object is used.
*
* The default cache value can be set by updating the
* {@link ng.$http#defaults `$http.defaults.cache`} property or the
@@ -18260,25 +18080,48 @@ function $HttpProvider() {
config.headers = mergeHeaders(requestConfig);
config.method = uppercase(config.method);
config.paramSerializer = isString(config.paramSerializer) ?
- $injector.get(config.paramSerializer) : config.paramSerializer;
+ $injector.get(config.paramSerializer) : config.paramSerializer;
+
+ var serverRequest = function(config) {
+ var headers = config.headers;
+ var reqData = transformData(config.data, headersGetter(headers), undefined, config.transformRequest);
- var requestInterceptors = [];
- var responseInterceptors = [];
+ // strip content-type if data is undefined
+ if (isUndefined(reqData)) {
+ forEach(headers, function(value, header) {
+ if (lowercase(header) === 'content-type') {
+ delete headers[header];
+ }
+ });
+ }
+
+ if (isUndefined(config.withCredentials) && !isUndefined(defaults.withCredentials)) {
+ config.withCredentials = defaults.withCredentials;
+ }
+
+ // send request
+ return sendReq(config, reqData).then(transformResponse, transformResponse);
+ };
+
+ var chain = [serverRequest, undefined];
var promise = $q.when(config);
// apply interceptors
forEach(reversedInterceptors, function(interceptor) {
if (interceptor.request || interceptor.requestError) {
- requestInterceptors.unshift(interceptor.request, interceptor.requestError);
+ chain.unshift(interceptor.request, interceptor.requestError);
}
if (interceptor.response || interceptor.responseError) {
- responseInterceptors.push(interceptor.response, interceptor.responseError);
+ chain.push(interceptor.response, interceptor.responseError);
}
});
- promise = chainInterceptors(promise, requestInterceptors);
- promise = promise.then(serverRequest);
- promise = chainInterceptors(promise, responseInterceptors);
+ while (chain.length) {
+ var thenFn = chain.shift();
+ var rejectFn = chain.shift();
+
+ promise = promise.then(thenFn, rejectFn);
+ }
if (useLegacyPromise) {
promise.success = function(fn) {
@@ -18305,18 +18148,14 @@ function $HttpProvider() {
return promise;
-
- function chainInterceptors(promise, interceptors) {
- for (var i = 0, ii = interceptors.length; i < ii;) {
- var thenFn = interceptors[i++];
- var rejectFn = interceptors[i++];
-
- promise = promise.then(thenFn, rejectFn);
- }
-
- interceptors.length = 0;
-
- return promise;
+ function transformResponse(response) {
+ // make a copy since the response must be cacheable
+ var resp = extend({}, response);
+ resp.data = transformData(response.data, response.headers, response.status,
+ config.transformResponse);
+ return (isSuccess(response.status))
+ ? resp
+ : $q.reject(resp);
}
function executeHeaderFns(headers, config) {
@@ -18360,37 +18199,6 @@ function $HttpProvider() {
// execute if header value is a function for merged headers
return executeHeaderFns(reqHeaders, shallowCopy(config));
}
-
- function serverRequest(config) {
- var headers = config.headers;
- var reqData = transformData(config.data, headersGetter(headers), undefined, config.transformRequest);
-
- // strip content-type if data is undefined
- if (isUndefined(reqData)) {
- forEach(headers, function(value, header) {
- if (lowercase(header) === 'content-type') {
- delete headers[header];
- }
- });
- }
-
- if (isUndefined(config.withCredentials) && !isUndefined(defaults.withCredentials)) {
- config.withCredentials = defaults.withCredentials;
- }
-
- // send request
- return sendReq(config, reqData).then(transformResponse, transformResponse);
- }
-
- function transformResponse(response) {
- // make a copy since the response must be cacheable
- var resp = extend({}, response);
- resp.data = transformData(response.data, response.headers, response.status,
- config.transformResponse);
- return (isSuccess(response.status))
- ? resp
- : $q.reject(resp);
- }
}
$http.pendingRequests = [];
@@ -18437,8 +18245,6 @@ function $HttpProvider() {
*
* @description
* Shortcut method to perform `JSONP` request.
- * If you would like to customise where and how the callbacks are stored then try overriding
- * or decorating the {@link $jsonpCallbacks} service.
*
* @param {string} url Relative or absolute URL specifying the destination of the request.
* The name of the callback should be the string `JSON_CALLBACK`.
@@ -18712,7 +18518,7 @@ function $xhrFactoryProvider() {
/**
* @ngdoc service
* @name $httpBackend
- * @requires $jsonpCallbacks
+ * @requires $window
* @requires $document
* @requires $xhrFactory
*
@@ -18727,8 +18533,8 @@ function $xhrFactoryProvider() {
* $httpBackend} which can be trained with responses.
*/
function $HttpBackendProvider() {
- this.$get = ['$browser', '$jsonpCallbacks', '$document', '$xhrFactory', function($browser, $jsonpCallbacks, $document, $xhrFactory) {
- return createHttpBackend($browser, $xhrFactory, $browser.defer, $jsonpCallbacks, $document[0]);
+ this.$get = ['$browser', '$window', '$document', '$xhrFactory', function($browser, $window, $document, $xhrFactory) {
+ return createHttpBackend($browser, $xhrFactory, $browser.defer, $window.angular.callbacks, $document[0]);
}];
}
@@ -18738,13 +18544,17 @@ function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDoc
$browser.$$incOutstandingRequestCount();
url = url || $browser.url();
- if (lowercase(method) === 'jsonp') {
- var callbackPath = callbacks.createCallback(url);
- var jsonpDone = jsonpReq(url, callbackPath, function(status, text) {
- // jsonpReq only ever sets status to 200 (OK), 404 (ERROR) or -1 (WAITING)
- var response = (status === 200) && callbacks.getResponse(callbackPath);
- completeRequest(callback, status, response, "", text);
- callbacks.removeCallback(callbackPath);
+ if (lowercase(method) == 'jsonp') {
+ var callbackId = '_' + (callbacks.counter++).toString(36);
+ callbacks[callbackId] = function(data) {
+ callbacks[callbackId].data = data;
+ callbacks[callbackId].called = true;
+ };
+
+ var jsonpDone = jsonpReq(url.replace('JSON_CALLBACK', 'angular.callbacks.' + callbackId),
+ callbackId, function(status, text) {
+ completeRequest(callback, status, callbacks[callbackId].data, "", text);
+ callbacks[callbackId] = noop;
});
} else {
@@ -18846,8 +18656,7 @@ function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDoc
}
};
- function jsonpReq(url, callbackPath, done) {
- url = url.replace('JSON_CALLBACK', callbackPath);
+ function jsonpReq(url, callbackId, done) {
// we can't use jQuery/jqLite here because jQuery does crazy stuff with script elements, e.g.:
// - fetches local scripts via XHR and evals them
// - adds and immediately removes script elements from the document
@@ -18865,7 +18674,7 @@ function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDoc
var text = "unknown";
if (event) {
- if (event.type === "load" && !callbacks.wasCalled(callbackPath)) {
+ if (event.type === "load" && !callbacks[callbackId].called) {
event = { type: "error" };
}
text = event.type;
@@ -19064,7 +18873,7 @@ function $InterpolateProvider() {
*
* `allOrNothing` is useful for interpolating URLs. `ngSrc` and `ngSrcset` use this behavior.
*
- * #### Escaped Interpolation
+ * ####Escaped Interpolation
* $interpolate provides a mechanism for escaping interpolation markers. Start and end markers
* can be escaped by preceding each of their characters with a REVERSE SOLIDUS U+005C (backslash).
* It will be rendered as a regular start/end marker, and will not be interpreted as an expression
@@ -19487,87 +19296,6 @@ function $IntervalProvider() {
}];
}
-/**
- * @ngdoc service
- * @name $jsonpCallbacks
- * @requires $window
- * @description
- * This service handles the lifecycle of callbacks to handle JSONP requests.
- * Override this service if you wish to customise where the callbacks are stored and
- * how they vary compared to the requested url.
- */
-var $jsonpCallbacksProvider = function() {
- this.$get = ['$window', function($window) {
- var callbacks = $window.angular.callbacks;
- var callbackMap = {};
-
- function createCallback(callbackId) {
- var callback = function(data) {
- callback.data = data;
- callback.called = true;
- };
- callback.id = callbackId;
- return callback;
- }
-
- return {
- /**
- * @ngdoc method
- * @name $jsonpCallbacks#createCallback
- * @param {string} url the url of the JSONP request
- * @returns {string} the callback path to send to the server as part of the JSONP request
- * @description
- * {@link $httpBackend} calls this method to create a callback and get hold of the path to the callback
- * to pass to the server, which will be used to call the callback with its payload in the JSONP response.
- */
- createCallback: function(url) {
- var callbackId = '_' + (callbacks.$$counter++).toString(36);
- var callbackPath = 'angular.callbacks.' + callbackId;
- var callback = createCallback(callbackId);
- callbackMap[callbackPath] = callbacks[callbackId] = callback;
- return callbackPath;
- },
- /**
- * @ngdoc method
- * @name $jsonpCallbacks#wasCalled
- * @param {string} callbackPath the path to the callback that was sent in the JSONP request
- * @returns {boolean} whether the callback has been called, as a result of the JSONP response
- * @description
- * {@link $httpBackend} calls this method to find out whether the JSONP response actually called the
- * callback that was passed in the request.
- */
- wasCalled: function(callbackPath) {
- return callbackMap[callbackPath].called;
- },
- /**
- * @ngdoc method
- * @name $jsonpCallbacks#getResponse
- * @param {string} callbackPath the path to the callback that was sent in the JSONP request
- * @returns {*} the data received from the response via the registered callback
- * @description
- * {@link $httpBackend} calls this method to get hold of the data that was provided to the callback
- * in the JSONP response.
- */
- getResponse: function(callbackPath) {
- return callbackMap[callbackPath].data;
- },
- /**
- * @ngdoc method
- * @name $jsonpCallbacks#removeCallback
- * @param {string} callbackPath the path to the callback that was sent in the JSONP request
- * @description
- * {@link $httpBackend} calls this method to remove the callback after the JSONP request has
- * completed or timed-out.
- */
- removeCallback: function(callbackPath) {
- var callback = callbackMap[callbackPath];
- delete callbacks[callback.id];
- delete callbackMap[callbackPath];
- }
- };
- }];
-};
-
/**
* @ngdoc service
* @name $locale
@@ -19907,12 +19635,6 @@ function LocationHashbangInHtml5Url(appBase, appBaseNoFile, hashPrefix) {
var locationPrototype = {
- /**
- * Ensure absolute url is initialized.
- * @private
- */
- $$absUrl:'',
-
/**
* Are we in html5 mode?
* @private
@@ -21286,7 +21008,7 @@ AST.prototype = {
var args = [];
if (this.peekToken().text !== ')') {
do {
- args.push(this.filterChain());
+ args.push(this.expression());
} while (this.expect(','));
}
return args;
@@ -23013,7 +22735,7 @@ function $ParseProvider() {
*
* **Methods**
*
- * - `then(successCallback, [errorCallback], [notifyCallback])` – regardless of when the promise was or
+ * - `then(successCallback, errorCallback, notifyCallback)` – regardless of when the promise was or
* will be resolved or rejected, `then` calls one of the success or error callbacks asynchronously
* as soon as the result is available. The callbacks are called with a single argument: the result
* or rejection reason. Additionally, the notify callback may be called zero or more times to
@@ -23024,8 +22746,7 @@ function $ParseProvider() {
* with the value which is resolved in that promise using
* [promise chaining](http://www.html5rocks.com/en/tutorials/es6/promises/#toc-promises-queues)).
* It also notifies via the return value of the `notifyCallback` method. The promise cannot be
- * resolved or rejected from the notifyCallback method. The errorCallback and notifyCallback
- * arguments are optional.
+ * resolved or rejected from the notifyCallback method.
*
* - `catch(errorCallback)` – shorthand for `promise.then(null, errorCallback)`
*
@@ -23440,30 +23161,6 @@ function qFactory(nextTick, exceptionHandler) {
return deferred.promise;
}
- /**
- * @ngdoc method
- * @name $q#race
- * @kind function
- *
- * @description
- * Returns a promise that resolves or rejects as soon as one of those promises
- * resolves or rejects, with the value or reason from that promise.
- *
- * @param {Array.|Object.} promises An array or hash of promises.
- * @returns {Promise} a promise that resolves or rejects as soon as one of the `promises`
- * resolves or rejects, with the value or reason from that promise.
- */
-
- function race(promises) {
- var deferred = defer();
-
- forEach(promises, function(promise) {
- when(promise).then(deferred.resolve, deferred.reject);
- });
-
- return deferred.promise;
- }
-
var $Q = function Q(resolver) {
if (!isFunction(resolver)) {
throw $qMinErr('norslvr', "Expected resolverFn, got '{0}'", resolver);
@@ -23493,7 +23190,6 @@ function qFactory(nextTick, exceptionHandler) {
$Q.when = when;
$Q.resolve = resolve;
$Q.all = all;
- $Q.race = race;
return $Q;
}
@@ -26845,11 +26541,10 @@ function $FilterProvider($provide) {
* - `Object`: A pattern object can be used to filter specific properties on objects contained
* by `array`. For example `{name:"M", phone:"1"}` predicate will return an array of items
* which have property `name` containing "M" and property `phone` containing "1". A special
- * property name (`$` by default) can be used (e.g. as in `{$: "text"}`) to accept a match
- * against any property of the object or its nested object properties. That's equivalent to the
- * simple substring match with a `string` as described above. The special property name can be
- * overwritten, using the `anyPropertyKey` parameter.
- * The predicate can be negated by prefixing the string with `!`.
+ * property name `$` can be used (as in `{$:"text"}`) to accept a match against any
+ * property of the object or its nested object properties. That's equivalent to the simple
+ * substring match with a `string` as described above. The predicate can be negated by prefixing
+ * the string with `!`.
* For example `{name: "!M"}` predicate will return an array of items which have property `name`
* not containing "M".
*
@@ -26883,9 +26578,6 @@ function $FilterProvider($provide) {
* Primitive values are converted to strings. Objects are not compared against primitives,
* unless they have a custom `toString` method (e.g. `Date` objects).
*
- * @param {string=} anyPropertyKey The special property name that matches against any property.
- * By default `$`.
- *
* @example
@@ -26954,9 +26646,8 @@ function $FilterProvider($provide) {
*/
-
function filterFilter() {
- return function(array, expression, comparator, anyPropertyKey) {
+ return function(array, expression, comparator) {
if (!isArrayLike(array)) {
if (array == null) {
return array;
@@ -26965,7 +26656,6 @@ function filterFilter() {
}
}
- anyPropertyKey = anyPropertyKey || '$';
var expressionType = getTypeForFilter(expression);
var predicateFn;
var matchAgainstAnyProp;
@@ -26982,7 +26672,7 @@ function filterFilter() {
//jshint -W086
case 'object':
//jshint +W086
- predicateFn = createPredicateFn(expression, comparator, anyPropertyKey, matchAgainstAnyProp);
+ predicateFn = createPredicateFn(expression, comparator, matchAgainstAnyProp);
break;
default:
return array;
@@ -26993,8 +26683,8 @@ function filterFilter() {
}
// Helper functions for `filterFilter`
-function createPredicateFn(expression, comparator, anyPropertyKey, matchAgainstAnyProp) {
- var shouldMatchPrimitives = isObject(expression) && (anyPropertyKey in expression);
+function createPredicateFn(expression, comparator, matchAgainstAnyProp) {
+ var shouldMatchPrimitives = isObject(expression) && ('$' in expression);
var predicateFn;
if (comparator === true) {
@@ -27022,25 +26712,25 @@ function createPredicateFn(expression, comparator, anyPropertyKey, matchAgainstA
predicateFn = function(item) {
if (shouldMatchPrimitives && !isObject(item)) {
- return deepCompare(item, expression[anyPropertyKey], comparator, anyPropertyKey, false);
+ return deepCompare(item, expression.$, comparator, false);
}
- return deepCompare(item, expression, comparator, anyPropertyKey, matchAgainstAnyProp);
+ return deepCompare(item, expression, comparator, matchAgainstAnyProp);
};
return predicateFn;
}
-function deepCompare(actual, expected, comparator, anyPropertyKey, matchAgainstAnyProp, dontMatchWholeObject) {
+function deepCompare(actual, expected, comparator, matchAgainstAnyProp, dontMatchWholeObject) {
var actualType = getTypeForFilter(actual);
var expectedType = getTypeForFilter(expected);
if ((expectedType === 'string') && (expected.charAt(0) === '!')) {
- return !deepCompare(actual, expected.substring(1), comparator, anyPropertyKey, matchAgainstAnyProp);
+ return !deepCompare(actual, expected.substring(1), comparator, matchAgainstAnyProp);
} else if (isArray(actual)) {
// In case `actual` is an array, consider it a match
// if ANY of it's items matches `expected`
return actual.some(function(item) {
- return deepCompare(item, expected, comparator, anyPropertyKey, matchAgainstAnyProp);
+ return deepCompare(item, expected, comparator, matchAgainstAnyProp);
});
}
@@ -27049,11 +26739,11 @@ function deepCompare(actual, expected, comparator, anyPropertyKey, matchAgainstA
var key;
if (matchAgainstAnyProp) {
for (key in actual) {
- if ((key.charAt(0) !== '$') && deepCompare(actual[key], expected, comparator, anyPropertyKey, true)) {
+ if ((key.charAt(0) !== '$') && deepCompare(actual[key], expected, comparator, true)) {
return true;
}
}
- return dontMatchWholeObject ? false : deepCompare(actual, expected, comparator, anyPropertyKey, false);
+ return dontMatchWholeObject ? false : deepCompare(actual, expected, comparator, false);
} else if (expectedType === 'object') {
for (key in expected) {
var expectedVal = expected[key];
@@ -27061,9 +26751,9 @@ function deepCompare(actual, expected, comparator, anyPropertyKey, matchAgainstA
continue;
}
- var matchAnyProperty = key === anyPropertyKey;
+ var matchAnyProperty = key === '$';
var actualVal = matchAnyProperty ? actual : actual[key];
- if (!deepCompare(actualVal, expectedVal, comparator, anyPropertyKey, matchAnyProperty, matchAnyProperty)) {
+ if (!deepCompare(actualVal, expectedVal, comparator, matchAnyProperty, matchAnyProperty)) {
return false;
}
}
@@ -27801,22 +27491,21 @@ var uppercaseFilter = valueFn(uppercase);
* @kind function
*
* @description
- * Creates a new array or string containing only a specified number of elements. The elements are
- * taken from either the beginning or the end of the source array, string or number, as specified by
- * the value and sign (positive or negative) of `limit`. Other array-like objects are also supported
- * (e.g. array subclasses, NodeLists, jqLite/jQuery collections etc). If a number is used as input,
- * it is converted to a string.
- *
- * @param {Array|ArrayLike|string|number} input - Array/array-like, string or number to be limited.
- * @param {string|number} limit - The length of the returned array or string. If the `limit` number
+ * Creates a new array or string containing only a specified number of elements. The elements
+ * are taken from either the beginning or the end of the source array, string or number, as specified by
+ * the value and sign (positive or negative) of `limit`. If a number is used as input, it is
+ * converted to a string.
+ *
+ * @param {Array|string|number} input Source array, string or number to be limited.
+ * @param {string|number} limit The length of the returned array or string. If the `limit` number
* is positive, `limit` number of items from the beginning of the source array/string are copied.
* If the number is negative, `limit` number of items from the end of the source array/string
* are copied. The `limit` will be trimmed if it exceeds `array.length`. If `limit` is undefined,
* the input will be returned unchanged.
- * @param {(string|number)=} begin - Index at which to begin limitation. As a negative index,
- * `begin` indicates an offset from the end of `input`. Defaults to `0`.
- * @returns {Array|string} A new sub-array or substring of length `limit` or less if the input had
- * less than `limit` elements.
+ * @param {(string|number)=} begin Index at which to begin limitation. As a negative index, `begin`
+ * indicates an offset from the end of `input`. Defaults to `0`.
+ * @returns {Array|string} A new sub-array or substring of length `limit` or less if input array
+ * had less than `limit` elements.
*
* @example
@@ -27904,157 +27593,67 @@ function limitToFilter() {
if (isNaN(limit)) return input;
if (isNumber(input)) input = input.toString();
- if (!isArrayLike(input)) return input;
+ if (!isArray(input) && !isString(input)) return input;
begin = (!begin || isNaN(begin)) ? 0 : toInt(begin);
begin = (begin < 0) ? Math.max(0, input.length + begin) : begin;
if (limit >= 0) {
- return sliceFn(input, begin, begin + limit);
+ return input.slice(begin, begin + limit);
} else {
if (begin === 0) {
- return sliceFn(input, limit, input.length);
+ return input.slice(limit, input.length);
} else {
- return sliceFn(input, Math.max(0, begin + limit), begin);
+ return input.slice(Math.max(0, begin + limit), begin);
}
}
};
}
-function sliceFn(input, begin, end) {
- if (isString(input)) return input.slice(begin, end);
-
- return slice.call(input, begin, end);
-}
-
/**
* @ngdoc filter
* @name orderBy
* @kind function
*
* @description
- * Returns an array containing the items from the specified `collection`, ordered by a `comparator`
- * function based on the values computed using the `expression` predicate.
- *
- * For example, `[{id: 'foo'}, {id: 'bar'}] | orderBy:'id'` would result in
- * `[{id: 'bar'}, {id: 'foo'}]`.
+ * Orders a specified `array` by the `expression` predicate. It is ordered alphabetically
+ * for strings and numerically for numbers. Note: if you notice numbers are not being sorted
+ * as expected, make sure they are actually being saved as numbers and not strings.
+ * Array-like values (e.g. NodeLists, jQuery objects, TypedArrays, Strings, etc) are also supported.
*
- * The `collection` can be an Array or array-like object (e.g. NodeList, jQuery object, TypedArray,
- * String, etc).
- *
- * The `expression` can be a single predicate, or a list of predicates each serving as a tie-breaker
- * for the preceeding one. The `expression` is evaluated against each item and the output is used
- * for comparing with other items.
- *
- * You can change the sorting order by setting `reverse` to `true`. By default, items are sorted in
- * ascending order.
- *
- * The comparison is done using the `comparator` function. If none is specified, a default, built-in
- * comparator is used (see below for details - in a nutshell, it compares numbers numerically and
- * strings alphabetically).
- *
- * ### Under the hood
- *
- * Ordering the specified `collection` happens in two phases:
- *
- * 1. All items are passed through the predicate (or predicates), and the returned values are saved
- * along with their type (`string`, `number` etc). For example, an item `{label: 'foo'}`, passed
- * through a predicate that extracts the value of the `label` property, would be transformed to:
- * ```
- * {
- * value: 'foo',
- * type: 'string',
- * index: ...
- * }
- * ```
- * 2. The comparator function is used to sort the items, based on the derived values, types and
- * indices.
- *
- * If you use a custom comparator, it will be called with pairs of objects of the form
- * `{value: ..., type: '...', index: ...}` and is expected to return `0` if the objects are equal
- * (as far as the comparator is concerned), `-1` if the 1st one should be ranked higher than the
- * second, or `1` otherwise.
- *
- * In order to ensure that the sorting will be deterministic across platforms, if none of the
- * specified predicates can distinguish between two items, `orderBy` will automatically introduce a
- * dummy predicate that returns the item's index as `value`.
- * (If you are using a custom comparator, make sure it can handle this predicate as well.)
- *
- * Finally, in an attempt to simplify things, if a predicate returns an object as the extracted
- * value for an item, `orderBy` will try to convert that object to a primitive value, before passing
- * it to the comparator. The following rules govern the conversion:
- *
- * 1. If the object has a `valueOf()` method that returns a primitive, its return value will be
- * used instead.
- * (If the object has a `valueOf()` method that returns another object, then the returned object
- * will be used in subsequent steps.)
- * 2. If the object has a custom `toString()` method (i.e. not the one inherited from `Object`) that
- * returns a primitive, its return value will be used instead.
- * (If the object has a `toString()` method that returns another object, then the returned object
- * will be used in subsequent steps.)
- * 3. No conversion; the object itself is used.
- *
- * ### The default comparator
- *
- * The default, built-in comparator should be sufficient for most usecases. In short, it compares
- * numbers numerically, strings alphabetically (and case-insensitively), for objects falls back to
- * using their index in the original collection, and sorts values of different types by type.
- *
- * More specifically, it follows these steps to determine the relative order of items:
- *
- * 1. If the compared values are of different types, compare the types themselves alphabetically.
- * 2. If both values are of type `string`, compare them alphabetically in a case- and
- * locale-insensitive way.
- * 3. If both values are objects, compare their indices instead.
- * 4. Otherwise, return:
- * - `0`, if the values are equal (by strict equality comparison, i.e. using `===`).
- * - `-1`, if the 1st value is "less than" the 2nd value (compared using the `<` operator).
- * - `1`, otherwise.
- *
- * **Note:** If you notice numbers not being sorted as expected, make sure they are actually being
- * saved as numbers and not strings.
- *
- * @param {Array|ArrayLike} collection - The collection (array or array-like object) to sort.
- * @param {(Function|string|Array.)=} expression - A predicate (or list of
- * predicates) to be used by the comparator to determine the order of elements.
+ * @param {Array} array The array (or array-like object) to sort.
+ * @param {function(*)|string|Array.<(function(*)|string)>=} expression A predicate to be
+ * used by the comparator to determine the order of elements.
*
* Can be one of:
*
- * - `Function`: A getter function. This function will be called with each item as argument and
- * the return value will be used for sorting.
- * - `string`: An Angular expression. This expression will be evaluated against each item and the
- * result will be used for sorting. For example, use `'label'` to sort by a property called
- * `label` or `'label.substring(0, 3)'` to sort by the first 3 characters of the `label`
- * property.
- * (The result of a constant expression is interpreted as a property name to be used for
- * comparison. For example, use `'"special name"'` (note the extra pair of quotes) to sort by a
- * property called `special name`.)
- * An expression can be optionally prefixed with `+` or `-` to control the sorting direction,
- * ascending or descending. For example, `'+label'` or `'-label'`. If no property is provided,
- * (e.g. `'+'` or `'-'`), the collection element itself is used in comparisons.
- * - `Array`: An array of function and/or string predicates. If a predicate cannot determine the
- * relative order of two items, the next predicate is used as a tie-breaker.
- *
- * **Note:** If the predicate is missing or empty then it defaults to `'+'`.
+ * - `function`: Getter function. The result of this function will be sorted using the
+ * `<`, `===`, `>` operator.
+ * - `string`: An Angular expression. The result of this expression is used to compare elements
+ * (for example `name` to sort by a property called `name` or `name.substr(0, 3)` to sort by
+ * 3 first characters of a property called `name`). The result of a constant expression
+ * is interpreted as a property name to be used in comparisons (for example `"special name"`
+ * to sort object by the value of their `special name` property). An expression can be
+ * optionally prefixed with `+` or `-` to control ascending or descending sort order
+ * (for example, `+name` or `-name`). If no property is provided, (e.g. `'+'`) then the array
+ * element itself is used to compare where sorting.
+ * - `Array`: An array of function or string predicates. The first predicate in the array
+ * is used for sorting, but when two items are equivalent, the next predicate is used.
*
- * @param {boolean=} reverse - If `true`, reverse the sorting order.
- * @param {(Function)=} comparator - The comparator function used to determine the relative order of
- * value pairs. If omitted, the built-in comparator will be used.
+ * If the predicate is missing or empty then it defaults to `'+'`.
*
- * @returns {Array} - The sorted array.
+ * @param {boolean=} reverse Reverse the order of the array.
+ * @returns {Array} Sorted copy of the source array.
*
*
* @example
- * ### Ordering a table with `ngRepeat`
- *
- * The example below demonstrates a simple {@link ngRepeat ngRepeat}, where the data is sorted by
- * age in descending order (expression is set to `'-age'`). The `comparator` is not set, which means
- * it defaults to the built-in comparator.
- *
-
+ * The example below demonstrates a simple ngRepeat, where the data is sorted
+ * by age in descending order (predicate is set to `'-age'`).
+ * `reverse` is not set, which means it defaults to `false`.
+
-
+
Name
Phone Number
@@ -28069,77 +27668,43 @@ function sliceFn(input, begin, end) {
- angular.module('orderByExample1', [])
+ angular.module('orderByExample', [])
.controller('ExampleController', ['$scope', function($scope) {
- $scope.friends = [
- {name: 'John', phone: '555-1212', age: 10},
- {name: 'Mary', phone: '555-9876', age: 19},
- {name: 'Mike', phone: '555-4321', age: 21},
- {name: 'Adam', phone: '555-5678', age: 35},
- {name: 'Julie', phone: '555-8765', age: 29}
- ];
+ $scope.friends =
+ [{name:'John', phone:'555-1212', age:10},
+ {name:'Mary', phone:'555-9876', age:19},
+ {name:'Mike', phone:'555-4321', age:21},
+ {name:'Adam', phone:'555-5678', age:35},
+ {name:'Julie', phone:'555-8765', age:29}];
}]);
-
- .friends {
- border-collapse: collapse;
- }
-
- .friends th {
- border-bottom: 1px solid;
- }
- .friends td, .friends th {
- border-left: 1px solid;
- padding: 5px 10px;
- }
- .friends td:first-child, .friends th:first-child {
- border-left: none;
- }
-
-
- // Element locators
- var names = element.all(by.repeater('friends').column('friend.name'));
-
- it('should sort friends by age in reverse order', function() {
- expect(names.get(0).getText()).toBe('Adam');
- expect(names.get(1).getText()).toBe('Julie');
- expect(names.get(2).getText()).toBe('Mike');
- expect(names.get(3).getText()).toBe('Mary');
- expect(names.get(4).getText()).toBe('John');
- });
-
- *
*
+ * The predicate and reverse parameters can be controlled dynamically through scope properties,
+ * as shown in the next example.
* @example
- * ### Changing parameters dynamically
- *
- * All parameters can be changed dynamically. The next example shows how you can make the columns of
- * a table sortable, by binding the `expression` and `reverse` parameters to scope properties.
- *
-
+
+
- .friends th {
- border-bottom: 1px solid;
- }
- .friends td, .friends th {
- border-left: 1px solid;
- padding: 5px 10px;
- }
- .friends td:first-child, .friends th:first-child {
- border-left: none;
- }
+
+ angular.module('orderByExample', [])
+ .controller('ExampleController', ['$scope', '$filter', function($scope, $filter) {
+ var orderBy = $filter('orderBy');
+ $scope.friends = [
+ { name: 'John', phone: '555-1212', age: 10 },
+ { name: 'Mary', phone: '555-9876', age: 19 },
+ { name: 'Mike', phone: '555-4321', age: 21 },
+ { name: 'Adam', phone: '555-5678', age: 35 },
+ { name: 'Julie', phone: '555-8765', age: 29 }
+ ];
+ $scope.order = function(predicate) {
+ $scope.predicate = predicate;
+ $scope.reverse = ($scope.predicate === predicate) ? !$scope.reverse : false;
+ $scope.friends = orderBy($scope.friends, predicate, $scope.reverse);
+ };
+ $scope.order('age', true);
+ }]);
+
+
.sortorder:after {
- content: '\25b2'; // BLACK UP-POINTING TRIANGLE
+ content: '\25b2';
}
.sortorder.reverse:after {
- content: '\25bc'; // BLACK DOWN-POINTING TRIANGLE
- }
-
-
- // Element locators
- var unsortButton = element(by.partialButtonText('unsorted'));
- var nameHeader = element(by.partialButtonText('Name'));
- var phoneHeader = element(by.partialButtonText('Phone'));
- var ageHeader = element(by.partialButtonText('Age'));
- var firstName = element(by.repeater('friends').column('friend.name').row(0));
- var lastName = element(by.repeater('friends').column('friend.name').row(4));
-
- it('should sort friends by some property, when clicking on the column header', function() {
- expect(firstName.getText()).toBe('Adam');
- expect(lastName.getText()).toBe('John');
-
- phoneHeader.click();
- expect(firstName.getText()).toBe('John');
- expect(lastName.getText()).toBe('Mary');
-
- nameHeader.click();
- expect(firstName.getText()).toBe('Adam');
- expect(lastName.getText()).toBe('Mike');
-
- ageHeader.click();
- expect(firstName.getText()).toBe('John');
- expect(lastName.getText()).toBe('Adam');
- });
-
- it('should sort friends in reverse order, when clicking on the same column', function() {
- expect(firstName.getText()).toBe('Adam');
- expect(lastName.getText()).toBe('John');
-
- ageHeader.click();
- expect(firstName.getText()).toBe('John');
- expect(lastName.getText()).toBe('Adam');
-
- ageHeader.click();
- expect(firstName.getText()).toBe('Adam');
- expect(lastName.getText()).toBe('John');
- });
-
- it('should restore the original order, when clicking "Set to unsorted"', function() {
- expect(firstName.getText()).toBe('Adam');
- expect(lastName.getText()).toBe('John');
-
- unsortButton.click();
- expect(firstName.getText()).toBe('John');
- expect(lastName.getText()).toBe('Julie');
- });
-
-
- *
- *
- * @example
- * ### Using a custom comparator
- *
- * If you have very specific requirements about the way items are sorted, you can pass your own
- * comparator function. For example, you might need to compare some strings in a locale-sensitive
- * way. (When specifying a custom comparator, you also need to pass a value for the `reverse`
- * argument - passing `false` retains the default sorting order, i.e. ascending.)
- *
-
-
-
-
-
Locale-sensitive Comparator
-
-
-
Name
-
Favorite Letter
-
-
-
{{friend.name}}
-
{{friend.favoriteLetter}}
-
-
-
-
-
Default Comparator
-
-
-
Name
-
Favorite Letter
-
-
-
{{friend.name}}
-
{{friend.favoriteLetter}}
-
-
-
-
-
-
- angular.module('orderByExample4', [])
- .controller('ExampleController', ['$scope', function($scope) {
- $scope.friends = [
- {name: 'John', favoriteLetter: 'Ä'},
- {name: 'Mary', favoriteLetter: 'Ü'},
- {name: 'Mike', favoriteLetter: 'Ö'},
- {name: 'Adam', favoriteLetter: 'H'},
- {name: 'Julie', favoriteLetter: 'Z'}
- ];
-
- $scope.localeSensitiveComparator = function(v1, v2) {
- // If we don't get strings, just compare by index
- if (v1.type !== 'string' || v2.type !== 'string') {
- return (v1.index < v2.index) ? -1 : 1;
- }
-
- // Compare strings alphabetically, taking locale into account
- return v1.value.localeCompare(v2.value);
- };
- }]);
-
-
- .friends-container {
- display: inline-block;
- margin: 0 30px;
- }
-
- .friends {
- border-collapse: collapse;
+ content: '\25bc';
}
-
- .friends th {
- border-bottom: 1px solid;
- }
- .friends td, .friends th {
- border-left: 1px solid;
- padding: 5px 10px;
- }
- .friends td:first-child, .friends th:first-child {
- border-left: none;
- }
-
-
- // Element locators
- var container = element(by.css('.custom-comparator'));
- var names = container.all(by.repeater('friends').column('friend.name'));
-
- it('should sort friends by favorite letter (in correct alphabetical order)', function() {
- expect(names.get(0).getText()).toBe('John');
- expect(names.get(1).getText()).toBe('Adam');
- expect(names.get(2).getText()).toBe('Mike');
- expect(names.get(3).getText()).toBe('Mary');
- expect(names.get(4).getText()).toBe('Julie');
- });
-
-
- *
+
+
*/
orderByFilter.$inject = ['$parse'];
function orderByFilter($parse) {
- return function(array, sortPredicate, reverseOrder, compareFn) {
+ return function(array, sortPredicate, reverseOrder) {
if (array == null) return array;
if (!isArrayLike(array)) {
@@ -28486,12 +27816,11 @@ function orderByFilter($parse) {
if (!isArray(sortPredicate)) { sortPredicate = [sortPredicate]; }
if (sortPredicate.length === 0) { sortPredicate = ['+']; }
- var predicates = processPredicates(sortPredicate);
-
- var descending = reverseOrder ? -1 : 1;
-
- // Define the `compare()` function. Use a default comparator if none is specified.
- var compare = isFunction(compareFn) ? compareFn : defaultCompare;
+ var predicates = processPredicates(sortPredicate, reverseOrder);
+ // Add a predicate at the end that evaluates to the element index. This makes the
+ // sort stable as it works as a tie-breaker when all the input predicates cannot
+ // distinguish between two elements.
+ predicates.push({ get: function() { return {}; }, descending: reverseOrder ? -1 : 1});
// The next three lines are a version of a Swartzian Transform idiom from Perl
// (sometimes called the Decorate-Sort-Undecorate idiom)
@@ -28503,12 +27832,8 @@ function orderByFilter($parse) {
return array;
function getComparisonObject(value, index) {
- // NOTE: We are adding an extra `tieBreaker` value based on the element's index.
- // This will be used to keep the sort stable when none of the input predicates can
- // distinguish between two elements.
return {
value: value,
- tieBreaker: {value: index, type: 'number', index: index},
predicateValues: predicates.map(function(predicate) {
return getPredicateValue(predicate.get(value), index);
})
@@ -28516,19 +27841,18 @@ function orderByFilter($parse) {
}
function doComparison(v1, v2) {
- for (var i = 0, ii = predicates.length; i < ii; i++) {
- var result = compare(v1.predicateValues[i], v2.predicateValues[i]);
- if (result) {
- return result * predicates[i].descending * descending;
- }
+ var result = 0;
+ for (var index=0, length = predicates.length; index < length; ++index) {
+ result = compare(v1.predicateValues[index], v2.predicateValues[index]) * predicates[index].descending;
+ if (result) break;
}
-
- return compare(v1.tieBreaker, v2.tieBreaker) * descending;
+ return result;
}
};
- function processPredicates(sortPredicates) {
- return sortPredicates.map(function(predicate) {
+ function processPredicates(sortPredicate, reverseOrder) {
+ reverseOrder = reverseOrder ? -1 : 1;
+ return sortPredicate.map(function(predicate) {
var descending = 1, get = identity;
if (isFunction(predicate)) {
@@ -28546,7 +27870,7 @@ function orderByFilter($parse) {
}
}
}
- return {get: get, descending: descending};
+ return { get: get, descending: descending * reverseOrder };
});
}
@@ -28561,9 +27885,9 @@ function orderByFilter($parse) {
}
}
- function objectValue(value) {
+ function objectValue(value, index) {
// If `valueOf` is a valid function use that
- if (isFunction(value.valueOf)) {
+ if (typeof value.valueOf === 'function') {
value = value.valueOf();
if (isPrimitive(value)) return value;
}
@@ -28572,8 +27896,8 @@ function orderByFilter($parse) {
value = value.toString();
if (isPrimitive(value)) return value;
}
-
- return value;
+ // We have a basic object so we use the position of the object in the collection
+ return index;
}
function getPredicateValue(value, index) {
@@ -28581,39 +27905,23 @@ function orderByFilter($parse) {
if (value === null) {
type = 'string';
value = 'null';
+ } else if (type === 'string') {
+ value = value.toLowerCase();
} else if (type === 'object') {
- value = objectValue(value);
+ value = objectValue(value, index);
}
- return {value: value, type: type, index: index};
+ return { value: value, type: type };
}
- function defaultCompare(v1, v2) {
+ function compare(v1, v2) {
var result = 0;
- var type1 = v1.type;
- var type2 = v2.type;
-
- if (type1 === type2) {
- var value1 = v1.value;
- var value2 = v2.value;
-
- if (type1 === 'string') {
- // Compare strings case-insensitively
- value1 = value1.toLowerCase();
- value2 = value2.toLowerCase();
- } else if (type1 === 'object') {
- // For basic objects, use the position of the object
- // in the collection instead of the value
- if (isObject(value1)) value1 = v1.index;
- if (isObject(value2)) value2 = v2.index;
- }
-
- if (value1 !== value2) {
- result = value1 < value2 ? -1 : 1;
+ if (v1.type === v2.type) {
+ if (v1.value !== v2.value) {
+ result = v1.value < v2.value ? -1 : 1;
}
} else {
- result = type1 < type2 ? -1 : 1;
+ result = v1.type < v2.type ? -1 : 1;
}
-
return result;
}
}
@@ -28893,11 +28201,9 @@ var htmlAnchorDirective = valueFn({
*
* @description
*
- * Sets the `readonly` attribute on the element, if the expression inside `ngReadonly` is truthy.
- * Note that `readonly` applies only to `input` elements with specific types. [See the input docs on
- * MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#attr-readonly) for more information.
+ * Sets the `readOnly` attribute on the element, if the expression inside `ngReadonly` is truthy.
*
- * A special directive is necessary because we cannot use interpolation inside the `readonly`
+ * A special directive is necessary because we cannot use interpolation inside the `readOnly`
* attribute. See the {@link guide/interpolation interpolation guide} for more info.
*
* @example
@@ -28934,13 +28240,6 @@ var htmlAnchorDirective = valueFn({
* A special directive is necessary because we cannot use interpolation inside the `selected`
* attribute. See the {@link guide/interpolation interpolation guide} for more info.
*
- *
- * **Note:** `ngSelected` does not interact with the `select` and `ngModel` directives, it only
- * sets the `selected` attribute on the element. If you are using `ngModel` on the select, you
- * should not use `ngSelected` on the options, as `ngModel` will set the select value and
- * selected options.
- *
- *
* @example
@@ -28977,11 +28276,6 @@ var htmlAnchorDirective = valueFn({
* A special directive is necessary because we cannot use interpolation inside the `open`
* attribute. See the {@link guide/interpolation interpolation guide} for more info.
*
- * ## A note about browser compatibility
- *
- * Edge, Firefox, and Internet Explorer do not support the `details` element, it is
- * recommended to use {@link ng.ngShow} and {@link ng.ngHide} instead.
- *
* @example
@@ -29672,9 +28966,7 @@ var ISO_DATE_REGEXP = /^\d{4,}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+(?:[+-
// 9. Fragment
// 1111111111111111 222 333333 44444 555555555555555555555555 666 77777777 8888888 999
var URL_REGEXP = /^[a-z][a-z\d.+-]*:\/*(?:[^:@]+(?::[^@]+)?@)?(?:[^\s:/?#]+|\[[a-f\d:]+\])(?::\d+)?(?:\/[^?#]*)?(?:\?[^#]*)?(?:#.*)?$/i;
-/* jshint maxlen:220 */
-var EMAIL_REGEXP = /^(?=.{1,254}$)(?=.{1,64}@)[-!#$%&'*+\/0-9=?A-Z^_`a-z{|}~]+(\.[-!#$%&'*+\/0-9=?A-Z^_`a-z{|}~]+)*@[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?(\.[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?)*$/;
-/* jshint maxlen:200 */
+var EMAIL_REGEXP = /^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i;
var NUMBER_REGEXP = /^\s*(\-|\+)?(\d+|(\d*(\.\d*)))([eE][+-]?\d+)?\s*$/;
var DATE_REGEXP = /^(\d{4,})-(\d{2})-(\d{2})$/;
var DATETIMELOCAL_REGEXP = /^(\d{4,})-(\d\d)-(\d\d)T(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/;
@@ -31059,7 +30351,7 @@ function numberInputType(scope, element, attr, ctrl, $sniffer, $browser) {
attr.$observe('min', function(val) {
if (isDefined(val) && !isNumber(val)) {
- val = parseFloat(val);
+ val = parseFloat(val, 10);
}
minVal = isNumber(val) && !isNaN(val) ? val : undefined;
// TODO(matsko): implement validateLater to reduce number of validations
@@ -31075,7 +30367,7 @@ function numberInputType(scope, element, attr, ctrl, $sniffer, $browser) {
attr.$observe('max', function(val) {
if (isDefined(val) && !isNumber(val)) {
- val = parseFloat(val);
+ val = parseFloat(val, 10);
}
maxVal = isNumber(val) && !isNaN(val) ? val : undefined;
// TODO(matsko): implement validateLater to reduce number of validations
@@ -31882,11 +31174,6 @@ function classDirective(name, selector) {
* When the expression changes, the previously added classes are removed and only then are the
* new classes added.
*
- * @knownIssue
- * You should not use {@link guide/interpolation interpolation} in the value of the `class`
- * attribute, when using the `ngClass` directive on the same element.
- * See {@link guide/interpolation#known-issues here} for more info.
- *
* @animations
* | Animation | Occurs |
* |----------------------------------|-------------------------------------|
@@ -35832,7 +35119,7 @@ var ngOptionsDirective = ['$compile', '$document', '$parse', function($compile,
for (var i = options.items.length - 1; i >= 0; i--) {
var option = options.items[i];
- if (isDefined(option.group)) {
+ if (option.group) {
jqLiteRemove(option.element.parentNode);
} else {
jqLiteRemove(option.element);
@@ -35864,8 +35151,7 @@ var ngOptionsDirective = ['$compile', '$document', '$parse', function($compile,
listFragment.appendChild(groupElement);
// Update the label on the group element
- // "null" is special cased because of Safari
- groupElement.label = option.group === null ? 'null' : option.group;
+ groupElement.label = option.group;
// Store it for use later
groupElementMap[option.group] = groupElement;
@@ -36201,7 +35487,7 @@ var ngPluralizeDirective = ['$locale', '$interpolate', '$log', function($locale,
* it's a prefix used by Angular for public (`$`) and private (`$$`) properties.
*
* - The built-in filters {@link ng.orderBy orderBy} and {@link ng.filter filter} do not work with
- * objects, and will throw an error if used with one.
+ * objects, and will throw if used with one.
*
* If you are hitting any of these limitations, the recommended workaround is to convert your object into an array
* that is sorted into the order that you prefer before providing it to `ngRepeat`. You could
@@ -37050,11 +36336,6 @@ var ngHideDirective = ['$animate', function($animate) {
* @description
* The `ngStyle` directive allows you to set CSS style on an HTML element conditionally.
*
- * @knownIssue
- * You should not use {@link guide/interpolation interpolation} in the value of the `style`
- * attribute, when using the `ngStyle` directive on the same element.
- * See {@link guide/interpolation#known-issues here} for more info.
- *
* @element ANY
* @param {expression} ngStyle
*
@@ -37466,63 +36747,37 @@ var ngSwitchDefaultDirective = ngDirective({
*
*/
var ngTranscludeMinErr = minErr('ngTransclude');
-var ngTranscludeDirective = ['$compile', function($compile) {
- return {
- restrict: 'EAC',
- terminal: true,
- compile: function ngTranscludeCompile(tElement) {
+var ngTranscludeDirective = ngDirective({
+ restrict: 'EAC',
+ link: function($scope, $element, $attrs, controller, $transclude) {
- // Remove and cache any original content to act as a fallback
- var fallbackLinkFn = $compile(tElement.contents());
- tElement.empty();
-
- return function ngTranscludePostLink($scope, $element, $attrs, controller, $transclude) {
-
- if (!$transclude) {
- throw ngTranscludeMinErr('orphan',
- 'Illegal use of ngTransclude directive in the template! ' +
- 'No parent directive that requires a transclusion found. ' +
- 'Element: {0}',
- startingTag($element));
- }
-
-
- // If the attribute is of the form: `ng-transclude="ng-transclude"` then treat it like the default
- if ($attrs.ngTransclude === $attrs.$attr.ngTransclude) {
- $attrs.ngTransclude = '';
- }
- var slotName = $attrs.ngTransclude || $attrs.ngTranscludeSlot;
-
- // If the slot is required and no transclusion content is provided then this call will throw an error
- $transclude(ngTranscludeCloneAttachFn, null, slotName);
-
- // If the slot is optional and no transclusion content is provided then use the fallback content
- if (slotName && !$transclude.isSlotFilled(slotName)) {
- useFallbackContent();
- }
+ if ($attrs.ngTransclude === $attrs.$attr.ngTransclude) {
+ // If the attribute is of the form: `ng-transclude="ng-transclude"`
+ // then treat it like the default
+ $attrs.ngTransclude = '';
+ }
- function ngTranscludeCloneAttachFn(clone, transcludedScope) {
- if (clone.length) {
- $element.append(clone);
- } else {
- useFallbackContent();
- // There is nothing linked against the transcluded scope since no content was available,
- // so it should be safe to clean up the generated scope.
- transcludedScope.$destroy();
- }
- }
+ function ngTranscludeCloneAttachFn(clone) {
+ if (clone.length) {
+ $element.empty();
+ $element.append(clone);
+ }
+ }
- function useFallbackContent() {
- // Since this is the fallback content rather than the transcluded content,
- // we link against the scope of this directive rather than the transcluded scope
- fallbackLinkFn($scope, function(clone) {
- $element.append(clone);
- });
- }
- };
+ if (!$transclude) {
+ throw ngTranscludeMinErr('orphan',
+ 'Illegal use of ngTransclude directive in the template! ' +
+ 'No parent directive that requires a transclusion found. ' +
+ 'Element: {0}',
+ startingTag($element));
}
- };
-}];
+
+ // If there is no slot name defined or the slot name is not optional
+ // then transclude the slot
+ var slotName = $attrs.ngTransclude || $attrs.ngTranscludeSlot;
+ $transclude(ngTranscludeCloneAttachFn, null, slotName);
+ }
+});
/**
* @ngdoc directive
@@ -38655,7 +37910,7 @@ Entity.prototype.encode = function encode(data, enc, /* internal */ reporter) {
return this._getEncoder(enc).encode(data, reporter);
};
-},{"../asn1":41,"inherits":434,"vm":490}],43:[function(require,module,exports){
+},{"../asn1":41,"inherits":435,"vm":491}],43:[function(require,module,exports){
var inherits = require('inherits');
var Reporter = require('../base').Reporter;
var Buffer = require('buffer').Buffer;
@@ -38773,7 +38028,7 @@ EncoderBuffer.prototype.join = function join(out, offset) {
return out;
};
-},{"../base":44,"buffer":90,"inherits":434}],44:[function(require,module,exports){
+},{"../base":44,"buffer":90,"inherits":435}],44:[function(require,module,exports){
var base = exports;
base.Reporter = require('./reporter').Reporter;
@@ -38847,7 +38102,7 @@ module.exports = Node;
var stateProps = [
'enc', 'parent', 'children', 'tag', 'args', 'reverseArgs', 'choice',
'optional', 'any', 'obj', 'use', 'alteredUse', 'key', 'default', 'explicit',
- 'implicit', 'contains'
+ 'implicit'
];
Node.prototype.clone = function clone() {
@@ -39052,17 +38307,17 @@ Node.prototype.contains = function contains(item) {
// Decoding
//
-Node.prototype._decode = function decode(input, options) {
+Node.prototype._decode = function decode(input) {
var state = this._baseState;
// Decode root node
if (state.parent === null)
- return input.wrapResult(state.children[0]._decode(input, options));
+ return input.wrapResult(state.children[0]._decode(input));
var result = state['default'];
var present = true;
- var prevKey = null;
+ var prevKey;
if (state.key !== null)
prevKey = input.enterKey(state.key);
@@ -39081,9 +38336,9 @@ Node.prototype._decode = function decode(input, options) {
var save = input.save();
try {
if (state.choice === null)
- this._decodeGeneric(state.tag, input, options);
+ this._decodeGeneric(state.tag, input);
else
- this._decodeChoice(input, options);
+ this._decodeChoice(input);
present = true;
} catch (e) {
present = false;
@@ -39111,8 +38366,6 @@ Node.prototype._decode = function decode(input, options) {
input = explicit;
}
- var start = input.offset;
-
// Unwrap implicit and normal values
if (state.use === null && state.choice === null) {
if (state.any)
@@ -39131,19 +38384,13 @@ Node.prototype._decode = function decode(input, options) {
input = body;
}
- if (options && options.track && state.tag !== null)
- options.track(input.path(), start, input.length, 'tagged');
-
- if (options && options.track && state.tag !== null)
- options.track(input.path(), input.offset, input.length, 'content');
-
// Select proper method for tag
if (state.any)
result = result;
else if (state.choice === null)
- result = this._decodeGeneric(state.tag, input, options);
+ result = this._decodeGeneric(state.tag, input);
else
- result = this._decodeChoice(input, options);
+ result = this._decodeChoice(input);
if (input.isError(result))
return result;
@@ -39153,15 +38400,14 @@ Node.prototype._decode = function decode(input, options) {
state.children.forEach(function decodeChildren(child) {
// NOTE: We are ignoring errors here, to let parser continue with other
// parts of encoded data
- child._decode(input, options);
+ child._decode(input);
});
}
// Decode contained/encoded by schema, only in bit or octet strings
if (state.contains && (state.tag === 'octstr' || state.tag === 'bitstr')) {
var data = new DecoderBuffer(result);
- result = this._getUse(state.contains, input._reporterState.obj)
- ._decode(data, options);
+ result = this._getUse(state.contains, input._reporterState.obj)._decode(data);
}
}
@@ -39172,40 +38418,35 @@ Node.prototype._decode = function decode(input, options) {
// Set key
if (state.key !== null && (result !== null || present === true))
input.leaveKey(prevKey, state.key, result);
- else if (prevKey !== null)
- input.exitKey(prevKey);
return result;
};
-Node.prototype._decodeGeneric = function decodeGeneric(tag, input, options) {
+Node.prototype._decodeGeneric = function decodeGeneric(tag, input) {
var state = this._baseState;
if (tag === 'seq' || tag === 'set')
return null;
if (tag === 'seqof' || tag === 'setof')
- return this._decodeList(input, tag, state.args[0], options);
+ return this._decodeList(input, tag, state.args[0]);
else if (/str$/.test(tag))
- return this._decodeStr(input, tag, options);
+ return this._decodeStr(input, tag);
else if (tag === 'objid' && state.args)
- return this._decodeObjid(input, state.args[0], state.args[1], options);
+ return this._decodeObjid(input, state.args[0], state.args[1]);
else if (tag === 'objid')
- return this._decodeObjid(input, null, null, options);
+ return this._decodeObjid(input, null, null);
else if (tag === 'gentime' || tag === 'utctime')
- return this._decodeTime(input, tag, options);
+ return this._decodeTime(input, tag);
else if (tag === 'null_')
- return this._decodeNull(input, options);
+ return this._decodeNull(input);
else if (tag === 'bool')
- return this._decodeBool(input, options);
+ return this._decodeBool(input);
else if (tag === 'int' || tag === 'enum')
- return this._decodeInt(input, state.args && state.args[0], options);
-
- if (state.use !== null) {
- return this._getUse(state.use, input._reporterState.obj)
- ._decode(input, options);
- } else {
+ return this._decodeInt(input, state.args && state.args[0]);
+ else if (state.use !== null)
+ return this._getUse(state.use, input._reporterState.obj)._decode(input);
+ else
return input.error('unknown tag: ' + tag);
- }
};
Node.prototype._getUse = function _getUse(entity, obj) {
@@ -39222,7 +38463,7 @@ Node.prototype._getUse = function _getUse(entity, obj) {
return state.useDecoder;
};
-Node.prototype._decodeChoice = function decodeChoice(input, options) {
+Node.prototype._decodeChoice = function decodeChoice(input) {
var state = this._baseState;
var result = null;
var match = false;
@@ -39231,7 +38472,7 @@ Node.prototype._decodeChoice = function decodeChoice(input, options) {
var save = input.save();
var node = state.choice[key];
try {
- var value = node._decode(input, options);
+ var value = node._decode(input);
if (input.isError(value))
return false;
@@ -39412,7 +38653,7 @@ Node.prototype._isPrintstr = function isPrintstr(str) {
return /^[A-Za-z0-9 '\(\)\+,\-\.\/:=\?]*$/.test(str);
};
-},{"../base":44,"minimalistic-assert":441}],46:[function(require,module,exports){
+},{"../base":44,"minimalistic-assert":442}],46:[function(require,module,exports){
var inherits = require('inherits');
function Reporter(options) {
@@ -39446,24 +38687,14 @@ Reporter.prototype.enterKey = function enterKey(key) {
return this._reporterState.path.push(key);
};
-Reporter.prototype.exitKey = function exitKey(index) {
- var state = this._reporterState;
-
- state.path = state.path.slice(0, index - 1);
-};
-
Reporter.prototype.leaveKey = function leaveKey(index, key, value) {
var state = this._reporterState;
- this.exitKey(index);
+ state.path = state.path.slice(0, index - 1);
if (state.obj !== null)
state.obj[key] = value;
};
-Reporter.prototype.path = function path() {
- return this._reporterState.path.join('/');
-};
-
Reporter.prototype.enterObject = function enterObject() {
var state = this._reporterState;
@@ -39535,7 +38766,7 @@ ReporterError.prototype.rethrow = function rethrow(msg) {
return this;
};
-},{"inherits":434}],47:[function(require,module,exports){
+},{"inherits":435}],47:[function(require,module,exports){
var constants = require('../constants');
exports.tagClass = {
@@ -39711,15 +38942,14 @@ DERNode.prototype._skipUntilEnd = function skipUntilEnd(buffer, fail) {
}
};
-DERNode.prototype._decodeList = function decodeList(buffer, tag, decoder,
- options) {
+DERNode.prototype._decodeList = function decodeList(buffer, tag, decoder) {
var result = [];
while (!buffer.isEmpty()) {
var possibleEnd = this._peekTag(buffer, 'end');
if (buffer.isError(possibleEnd))
return possibleEnd;
- var res = decoder.decode(buffer, 'der', options);
+ var res = decoder.decode(buffer, 'der');
if (buffer.isError(res) && possibleEnd)
break;
result.push(res);
@@ -39924,7 +39154,7 @@ function derDecodeLen(buf, primitive, fail) {
return len;
}
-},{"../../asn1":41,"inherits":434}],50:[function(require,module,exports){
+},{"../../asn1":41,"inherits":435}],50:[function(require,module,exports){
var decoders = exports;
decoders.der = require('./der');
@@ -39981,7 +39211,7 @@ PEMDecoder.prototype.decode = function decode(data, options) {
return DERDecoder.prototype.decode.call(this, input, options);
};
-},{"./der":49,"buffer":90,"inherits":434}],52:[function(require,module,exports){
+},{"./der":49,"buffer":90,"inherits":435}],52:[function(require,module,exports){
var inherits = require('inherits');
var Buffer = require('buffer').Buffer;
@@ -40276,7 +39506,7 @@ function encodeTag(tag, primitive, cls, reporter) {
return res;
}
-},{"../../asn1":41,"buffer":90,"inherits":434}],53:[function(require,module,exports){
+},{"../../asn1":41,"buffer":90,"inherits":435}],53:[function(require,module,exports){
var encoders = exports;
encoders.der = require('./der');
@@ -40305,7 +39535,7 @@ PEMEncoder.prototype.encode = function encode(data, options) {
return out.join('\n');
};
-},{"./der":52,"inherits":434}],55:[function(require,module,exports){
+},{"./der":52,"inherits":435}],55:[function(require,module,exports){
// http://wiki.commonjs.org/wiki/Unit_Testing/1.0
//
// THIS IS NOT TESTED NOR LIKELY TO WORK OUTSIDE V8!
@@ -40666,7 +39896,7 @@ var objectKeys = Object.keys || function (obj) {
return keys;
};
-},{"util/":487}],56:[function(require,module,exports){
+},{"util/":488}],56:[function(require,module,exports){
(function (global){
"use strict";
@@ -40701,7 +39931,7 @@ define(String.prototype, "padRight", "".padEnd);
[][key] && define(Array, key, Function.call.bind([][key]));
});
}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-},{"core-js/fn/regexp/escape":92,"core-js/shim":385,"regenerator-runtime/runtime":466}],57:[function(require,module,exports){
+},{"core-js/fn/regexp/escape":92,"core-js/shim":386,"regenerator-runtime/runtime":467}],57:[function(require,module,exports){
'use strict'
exports.toByteArray = toByteArray
@@ -40813,13 +40043,13 @@ function fromByteArray (uint8) {
}
},{}],58:[function(require,module,exports){
-/*! bignumber.js v2.4.0 https://github.com/MikeMcl/bignumber.js/LICENCE */
+/*! bignumber.js v2.3.0 https://github.com/MikeMcl/bignumber.js/LICENCE */
;(function (globalObj) {
'use strict';
/*
- bignumber.js v2.4.0
+ bignumber.js v2.3.0
A JavaScript library for arbitrary-precision arithmetic.
https://github.com/MikeMcl/bignumber.js
Copyright (c) 2016 Michael Mclaughlin
@@ -40827,7 +40057,7 @@ function fromByteArray (uint8) {
*/
- var BigNumber, cryptoObj, parseNumeric,
+ var cryptoObj, parseNumeric,
isNumeric = /^-?(\d+(\.\d*)?|\.\d+)(e[+-]?\d+)?$/i,
mathceil = Math.ceil,
mathfloor = Math.floor,
@@ -43529,17 +42759,13 @@ function fromByteArray (uint8) {
// EXPORT
- BigNumber = constructorFactory();
- BigNumber.default = BigNumber.BigNumber = BigNumber;
-
-
- // AMD.
+ // AMD.
if ( typeof define == 'function' && define.amd ) {
- define( function () { return BigNumber; } );
+ define( function () { return constructorFactory(); } );
// Node.js and other environments that support module.exports.
} else if ( typeof module != 'undefined' && module.exports ) {
- module.exports = BigNumber;
+ module.exports = constructorFactory();
// Split string stops browserify adding crypto shim.
if ( !cryptoObj ) try { cryptoObj = require('cry' + 'pto'); } catch (e) {}
@@ -43547,7 +42773,7 @@ function fromByteArray (uint8) {
// Browser.
} else {
if ( !globalObj ) globalObj = typeof self != 'undefined' ? self : Function('return this')();
- globalObj.BigNumber = BigNumber;
+ globalObj.BigNumber = constructorFactory();
}
})(this);
@@ -43724,12 +42950,8 @@ module.exports = {
}
BN.isBN = function isBN (num) {
- if (num instanceof BN) {
- return true;
- }
-
return num !== null && typeof num === 'object' &&
- num.constructor.wordSize === BN.wordSize && Array.isArray(num.words);
+ num.constructor.name === 'BN' && Array.isArray(num.words);
};
BN.max = function max (left, right) {
@@ -45770,10 +44992,6 @@ module.exports = {
assert(this.negative === 0, 'imaskn works only with positive numbers');
- if (this.length <= s) {
- return this;
- }
-
if (r !== 0) {
s++;
}
@@ -47438,7 +46656,7 @@ function xorTest (a, b) {
}
}).call(this,require("buffer").Buffer)
-},{"./aes":63,"./ghash":68,"buffer":90,"buffer-xor":89,"cipher-base":91,"inherits":434}],65:[function(require,module,exports){
+},{"./aes":63,"./ghash":68,"buffer":90,"buffer-xor":89,"cipher-base":91,"inherits":435}],65:[function(require,module,exports){
var ciphers = require('./encrypter')
exports.createCipher = exports.Cipher = ciphers.createCipher
exports.createCipheriv = exports.Cipheriv = ciphers.createCipheriv
@@ -47592,7 +46810,7 @@ exports.createDecipher = createDecipher
exports.createDecipheriv = createDecipheriv
}).call(this,require("buffer").Buffer)
-},{"./aes":63,"./authCipher":64,"./modes":69,"./modes/cbc":70,"./modes/cfb":71,"./modes/cfb1":72,"./modes/cfb8":73,"./modes/ctr":74,"./modes/ecb":75,"./modes/ofb":76,"./streamCipher":77,"buffer":90,"cipher-base":91,"evp_bytestokey":425,"inherits":434}],67:[function(require,module,exports){
+},{"./aes":63,"./authCipher":64,"./modes":69,"./modes/cbc":70,"./modes/cfb":71,"./modes/cfb1":72,"./modes/cfb8":73,"./modes/ctr":74,"./modes/ecb":75,"./modes/ofb":76,"./streamCipher":77,"buffer":90,"cipher-base":91,"evp_bytestokey":426,"inherits":435}],67:[function(require,module,exports){
(function (Buffer){
var aes = require('./aes')
var Transform = require('cipher-base')
@@ -47718,7 +46936,7 @@ exports.createCipheriv = createCipheriv
exports.createCipher = createCipher
}).call(this,require("buffer").Buffer)
-},{"./aes":63,"./authCipher":64,"./modes":69,"./modes/cbc":70,"./modes/cfb":71,"./modes/cfb1":72,"./modes/cfb8":73,"./modes/ctr":74,"./modes/ecb":75,"./modes/ofb":76,"./streamCipher":77,"buffer":90,"cipher-base":91,"evp_bytestokey":425,"inherits":434}],68:[function(require,module,exports){
+},{"./aes":63,"./authCipher":64,"./modes":69,"./modes/cbc":70,"./modes/cfb":71,"./modes/cfb1":72,"./modes/cfb8":73,"./modes/ctr":74,"./modes/ecb":75,"./modes/ofb":76,"./streamCipher":77,"buffer":90,"cipher-base":91,"evp_bytestokey":426,"inherits":435}],68:[function(require,module,exports){
(function (Buffer){
var zeros = new Buffer(16)
zeros.fill(0)
@@ -48196,7 +47414,7 @@ StreamCipher.prototype._final = function () {
}
}).call(this,require("buffer").Buffer)
-},{"./aes":63,"buffer":90,"cipher-base":91,"inherits":434}],78:[function(require,module,exports){
+},{"./aes":63,"buffer":90,"cipher-base":91,"inherits":435}],78:[function(require,module,exports){
var ebtk = require('evp_bytestokey')
var aes = require('browserify-aes/browser')
var DES = require('browserify-des')
@@ -48271,7 +47489,7 @@ function getCiphers () {
}
exports.listCiphers = exports.getCiphers = getCiphers
-},{"browserify-aes/browser":65,"browserify-aes/modes":69,"browserify-des":79,"browserify-des/modes":80,"evp_bytestokey":425}],79:[function(require,module,exports){
+},{"browserify-aes/browser":65,"browserify-aes/modes":69,"browserify-des":79,"browserify-des/modes":80,"evp_bytestokey":426}],79:[function(require,module,exports){
(function (Buffer){
var CipherBase = require('cipher-base')
var des = require('des.js')
@@ -48318,7 +47536,7 @@ DES.prototype._final = function () {
}
}).call(this,require("buffer").Buffer)
-},{"buffer":90,"cipher-base":91,"des.js":393,"inherits":434}],80:[function(require,module,exports){
+},{"buffer":90,"cipher-base":91,"des.js":394,"inherits":435}],80:[function(require,module,exports){
exports['des-ecb'] = {
key: 8,
iv: 0
@@ -48388,7 +47606,7 @@ function getr(priv) {
}
}).call(this,require("buffer").Buffer)
-},{"bn.js":60,"buffer":90,"randombytes":455}],82:[function(require,module,exports){
+},{"bn.js":60,"buffer":90,"randombytes":456}],82:[function(require,module,exports){
(function (Buffer){
const Sha3 = require('js-sha3')
@@ -48426,7 +47644,7 @@ module.exports = {
}
}).call(this,require("buffer").Buffer)
-},{"buffer":90,"js-sha3":437}],83:[function(require,module,exports){
+},{"buffer":90,"js-sha3":438}],83:[function(require,module,exports){
(function (Buffer){
'use strict'
exports['RSA-SHA224'] = exports.sha224WithRSAEncryption = {
@@ -48609,7 +47827,7 @@ module.exports = {
}
}).call(this,require("buffer").Buffer)
-},{"./algos":83,"./sign":86,"./verify":87,"buffer":90,"create-hash":388,"inherits":434,"stream":483}],85:[function(require,module,exports){
+},{"./algos":83,"./sign":86,"./verify":87,"buffer":90,"create-hash":389,"inherits":435,"stream":484}],85:[function(require,module,exports){
'use strict'
exports['1.3.132.0.10'] = 'secp256k1'
@@ -48812,7 +48030,7 @@ module.exports.getKey = getKey
module.exports.makeKey = makeKey
}).call(this,require("buffer").Buffer)
-},{"./curves":85,"bn.js":60,"browserify-rsa":81,"buffer":90,"create-hmac":391,"elliptic":403,"parse-asn1":445}],87:[function(require,module,exports){
+},{"./curves":85,"bn.js":60,"browserify-rsa":81,"buffer":90,"create-hmac":392,"elliptic":404,"parse-asn1":446}],87:[function(require,module,exports){
(function (Buffer){
// much of this based on https://github.com/indutny/self-signed/blob/gh-pages/lib/rsa.js
var curves = require('./curves')
@@ -48919,7 +48137,7 @@ function checkValue (b, q) {
module.exports = verify
}).call(this,require("buffer").Buffer)
-},{"./curves":85,"bn.js":60,"buffer":90,"elliptic":403,"parse-asn1":445}],88:[function(require,module,exports){
+},{"./curves":85,"bn.js":60,"buffer":90,"elliptic":404,"parse-asn1":446}],88:[function(require,module,exports){
(function (global){
'use strict';
@@ -49101,7 +48319,7 @@ exports.kMaxLength = kMaxLength()
function typedArraySupport () {
try {
var arr = new Uint8Array(1)
- arr.__proto__ = {__proto__: Uint8Array.prototype, foo: function () { return 42 }}
+ arr.foo = function () { return 42 }
return arr.foo() === 42 && // typed array instances can be augmented
typeof arr.subarray === 'function' && // chrome 9-10 lack `subarray`
arr.subarray(1, 1).byteLength === 0 // ie10 has broken `subarray`
@@ -49245,7 +48463,7 @@ function allocUnsafe (that, size) {
assertSize(size)
that = createBuffer(that, size < 0 ? 0 : checked(size) | 0)
if (!Buffer.TYPED_ARRAY_SUPPORT) {
- for (var i = 0; i < size; ++i) {
+ for (var i = 0; i < size; i++) {
that[i] = 0
}
}
@@ -49301,9 +48519,7 @@ function fromArrayBuffer (that, array, byteOffset, length) {
throw new RangeError('\'length\' is out of bounds')
}
- if (byteOffset === undefined && length === undefined) {
- array = new Uint8Array(array)
- } else if (length === undefined) {
+ if (length === undefined) {
array = new Uint8Array(array, byteOffset)
} else {
array = new Uint8Array(array, byteOffset, length)
@@ -49425,14 +48641,14 @@ Buffer.concat = function concat (list, length) {
var i
if (length === undefined) {
length = 0
- for (i = 0; i < list.length; ++i) {
+ for (i = 0; i < list.length; i++) {
length += list[i].length
}
}
var buffer = Buffer.allocUnsafe(length)
var pos = 0
- for (i = 0; i < list.length; ++i) {
+ for (i = 0; i < list.length; i++) {
var buf = list[i]
if (!Buffer.isBuffer(buf)) {
throw new TypeError('"list" argument must be an Array of Buffers')
@@ -49464,6 +48680,7 @@ function byteLength (string, encoding) {
switch (encoding) {
case 'ascii':
case 'binary':
+ // Deprecated
case 'raw':
case 'raws':
return len
@@ -49701,16 +48918,15 @@ function arrayIndexOf (arr, val, byteOffset, encoding) {
}
var foundIndex = -1
- for (var i = byteOffset; i < arrLength; ++i) {
- if (read(arr, i) === read(val, foundIndex === -1 ? 0 : i - foundIndex)) {
+ for (var i = 0; byteOffset + i < arrLength; i++) {
+ if (read(arr, byteOffset + i) === read(val, foundIndex === -1 ? 0 : i - foundIndex)) {
if (foundIndex === -1) foundIndex = i
- if (i - foundIndex + 1 === valLength) return foundIndex * indexSize
+ if (i - foundIndex + 1 === valLength) return (byteOffset + foundIndex) * indexSize
} else {
if (foundIndex !== -1) i -= i - foundIndex
foundIndex = -1
}
}
-
return -1
}
@@ -49775,7 +48991,7 @@ function hexWrite (buf, string, offset, length) {
if (length > strLen / 2) {
length = strLen / 2
}
- for (var i = 0; i < length; ++i) {
+ for (var i = 0; i < length; i++) {
var parsed = parseInt(string.substr(i * 2, 2), 16)
if (isNaN(parsed)) return i
buf[offset + i] = parsed
@@ -49989,7 +49205,7 @@ function asciiSlice (buf, start, end) {
var ret = ''
end = Math.min(buf.length, end)
- for (var i = start; i < end; ++i) {
+ for (var i = start; i < end; i++) {
ret += String.fromCharCode(buf[i] & 0x7F)
}
return ret
@@ -49999,7 +49215,7 @@ function binarySlice (buf, start, end) {
var ret = ''
end = Math.min(buf.length, end)
- for (var i = start; i < end; ++i) {
+ for (var i = start; i < end; i++) {
ret += String.fromCharCode(buf[i])
}
return ret
@@ -50012,7 +49228,7 @@ function hexSlice (buf, start, end) {
if (!end || end < 0 || end > len) end = len
var out = ''
- for (var i = start; i < end; ++i) {
+ for (var i = start; i < end; i++) {
out += toHex(buf[i])
}
return out
@@ -50055,7 +49271,7 @@ Buffer.prototype.slice = function slice (start, end) {
} else {
var sliceLen = end - start
newBuf = new Buffer(sliceLen, undefined)
- for (var i = 0; i < sliceLen; ++i) {
+ for (var i = 0; i < sliceLen; i++) {
newBuf[i] = this[i + start]
}
}
@@ -50282,7 +49498,7 @@ Buffer.prototype.writeUInt8 = function writeUInt8 (value, offset, noAssert) {
function objectWriteUInt16 (buf, value, offset, littleEndian) {
if (value < 0) value = 0xffff + value + 1
- for (var i = 0, j = Math.min(buf.length - offset, 2); i < j; ++i) {
+ for (var i = 0, j = Math.min(buf.length - offset, 2); i < j; i++) {
buf[offset + i] = (value & (0xff << (8 * (littleEndian ? i : 1 - i)))) >>>
(littleEndian ? i : 1 - i) * 8
}
@@ -50316,7 +49532,7 @@ Buffer.prototype.writeUInt16BE = function writeUInt16BE (value, offset, noAssert
function objectWriteUInt32 (buf, value, offset, littleEndian) {
if (value < 0) value = 0xffffffff + value + 1
- for (var i = 0, j = Math.min(buf.length - offset, 4); i < j; ++i) {
+ for (var i = 0, j = Math.min(buf.length - offset, 4); i < j; i++) {
buf[offset + i] = (value >>> (littleEndian ? i : 3 - i) * 8) & 0xff
}
}
@@ -50531,12 +49747,12 @@ Buffer.prototype.copy = function copy (target, targetStart, start, end) {
if (this === target && start < targetStart && targetStart < end) {
// descending copy from end
- for (i = len - 1; i >= 0; --i) {
+ for (i = len - 1; i >= 0; i--) {
target[i + targetStart] = this[i + start]
}
} else if (len < 1000 || !Buffer.TYPED_ARRAY_SUPPORT) {
// ascending copy from start
- for (i = 0; i < len; ++i) {
+ for (i = 0; i < len; i++) {
target[i + targetStart] = this[i + start]
}
} else {
@@ -50597,7 +49813,7 @@ Buffer.prototype.fill = function fill (val, start, end, encoding) {
var i
if (typeof val === 'number') {
- for (i = start; i < end; ++i) {
+ for (i = start; i < end; i++) {
this[i] = val
}
} else {
@@ -50605,7 +49821,7 @@ Buffer.prototype.fill = function fill (val, start, end, encoding) {
? val
: utf8ToBytes(new Buffer(val, encoding).toString())
var len = bytes.length
- for (i = 0; i < end - start; ++i) {
+ for (i = 0; i < end - start; i++) {
this[i + start] = bytes[i % len]
}
}
@@ -50647,7 +49863,7 @@ function utf8ToBytes (string, units) {
var leadSurrogate = null
var bytes = []
- for (var i = 0; i < length; ++i) {
+ for (var i = 0; i < length; i++) {
codePoint = string.charCodeAt(i)
// is surrogate component
@@ -50722,7 +49938,7 @@ function utf8ToBytes (string, units) {
function asciiToBytes (str) {
var byteArray = []
- for (var i = 0; i < str.length; ++i) {
+ for (var i = 0; i < str.length; i++) {
// Node's code seems to be doing this and not & 0x7F..
byteArray.push(str.charCodeAt(i) & 0xFF)
}
@@ -50732,7 +49948,7 @@ function asciiToBytes (str) {
function utf16leToBytes (str, units) {
var c, hi, lo
var byteArray = []
- for (var i = 0; i < str.length; ++i) {
+ for (var i = 0; i < str.length; i++) {
if ((units -= 2) < 0) break
c = str.charCodeAt(i)
@@ -50750,7 +49966,7 @@ function base64ToBytes (str) {
}
function blitBuffer (src, dst, offset, length) {
- for (var i = 0; i < length; ++i) {
+ for (var i = 0; i < length; i++) {
if ((i + offset >= dst.length) || (i >= src.length)) break
dst[i + offset] = src[i]
}
@@ -50762,7 +49978,7 @@ function isnan (val) {
}
}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-},{"base64-js":57,"ieee754":432,"isarray":436}],91:[function(require,module,exports){
+},{"base64-js":57,"ieee754":433,"isarray":437}],91:[function(require,module,exports){
(function (Buffer){
var Transform = require('stream').Transform
var inherits = require('inherits')
@@ -50856,19 +50072,19 @@ CipherBase.prototype._toString = function (value, enc, final) {
}
}).call(this,require("buffer").Buffer)
-},{"buffer":90,"inherits":434,"stream":483,"string_decoder":484}],92:[function(require,module,exports){
+},{"buffer":90,"inherits":435,"stream":484,"string_decoder":485}],92:[function(require,module,exports){
require('../../modules/core.regexp.escape');
module.exports = require('../../modules/_core').RegExp.escape;
-},{"../../modules/_core":113,"../../modules/core.regexp.escape":209}],93:[function(require,module,exports){
+},{"../../modules/_core":113,"../../modules/core.regexp.escape":210}],93:[function(require,module,exports){
module.exports = function(it){
if(typeof it != 'function')throw TypeError(it + ' is not a function!');
return it;
};
},{}],94:[function(require,module,exports){
-var cof = require('./_cof');
-module.exports = function(it, msg){
- if(typeof it != 'number' && cof(it) != 'Number')throw TypeError(msg);
- return +it;
+var cof = require('./_cof');
+module.exports = function(it, msg){
+ if(typeof it != 'number' && cof(it) != 'Number')throw TypeError(msg);
+ return +it;
};
},{"./_cof":108}],95:[function(require,module,exports){
// 22.1.3.31 Array.prototype[@@unscopables]
@@ -51010,50 +50226,50 @@ module.exports = function(TYPE, $create){
};
};
},{"./_array-species-create":105,"./_ctx":115,"./_iobject":135,"./_to-length":198,"./_to-object":199}],103:[function(require,module,exports){
-var aFunction = require('./_a-function')
- , toObject = require('./_to-object')
- , IObject = require('./_iobject')
- , toLength = require('./_to-length');
-
-module.exports = function(that, callbackfn, aLen, memo, isRight){
- aFunction(callbackfn);
- var O = toObject(that)
- , self = IObject(O)
- , length = toLength(O.length)
- , index = isRight ? length - 1 : 0
- , i = isRight ? -1 : 1;
- if(aLen < 2)for(;;){
- if(index in self){
- memo = self[index];
- index += i;
- break;
- }
- index += i;
- if(isRight ? index < 0 : length <= index){
- throw TypeError('Reduce of empty array with no initial value');
- }
- }
- for(;isRight ? index >= 0 : length > index; index += i)if(index in self){
- memo = callbackfn(memo, self[index], index, O);
- }
- return memo;
+var aFunction = require('./_a-function')
+ , toObject = require('./_to-object')
+ , IObject = require('./_iobject')
+ , toLength = require('./_to-length');
+
+module.exports = function(that, callbackfn, aLen, memo, isRight){
+ aFunction(callbackfn);
+ var O = toObject(that)
+ , self = IObject(O)
+ , length = toLength(O.length)
+ , index = isRight ? length - 1 : 0
+ , i = isRight ? -1 : 1;
+ if(aLen < 2)for(;;){
+ if(index in self){
+ memo = self[index];
+ index += i;
+ break;
+ }
+ index += i;
+ if(isRight ? index < 0 : length <= index){
+ throw TypeError('Reduce of empty array with no initial value');
+ }
+ }
+ for(;isRight ? index >= 0 : length > index; index += i)if(index in self){
+ memo = callbackfn(memo, self[index], index, O);
+ }
+ return memo;
};
},{"./_a-function":93,"./_iobject":135,"./_to-length":198,"./_to-object":199}],104:[function(require,module,exports){
-var isObject = require('./_is-object')
- , isArray = require('./_is-array')
- , SPECIES = require('./_wks')('species');
-
-module.exports = function(original){
- var C;
- if(isArray(original)){
- C = original.constructor;
- // cross-realm fallback
- if(typeof C == 'function' && (C === Array || isArray(C.prototype)))C = undefined;
- if(isObject(C)){
- C = C[SPECIES];
- if(C === null)C = undefined;
- }
- } return C === undefined ? Array : C;
+var isObject = require('./_is-object')
+ , isArray = require('./_is-array')
+ , SPECIES = require('./_wks')('species');
+
+module.exports = function(original){
+ var C;
+ if(isArray(original)){
+ C = original.constructor;
+ // cross-realm fallback
+ if(typeof C == 'function' && (C === Array || isArray(C.prototype)))C = undefined;
+ if(isObject(C)){
+ C = C[SPECIES];
+ if(C === null)C = undefined;
+ }
+ } return C === undefined ? Array : C;
};
},{"./_is-array":137,"./_is-object":139,"./_wks":207}],105:[function(require,module,exports){
// 9.4.2.3 ArraySpeciesCreate(originalArray, length)
@@ -51121,6 +50337,7 @@ module.exports = function(it){
'use strict';
var dP = require('./_object-dp').f
, create = require('./_object-create')
+ , hide = require('./_hide')
, redefineAll = require('./_redefine-all')
, ctx = require('./_ctx')
, anInstance = require('./_an-instance')
@@ -51260,7 +50477,7 @@ module.exports = {
setSpecies(NAME);
}
};
-},{"./_an-instance":96,"./_ctx":115,"./_defined":117,"./_descriptors":118,"./_for-of":127,"./_iter-define":143,"./_iter-step":145,"./_meta":152,"./_object-create":156,"./_object-dp":157,"./_redefine-all":176,"./_set-species":181}],110:[function(require,module,exports){
+},{"./_an-instance":96,"./_ctx":115,"./_defined":117,"./_descriptors":118,"./_for-of":127,"./_hide":130,"./_iter-define":143,"./_iter-step":145,"./_meta":152,"./_object-create":156,"./_object-dp":157,"./_redefine-all":176,"./_set-species":181}],110:[function(require,module,exports){
// https://github.com/DavidBruant/Map-Set.prototype.toJSON
var classof = require('./_classof')
, from = require('./_array-from-iterable');
@@ -51444,13 +50661,13 @@ module.exports = function(NAME, wrapper, methods, common, IS_MAP, IS_WEAK){
var core = module.exports = {version: '2.4.0'};
if(typeof __e == 'number')__e = core; // eslint-disable-line no-undef
},{}],114:[function(require,module,exports){
-'use strict';
-var $defineProperty = require('./_object-dp')
- , createDesc = require('./_property-desc');
-
-module.exports = function(object, index, value){
- if(index in object)$defineProperty.f(object, index, createDesc(0, value));
- else object[index] = value;
+'use strict';
+var $defineProperty = require('./_object-dp')
+ , createDesc = require('./_property-desc');
+
+module.exports = function(object, index, value){
+ if(index in object)$defineProperty.f(object, index, createDesc(0, value));
+ else object[index] = value;
};
},{"./_object-dp":157,"./_property-desc":175}],115:[function(require,module,exports){
// optional / simple context binding
@@ -51474,14 +50691,14 @@ module.exports = function(fn, that, length){
};
};
},{"./_a-function":93}],116:[function(require,module,exports){
-'use strict';
-var anObject = require('./_an-object')
- , toPrimitive = require('./_to-primitive')
- , NUMBER = 'number';
-
-module.exports = function(hint){
- if(hint !== 'string' && hint !== NUMBER && hint !== 'default')throw TypeError('Incorrect hint');
- return toPrimitive(anObject(this), hint != NUMBER);
+'use strict';
+var anObject = require('./_an-object')
+ , toPrimitive = require('./_to-primitive')
+ , NUMBER = 'number';
+
+module.exports = function(hint){
+ if(hint !== 'string' && hint !== NUMBER && hint !== 'default')throw TypeError('Incorrect hint');
+ return toPrimitive(anObject(this), hint != NUMBER);
};
},{"./_an-object":97,"./_to-primitive":200}],117:[function(require,module,exports){
// 7.2.1 RequireObjectCoercible(argument)
@@ -51503,9 +50720,9 @@ module.exports = function(it){
return is ? document.createElement(it) : {};
};
},{"./_global":128,"./_is-object":139}],120:[function(require,module,exports){
-// IE 8- don't enum bug keys
-module.exports = (
- 'constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf'
+// IE 8- don't enum bug keys
+module.exports = (
+ 'constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf'
).split(',');
},{}],121:[function(require,module,exports){
// all enumerable object keys, includes symbols
@@ -51679,17 +50896,17 @@ module.exports = require('./_descriptors') ? function(object, key, value){
},{"./_descriptors":118,"./_object-dp":157,"./_property-desc":175}],131:[function(require,module,exports){
module.exports = require('./_global').document && document.documentElement;
},{"./_global":128}],132:[function(require,module,exports){
-module.exports = !require('./_descriptors') && !require('./_fails')(function(){
- return Object.defineProperty(require('./_dom-create')('div'), 'a', {get: function(){ return 7; }}).a != 7;
+module.exports = !require('./_descriptors') && !require('./_fails')(function(){
+ return Object.defineProperty(require('./_dom-create')('div'), 'a', {get: function(){ return 7; }}).a != 7;
});
},{"./_descriptors":118,"./_dom-create":119,"./_fails":124}],133:[function(require,module,exports){
-var isObject = require('./_is-object')
- , setPrototypeOf = require('./_set-proto').set;
-module.exports = function(that, target, C){
- var P, S = target.constructor;
- if(S !== C && typeof S == 'function' && (P = S.prototype) !== C.prototype && isObject(P) && setPrototypeOf){
- setPrototypeOf(that, P);
- } return that;
+var isObject = require('./_is-object')
+ , setPrototypeOf = require('./_set-proto').set;
+module.exports = function(that, target, C){
+ var P, S = target.constructor;
+ if(S !== C && typeof S == 'function' && (P = S.prototype) !== C.prototype && isObject(P) && setPrototypeOf){
+ setPrototypeOf(that, P);
+ } return that;
};
},{"./_is-object":139,"./_set-proto":180}],134:[function(require,module,exports){
// fast apply, http://jsperf.lnkit.com/fast-apply/5
@@ -52015,7 +51232,7 @@ module.exports = {
key: toMetaKey,
exp: exp
};
-},{"./_export":122,"./_shared":184,"./es6.map":239,"./es6.weak-map":345}],154:[function(require,module,exports){
+},{"./_export":122,"./_shared":184,"./es6.map":240,"./es6.weak-map":346}],154:[function(require,module,exports){
var global = require('./_global')
, macrotask = require('./_task').set
, Observer = global.MutationObserver || global.WebKitMutationObserver
@@ -52119,48 +51336,46 @@ module.exports = !$assign || require('./_fails')(function(){
} return T;
} : $assign;
},{"./_fails":124,"./_iobject":135,"./_object-gops":163,"./_object-keys":166,"./_object-pie":167,"./_to-object":199}],156:[function(require,module,exports){
-// 19.1.2.2 / 15.2.3.5 Object.create(O [, Properties])
-var anObject = require('./_an-object')
- , dPs = require('./_object-dps')
- , enumBugKeys = require('./_enum-bug-keys')
- , IE_PROTO = require('./_shared-key')('IE_PROTO')
- , Empty = function(){ /* empty */ }
- , PROTOTYPE = 'prototype';
-
-// Create object with fake `null` prototype: use iframe Object with cleared prototype
-var createDict = function(){
- // Thrash, waste and sodomy: IE GC bug
- var iframe = require('./_dom-create')('iframe')
- , i = enumBugKeys.length
- , lt = '<'
- , gt = '>'
- , iframeDocument;
- iframe.style.display = 'none';
- require('./_html').appendChild(iframe);
- iframe.src = 'javascript:'; // eslint-disable-line no-script-url
- // createDict = iframe.contentWindow.Object;
- // html.removeChild(iframe);
- iframeDocument = iframe.contentWindow.document;
- iframeDocument.open();
- iframeDocument.write(lt + 'script' + gt + 'document.F=Object' + lt + '/script' + gt);
- iframeDocument.close();
- createDict = iframeDocument.F;
- while(i--)delete createDict[PROTOTYPE][enumBugKeys[i]];
- return createDict();
-};
-
-module.exports = Object.create || function create(O, Properties){
- var result;
- if(O !== null){
- Empty[PROTOTYPE] = anObject(O);
- result = new Empty;
- Empty[PROTOTYPE] = null;
- // add "__proto__" for Object.getPrototypeOf polyfill
- result[IE_PROTO] = O;
- } else result = createDict();
- return Properties === undefined ? result : dPs(result, Properties);
+// 19.1.2.2 / 15.2.3.5 Object.create(O [, Properties])
+var anObject = require('./_an-object')
+ , dPs = require('./_object-dps')
+ , enumBugKeys = require('./_enum-bug-keys')
+ , IE_PROTO = require('./_shared-key')('IE_PROTO')
+ , Empty = function(){ /* empty */ }
+ , PROTOTYPE = 'prototype';
+
+// Create object with fake `null` prototype: use iframe Object with cleared prototype
+var createDict = function(){
+ // Thrash, waste and sodomy: IE GC bug
+ var iframe = require('./_dom-create')('iframe')
+ , i = enumBugKeys.length
+ , gt = '>'
+ , iframeDocument;
+ iframe.style.display = 'none';
+ require('./_html').appendChild(iframe);
+ iframe.src = 'javascript:'; // eslint-disable-line no-script-url
+ // createDict = iframe.contentWindow.Object;
+ // html.removeChild(iframe);
+ iframeDocument = iframe.contentWindow.document;
+ iframeDocument.open();
+ iframeDocument.write('