Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Issue #246.1][Try #2] GUI: Add First Operator (regex) #299

Merged
merged 5 commits into from
Nov 28, 2016

Conversation

Jimmy-VVang
Copy link
Contributor

@Jimmy-VVang Jimmy-VVang commented Nov 26, 2016

screenshot 2
screenshot 3

Added Regex Operator -> Added Regex Panel in Menu
Added Delete Button
Added first Javascript interactions with flowchart.js ('createOperator' and 'deleteSelected')

</div>

<div class="dashboard" id="the-flowchart">

<script src="js/onstart.js" type="text/javascript"></script>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix indentation here and throughout the HTML file.

@@ -1,39 +1,58 @@

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix all indentation in this js file and in the onstart.js file.


@Author: Jimmy Wang
*/

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a description to this function maybe.


var operatorI = 0;

var defaultRegex = "zika\s*(virus|fever)";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Constants should be named in upper case, and delimited by underscores. Like this -> DEFAULT_REGEX

@chenlica
Copy link
Collaborator

Did a F2F review. After making a few changes made by @kishore-narendran please go ahead to do the merge.

@chenlica chenlica merged commit c4c61be into master Nov 28, 2016
@chenlica chenlica deleted the jimmy-ui-firstoperator branch November 28, 2016 18:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants