Merge pull request #7 from solcates/master

PR to add support for {{variables}} in dropdown-group

Author: 0xAX

Changelog.md

@@ -1,5 +1,8 @@
 0.0.2 [WiP]
 =============================
+  * Added Wizard directive
+  * fixes to dropdown to update model, and allow for {{variables}} as title
+  * code clean up and grunt task optimization
 
 0.0.1 [Released]
 =============================

Contributors.md

@@ -5,3 +5,4 @@ Contributors:
   * [Nikita K.](https://github.com/Mendor)
   * [StudioThree10](https://github.com/studiothree10)
   * [cgroner](https://github.com/cgroner)
+  * [solcates](https://github.com/solcates)

Gruntfile.js

@@ -1,53 +1,63 @@
+'use strict';
 module.exports = function(grunt) {
-  
-  grunt.loadNpmTasks('grunt-contrib-watch');
-  grunt.loadNpmTasks('grunt-contrib-concat');
-  grunt.loadNpmTasks('grunt-contrib-copy');
-  grunt.loadNpmTasks('grunt-contrib-jshint');
-  grunt.loadNpmTasks('grunt-contrib-uglify');
-  grunt.loadNpmTasks('grunt-html2js');
-  grunt.loadNpmTasks('grunt-karma');
-  grunt.loadNpmTasks('grunt-conventional-changelog');
-  grunt.loadNpmTasks('grunt-ngdocs');
 
-  grunt.initConfig({
-    dist: 'dist',
-    filename: 'angular-semantic-ui',
-    pkg: grunt.file.readJSON('package.json'),
-    concat: {
-      js:{
-        src: ['src/angularify.semantic.js', 'src/accordion/accordion.js',
-              'src/checkbox/checkbox.js',   'src/dimmer/dimmer.js',
-              'src/dropdown/dropdown.js',   'src/modal/modal.js',
-              'src/popup/popup.js',         
-              'src/sidebar/sidebar.js', 'src/rating/rating.js'
-             ],
-        dest: '<%= dist %>/<%= filename %>-<%= pkg.version %>.js'
-      }
-    },
-    uglify: {
-      dist:{
-        src:['<%= dist %>/<%= filename %>-<%= pkg.version %>.js'],
-            dest: '<%= dist %>/<%= filename %>-<%= pkg.version %>.js'
-      }
-    },
-    karma: {
-      options: {
-          configFile: 'karma.conf.js'
+    grunt.loadNpmTasks('grunt-contrib-watch');
+    grunt.loadNpmTasks('grunt-contrib-concat');
+    grunt.loadNpmTasks('grunt-contrib-copy');
+    grunt.loadNpmTasks('grunt-contrib-jshint');
+    grunt.loadNpmTasks('grunt-contrib-uglify');
+    grunt.loadNpmTasks('grunt-html2js');
+    grunt.loadNpmTasks('grunt-karma');
+    grunt.loadNpmTasks('grunt-conventional-changelog');
+    grunt.loadNpmTasks('grunt-ngdocs');
+
+    grunt.initConfig({
+        dist: 'dist',
+        filename: 'angular-semantic-ui',
+        pkg: grunt.file.readJSON('package.json'),
+        concat: {
+            js: {
+                src: ['src/angularify.semantic.js',
+                    'src/accordion/accordion.js',
+                    'src/checkbox/checkbox.js',
+                    'src/dimmer/dimmer.js',
+                    'src/dropdown/dropdown.js',
+                    'src/modal/modal.js',
+                    'src/popup/popup.js',
+                    'src/sidebar/sidebar.js',
+                    'src/rating/rating.js',
+                    'src/wizard/wizard.js',
+                ],
+                dest: '<%= dist %>/<%= filename %>.js'
+            }
         },
-        watch: {
-          background: true
+        uglify: {
+            dist: {
+                src: ['<%= dist %>/<%= filename %>.js'],
+                dest: '<%= dist %>/<%= filename %>.min.js'
+            }
         },
-        continuous: {
-          singleRun: true
+        karma: {
+            options: {
+                configFile: 'karma.conf.js'
+            },
+            watch: {
+                background: true
+            },
+            continuous: {
+                singleRun: true
+            },
         },
-    }
-  });
+        watch: {
+            javascript: {
+                files: ['src/**/*.js'],
+                tasks: ['concat:js', 'uglify']
+            }
 
-  grunt.registerTask('build', ['concat:js', 'uglify']);
-  grunt.registerTask('test',  ['karma']);
+        }
+    });
 
-  grunt.registerTask('angular-semantic-ui-version', 'Prints version of angular-semantic-ui.', function() {
-    console.log('angular-semantic-ui-0.0.1');
-  });
-}
+    grunt.registerTask('build', ['concat:js', 'uglify']);
+    grunt.registerTask('test', ['karma']);
+    grunt.registerTask('default', ['concat:js', 'uglify', 'watch:javascript']);
+};

bower.json

@@ -6,25 +6,25 @@
     "angular",
     "ui"
   ],
-  "homepage": "http://0xAX.github.io/angular-semantic-ui",
-  "bugs": "https://github.com/angularify/angular-semantic-ui",
+  "homepage": "http://solcates.github.io/angular-semantic-ui",
+  "bugs": "https://github.com/solcates/angular-semantic-ui",
   "author": {
     "name": "Alex Kuleshov",
     "url": "https://github.com/0xAX"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/angularify/angular-semantic-ui.git"
+    "url": "https://github.com/solcates/angular-semantic-ui.git"
   },
   "licenses": [
     {
       "type": "MIT",
-      "url": "https://github.com/angularify/angular-semantic-ui/blob/master/LICENSE.md"
+      "url": "https://github.com/solcates/angular-semantic-ui/blob/master/LICENSE.md"
     }
   ],
   "main": [
-    "dist/angular-semantic-ui.min.js",
-    "dist/angular-semantic-ui.tpl.min.js"
+    "dist/angular-semantic-ui.js",
+    "dist/angular-semantic-ui.min.js"
   ],
   "ignore": [
     "docs",

dist/angular-semantic-ui-0.0.1.js

@@ -8,6 +8,7 @@ angular.module('angularify.semantic.accordion', [])
     this.add_accordion = function(scope) {
         $scope.accordions.push(scope);
 
+        
         scope.$on('$destroy', function (event) {
             this.remove_accordion(scope);
         });

src/accordion/accordion.js

@@ -5,4 +5,5 @@ angular.module('angularify.semantic', ['angularify.semantic.accordion',
 	                                   'angularify.semantic.modal',
 	                                   'angularify.semantic.popup',
 	                                   'angularify.semantic.rating',
-	                                   'angularify.semantic.sidebar']);
+	                                   'angularify.semantic.sidebar',
+	                                   'angularify.semantic.wizard']);

src/angularify.semantic.js

@@ -15,12 +15,24 @@ Usage
 </dropdown>
 ```
 
+or
+
+```html
+<dropdown title="my dropdown" ng-model="category_model">
+	<dropdown-group title="c" ng-repeat="c in catetories">{{c}}</dropdown-group>
+</dropdown>
+```
+
 `dropdown` - can have following attributes:
 
   * `title` - title of the dropdown;
   * `ng-model` - angular model;
   * `open` - `true` || `false`. is current dropdown opened.
 
+`dropdown-group` - can have following attributes:
+
+  * `title` - optional setting to set the name and value of the entry. Helpful for those {{variables}} that don't.
+
 Contribution
 -------------------------------