Skip to content

B
baas-ide
Commit ff65dbd3 authored by Alex Beregszaszi's avatar Alex Beregszaszi
Browse files
Options

Move ballot example into src/app/example-contracts

parent e5141cab
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 36 deletions
index.html
View file @ ff65dbd3
...@@ -35,13 +35,9 @@ ...@@ -35,13 +35,9 @@
<link rel="stylesheet" href="assets/css/font-awesome.min.css"> <link rel="stylesheet" href="assets/css/font-awesome.min.css">
<link rel="icon" type="x-icon" href="icon.png"> <link rel="icon" type="x-icon" href="icon.png">
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
<script src="assets/js/ballot.sol.js"></script>
</head> </head>
<body> <body>
<div id="editor"> <div id="editor">
<span class="newFile" title="New File"><i class="fa fa-file-code-o"></i></span> <span class="newFile" title="New File"><i class="fa fa-file-code-o"></i></span>
<span class="uploadFile" title="Upload"><label class="fa fa-upload"><input type="file" class="inputFile" multiple /></label></span> <span class="uploadFile" title="Upload"><label class="fa fa-upload"><input type="file" class="inputFile" multiple /></label></span>
......
package.json
View file @ ff65dbd3
...@@ -59,7 +59,6 @@ ...@@ -59,7 +59,6 @@
"private": true, "private": true,
"semistandard": { "semistandard": {
"ignore": [ "ignore": [
"assets/js/",
"build/", "build/",
"src/mode-solidity.js", "src/mode-solidity.js",
"nightwatch.js", "nightwatch.js",
......
src/app/editor.js
View file @ ff65dbd3
/* global BALLOT_EXAMPLE, FileReader */ /* global FileReader */
'use strict'; 'use strict';
var utils = require('./utils'); var utils = require('./utils');
var examples = require('./example-contracts');
var ace = require('brace'); var ace = require('brace');
require('../mode-solidity.js'); require('../mode-solidity.js');
...@@ -178,7 +179,7 @@ function Editor (loadingFromGist, storage) { ...@@ -178,7 +179,7 @@ function Editor (loadingFromGist, storage) {
} }
SOL_CACHE_FILE = SOL_CACHE_UNTITLED + untitledCount; SOL_CACHE_FILE = SOL_CACHE_UNTITLED + untitledCount;
files.push(SOL_CACHE_FILE); files.push(SOL_CACHE_FILE);
storage.set(SOL_CACHE_FILE, BALLOT_EXAMPLE); // defined in assets/js/ballot.sol.js storage.set(SOL_CACHE_FILE, examples.ballot);
} }
SOL_CACHE_FILE = files[0]; SOL_CACHE_FILE = files[0];
......
assets/js/ballot.sol.js → src/app/example-contracts.js
View file @ ff65dbd3
/* var ballot = `pragma solidity ^0.4.0;
* The MIT License (MIT)
*
* Copyright (c) 2014, 2015, the individual contributors
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
var multi = function (func) { return func.toString().match(/[^]*\/\*([^]*)\*\/\}$/)[1]; };
var BALLOT_EXAMPLE = multi(function () { /*pragma solidity ^0.4.0;
contract Ballot { contract Ballot {
struct Voter { struct Voter {
...@@ -88,5 +62,8 @@ contract Ballot { ...@@ -88,5 +62,8 @@ contract Ballot {
winningProposal = proposal; winningProposal = proposal;
} }
} }
} }`;
*/});
module.exports = {
ballot: ballot
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment