diff --git a/app/client/lib/appStart.js b/app/client/lib/appStart.js index 9dfa7b17c..bd77404c8 100644 --- a/app/client/lib/appStart.js +++ b/app/client/lib/appStart.js @@ -5,7 +5,7 @@ if(location.hostname !== 'localhost' && location.hostname !== '127.0.0.1') // Make sure the example contract code is up to date var shortExample = Helpers.defaultContractExample.substr(Helpers.defaultContractExample.indexOf("\n\n")+2); -if (localStorage.getItem('contractSource').indexOf(shortExample) !== -1) { +if (localStorage.getItem('contractSource') && localStorage.getItem('contractSource').indexOf(shortExample) !== -1) { localStorage.setItem('contractSource', Helpers.defaultContractExample); } diff --git a/build/7dd21f58d3f2458caf2c88a6e4289b71c8598265.js b/build/9dc6491723d56daaff937fb7bb5c69165fd43ace.js similarity index 99% rename from build/7dd21f58d3f2458caf2c88a6e4289b71c8598265.js rename to build/9dc6491723d56daaff937fb7bb5c69165fd43ace.js index 66b926abc..943ad7b21 100644 --- a/build/7dd21f58d3f2458caf2c88a6e4289b71c8598265.js +++ b/build/9dc6491723d56daaff937fb7bb5c69165fd43ace.js @@ -365,7 +365,7 @@ if(i.isEmpty())var r=o;else var a=this.session.documentToScreenPosition(n?i.end: (function(){ace.define("ace/theme/tomorrow_night",["require","exports","module","ace/lib/dom"],function(o,e,r){e.isDark=!0,e.cssClass="ace-tomorrow-night",e.cssText=".ace-tomorrow-night .ace_gutter {background: #25282c;color: #C5C8C6}.ace-tomorrow-night .ace_print-margin {width: 1px;background: #25282c}.ace-tomorrow-night {background-color: #1D1F21;color: #C5C8C6}.ace-tomorrow-night .ace_cursor {color: #AEAFAD}.ace-tomorrow-night .ace_marker-layer .ace_selection {background: #373B41}.ace-tomorrow-night.ace_multiselect .ace_selection.ace_start {box-shadow: 0 0 3px 0px #1D1F21;border-radius: 2px}.ace-tomorrow-night .ace_marker-layer .ace_step {background: rgb(102, 82, 0)}.ace-tomorrow-night .ace_marker-layer .ace_bracket {margin: -1px 0 0 -1px;border: 1px solid #4B4E55}.ace-tomorrow-night .ace_marker-layer .ace_active-line {background: #282A2E}.ace-tomorrow-night .ace_gutter-active-line {background-color: #282A2E}.ace-tomorrow-night .ace_marker-layer .ace_selected-word {border: 1px solid #373B41}.ace-tomorrow-night .ace_invisible {color: #4B4E55}.ace-tomorrow-night .ace_keyword,.ace-tomorrow-night .ace_meta,.ace-tomorrow-night .ace_storage,.ace-tomorrow-night .ace_storage.ace_type,.ace-tomorrow-night .ace_support.ace_type {color: #B294BB}.ace-tomorrow-night .ace_keyword.ace_operator {color: #8ABEB7}.ace-tomorrow-night .ace_constant.ace_character,.ace-tomorrow-night .ace_constant.ace_language,.ace-tomorrow-night .ace_constant.ace_numeric,.ace-tomorrow-night .ace_keyword.ace_other.ace_unit,.ace-tomorrow-night .ace_support.ace_constant,.ace-tomorrow-night .ace_variable.ace_parameter {color: #DE935F}.ace-tomorrow-night .ace_constant.ace_other {color: #CED1CF}.ace-tomorrow-night .ace_invalid {color: #CED2CF;background-color: #DF5F5F}.ace-tomorrow-night .ace_invalid.ace_deprecated {color: #CED2CF;background-color: #B798BF}.ace-tomorrow-night .ace_fold {background-color: #81A2BE;border-color: #C5C8C6}.ace-tomorrow-night .ace_entity.ace_name.ace_function,.ace-tomorrow-night .ace_support.ace_function,.ace-tomorrow-night .ace_variable {color: #81A2BE}.ace-tomorrow-night .ace_support.ace_class,.ace-tomorrow-night .ace_support.ace_type {color: #F0C674}.ace-tomorrow-night .ace_heading,.ace-tomorrow-night .ace_markup.ace_heading,.ace-tomorrow-night .ace_string {color: #B5BD68}.ace-tomorrow-night .ace_entity.ace_name.ace_tag,.ace-tomorrow-night .ace_entity.ace_other.ace_attribute-name,.ace-tomorrow-night .ace_meta.ace_tag,.ace-tomorrow-night .ace_string.ace_regexp,.ace-tomorrow-night .ace_variable {color: #CC6666}.ace-tomorrow-night .ace_comment {color: #969896}.ace-tomorrow-night .ace_indent-guide {background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYHB3d/8PAAOIAdULw8qMAAAAAElFTkSuQmCC) right repeat-y}";var a=o("../lib/dom");a.importCssString(e.cssText,e.cssClass)})}).call(this); -(function(){"localhost"!==location.hostname&&"127.0.0.1"!==location.hostname&&Meteor.disconnect();var e=Helpers.defaultContractExample.substr(Helpers.defaultContractExample.indexOf("\n\n")+2);-1!==localStorage.getItem("contractSource").indexOf(e)&&localStorage.setItem("contractSource",Helpers.defaultContractExample),Meteor.Spinner.options={lines:17,length:0,width:4,radius:16,corners:1,rotate:0,direction:1,color:"#000",speed:1.7,trail:49,shadow:!1,hwaccel:!1,className:"spinner",zIndex:10,top:"50%",left:"50%"},web3.eth.isSyncing(function(e,t){e||(t===!0?(console.time("nodeRestarted"),console.log("Node started syncing, stopping app operation"),web3.reset(!0),_.each(collectionObservers,function(e){e&&e.stop()}),collectionObservers=[]):_.isObject(t)?(t.progress=Math.floor((t.currentBlock-t.startingBlock)/(t.highestBlock-t.startingBlock)*100),t.blockDiff=numeral(t.highestBlock-t.currentBlock).format("0,0"),TemplateVar.setTo("header nav","syncing",t)):(console.timeEnd("nodeRestarted"),console.log("Restart app operation again"),TemplateVar.setTo("header nav","syncing",!1),connectToNode()))});var t=function(){web3.isConnected()?web3.eth.getSyncing(function(e,t){e||!t?connectToNode():EthAccounts.init()}):Meteor.setTimeout(function(){var e=web3.admin?"geth":'geth --rpc --rpccorsdomain "'+window.location.protocol+"//"+window.location.host+'"';EthElements.Modal.question({text:new Spacebars.SafeString(TAPi18n.__("wallet.app.texts.connectionError"+(web3.admin?"Mist":"Browser"),{node:e})),ok:function(){Tracker.afterFlush(function(){t()})}},{closeable:!1})},600)};Meteor.startup(function(){Meteor.setTimeout(function(){t()},3e3)})}).call(this); +(function(){"localhost"!==location.hostname&&"127.0.0.1"!==location.hostname&&Meteor.disconnect();var e=Helpers.defaultContractExample.substr(Helpers.defaultContractExample.indexOf("\n\n")+2);localStorage.getItem("contractSource")&&-1!==localStorage.getItem("contractSource").indexOf(e)&&localStorage.setItem("contractSource",Helpers.defaultContractExample),Meteor.Spinner.options={lines:17,length:0,width:4,radius:16,corners:1,rotate:0,direction:1,color:"#000",speed:1.7,trail:49,shadow:!1,hwaccel:!1,className:"spinner",zIndex:10,top:"50%",left:"50%"},web3.eth.isSyncing(function(e,t){e||(t===!0?(console.time("nodeRestarted"),console.log("Node started syncing, stopping app operation"),web3.reset(!0),_.each(collectionObservers,function(e){e&&e.stop()}),collectionObservers=[]):_.isObject(t)?(t.progress=Math.floor((t.currentBlock-t.startingBlock)/(t.highestBlock-t.startingBlock)*100),t.blockDiff=numeral(t.highestBlock-t.currentBlock).format("0,0"),TemplateVar.setTo("header nav","syncing",t)):(console.timeEnd("nodeRestarted"),console.log("Restart app operation again"),TemplateVar.setTo("header nav","syncing",!1),connectToNode()))});var t=function(){web3.isConnected()?web3.eth.getSyncing(function(e,t){e||!t?connectToNode():EthAccounts.init()}):Meteor.setTimeout(function(){var e=web3.admin?"geth":'geth --rpc --rpccorsdomain "'+window.location.protocol+"//"+window.location.host+'"';EthElements.Modal.question({text:new Spacebars.SafeString(TAPi18n.__("wallet.app.texts.connectionError"+(web3.admin?"Mist":"Browser"),{node:e})),ok:function(){Tracker.afterFlush(function(){t()})}},{closeable:!1})},600)};Meteor.startup(function(){Meteor.setTimeout(function(){t()},3e3)})}).call(this); (function(){Wallets=new Mongo.Collection("wallets",{connection:null}),new PersistentMinimongo2(Wallets,"ethereum_wallet"),CustomContracts=new Mongo.Collection("custom-contracts",{connection:null}),new PersistentMinimongo2(CustomContracts,"ethereum_wallet"),Transactions=new Mongo.Collection("transactions",{connection:null}),new PersistentMinimongo2(Transactions,"ethereum_wallet"),PendingConfirmations=new Mongo.Collection("pending-confirmations",{connection:null}),new PersistentMinimongo2(PendingConfirmations,"ethereum_wallet"),Events=new Mongo.Collection("events",{connection:null}),new PersistentMinimongo2(Events,"ethereum_wallet"),Tokens=new Mongo.Collection("tokens",{connection:null}),new PersistentMinimongo2(Tokens,"ethereum_wallet")}).call(this); diff --git a/build/index.html b/build/index.html index 092ab981c..43a596b78 100644 --- a/build/index.html +++ b/build/index.html @@ -3,7 +3,7 @@ - + Ethereum Wallet