Skip to content

Commit dd35d79

Browse files
wimpyprogrammerwimpyprogrammer
committed
Merge branch 'release/1.0.0'
2 parents 2bef3ad + 31f9b84 commit dd35d79

27 files changed

+1898
-312
lines changed

‎.gitattributes‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Set the default behavior, in case people don't have core.autocrlf set.
2+
* text=auto

‎.htaccess‎

Lines changed: 675 additions & 0 deletions
Large diffs are not rendered by default.

‎LICENSE‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2015 Andrew Keller
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎conditional.html‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎css/bootswatch-flatly-3.3.1.2.min.css‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎css/main.css‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
#input {
2+
height: 5em;
3+
}
4+
TH, TD {
5+
text-align: center;
6+
}
7+
.table-bordered--dark,
8+
.table-bordered--dark > THEAD > TR > TH,
9+
.table-bordered--dark > TBODY > TR > TD {
10+
border-color: #000;
11+
}
12+
.condition.depth-1 {
13+
background-color: #E0F2FF;
14+
}
15+
.condition.depth-2 {
16+
background-color: #C0E8C5;
17+
}
18+
.condition.depth-3 {
19+
background-color: #FFF9D3;
20+
}
21+
.condition.depth-4 {
22+
background-color: #DAC0E8;
23+
}
24+
.condition.depth-5 {
25+
background-color: #FFE3DC;
26+
}
27+
.operator {
28+
background-color: #C6C6C6;
29+
}
30+
.table-bordered .begin-expression {
31+
border-left: 3px solid black;
32+
}
33+
.table-bordered .end-expression {
34+
border-right: 3px solid black;
35+
}

‎css/style.css‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎humans.txt‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# humanstxt.org/
2+
# The humans responsible & technology colophon
3+
4+
# TEAM
5+
6+
Andrew Keller -- Lead Developer -- http://www.wimpyprogrammer.com/
7+
8+
# TECHNOLOGY COLOPHON
9+
10+
HTML5, CSS3, Bootstrap
11+
jQuery, Modernizr, lodash, RequireJS

‎index.html‎

Lines changed: 145 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,145 @@
1+
<!DOCTYPE html>
2+
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
3+
<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
4+
<!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]-->
5+
<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
6+
<head>
7+
<meta charset="utf-8">
8+
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
9+
<title>Conditional Expression Parser</title>
10+
<meta name="description" content="">
11+
<meta name="viewport" content="width=device-width, initial-scale=1">
12+
13+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.1.1/css/bootstrap.min.css">
14+
<style>
15+
body {
16+
padding-top: 50px;
17+
padding-bottom: 20px;
18+
}
19+
</style>
20+
<link rel="stylesheet" href="css/bootswatch-flatly-3.3.1.2.min.css">
21+
<link rel="stylesheet" href="css/main.css">
22+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-tour/0.10.1/css/bootstrap-tour.min.css">
23+
24+
<script src="js/vendor/modernizr-2.6.2.min.js"></script>
25+
</head>
26+
<body>
27+
<!-- Google Tag Manager -->
28+
<noscript>
29+
<iframe src="//www.googletagmanager.com/ns.html?id=GTM-WXV8ZH" height="0" width="0" style="display:none;visibility:hidden"></iframe>
30+
</noscript>
31+
<script>(function(w,d,s,l,i){
32+
w[l]=w[l]||[];
33+
w[l].push({
34+
'gtm.start':new Date().getTime(),event:'gtm.js'
35+
});
36+
var f=d.getElementsByTagName(s)[0],j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';
37+
j.async=true;
38+
j.src='//www.googletagmanager.com/gtm.js?id='+i+dl;
39+
f.parentNode.insertBefore(j,f);
40+
})(window,document,'script','dataLayer','GTM-WXV8ZH');</script>
41+
<!-- End Google Tag Manager -->
42+
43+
<!--[if lt IE 7]>
44+
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
45+
<![endif]-->
46+
<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
47+
<div class="container">
48+
<div class="navbar-header">
49+
<span class="navbar-brand">Conditional Expression Parser</span>
50+
</div>
51+
<div class="navbar-right hidden-xs">
52+
<button class="btn btn-info js-tutorial-start">View Tutorial</button>
53+
</div>
54+
</div>
55+
</nav>
56+
57+
<!-- Main jumbotron for a primary marketing message or call to action -->
58+
<div class="jumbotron">
59+
<div class="container">
60+
<form class="form-horizontal js-input-form">
61+
<label for="input">Expression to parse</label>
62+
<textarea class="form-control js-tutorial-input" id="input" placeholder="Enter your expression"></textarea>
63+
</form>
64+
</div>
65+
</div>
66+
67+
<div class="container">
68+
69+
<div class="row">
70+
71+
<div class="alert alert-info js-intro-text">
72+
<button type="button" class="close" data-dismiss="alert">×</button>
73+
Enter the conditional expression you want to parse in the box above<span class="hidden-xs">, or click "View Tutorial" for a walkthrough</span>.
74+
</div>
75+
76+
<div class="alert alert-danger hidden js-alert-mixed-operators">
77+
Unable to calculate mixed operators
78+
</div>
79+
80+
<div class="panel panel-default hidden js-truth-table">
81+
<div class="panel-heading">Truth Table</div>
82+
83+
<div class="panel-body">
84+
<p>This table shows all combinations in which the conditional expression will evaluate to TRUE. Blank cells indicate that the condition can be either TRUE or FALSE.</p>
85+
</div>
86+
87+
<table class="table table-bordered table-condensed table-responsive table-bordered--dark">
88+
<thead></thead>
89+
<tbody></tbody>
90+
</table>
91+
</div>
92+
93+
</div>
94+
95+
<hr>
96+
97+
<footer class="clearfix">
98+
<p class="pull-left">&copy; <a href="http://www.wimpyprogrammer.com/">WimpyProgrammer.com</a> 2015</p>
99+
<p class="pull-right"><a href="https://github.com/wimpyprogrammer/conditional-expression-parser">Fork me on GitHub</a> or <a href="https://github.com/wimpyprogrammer/conditional-expression-parser/issues">report an issue</a></p>
100+
</footer>
101+
</div> <!-- /container -->
102+
103+
<script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.1.15/require.min.js"></script>
104+
<script>window.define || document.write('<script src="js/vendor/require-2.1.15.min.js"><\/script>')</script>
105+
<script type="text/javascript">
106+
require.config({
107+
baseUrl: 'js/',
108+
paths: {
109+
'jquery': [
110+
'https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min',
111+
'vendor/jquery-2.1.3.min'
112+
],
113+
'lodash': [
114+
'https://cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.min',
115+
'vendor/lodash-2.4.1.min'
116+
],
117+
'bootstrap': [
118+
'https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.1.1/js/bootstrap.min',
119+
'vendor/bootstrap-3.1.1.min'
120+
],
121+
'tour': [
122+
'https://cdnjs.cloudflare.com/ajax/libs/bootstrap-tour/0.10.1/js/bootstrap-tour.min',
123+
'vendor/bootstrap-tour-0.10.1.min'
124+
]
125+
},
126+
shim: {
127+
'underscore': {
128+
exports: '_'
129+
},
130+
'jquery': {
131+
exports: '$'
132+
},
133+
'bootstrap': {
134+
deps: [ 'jquery' ]
135+
},
136+
'tour': {
137+
exports: 'Tour',
138+
deps: [ 'jquery', 'bootstrap' ]
139+
}
140+
}
141+
});
142+
require(['main', 'plugins']);
143+
</script>
144+
</body>
145+
</html>

‎js/condition.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ define(function(require, exports, module) {
1111
return this.text;
1212
};
1313

14-
return Condition;
14+
exports.Condition = Condition;
1515

1616
});

0 commit comments

Comments
 (0)