Merge branch 'newdev'

Conflicts:
	dist/angular-leaflet-directive.min.js
	src/angular-leaflet-directive.js

Author: tombatossals

.travis.yml

@@ -0,0 +1,5 @@
+branches:
+  only:
+    - master
+    - gh-pages
+language: javascript

Gruntfile.js

@@ -8,7 +8,7 @@ module.exports = function(grunt) {
             },
             dist: {
                 files: {
-                    'dist/<%= pkg.name %>.min.js': ['dist/angular-leaflet-directive.ngmin.js']
+                    'dist/<%= pkg.name %>.min.no-header.js': ['dist/angular-leaflet-directive.ngmin.js']
                 }
             }
         },
@@ -31,12 +31,13 @@ module.exports = function(grunt) {
                 browser: true,
                 globals: {
                     angular: true,
+                    console: true,
                     module: true,
                     L: true,
                 }
             },
             source: {
-                src: ['src/angular-leaflet-directive.js']
+                src: ['dist/angular-leaflet-directive.js']
             },
             tests: {
                 src: ['test/unit/*.js', 'test/e2e/*.js'],
@@ -75,7 +76,7 @@ module.exports = function(grunt) {
         ngmin: {
             directives: {
                 expand: true,
-                cwd: 'src',
+                cwd: 'dist',
                 src: ['angular-leaflet-directive.js'],
                 dest: 'dist',
                 ext: '.ngmin.js',
@@ -84,20 +85,64 @@ module.exports = function(grunt) {
         },
         watch: {
             source: {
-                files: ['src/angular-leaflet-directive.js', 'test/unit/*.js', 'test/e2e/*.js'],
-                tasks: [ 'karma:background:run', 'jshint', 'ngmin', 'uglify' ]
+                files: [
+                        'src/**/*.js',
+                        'test/unit/*.js',
+                        'test/e2e/*.js'
+                       ],
+                tasks: [
+                        'karma:background:run',
+                        'concat:dist',
+                        'jshint',
+                        'ngmin',
+                        'uglify',
+                        'concat:license'
+                       ]
             },
             grunt: {
                 files: ['Gruntfile.js'],
                 tasks: ['jshint:grunt']
             }
-        }
+        },
+        concat: {
+            dist: {
+                options: {
+                    banner: '(function() {\n\n"use strict";\n\n',
+                    footer: '\n}());'
+                },
+                src: [
+                      'src/modules/Scope.SafeApply.js',
+                      'src/main.js',
+                      'src/directives/leaflet.js',
+                      'src/directives/center.js',
+                      'src/directives/tiles.js',
+                      'src/directives/legend.js',
+                      'src/directives/geojson.js',
+                      'src/directives/layers.js',
+                      'src/directives/bounds.js',
+                      'src/directives/markers.js',
+                      'src/directives/paths.js',
+                      'src/directives/eventBroadcast.js',
+                      'src/directives/maxBounds.js',
+                      'src/services/leafletData.js'
+                     ],
+                dest: 'dist/angular-leaflet-directive.js',
+            },
+            license: {
+                src: [
+                      'src/header-MIT-license.txt',
+                      'dist/angular-leaflet-directive.min.no-header.js'
+                     ],
+                dest: 'dist/angular-leaflet-directive.min.js',
+            }
+        },
     });
 
     grunt.loadNpmTasks('grunt-contrib-jshint');
     grunt.loadNpmTasks('grunt-contrib-uglify');
     grunt.loadNpmTasks('grunt-contrib-connect');
     grunt.loadNpmTasks('grunt-contrib-watch');
+    grunt.loadNpmTasks('grunt-contrib-concat');
     grunt.loadNpmTasks('grunt-karma');
     grunt.loadNpmTasks('grunt-ngmin');
 

config/karma.conf.js

@@ -9,8 +9,14 @@ module.exports = function(karma) {
             'test/lib/angular/angular.js',
             'test/lib/angular/angular-mocks.js',
             'test/lib/markercluster/leaflet.markercluster.js',
-            'src/angular-leaflet-directive.js',
-            'test/unit/**/*.js'
+            'dist/angular-leaflet-directive.js',
+            'test/unit/leafletDirectiveSpec.js',
+            'test/unit/tilesDirectiveSpec.js',
+            'test/unit/centerDirectiveSpec.js',
+            'test/unit/pathsDirectiveSpec.js',
+            'test/unit/layersDirectiveSpec.js',
+            'test/unit/markersDirectiveSpec.js',
+            'test/unit/eventsDirectiveSpec.js'
         ],
 
         // Frameworks
@@ -28,9 +34,9 @@ module.exports = function(karma) {
         // - Safari
         // - PhantomJS
         browsers: [
-            'Firefox'
+            //'Firefox'
             //'Chrome'
-            //'PhantomJS'
+            'PhantomJS'
         ],
 
         // test results reporter to use