Skip to content

Commit 16ec778

Browse files
author
scates
committed
Added support for dropdown-group {{variables}} via title=
1 parent d26eed1 commit 16ec778

File tree

6 files changed

+140
-115
lines changed

6 files changed

+140
-115
lines changed

Gruntfile.js

Lines changed: 51 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,58 @@
1+
'use strict';
12
module.exports = function(grunt) {
2-
3-
grunt.loadNpmTasks('grunt-contrib-watch');
4-
grunt.loadNpmTasks('grunt-contrib-concat');
5-
grunt.loadNpmTasks('grunt-contrib-copy');
6-
grunt.loadNpmTasks('grunt-contrib-jshint');
7-
grunt.loadNpmTasks('grunt-contrib-uglify');
8-
grunt.loadNpmTasks('grunt-html2js');
9-
grunt.loadNpmTasks('grunt-karma');
10-
grunt.loadNpmTasks('grunt-conventional-changelog');
11-
grunt.loadNpmTasks('grunt-ngdocs');
123

13-
grunt.initConfig({
14-
dist: 'dist',
15-
filename: 'angular-semantic-ui',
16-
pkg: grunt.file.readJSON('package.json'),
17-
concat: {
18-
js:{
19-
src: ['src/angularify.semantic.js', 'src/accordion/accordion.js',
20-
'src/checkbox/checkbox.js', 'src/dimmer/dimmer.js',
21-
'src/dropdown/dropdown.js', 'src/modal/modal.js',
22-
'src/popup/popup.js',
23-
'src/sidebar/sidebar.js', 'src/rating/rating.js'
24-
],
25-
dest: '<%= dist %>/<%= filename %>-<%= pkg.version %>.js'
26-
}
27-
},
28-
uglify: {
29-
dist:{
30-
src:['<%= dist %>/<%= filename %>-<%= pkg.version %>.js'],
31-
dest: '<%= dist %>/<%= filename %>-<%= pkg.version %>.js'
32-
}
33-
},
34-
karma: {
35-
options: {
36-
configFile: 'karma.conf.js'
4+
grunt.loadNpmTasks('grunt-contrib-watch');
5+
grunt.loadNpmTasks('grunt-contrib-concat');
6+
grunt.loadNpmTasks('grunt-contrib-copy');
7+
grunt.loadNpmTasks('grunt-contrib-jshint');
8+
grunt.loadNpmTasks('grunt-contrib-uglify');
9+
grunt.loadNpmTasks('grunt-html2js');
10+
grunt.loadNpmTasks('grunt-karma');
11+
grunt.loadNpmTasks('grunt-conventional-changelog');
12+
grunt.loadNpmTasks('grunt-ngdocs');
13+
14+
grunt.initConfig({
15+
dist: 'dist',
16+
filename: 'angular-semantic-ui',
17+
pkg: grunt.file.readJSON('package.json'),
18+
concat: {
19+
js: {
20+
src: ['src/angularify.semantic.js', 'src/accordion/accordion.js',
21+
'src/checkbox/checkbox.js', 'src/dimmer/dimmer.js',
22+
'src/dropdown/dropdown.js', 'src/modal/modal.js',
23+
'src/popup/popup.js',
24+
'src/sidebar/sidebar.js', 'src/rating/rating.js'
25+
],
26+
dest: '<%= dist %>/<%= filename %>.js'
27+
}
3728
},
38-
watch: {
39-
background: true
29+
uglify: {
30+
dist: {
31+
src: ['<%= dist %>/<%= filename %>.js'],
32+
dest: '<%= dist %>/<%= filename %>.min.js'
33+
}
4034
},
41-
continuous: {
42-
singleRun: true
35+
karma: {
36+
options: {
37+
configFile: 'karma.conf.js'
38+
},
39+
watch: {
40+
background: true
41+
},
42+
continuous: {
43+
singleRun: true
44+
},
4345
},
44-
}
45-
});
46+
watch: {
47+
javascript: {
48+
files: ['src/**/*.js'],
49+
tasks: ['concat:js', 'uglify']
50+
}
4651

47-
grunt.registerTask('build', ['concat:js', 'uglify']);
48-
grunt.registerTask('test', ['karma']);
52+
}
53+
});
4954

50-
grunt.registerTask('angular-semantic-ui-version', 'Prints version of angular-semantic-ui.', function() {
51-
console.log('angular-semantic-ui-0.0.1');
52-
});
53-
}
55+
grunt.registerTask('build', ['concat:js', 'uglify']);
56+
grunt.registerTask('test', ['karma']);
57+
grunt.registerTask('default', ['concat:js', 'uglify', 'watch:javascript']);
58+
};

bower.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"dependencies": {
3535
"angular": "latest",
3636
"angular-mocks" : "latest",
37+
"angular-sanitize" : "latest",
3738
"semantic": "latest"
3839
},
3940
"devDependencies": {

dist/angular-semantic-ui-0.0.1.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/accordion/accordion.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ angular.module('angularify.semantic.accordion', [])
88
this.add_accordion = function(scope) {
99
$scope.accordions.push(scope);
1010

11+
1112
scope.$on('$destroy', function (event) {
1213
this.remove_accordion(scope);
1314
});

src/dropdown/README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,24 @@ Usage
1515
</dropdown>
1616
```
1717

18+
or
19+
20+
```html
21+
<dropdown title="my dropdown" ng-model="category_model">
22+
<dropdown-group title="c" ng-repeat="c in catetories">{{c}}</dropdown-group>
23+
</dropdown>
24+
```
25+
1826
`dropdown` - can have following attributes:
1927

2028
* `title` - title of the dropdown;
2129
* `ng-model` - angular model;
2230
* `open` - `true` || `false`. is current dropdown opened.
2331

32+
`dropdown-group` - can have following attributes:
33+
34+
* `title` - optional setting to set the name and value of the entry. Helpful for those {{variables}} that don't.
35+
2436
Contribution
2537
-------------------------------
2638

0 commit comments

Comments
 (0)