Skip to content
This repository was archived by the owner on Dec 16, 2019. It is now read-only.

Commit d70bcaf

Browse files
dotansimhadotansimha
authored
Merge pull request #287 from myforce/master
Merge fork back into repo
2 parents 71363f1 + 461b713 commit d70bcaf

File tree

13 files changed

+2174
-1325
lines changed

13 files changed

+2174
-1325
lines changed

‎.editorconfig‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Unix-style newlines with a newline ending every file
2+
[*]
3+
end_of_line = crlf
4+
insert_final_newline = true
5+
6+
indent_style = tab
7+
indent_size = 2

‎README.md‎

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# AngularJS Dropdown Multiselect
2-
This directive gives you a Bootstrap Dropdown with the power of AngularJS directives.
2+
[![CDNJS](https://img.shields.io/cdnjs/v/myforce-angularjs-dropdown-multiselect.svg)](https://cdnjs.com/libraries/myforce-angularjs-dropdown-multiselect)
33

4-
# ** NOTE: This repository is no longer maintained, if you have time and will to help and contribute, please contact me **
4+
This directive gives you a Bootstrap Dropdown with the power of AngularJS directives.
55

66
# Features
77
- Based on Bootstrap's dropdown.
@@ -18,34 +18,27 @@ This directive gives you a Bootstrap Dropdown with the power of AngularJS direct
1818
- Scrollable list (useful for big lists)
1919

2020
## Demo
21-
http://dotansimha.github.io/angularjs-dropdown-multiselect/
21+
http://myforce.github.io/angularjs-dropdown-multiselect/
2222

2323
## Dependencies
24-
- required: AngularJS >= 1.2, Lodash >= 2, Bootstrap >= 3.0
24+
- required: AngularJS >= 1.2, Bootstrap >= 3.0
2525

2626
- Make sure to add the dependencies before the directive's js file.
27-
- Note: Bootstrap JS file is not needed for the directive, it just uses the CSS file.
28-
- **Note: Make sure to add lodash.js to your project, and make sure you use the regulate version of Lodash (NOT lodash.underscore or lodash.compat**
27+
- Note: Bootstrap JS file is not needed for the directive, it just uses the CSS file
2928

3029
## Install
3130
1. Download the files
32-
1. Using bower: <img src="http://benschwarz.github.io/bower-badges/badge@2x.png" width="130" height="30">
31+
1. Using bower: <img src="http://benschwarz.github.io/bower-badges/badge@2x.png" width="130" height="30">
3332

34-
Just run `bower install angularjs-dropdown-multiselect`
33+
Just run `bower install myforce-angularjs-dropdown-multiselect`
3534
2. Manually:
36-
You can download the `.js` file directly or clone this repository.
37-
2. **Include lodash.js in your project.**
38-
- `<script type="text/javascript" src="lodash.js"></script>`.
39-
3. Include the file in your app
35+
You can download the `.js` file directly or clone this repository
36+
2. Include the file in your app
4037
- `<script type="text/javascript" src="angularjs-dropdown-multiselect.js"></script>`.
4138
- You can also use the minfined version (`angularjs-dropdown-multiselect.min.js`).
42-
4. Include the module in angular (i.e. in `app.js`) - `angularjs-dropdown-multiselect`
39+
3. Include the module in angular (i.e. in `app.js`) - `angularjs-dropdown-multiselect`
4340

4441

4542
## Usage and Documentation
4643
See the documentation and examples in the GitHub pages:
47-
http://dotansimha.github.io/angularjs-dropdown-multiselect/
48-
49-
## TODO:
50-
- Feel free to send me more requests for features - open an issue with "feature request" tag - Thanks!
51-
- Keyboard support.
44+
http://myforce.github.io/angularjs-dropdown-multiselect/

‎bower.json‎

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,22 @@
11
{
2-
"name": "angularjs-dropdown-multiselect",
3-
"version": "1.5.2",
2+
"name": "myforce-angularjs-dropdown-multiselect",
3+
"version": "1.10.0",
44
"authors": [
5-
"Dotan Simha <dotansimha@gmail.com>"
5+
"Dotan Simha <dotansimha@gmail.com>",
6+
"Pieter Kempenaers <pkempenaers@myforce.be>"
67
],
78
"description": "AngularJS Dropdown Multiselect directive",
8-
"keywords": ["angular", "angularjs", "directive", "dropdown", "multiselect", "checklist", "list", "bootstrap", "checkbox"],
9+
"keywords": [
10+
"angular",
11+
"angularjs",
12+
"directive",
13+
"dropdown",
14+
"multiselect",
15+
"checklist",
16+
"list",
17+
"bootstrap",
18+
"checkbox"
19+
],
920
"license": "MIT",
1021
"main": "src/angularjs-dropdown-multiselect.js",
1122
"ignore": [
@@ -16,17 +27,16 @@
1627
"tests"
1728
],
1829
"dependencies": {
19-
"angular": "~1.2.0",
20-
"lodash": "~2.4.1"
30+
"angular": "~1"
2131
},
2232
"devDependencies": {
23-
"angular": "~1.2.0",
24-
"angular-animate": "~1.2.0",
25-
"angular-sanitize": "~1.2.0",
26-
"angular-touch": "~1.2.0",
27-
"angular-route": "~1.2.0",
28-
"lodash": "~2.4.1",
33+
"angular": "~1",
34+
"angular-animate": "~1",
35+
"angular-sanitize": "~1",
36+
"angular-touch": "~1",
37+
"angular-route": "~1",
2938
"bootstrap": "~3.1.1",
30-
"angular-highlightjs": "~0.2.7"
39+
"angular-highlightjs": "~0.2.7",
40+
"angular-bootstrap": "^1.3.1"
3141
}
3242
}

‎development_index.html‎

Lines changed: 62 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -2,65 +2,76 @@
22
<html ng-app="exampleApp">
33

44
<head>
5-
<meta charset='utf-8'>
6-
<meta http-equiv="X-UA-Compatible" content="chrome=1">
7-
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
8-
<link rel="stylesheet" type="text/css" href="pages/stylesheets/stylesheet.css" media="screen" />
9-
<link rel="stylesheet" type="text/css" href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" />
10-
<link href='https://fonts.googleapis.com/css?family=Architects+Daughter' rel='stylesheet' type='text/css'>
11-
<script>
12-
var staticPath = '/angularjs-dropdown-multiselect/pages/';
13-
</script>
14-
<style>
15-
.nav,
16-
.pagination,
17-
.carousel,
18-
.panel-title a {
19-
cursor: pointer;
20-
}
21-
</style>
5+
<meta charset='utf-8'>
6+
<meta http-equiv="X-UA-Compatible" content="chrome=1">
7+
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
8+
<link rel="stylesheet" type="text/css" href="./pages/stylesheets/stylesheet.css" media="screen" />
9+
<link rel="stylesheet" type="text/css" href="bower_components/bootstrap/dist/css/bootstrap.css" />
10+
<link href='https://fonts.googleapis.com/css?family=Architects+Daughter' rel='stylesheet' type='text/css'>
11+
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.9.1/styles/github.min.css">
12+
<script>
13+
var staticPath = '/pages/';
14+
</script>
15+
<style>
16+
.nav,
17+
.pagination,
18+
.carousel,
19+
.panel-title a {
20+
cursor: pointer;
21+
}
22+
</style>
2223

23-
<!--[if lt IE 9]>
24-
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
25-
<![endif]-->
24+
<!--[if lt IE 9]>
25+
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
26+
<![endif]-->
2627

27-
<title>AngularJS Dropdown Multiselect by dotansimha</title>
28+
<title>AngularJS Dropdown Multiselect by MyForce</title>
2829
</head>
2930

3031
<body>
31-
<header>
32-
<div class="inner">
33-
<a href="https://github.com/dotansimha/angularjs-dropdown-multiselect" class="btn btn-info pull-right gh-button-link">
34-
<strong>View project on
35-
<br />GitHub</strong>
36-
</a>
37-
<h1>AngularJS Dropdown Multiselect</h1>
38-
<h2>based on Bootstrap's dropdown</h2>
39-
</div>
40-
</header>
41-
<div class="container">
42-
<div class="row">
43-
<div class="col-md-12">
44-
<div ng-view></div>
45-
</div>
46-
</div>
47-
</div>
48-
<p>This page was generated by <a href="https://pages.github.com">GitHub Pages</a> using the Architect theme by <a href="https://twitter.com/jasonlong">Jason Long</a>.
32+
<header>
33+
<div class="inner">
34+
<a href="https://github.com/myforce/angularjs-dropdown-multiselect" class="btn btn-info pull-right gh-button-link">
35+
<strong>
36+
View project on
37+
<br />GitHub
38+
</strong>
39+
</a>
40+
<h1>AngularJS Dropdown Multiselect</h1>
41+
<h2>based on Bootstrap's dropdown</h2>
42+
</div>
43+
</header>
44+
<div class="container">
45+
<div class="row">
46+
<div class="col-md-12">
47+
<div ng-view></div>
48+
</div>
49+
</div>
50+
</div>
51+
<footer>
52+
<div class="inner">
53+
<a href="http://www.myforce.be/" class="pull-right">
54+
<img src="./pages/images/myforcelogokleur.png" />
55+
</a>
56+
<p>Contributed by MyForce NV</p>
57+
<p>This page was generated by <a href="https://pages.github.com">GitHub Pages</a> using the Architect theme by <a href="https://twitter.com/jasonlong">Jason Long</a>.
58+
</div>
59+
</footer>
4960

50-
<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.16/angular.js"></script>
51-
<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.16/angular-route.js"></script>
52-
<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.16/angular-sanitize.js"></script>
53-
<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.16/angular-touch.min.js"></script>
54-
<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.16/angular-animate.js"></script>
55-
<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.min.js"></script>
56-
<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.0/highlight.min.js"></script>
57-
<script type="text/javascript" src="https://rawgit.com/pc035860/angular-highlightjs/master/angular-highlightjs.js"></script>
58-
<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.10.0/ui-bootstrap-tpls.js"></script>
61+
<script type="text/javascript" src="bower_components/angular/angular.js"></script>
62+
<script type="text/javascript" src="bower_components/angular-route/angular-route.js"></script>
63+
<script type="text/javascript" src="bower_components/angular-sanitize/angular-sanitize.js"></script>
64+
<script type="text/javascript" src="bower_components/angular-touch/angular-touch.js"></script>
65+
<script type="text/javascript" src="bower_components/angular-animate/angular-animate.js"></script>
66+
<script type="text/javascript" src="bower_components/highlightjs/highlight.pack.js"></script>
67+
<script type="text/javascript" src="bower_components/angular-highlightjs/angular-highlightjs.js"></script>
68+
<script type="text/javascript" src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
5969

60-
<script type="text/javascript" src="src/angularjs-dropdown-multiselect.js"></script>
70+
<script type="text/javascript" src="src/angularjs-dropdown-multiselect.js"></script>
71+
<!--<script type="text/javascript" src="dist/angularjs-dropdown-multiselect.min.js"></script>-->
6172

62-
<script type="text/javascript" src="pages/javascripts/app.js"></script>
63-
<script type="text/javascript" src="pages/javascripts/pages/home/ExampleCtrl.js"></script>
73+
<script type="text/javascript" src="./pages/javascripts/app.js"></script>
74+
<script type="text/javascript" src="./pages/javascripts/pages/home/ExampleCtrl.js"></script>
6475

6576
</body>
6677

‎dist/angularjs-dropdown-multiselect.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎index.html‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
<!DOCTYPE html>
2+
<html ng-app="exampleApp">
3+
4+
<head>
5+
<meta charset='utf-8'>
6+
<meta http-equiv="X-UA-Compatible" content="chrome=1">
7+
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
8+
<link rel="stylesheet" type="text/css" href="./pages/stylesheets/stylesheet.css" media="screen" />
9+
<link rel="stylesheet" type="text/css" href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" />
10+
<link href='https://fonts.googleapis.com/css?family=Architects+Daughter' rel='stylesheet' type='text/css'>
11+
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.9.1/styles/github.min.css">
12+
<script>
13+
var staticPath = '/angularjs-dropdown-multiselect/pages/';
14+
</script>
15+
<style>
16+
.nav,
17+
.pagination,
18+
.carousel,
19+
.panel-title a {
20+
cursor: pointer;
21+
}
22+
</style>
23+
24+
<!--[if lt IE 9]>
25+
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
26+
<![endif]-->
27+
28+
<title>AngularJS Dropdown Multiselect by MyForce</title>
29+
</head>
30+
31+
<body>
32+
<header>
33+
<div class="inner">
34+
<a href="https://github.com/myforce/angularjs-dropdown-multiselect" class="btn btn-info pull-right gh-button-link">
35+
<strong>
36+
View project on
37+
<br />GitHub
38+
</strong>
39+
</a>
40+
<h1>AngularJS Dropdown Multiselect</h1>
41+
<h2>based on Bootstrap's dropdown</h2>
42+
</div>
43+
</header>
44+
<div class="container">
45+
<div class="row">
46+
<div class="col-md-12">
47+
<div ng-view></div>
48+
</div>
49+
</div>
50+
</div>
51+
<footer>
52+
<div class="inner">
53+
<a href="http://www.myforce.be/" class="pull-right">
54+
<img src="./pages/images/myforcelogokleur.png" />
55+
</a>
56+
<p>Contributed by MyForce NV</p>
57+
<p>This page was generated by <a href="https://pages.github.com">GitHub Pages</a> using the Architect theme by <a href="https://twitter.com/jasonlong">Jason Long</a>.
58+
</div>
59+
</footer>
60+
61+
<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.16/angular.js"></script>
62+
<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.16/angular-route.js"></script>
63+
<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.16/angular-sanitize.js"></script>
64+
<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.16/angular-touch.min.js"></script>
65+
<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.16/angular-animate.js"></script>
66+
<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.0/highlight.min.js"></script>
67+
<script type="text/javascript" src="https://rawgit.com/pc035860/angular-highlightjs/master/angular-highlightjs.js"></script>
68+
<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.10.0/ui-bootstrap-tpls.js"></script>
69+
70+
<script type="text/javascript" src="src/angularjs-dropdown-multiselect.js"></script>
71+
72+
<script type="text/javascript" src="./pages/javascripts/app.js"></script>
73+
<script type="text/javascript" src="./pages/javascripts/pages/home/ExampleCtrl.js"></script>
74+
75+
</body>
76+
77+
</html>

‎package.json‎

Lines changed: 38 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,40 @@
11
{
2-
"author": "",
3-
"name": "angularjs-dropdown-multiselect-demo",
4-
"version": "0.0.0",
5-
"description": "",
6-
"homepage": "",
7-
"dependencies": {
8-
"source-map": "^0.1.34"
9-
},
10-
"devDependencies": {
11-
"express": "~3.4.4",
12-
"grunt": "^0.4.5",
13-
"grunt-build-control": "^0.1.3",
14-
"grunt-contrib-concat": "~0.3.0",
15-
"grunt-contrib-cssmin": "~0.7.0",
16-
"grunt-contrib-jshint": "~0.7.0",
17-
"grunt-contrib-less": "~0.8.1",
18-
"grunt-contrib-uglify": "~0.2.5",
19-
"grunt-karma": "~0.6.2"
20-
},
21-
"scripts": {
22-
"test": "echo \"Error: no test specified\" && exit 1"
23-
},
24-
"repository": "",
25-
"engines": {
26-
"node": "0.10.10"
27-
}
2+
"author": "pkempenaers@myforce.be",
3+
"name": "angularjs-dropdown-multiselect",
4+
"version": "0.0.0",
5+
"description": "This directive gives you a Bootstrap Dropdown with the power of AngularJS directives.",
6+
"homepage": "http://myforce.github.io/angularjs-dropdown-multiselect/#/",
7+
"dependencies": {
8+
"angular": "~1"
9+
},
10+
"devDependencies": {
11+
"express": "~3.4.4",
12+
"grunt": "^0.4.5",
13+
"grunt-build-control": "^0.1.3",
14+
"grunt-contrib-concat": "~0.3.0",
15+
"grunt-contrib-cssmin": "~0.7.0",
16+
"grunt-contrib-jshint": "~0.7.0",
17+
"grunt-contrib-less": "~0.8.1",
18+
"grunt-contrib-uglify": "~0.2.5",
19+
"grunt-karma": "~0.6.2"
20+
},
21+
"scripts": {
22+
"test": "echo \"Error: no test specified\" && exit 1"
23+
},
24+
"repository": {
25+
"type": "git",
26+
"url": "git+https://github.com/myforce/angularjs-dropdown-multiselect.git"
27+
},
28+
"engines": {
29+
"node": "0.10.10"
30+
},
31+
"main": "src/angularjs-dropdown-multiselect.js",
32+
"keywords": [
33+
"angular",
34+
"multiselect"
35+
],
36+
"license": "MIT",
37+
"bugs": {
38+
"url": "https://github.com/myforce/angularjs-dropdown-multiselect/issues"
39+
}
2840
}

‎pages/images/myforcelogokleur.png‎

3.41 KB
Loading

0 commit comments

Comments
 (0)