Skip to content

Commit 976531f

Browse files
authored
Merge pull request #99 from SIU-CS/dev
Sprint 3 -> dev to master
2 parents a761a86 + e7f9cf6 commit 976531f

File tree

173 files changed

+56137
-1667
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+56137
-1667
lines changed

.DS_Store

-10 KB
Binary file not shown.

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
.vs/
2-
**/.vs
2+
**/.vs
3+
**/.DS_Store

.vscode/temp.sql

Whitespace-only changes.

README.md

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,28 @@ The purpose is to develop a backwards compatible JavaScript multiselect tool wit
1414

1515
**Scrum Master:** Swathi Kaluvakuri
1616
Student Email: [email protected]
17-
Personal Email: [email protected] <br/>
18-
19-
**Members:**<br/>
17+
Personal Email: [email protected]
18+
19+
**Members:**
2020

2121
* Username: james-wasson
2222
23-
Student Email: [email protected] <br/>
24-
23+
Student Email: [email protected]
24+
2525
* Username: N3rdizm
2626
27-
Student Email: [email protected] <br/>
28-
27+
Student Email: [email protected]
28+
2929
* Username: IndranilRoy80133
3030
31-
Student Email:indranil.[email protected] <br/>
32-
31+
Student Email:indranil.[email protected]
32+
3333
* Username: adlevsky
3434
35-
Student Email: [email protected]
35+
Student Email: [email protected]
36+
37+
**JS Fiddle:**
38+
A JSFiddle for the project can be found [here](https://jsfiddle.net/james_wasson/jgmh1ozy/)
3639

3740
**This is a Quagga**<br/>
3841
![A QUAGGA](https://github.com/SIU-CS/QuaggaQuagga-Production/blob/master/git-wiki/Quagga.jpg)

app.build.js

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

js/consts.config.js renamed to app/js/consts.config.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,12 @@ define(['require', 'jquery'],function (require) {
4040
<span class="JSM-title navbar-brand"></span>
4141
<span class="JSM-search">
4242
<input class="JSM-searchbar form-control" type="text" placeholder="Search">
43-
<span class="fa fa-times JSM-closePopList" aria-hidden="true"></span>
4443
</span>
4544
</div>
4645
<!-- MULTISELECT BODY -->
46+
<div class="JSM-popoverDisplay">
47+
</div>
4748
<div class="JSM-body">
48-
<div class="JSM-popoverDisplay collapse in">
49-
</div>
5049
<!-- List structure and base style Via, Marcos from stackoverflow at "https://jsfiddle.net/ann7tctp/" -->
5150
<div class="JSM-list list-group-root collapse">
5251
@@ -76,7 +75,7 @@ define(['require', 'jquery'],function (require) {
7675
}
7776

7877
function MULTISELECTOR_ROOT_NAME() {
79-
return "JS_Multiselect";
78+
return "JSMultiselect";
8079
}
8180
function MULTISELECTOR_STYLE_TYPES() {
8281
return ['singleColumn', 'multiColumn', 'popoverSelect'];
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)